flink-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fhue...@apache.org
Subject [4/8] flink git commit: [FLINK-3116] Remove RecordOperator
Date Mon, 21 Dec 2015 17:44:07 GMT
[FLINK-3116] Remove RecordOperator

This closes #1444


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

Branch: refs/heads/master
Commit: ba2aba80f578659b8e7331855d1518744c90f860
Parents: a6a0528
Author: Jun Aoki <jaoki@apache.org>
Authored: Tue Dec 8 14:49:41 2015 -0800
Committer: Fabian Hueske <fhueske@apache.org>
Committed: Mon Dec 21 16:48:45 2015 +0100

----------------------------------------------------------------------
 .../api/common/operators/RecordOperator.java    | 35 --------------------
 .../flink/optimizer/util/NoOpBinaryUdfOp.java   | 10 +-----
 .../flink/optimizer/util/NoOpUnaryUdfOp.java    | 10 +-----
 3 files changed, 2 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/ba2aba80/flink-core/src/main/java/org/apache/flink/api/common/operators/RecordOperator.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/RecordOperator.java
b/flink-core/src/main/java/org/apache/flink/api/common/operators/RecordOperator.java
deleted file mode 100644
index bfad3b3..0000000
--- a/flink-core/src/main/java/org/apache/flink/api/common/operators/RecordOperator.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.flink.api.common.operators;
-
-import org.apache.flink.types.Key;
-
-/**
- * Interface marking operators to be referring to the {@link org.apache.flink.types.Record}
data model.
- */
-public interface RecordOperator {
-	
-	/**
-	 * Gets the key classes that this operator works on.
-	 * 
-	 * @return The key classes that this operator works on.
-	 */
-	Class<? extends Key<?>>[] getKeyClasses();
-}

http://git-wip-us.apache.org/repos/asf/flink/blob/ba2aba80/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java
----------------------------------------------------------------------
diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java
b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java
index 5110849..a2544ea 100644
--- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java
+++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpBinaryUdfOp.java
@@ -25,24 +25,16 @@ import org.apache.flink.api.common.functions.RuntimeContext;
 import org.apache.flink.api.common.functions.util.NoOpFunction;
 import org.apache.flink.api.common.operators.BinaryOperatorInformation;
 import org.apache.flink.api.common.operators.DualInputOperator;
-import org.apache.flink.api.common.operators.RecordOperator;
 import org.apache.flink.api.common.operators.util.UserCodeClassWrapper;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.types.Key;
 
 
-public class NoOpBinaryUdfOp<OUT> extends DualInputOperator<OUT, OUT, OUT, NoOpFunction>
implements RecordOperator {
+public class NoOpBinaryUdfOp<OUT> extends DualInputOperator<OUT, OUT, OUT, NoOpFunction>
{
 
 	public NoOpBinaryUdfOp(TypeInformation<OUT> type) {
 		super(new UserCodeClassWrapper<NoOpFunction>(NoOpFunction.class), new BinaryOperatorInformation<OUT,
OUT, OUT>(type, type, type), "NoContract");
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public Class<? extends Key<?>>[] getKeyClasses() {
-		return (Class<? extends Key<?>>[]) new Class[0];
-	}
-
 	@Override
 	protected List<OUT> executeOnCollections(List<OUT> inputData1, List<OUT>
inputData2, RuntimeContext runtimeContext, ExecutionConfig executionConfig) {
 		throw new UnsupportedOperationException();

http://git-wip-us.apache.org/repos/asf/flink/blob/ba2aba80/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java
----------------------------------------------------------------------
diff --git a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java
b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java
index 8537b9c..f0de9ea 100644
--- a/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java
+++ b/flink-optimizer/src/main/java/org/apache/flink/optimizer/util/NoOpUnaryUdfOp.java
@@ -23,15 +23,13 @@ import java.util.List;
 import org.apache.flink.api.common.ExecutionConfig;
 import org.apache.flink.api.common.functions.RuntimeContext;
 import org.apache.flink.api.common.functions.util.NoOpFunction;
-import org.apache.flink.api.common.operators.RecordOperator;
 import org.apache.flink.api.common.operators.SingleInputOperator;
 import org.apache.flink.api.common.operators.UnaryOperatorInformation;
 import org.apache.flink.api.common.operators.util.UserCodeClassWrapper;
 import org.apache.flink.api.common.typeinfo.TypeInformation;
-import org.apache.flink.types.Key;
 
 
-public class NoOpUnaryUdfOp<OUT> extends SingleInputOperator<OUT, OUT, NoOpFunction>
implements RecordOperator {
+public class NoOpUnaryUdfOp<OUT> extends SingleInputOperator<OUT, OUT, NoOpFunction>
{
 	
 	@SuppressWarnings("rawtypes")
 	public static final NoOpUnaryUdfOp INSTANCE = new NoOpUnaryUdfOp();
@@ -42,12 +40,6 @@ public class NoOpUnaryUdfOp<OUT> extends SingleInputOperator<OUT,
OUT, NoOpFunct
 		super(new UserCodeClassWrapper<NoOpFunction>(NoOpFunction.class), null, "");
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public Class<? extends Key<?>>[] getKeyClasses() {
-		return (Class<? extends Key<?>>[]) new Class[0];
-	}
-
 	@Override
 	public UnaryOperatorInformation<OUT, OUT> getOperatorInfo() {
 		TypeInformation<OUT> previousOut = input.getOperatorInfo().getOutputType();


Mime
View raw message