flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ches...@apache.org
Subject [1/4] flink git commit: [hotfix] Fix condition in CoGroupRawDescriptor
Date Sun, 27 Nov 2016 11:51:32 GMT
Repository: flink
Updated Branches:
  refs/heads/master 1b2f3c06d -> e2b93f69c


[hotfix] Fix condition in CoGroupRawDescriptor

This closes #2852.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7d34f654
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7d34f654
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7d34f654

Branch: refs/heads/master
Commit: 7d34f654c3a1dcd470d1f919918e0d2c44e5573c
Parents: 2eacfba
Author: Boris Osipov <boris_osipov@epam.com>
Authored: Tue Nov 22 17:42:54 2016 +0300
Committer: zentol <chesnay@apache.org>
Committed: Sun Nov 27 10:57:58 2016 +0100

----------------------------------------------------------------------
 .../org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/7d34f654/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java
----------------------------------------------------------------------
diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java
b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java
index 61561a4..5a981b6 100644
--- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java
+++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/operators/CoGroupRawDescriptor.java
@@ -114,7 +114,7 @@ public class CoGroupRawDescriptor extends OperatorDescriptorDual {
 		Ordering prod2 = produced2.getOrdering();
 
 		if (prod1 == null || prod2 == null || prod1.getNumberOfFields() < numRelevantFields
-				|| prod2.getNumberOfFields() < prod2.getNumberOfFields()) {
+				|| prod2.getNumberOfFields() < numRelevantFields) {
 			throw new CompilerException("The given properties do not meet this operators requirements.");
 		}
 


Mime
View raw message