From 066913e2360db3c184e12f0104c87b91824b449b Mon Sep 17 00:00:00 2001 From: Stephan Ewen Date: Sun, 13 Dec 2015 19:50:37 +0100 Subject: [PATCH] [FLINK-3169] Move Record Type Utils from flink-java to flink-runtime/test --- .../api/java/typeutils/RecordTypeInfo.java | 95 ------------------- .../java/typeutils/RecordTypeInfoTest.java | 44 --------- .../operators/CachedMatchTaskTest.java | 4 +- .../operators/CoGroupTaskExternalITCase.java | 4 +- .../runtime/operators/CoGroupTaskTest.java | 4 +- .../operators/CombineTaskExternalITCase.java | 2 +- .../runtime/operators/DataSinkTaskTest.java | 2 +- .../operators/JoinTaskExternalITCase.java | 4 +- .../flink/runtime/operators/JoinTaskTest.java | 4 +- .../operators/LeftOuterJoinTaskTest.java | 6 -- .../operators/ReduceTaskExternalITCase.java | 4 +- .../runtime/operators/ReduceTaskTest.java | 4 +- .../operators/chaining/ChainTaskTest.java | 4 +- .../operators/hash/HashTableITCase.java | 4 +- ...ckResettableMutableObjectIteratorTest.java | 2 +- ...NonReusingBlockResettableIteratorTest.java | 2 +- .../ReusingBlockResettableIteratorTest.java | 2 +- ...ngResettableMutableObjectIteratorTest.java | 2 +- .../operators/testutils/DriverTestBase.java | 4 +- .../operators/testutils/TaskTestBase.java | 2 +- .../operators/util/OutputEmitterTest.java | 4 +- .../recordutils}/RecordComparator.java | 2 +- .../recordutils}/RecordComparatorFactory.java | 2 +- .../recordutils}/RecordPairComparator.java | 2 +- .../RecordPairComparatorFactory.java | 2 +- .../recordutils}/RecordSerializer.java | 2 +- .../recordutils}/RecordSerializerFactory.java | 2 +- .../NonReusingKeyGroupedIteratorTest.java | 2 +- .../util/ReusingKeyGroupedIteratorTest.java | 4 +- 29 files changed, 38 insertions(+), 183 deletions(-) delete mode 100644 flink-java/src/main/java/org/apache/flink/api/java/typeutils/RecordTypeInfo.java delete mode 100644 flink-java/src/test/java/org/apache/flink/api/java/typeutils/RecordTypeInfoTest.java rename {flink-core/src/main/java/org/apache/flink/api/common/typeutils/record => flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils}/RecordComparator.java (99%) rename {flink-core/src/main/java/org/apache/flink/api/common/typeutils/record => flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils}/RecordComparatorFactory.java (98%) rename {flink-core/src/main/java/org/apache/flink/api/common/typeutils/record => flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils}/RecordPairComparator.java (98%) rename {flink-core/src/main/java/org/apache/flink/api/common/typeutils/record => flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils}/RecordPairComparatorFactory.java (98%) rename {flink-core/src/main/java/org/apache/flink/api/common/typeutils/record => flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils}/RecordSerializer.java (98%) rename {flink-core/src/main/java/org/apache/flink/api/common/typeutils/record => flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils}/RecordSerializerFactory.java (97%) diff --git a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/RecordTypeInfo.java b/flink-java/src/main/java/org/apache/flink/api/java/typeutils/RecordTypeInfo.java deleted file mode 100644 index e9ce1029e43..00000000000 --- a/flink-java/src/main/java/org/apache/flink/api/java/typeutils/RecordTypeInfo.java +++ /dev/null @@ -1,95 +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.java.typeutils; - -import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeinfo.TypeInformation; -import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.record.RecordSerializer; -import org.apache.flink.types.Record; - -/** - * Type information for the {@link Record} data type. - */ -public class RecordTypeInfo extends TypeInformation { - - private static final long serialVersionUID = 1L; - - @Override - public boolean isBasicType() { - return false; - } - - @Override - public boolean isTupleType() { - return false; - } - - @Override - public int getArity() { - return 1; - } - - @Override - public int getTotalFields() { - return 1; - } - - @Override - public Class getTypeClass() { - return Record.class; - } - - @Override - public boolean isKeyType() { - return false; - } - - @Override - public TypeSerializer createSerializer(ExecutionConfig config) { - return RecordSerializer.get(); - } - - // -------------------------------------------------------------------------------------------- - - @Override - public int hashCode() { - return Record.class.hashCode(); - } - - @Override - public boolean canEqual(Object obj) { - return obj instanceof RecordTypeInfo; - } - - @Override - public boolean equals(Object obj) { - if (obj instanceof RecordTypeInfo) { - RecordTypeInfo recordTypeInfo = (RecordTypeInfo) obj; - return recordTypeInfo.canEqual(this); - } else { - return false; - } - } - - @Override - public String toString() { - return "RecordType"; - } -} diff --git a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/RecordTypeInfoTest.java b/flink-java/src/test/java/org/apache/flink/api/java/typeutils/RecordTypeInfoTest.java deleted file mode 100644 index 7aeb0625b52..00000000000 --- a/flink-java/src/test/java/org/apache/flink/api/java/typeutils/RecordTypeInfoTest.java +++ /dev/null @@ -1,44 +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.java.typeutils; - -import org.apache.flink.util.TestLogger; -import org.junit.Test; - -import static org.junit.Assert.*; - -public class RecordTypeInfoTest extends TestLogger { - - @Test - public void testRecordTypeInfoEquality() { - RecordTypeInfo tpeInfo1 = new RecordTypeInfo(); - RecordTypeInfo tpeInfo2 = new RecordTypeInfo(); - - assertEquals(tpeInfo1, tpeInfo2); - assertEquals(tpeInfo1.hashCode(), tpeInfo2.hashCode()); - } - - @Test - public void testRecordTypeInfoInequality() { - RecordTypeInfo tpeInfo1 = new RecordTypeInfo(); - MissingTypeInfo tpeInfo2 = new MissingTypeInfo("foobar"); - - assertNotEquals(tpeInfo1, tpeInfo2); - } -} diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CachedMatchTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CachedMatchTaskTest.java index c93c302249d..9ccb89922fe 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CachedMatchTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CachedMatchTaskTest.java @@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.FlatJoinFunction; import org.apache.flink.api.common.functions.RichFlatJoinFunction; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordPairComparatorFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordPairComparatorFactory; import org.apache.flink.runtime.operators.testutils.DelayingInfinitiveInputIterator; import org.apache.flink.runtime.operators.testutils.DriverTestBase; import org.apache.flink.runtime.operators.testutils.ExpectedTestException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java index 7f96954961e..a4e4fd58145 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskExternalITCase.java @@ -22,8 +22,8 @@ import org.apache.flink.api.common.ExecutionConfig; import org.junit.Assert; import org.apache.flink.api.common.functions.CoGroupFunction; import org.apache.flink.api.common.functions.RichCoGroupFunction; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordPairComparatorFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordPairComparatorFactory; import org.apache.flink.runtime.operators.testutils.DriverTestBase; import org.apache.flink.runtime.operators.testutils.UniformRecordGenerator; import org.apache.flink.types.IntValue; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java index 9c0f075a14b..bf7d467d30d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CoGroupTaskTest.java @@ -24,8 +24,8 @@ import org.apache.flink.api.common.ExecutionConfig; import org.junit.Assert; import org.apache.flink.api.common.functions.CoGroupFunction; import org.apache.flink.api.common.functions.RichCoGroupFunction; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordPairComparatorFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordPairComparatorFactory; import org.apache.flink.runtime.operators.CoGroupTaskExternalITCase.MockCoGroupStub; import org.apache.flink.runtime.operators.testutils.DelayingInfinitiveInputIterator; import org.apache.flink.runtime.operators.testutils.DriverTestBase; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java index 800bca7d69a..e162d7d0cd4 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/CombineTaskExternalITCase.java @@ -27,7 +27,7 @@ import org.apache.flink.util.Collector; import org.junit.Assert; import org.apache.flink.api.common.functions.RichGroupReduceFunction; import org.apache.flink.api.common.functions.RichGroupReduceFunction.Combinable; -import org.apache.flink.api.common.typeutils.record.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; import org.apache.flink.runtime.operators.testutils.DriverTestBase; import org.apache.flink.runtime.operators.testutils.UniformRecordGenerator; import org.apache.flink.types.IntValue; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java index 6221706cd3b..eb2c8a90298 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/DataSinkTaskTest.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators; import org.apache.flink.api.common.io.FileOutputFormat; -import org.apache.flink.api.common.typeutils.record.RecordComparatorFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparatorFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.io.network.partition.consumer.IteratorWrappingTestSingleInputGate; import org.apache.flink.runtime.io.network.api.writer.ResultPartitionWriter; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/JoinTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/JoinTaskExternalITCase.java index 5b2e6eb2b60..5dc3772e744 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/JoinTaskExternalITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/JoinTaskExternalITCase.java @@ -22,8 +22,8 @@ package org.apache.flink.runtime.operators; import org.apache.flink.api.common.ExecutionConfig; import org.junit.Assert; import org.apache.flink.api.common.functions.FlatJoinFunction; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordPairComparatorFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordPairComparatorFactory; import org.apache.flink.runtime.operators.testutils.DriverTestBase; import org.apache.flink.runtime.operators.testutils.UniformRecordGenerator; import org.apache.flink.types.IntValue; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/JoinTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/JoinTaskTest.java index ecde59eae90..4ce4fd124d6 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/JoinTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/JoinTaskTest.java @@ -25,8 +25,8 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.flink.api.common.ExecutionConfig; import org.apache.flink.api.common.functions.FlatJoinFunction; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordPairComparatorFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordPairComparatorFactory; import org.apache.flink.runtime.operators.testutils.DelayingInfinitiveInputIterator; import org.apache.flink.runtime.operators.testutils.DriverTestBase; import org.apache.flink.runtime.operators.testutils.ExpectedTestException; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/LeftOuterJoinTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/LeftOuterJoinTaskTest.java index ad117689b28..266723a778f 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/LeftOuterJoinTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/LeftOuterJoinTaskTest.java @@ -21,22 +21,16 @@ package org.apache.flink.runtime.operators; import com.google.common.base.Throwables; import org.apache.flink.api.common.ExecutionConfig; -import org.apache.flink.api.common.typeutils.record.RecordPairComparatorFactory; import org.apache.flink.api.java.tuple.Tuple2; import org.apache.flink.api.java.typeutils.runtime.RuntimePairComparatorFactory; -import org.apache.flink.runtime.operators.testutils.DelayingInfinitiveInputIterator; import org.apache.flink.runtime.operators.testutils.DelayingIterator; import org.apache.flink.runtime.operators.testutils.DiscardingOutputCollector; import org.apache.flink.runtime.operators.testutils.ExpectedTestException; import org.apache.flink.runtime.operators.testutils.InfiniteIntTupleIterator; -import org.apache.flink.runtime.operators.testutils.NirvanaOutputList; import org.apache.flink.runtime.operators.testutils.UniformIntTupleGenerator; -import org.apache.flink.runtime.operators.testutils.UniformRecordGenerator; -import org.apache.flink.types.Record; import org.junit.Assert; import org.junit.Test; -import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import static org.junit.Assert.assertFalse; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java index 415b6bc8055..a00aea3d1bc 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskExternalITCase.java @@ -27,8 +27,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.flink.api.common.functions.RichGroupReduceFunction; import org.apache.flink.api.common.functions.RichGroupReduceFunction.Combinable; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordSerializerFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializerFactory; import org.apache.flink.runtime.operators.sort.CombiningUnilateralSortMerger; import org.apache.flink.runtime.operators.testutils.DriverTestBase; import org.apache.flink.runtime.operators.testutils.UniformRecordGenerator; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java index 8bc7fe5476c..531d8bad2ee 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/ReduceTaskTest.java @@ -28,8 +28,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.flink.api.common.functions.RichGroupReduceFunction; import org.apache.flink.api.common.functions.RichGroupReduceFunction.Combinable; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordSerializerFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializerFactory; import org.apache.flink.runtime.operators.sort.CombiningUnilateralSortMerger; import org.apache.flink.runtime.operators.testutils.DelayingInfinitiveInputIterator; import org.apache.flink.runtime.operators.testutils.DriverTestBase; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java index 542812c461e..4d8e0dede24 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/chaining/ChainTaskTest.java @@ -23,8 +23,8 @@ import java.util.List; import org.apache.flink.api.common.functions.FlatMapFunction; import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; -import org.apache.flink.api.common.typeutils.record.RecordComparatorFactory; -import org.apache.flink.api.common.typeutils.record.RecordSerializerFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparatorFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializerFactory; import org.apache.flink.api.common.functions.RichGroupReduceFunction; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.io.network.api.writer.ResultPartitionWriter; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java index d0a6fc605f6..4afa11434c9 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/hash/HashTableITCase.java @@ -30,8 +30,8 @@ import java.util.Map; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordSerializer; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializer; import org.apache.flink.core.memory.MemorySegment; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java index bfb7cf24ad9..00011ae1d8d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/BlockResettableMutableObjectIteratorTest.java @@ -23,7 +23,7 @@ import java.util.List; import org.junit.Assert; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.record.RecordSerializer; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializer; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.operators.testutils.DummyInvokable; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIteratorTest.java index d5de75e1646..01dbe1852c5 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/NonReusingBlockResettableIteratorTest.java @@ -24,7 +24,7 @@ import java.util.List; import org.junit.Assert; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.record.RecordSerializer; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializer; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.operators.testutils.DummyInvokable; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIteratorTest.java index 7dbd2fbf446..ea4b6671502 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/ReusingBlockResettableIteratorTest.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators.resettable; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.record.RecordSerializer; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializer; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; import org.apache.flink.runtime.memory.MemoryManager; import org.apache.flink.runtime.operators.testutils.DummyInvokable; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java index c64db54b1e9..ef48a1f60c8 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/resettable/SpillingResettableMutableObjectIteratorTest.java @@ -19,7 +19,7 @@ package org.apache.flink.runtime.operators.resettable; import org.apache.flink.api.common.typeutils.TypeSerializer; -import org.apache.flink.api.common.typeutils.record.RecordSerializer; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializer; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; import org.apache.flink.runtime.jobgraph.tasks.AbstractInvokable; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java index c4429403d1e..ab58cea536d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/DriverTestBase.java @@ -32,8 +32,8 @@ import org.apache.flink.api.common.functions.Function; import org.apache.flink.api.common.functions.util.FunctionUtils; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordSerializerFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializerFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.runtime.io.disk.iomanager.IOManager; import org.apache.flink.runtime.io.disk.iomanager.IOManagerAsync; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskTestBase.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskTestBase.java index 63f54ea9291..458f0a81e3d 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskTestBase.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/testutils/TaskTestBase.java @@ -23,7 +23,7 @@ import org.apache.flink.api.common.io.DelimitedInputFormat; import org.apache.flink.api.common.io.FileOutputFormat; import org.apache.flink.api.common.operators.util.UserCodeClassWrapper; import org.apache.flink.api.common.operators.util.UserCodeObjectWrapper; -import org.apache.flink.api.common.typeutils.record.RecordSerializerFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializerFactory; import org.apache.flink.configuration.Configuration; import org.apache.flink.core.fs.FileSystem.WriteMode; import org.apache.flink.core.fs.Path; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java index 6bf5dcc2727..462364660c0 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/operators/util/OutputEmitterTest.java @@ -28,8 +28,8 @@ import org.apache.flink.api.common.typeutils.base.IntComparator; import org.junit.Assert; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.base.IntSerializer; -import org.apache.flink.api.common.typeutils.record.RecordComparatorFactory; -import org.apache.flink.api.common.typeutils.record.RecordSerializerFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordComparatorFactory; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializerFactory; import org.apache.flink.core.memory.DataInputView; import org.apache.flink.core.memory.DataOutputView; import org.apache.flink.core.memory.InputViewDataInputStreamWrapper; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparator.java similarity index 99% rename from flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordComparator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparator.java index 605d6a13565..41810bf8b11 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordComparator.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparator.java @@ -17,7 +17,7 @@ */ -package org.apache.flink.api.common.typeutils.record; +package org.apache.flink.runtime.testutils.recordutils; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordComparatorFactory.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparatorFactory.java similarity index 98% rename from flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordComparatorFactory.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparatorFactory.java index 7de758bed1c..3ea7106b2a4 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordComparatorFactory.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordComparatorFactory.java @@ -17,7 +17,7 @@ */ -package org.apache.flink.api.common.typeutils.record; +package org.apache.flink.runtime.testutils.recordutils; import java.util.Arrays; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordPairComparator.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordPairComparator.java similarity index 98% rename from flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordPairComparator.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordPairComparator.java index 7b95e5541c2..fd51ce1e54d 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordPairComparator.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordPairComparator.java @@ -17,7 +17,7 @@ */ -package org.apache.flink.api.common.typeutils.record; +package org.apache.flink.runtime.testutils.recordutils; import org.apache.flink.api.common.typeutils.TypePairComparator; import org.apache.flink.types.Key; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordPairComparatorFactory.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordPairComparatorFactory.java similarity index 98% rename from flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordPairComparatorFactory.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordPairComparatorFactory.java index 752540e3633..c1741b0b631 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordPairComparatorFactory.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordPairComparatorFactory.java @@ -17,7 +17,7 @@ */ -package org.apache.flink.api.common.typeutils.record; +package org.apache.flink.runtime.testutils.recordutils; import org.apache.flink.api.common.typeutils.TypeComparator; import org.apache.flink.api.common.typeutils.TypePairComparator; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordSerializer.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializer.java similarity index 98% rename from flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordSerializer.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializer.java index 6ffa0dff0e6..146ccd054db 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordSerializer.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializer.java @@ -17,7 +17,7 @@ */ -package org.apache.flink.api.common.typeutils.record; +package org.apache.flink.runtime.testutils.recordutils; import java.io.IOException; diff --git a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordSerializerFactory.java b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializerFactory.java similarity index 97% rename from flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordSerializerFactory.java rename to flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializerFactory.java index 306b06341c6..ea14591fda0 100644 --- a/flink-core/src/main/java/org/apache/flink/api/common/typeutils/record/RecordSerializerFactory.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/testutils/recordutils/RecordSerializerFactory.java @@ -17,7 +17,7 @@ */ -package org.apache.flink.api.common.typeutils.record; +package org.apache.flink.runtime.testutils.recordutils; import org.apache.flink.api.common.typeutils.TypeSerializer; import org.apache.flink.api.common.typeutils.TypeSerializerFactory; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/NonReusingKeyGroupedIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/NonReusingKeyGroupedIteratorTest.java index b71fdb0d889..3cdf7757953 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/NonReusingKeyGroupedIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/NonReusingKeyGroupedIteratorTest.java @@ -23,7 +23,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.flink.api.common.typeutils.record.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; import org.apache.flink.types.IntValue; import org.apache.flink.types.Record; import org.apache.flink.types.StringValue; diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ReusingKeyGroupedIteratorTest.java b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ReusingKeyGroupedIteratorTest.java index 8a9f8bae4b8..fae3767c825 100644 --- a/flink-runtime/src/test/java/org/apache/flink/runtime/util/ReusingKeyGroupedIteratorTest.java +++ b/flink-runtime/src/test/java/org/apache/flink/runtime/util/ReusingKeyGroupedIteratorTest.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.NoSuchElementException; -import org.apache.flink.api.common.typeutils.record.RecordComparator; -import org.apache.flink.api.common.typeutils.record.RecordSerializer; +import org.apache.flink.runtime.testutils.recordutils.RecordComparator; +import org.apache.flink.runtime.testutils.recordutils.RecordSerializer; import org.apache.flink.types.IntValue; import org.apache.flink.types.Record; import org.apache.flink.types.StringValue; -- GitLab