You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/11/02 20:48:32 UTC

flink git commit: [FLINK-4996] [core] Make CrossHint @Public

Repository: flink
Updated Branches:
  refs/heads/release-1.1 8412234eb -> 6e57e7f46


[FLINK-4996] [core] Make CrossHint @Public

This closes #2743.


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

Branch: refs/heads/release-1.1
Commit: 6e57e7f463873cc9a36c71e3edde91a724bd48a6
Parents: 8412234
Author: Greg Hogan <co...@greghogan.com>
Authored: Wed Nov 2 11:02:51 2016 -0400
Committer: Fabian Hueske <fh...@apache.org>
Committed: Wed Nov 2 21:48:00 2016 +0100

----------------------------------------------------------------------
 .../flink/api/common/operators/base/CrossOperatorBase.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/6e57e7f4/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java
index 95d5bc3..72da53d 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/CrossOperatorBase.java
@@ -18,10 +18,8 @@
 
 package org.apache.flink.api.common.operators.base;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.apache.flink.annotation.Internal;
+import org.apache.flink.annotation.Public;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.functions.CrossFunction;
 import org.apache.flink.api.common.functions.RuntimeContext;
@@ -33,6 +31,9 @@ import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper;
 import org.apache.flink.api.common.operators.util.UserCodeWrapper;
 import org.apache.flink.api.common.typeutils.TypeSerializer;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @see org.apache.flink.api.common.functions.CrossFunction
  */
@@ -42,6 +43,7 @@ public class CrossOperatorBase<IN1, IN2, OUT, FT extends CrossFunction<IN1, IN2,
 	/**
 	 * The cross hint tells the system which sizes to expect from the data sets
 	 */
+	@Public
 	public static enum CrossHint {
 		
 		OPTIMIZER_CHOOSES,