http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java index b0c210f..b55b64e 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/AbstractExternalGroupbyTest.java @@ -58,50 +58,39 @@ import org.junit.Test; public abstract class AbstractExternalGroupbyTest { - ISerializerDeserializer[] inFields = new ISerializerDeserializer[] { - IntegerSerializerDeserializer.INSTANCE, - new UTF8StringSerializerDeserializer(), - }; + ISerializerDeserializer[] inFields = new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, + new UTF8StringSerializerDeserializer(), }; - ISerializerDeserializer[] aggrFields = new ISerializerDeserializer[] { - new UTF8StringSerializerDeserializer(), // key - IntegerSerializerDeserializer.INSTANCE, // sum - IntegerSerializerDeserializer.INSTANCE, // count - FloatSerializerDeserializer.INSTANCE, // avg + ISerializerDeserializer[] aggrFields = new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), // key + IntegerSerializerDeserializer.INSTANCE, // sum + IntegerSerializerDeserializer.INSTANCE, // count + FloatSerializerDeserializer.INSTANCE, // avg }; RecordDescriptor inRecordDesc = new RecordDescriptor(inFields); RecordDescriptor outputRec = new RecordDescriptor(aggrFields); - IBinaryComparatorFactory[] comparatorFactories = new IBinaryComparatorFactory[] { - PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY) }; + IBinaryComparatorFactory[] comparatorFactories = + new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY) }; INormalizedKeyComputerFactory normalizedKeyComputerFactory = new UTF8StringNormalizedKeyComputerFactory(); IAggregatorDescriptorFactory partialAggrInPlace = new MultiFieldsAggregatorFactory( - new IFieldAggregateDescriptorFactory[] { - new IntSumFieldAggregatorFactory(0, false), - new CountFieldAggregatorFactory(false), - new AvgFieldGroupAggregatorFactory(0, false) }); + new IFieldAggregateDescriptorFactory[] { new IntSumFieldAggregatorFactory(0, false), + new CountFieldAggregatorFactory(false), new AvgFieldGroupAggregatorFactory(0, false) }); IAggregatorDescriptorFactory finalAggrInPlace = new MultiFieldsAggregatorFactory( - new IFieldAggregateDescriptorFactory[] { - new IntSumFieldAggregatorFactory(1, false), - new IntSumFieldAggregatorFactory(2, false), - new AvgFieldMergeAggregatorFactory(3, false) }); + new IFieldAggregateDescriptorFactory[] { new IntSumFieldAggregatorFactory(1, false), + new IntSumFieldAggregatorFactory(2, false), new AvgFieldMergeAggregatorFactory(3, false) }); IAggregatorDescriptorFactory partialAggrInState = new MultiFieldsAggregatorFactory( - new IFieldAggregateDescriptorFactory[] { - new IntSumFieldAggregatorFactory(0, true), - new CountFieldAggregatorFactory(true), - new AvgFieldGroupAggregatorFactory(0, true) }); + new IFieldAggregateDescriptorFactory[] { new IntSumFieldAggregatorFactory(0, true), + new CountFieldAggregatorFactory(true), new AvgFieldGroupAggregatorFactory(0, true) }); IAggregatorDescriptorFactory finalAggrInState = new MultiFieldsAggregatorFactory( - new IFieldAggregateDescriptorFactory[] { - new IntSumFieldAggregatorFactory(1, true), - new IntSumFieldAggregatorFactory(2, true), - new AvgFieldMergeAggregatorFactory(3, true) }); + new IFieldAggregateDescriptorFactory[] { new IntSumFieldAggregatorFactory(1, true), + new IntSumFieldAggregatorFactory(2, true), new AvgFieldMergeAggregatorFactory(3, true) }); int[] keyFields = new int[] { 1 }; int[] keyFieldsAfterPartial = new int[] { 0 }; @@ -213,17 +202,15 @@ public abstract class AbstractExternalGroupbyTest { protected abstract IOperatorNodePushable getMerger(); - private void testBuildAndMerge(int tableSize, int numFrames, int frameSize, int minDataSize, - int minRecordSize, int maxRecordSize, - Map<Integer, String> specialData) - throws HyracksDataException { + private void testBuildAndMerge(int tableSize, int numFrames, int frameSize, int minDataSize, int minRecordSize, + int maxRecordSize, Map<Integer, String> specialData) throws HyracksDataException { IHyracksTaskContext ctx = TestUtils.create(frameSize); initial(ctx, tableSize, numFrames); ArrayList<IFrame> input = new ArrayList<>(); Map<Integer, String> keyValueMap = new HashMap<>(); - AbstractRunGeneratorTest - .prepareData(ctx, input, minDataSize, minRecordSize, maxRecordSize, specialData, keyValueMap); + AbstractRunGeneratorTest.prepareData(ctx, input, minDataSize, minRecordSize, maxRecordSize, specialData, + keyValueMap); ResultValidateWriter writer = new ResultValidateWriter(keyValueMap);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/IntersectOperatorDescriptorTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/IntersectOperatorDescriptorTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/IntersectOperatorDescriptorTest.java index 6729713..bd51619 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/IntersectOperatorDescriptorTest.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/IntersectOperatorDescriptorTest.java @@ -51,9 +51,9 @@ import org.junit.Test; public class IntersectOperatorDescriptorTest { - IOperatorDescriptorRegistry mockRegistry = when( - mock(IOperatorDescriptorRegistry.class).createOperatorDescriptorId(any())) - .thenReturn(new OperatorDescriptorId(1)).getMock(); + IOperatorDescriptorRegistry mockRegistry = + when(mock(IOperatorDescriptorRegistry.class).createOperatorDescriptorId(any())) + .thenReturn(new OperatorDescriptorId(1)).getMock(); MultiThreadTaskEmulator multiThreadTaskEmulator = new MultiThreadTaskEmulator(); InputFrameGenerator frameGenerator = new InputFrameGenerator(256); IHyracksTaskContext ctx = TestUtils.create(256); @@ -72,10 +72,9 @@ public class IntersectOperatorDescriptorTest { inputRecordDescriptor = new RecordDescriptor[nInputs]; normalizedKeyFactory = null; - comparatorFactory = new IBinaryComparatorFactory[] { - PointableBinaryComparatorFactory.of(IntegerPointable.FACTORY), - PointableBinaryComparatorFactory.of(IntegerPointable.FACTORY) - }; + comparatorFactory = + new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory.of(IntegerPointable.FACTORY), + PointableBinaryComparatorFactory.of(IntegerPointable.FACTORY) }; for (int i = 0; i < nInputs; i++) { compareFields[i] = new int[nProjectFields]; @@ -84,17 +83,13 @@ public class IntersectOperatorDescriptorTest { } } for (int i = 0; i < nInputs; i++) { - inputRecordDescriptor[i] = new RecordDescriptor(new ISerializerDeserializer[] { - IntegerSerializerDeserializer.INSTANCE, - IntegerSerializerDeserializer.INSTANCE, - IntegerSerializerDeserializer.INSTANCE - }); + inputRecordDescriptor[i] = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, + IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }); } outRecordDescriptor = new RecordDescriptor(new ISerializerDeserializer[] { - IntegerSerializerDeserializer.INSTANCE, - IntegerSerializerDeserializer.INSTANCE - }); + IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }); } @Before @@ -208,8 +203,8 @@ public class IntersectOperatorDescriptorTest { generateRecordStream(answer, outRecordDescriptor, 0, 100, 1); } - private void generateRecordStream(List<Object[]> inputs, RecordDescriptor recordDesc, - int start, int end, int step) { + private void generateRecordStream(List<Object[]> inputs, RecordDescriptor recordDesc, int start, int end, + int step) { for (int i = start; i < end; i += step) { Object[] obj = new Object[recordDesc.getFieldCount()]; for (int f = 0; f < recordDesc.getFieldCount(); f++) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/TopKRunGeneratorTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/TopKRunGeneratorTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/TopKRunGeneratorTest.java index b2a8323..016fe0b 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/TopKRunGeneratorTest.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/unit/TopKRunGeneratorTest.java @@ -137,8 +137,8 @@ public class TopKRunGeneratorTest { public void testHybridTopKWithTwoNormalizedKeys() throws HyracksDataException { int topK = SORT_FRAME_LIMIT; IHyracksTaskContext ctx = AbstractRunGeneratorTest.testUtils.create(PAGE_SIZE); - AbstractSortRunGenerator sorter = new HybridTopKSortRunGenerator( - ctx, SORT_FRAME_LIMIT, topK, SortFields, new INormalizedKeyComputerFactory[] { + AbstractSortRunGenerator sorter = new HybridTopKSortRunGenerator(ctx, + SORT_FRAME_LIMIT, topK, SortFields, new INormalizedKeyComputerFactory[] { new IntegerNormalizedKeyComputerFactory(), new UTF8StringNormalizedKeyComputerFactory() }, ComparatorFactories, RecordDesc); testInMemoryOnly(ctx, topK, ORDER.REVERSE, sorter); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/OutputFrameVerifier.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/OutputFrameVerifier.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/OutputFrameVerifier.java index 77b6913..13ed058 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/OutputFrameVerifier.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/util/OutputFrameVerifier.java @@ -56,8 +56,7 @@ public class OutputFrameVerifier implements IFrameWriter { Object[] objects = new Object[inputRecordDescriptor.getFieldCount()]; for (int fid = 0; fid < inputRecordDescriptor.getFieldCount(); fid++) { ByteArrayInputStream bais = new ByteArrayInputStream(frameAccessor.getBuffer().array(), - frameAccessor.getAbsoluteFieldStartOffset(tid, fid), - frameAccessor.getFieldLength(tid, fid)); + frameAccessor.getAbsoluteFieldStartOffset(tid, fid), frameAccessor.getFieldLength(tid, fid)); DataInputStream dis = new DataInputStream(bais); objects[fid] = inputRecordDescriptor.getFields()[fid].deserialize(dis); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java index 49b2779..7c85d5a 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/src/test/java/org/apache/hyracks/examples/shutdown/test/ClusterShutdownIT.java @@ -33,6 +33,7 @@ public class ClusterShutdownIT { private static Logger LOGGER = LogManager.getLogger(); @Rule public ExpectedException closeTwice = ExpectedException.none(); + @Test public void runShutdown() throws Exception { IHyracksClientConnection hcc = new HyracksConnection("localhost", 1098); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Common.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Common.java b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Common.java index 3c0ecfd..2844d02 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Common.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Common.java @@ -43,22 +43,22 @@ public class Common { new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }); - static RecordDescriptor ordersDesc = new RecordDescriptor(new ISerializerDeserializer[] { - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer() }); - static RecordDescriptor custOrderJoinDesc = new RecordDescriptor(new ISerializerDeserializer[] { - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer() }); + static RecordDescriptor ordersDesc = + new RecordDescriptor(new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }); + static RecordDescriptor custOrderJoinDesc = + new RecordDescriptor(new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }); static RecordDescriptor lineitemDesc = new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE, @@ -70,25 +70,20 @@ public class Common { new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }); - static IValueParserFactory[] lineitemParserFactories = new IValueParserFactory[] { - IntegerParserFactory.INSTANCE, IntegerParserFactory.INSTANCE, - IntegerParserFactory.INSTANCE, IntegerParserFactory.INSTANCE, - IntegerParserFactory.INSTANCE, FloatParserFactory.INSTANCE, - FloatParserFactory.INSTANCE, FloatParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, }; + static IValueParserFactory[] lineitemParserFactories = new IValueParserFactory[] { IntegerParserFactory.INSTANCE, + IntegerParserFactory.INSTANCE, IntegerParserFactory.INSTANCE, IntegerParserFactory.INSTANCE, + IntegerParserFactory.INSTANCE, FloatParserFactory.INSTANCE, FloatParserFactory.INSTANCE, + FloatParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, + UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, + UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, }; static IValueParserFactory[] custParserFactories = new IValueParserFactory[] { UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, + UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, + UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE }; static IValueParserFactory[] orderParserFactories = new IValueParserFactory[] { UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, + UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, + UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE }; static FileSplit[] parseFileSplits(String fileSplits) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Groupby.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Groupby.java b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Groupby.java index 42fe8c9..80c4f88 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Groupby.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Groupby.java @@ -134,8 +134,8 @@ public class Groupby { createPartitionConstraint(spec, fileScanner, inSplits); // Output: each unique string with an integer count - RecordDescriptor outDesc = new RecordDescriptor( - new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, + RecordDescriptor outDesc = + new RecordDescriptor(new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, // IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }); @@ -187,9 +187,9 @@ public class Groupby { spec.connect(scanGroupConnDef2, fileScanner, 0, grouper, 0); IFileSplitProvider outSplitProvider = new ConstantFileSplitProvider(outSplits); - AbstractSingleActivityOperatorDescriptor writer = outPlain ? new PlainFileWriterOperatorDescriptor(spec, - outSplitProvider, "|") - : new FrameFileWriterOperatorDescriptor(spec, outSplitProvider); + AbstractSingleActivityOperatorDescriptor writer = + outPlain ? new PlainFileWriterOperatorDescriptor(spec, outSplitProvider, "|") + : new FrameFileWriterOperatorDescriptor(spec, outSplitProvider); createPartitionConstraint(spec, writer, outSplits); IConnectorDescriptor groupOutConn = new OneToOneConnectorDescriptor(spec); spec.connect(groupOutConn, grouper, 0, writer, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Sort.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Sort.java b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Sort.java index 7e56004..5043974 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Sort.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/tpch-example/tpchclient/src/main/java/org/apache/hyracks/examples/tpch/client/Sort.java @@ -87,13 +87,13 @@ public class Sort { } static int[] SortFields = new int[] { 1, 0 }; - static IBinaryComparatorFactory[] SortFieldsComparatorFactories = new IBinaryComparatorFactory[] { - PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY), - PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY) }; + static IBinaryComparatorFactory[] SortFieldsComparatorFactories = + new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY), + PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY) }; - static IBinaryHashFunctionFactory[] orderBinaryHashFunctionFactories = new IBinaryHashFunctionFactory[] { - PointableBinaryHashFunctionFactory.of(UTF8StringPointable.FACTORY), - PointableBinaryHashFunctionFactory.of(UTF8StringPointable.FACTORY) }; + static IBinaryHashFunctionFactory[] orderBinaryHashFunctionFactories = + new IBinaryHashFunctionFactory[] { PointableBinaryHashFunctionFactory.of(UTF8StringPointable.FACTORY), + PointableBinaryHashFunctionFactory.of(UTF8StringPointable.FACTORY) }; public static void main(String[] args) throws Exception { Options options = new Options(); @@ -107,8 +107,8 @@ public class Sort { IHyracksClientConnection hcc = new HyracksConnection(options.host, options.port); JobSpecification job = createJob(parseFileSplits(options.inFileOrderSplits), - parseFileSplits(options.outFileSplits), - options.memBufferAlg, options.frameLimit, options.frameSize, options.topK, options.usingHeapSorter); + parseFileSplits(options.outFileSplits), options.memBufferAlg, options.frameLimit, options.frameSize, + options.topK, options.usingHeapSorter); long start = System.currentTimeMillis(); JobId jobId = hcc.startJob(job, @@ -156,8 +156,8 @@ public class Sort { spec.connect( new MToNPartitioningMergingConnectorDescriptor(spec, - new FieldHashPartitionComputerFactory(SortFields, orderBinaryHashFunctionFactories), - SortFields, SortFieldsComparatorFactories, new UTF8StringNormalizedKeyComputerFactory()), + new FieldHashPartitionComputerFactory(SortFields, orderBinaryHashFunctionFactories), SortFields, + SortFieldsComparatorFactories, new UTF8StringNormalizedKeyComputerFactory()), sorter, 0, printer, 0); spec.addRoot(printer); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/INcCollectionBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/INcCollectionBuilder.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/INcCollectionBuilder.java index 9010378..02c5fb3 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/INcCollectionBuilder.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/INcCollectionBuilder.java @@ -30,7 +30,6 @@ import org.apache.hyracks.api.client.NodeControllerInfo; */ public interface INcCollectionBuilder { - public INcCollection build(Map<String, NodeControllerInfo> ncNameToNcInfos, - Map<String, List<String>> ipToNcMapping, Map<String, Integer> ncNameToIndex, String[] NCs, int[] workloads, - int slotLimit); + public INcCollection build(Map<String, NodeControllerInfo> ncNameToNcInfos, Map<String, List<String>> ipToNcMapping, + Map<String, Integer> ncNameToIndex, String[] NCs, int[] workloads, int slotLimit); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/ITupleWriterFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/ITupleWriterFactory.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/ITupleWriterFactory.java index 6d3a082..57dadb0 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/ITupleWriterFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/api/ITupleWriterFactory.java @@ -34,6 +34,7 @@ public interface ITupleWriterFactory extends Serializable { * the IHyracksTaskContext * @return a tuple writer instance */ - public ITupleWriter getTupleWriter(IHyracksTaskContext ctx, int partition, int nPartition) throws HyracksDataException; + public ITupleWriter getTupleWriter(IHyracksTaskContext ctx, int partition, int nPartition) + throws HyracksDataException; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/dataflow/HDFSReadOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/dataflow/HDFSReadOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/dataflow/HDFSReadOperatorDescriptor.java index 8357ae0..021efca 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/dataflow/HDFSReadOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/dataflow/HDFSReadOperatorDescriptor.java @@ -90,7 +90,7 @@ public class HDFSReadOperatorDescriptor extends AbstractSingleActivityOperatorDe @Override public IOperatorNodePushable createPushRuntime(final IHyracksTaskContext ctx, IRecordDescriptorProvider recordDescProvider, final int partition, final int nPartitions) - throws HyracksDataException { + throws HyracksDataException { final InputSplit[] inputSplits = splitsFactory.getSplits(); return new AbstractUnaryOutputSourceOperatorNodePushable() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/IPProximityNcCollectionBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/IPProximityNcCollectionBuilder.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/IPProximityNcCollectionBuilder.java index 6d7d63b..c53a779 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/IPProximityNcCollectionBuilder.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/IPProximityNcCollectionBuilder.java @@ -46,8 +46,7 @@ public class IPProximityNcCollectionBuilder implements INcCollectionBuilder { byte[] rawip; try { rawip = ncNameToNcInfos.get(NCs[i]).getNetworkAddress().lookupIpAddress(); - } - catch (UnknownHostException e) { + } catch (UnknownHostException e) { // QQQ Should probably have a neater solution than this throw new RuntimeException(e); } @@ -122,8 +121,8 @@ public class IPProximityNcCollectionBuilder implements INcCollectionBuilder { /** * Update the entry of the selected NC */ - List<String> dataLocations = ipToNcMapping.get(InetAddress.getByAddress( - currentCandidateIp.getBytes()).getHostAddress()); + List<String> dataLocations = ipToNcMapping + .get(InetAddress.getByAddress(currentCandidateIp.getBytes()).getHostAddress()); for (String nc : dataLocations) { int ncIndex = ncNameToIndex.get(nc); if (workloads[ncIndex] < slotLimit) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java index c9bf547..63be8c5 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/RackAwareNcCollectionBuilder.java @@ -52,8 +52,8 @@ public class RackAwareNcCollectionBuilder implements INcCollectionBuilder { final Map<List<Integer>, List<String>> pathToNCs = new HashMap<List<Integer>, List<String>>(); for (String NC : NCs) { List<Integer> path = new ArrayList<>(); - String ipAddress = InetAddress.getByAddress( - ncNameToNcInfos.get(NC).getNetworkAddress().lookupIpAddress()).getHostAddress(); + String ipAddress = InetAddress + .getByAddress(ncNameToNcInfos.get(NC).getNetworkAddress().lookupIpAddress()).getHostAddress(); topology.lookupNetworkTerminal(ipAddress, path); if (path.isEmpty()) { // if the hyracks nc is not in the defined cluster @@ -64,8 +64,8 @@ public class RackAwareNcCollectionBuilder implements INcCollectionBuilder { ncs.add(NC); } - final TreeMap<List<Integer>, IntWritable> availableIpsToSlots = new TreeMap<List<Integer>, IntWritable>( - (l1, l2) -> { + final TreeMap<List<Integer>, IntWritable> availableIpsToSlots = + new TreeMap<List<Integer>, IntWritable>((l1, l2) -> { int commonLength = Math.min(l1.size(), l2.size()); for (int i = 0; i < commonLength; i++) { int value1 = l1.get(i); @@ -80,8 +80,9 @@ public class RackAwareNcCollectionBuilder implements INcCollectionBuilder { for (int i = 0; i < workloads.length; i++) { if (workloads[i] < slotLimit) { List<Integer> path = new ArrayList<Integer>(); - String ipAddress = InetAddress.getByAddress( - ncNameToNcInfos.get(NCs[i]).getNetworkAddress().lookupIpAddress()).getHostAddress(); + String ipAddress = + InetAddress.getByAddress(ncNameToNcInfos.get(NCs[i]).getNetworkAddress().lookupIpAddress()) + .getHostAddress(); topology.lookupNetworkTerminal(ipAddress, path); if (path.isEmpty()) { // if the hyracks nc is not in the defined cluster http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java index 615f827..25cc9b3 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs/scheduler/Scheduler.java @@ -130,8 +130,8 @@ public class Scheduler { public Scheduler(Map<String, NodeControllerInfo> ncNameToNcInfos, ClusterTopology topology) throws HyracksException { this(ncNameToNcInfos); - this.ncCollectionBuilder = topology == null ? new IPProximityNcCollectionBuilder() - : new RackAwareNcCollectionBuilder(topology); + this.ncCollectionBuilder = + topology == null ? new IPProximityNcCollectionBuilder() : new RackAwareNcCollectionBuilder(topology); } /** @@ -276,7 +276,7 @@ public class Scheduler { */ private void scheduleLocalSlots(InputSplit[] splits, int[] workloads, String[] locations, int slots, Random random, boolean[] scheduled, final Map<String, IntWritable> locationToNumSplits) - throws IOException, UnknownHostException { + throws IOException, UnknownHostException { /** scheduling candidates will be ordered inversely according to their popularity */ PriorityQueue<String> scheduleCadndiates = new PriorityQueue<String>(3, new Comparator<String>() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/dataflow/HDFSReadOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/dataflow/HDFSReadOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/dataflow/HDFSReadOperatorDescriptor.java index 15bf260..0c635e0 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/dataflow/HDFSReadOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/dataflow/HDFSReadOperatorDescriptor.java @@ -103,7 +103,7 @@ public class HDFSReadOperatorDescriptor extends AbstractSingleActivityOperatorDe @Override public IOperatorNodePushable createPushRuntime(final IHyracksTaskContext ctx, IRecordDescriptorProvider recordDescProvider, final int partition, final int nPartitions) - throws HyracksDataException { + throws HyracksDataException { final List<FileSplit> inputSplits = splitsFactory.getSplits(); return new AbstractUnaryOutputSourceOperatorNodePushable() { @@ -120,8 +120,8 @@ public class HDFSReadOperatorDescriptor extends AbstractSingleActivityOperatorDe Job job = confFactory.getConf(); job.getConfiguration().setClassLoader(ctx.getJobletContext().getClassLoader()); IKeyValueParser parser = tupleParserFactory.createKeyValueParser(ctx); - InputFormat inputFormat = ReflectionUtils.newInstance(job.getInputFormatClass(), - job.getConfiguration()); + InputFormat inputFormat = + ReflectionUtils.newInstance(job.getInputFormatClass(), job.getConfiguration()); int size = inputSplits.size(); for (int i = 0; i < size; i++) { /** http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/scheduler/Scheduler.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/scheduler/Scheduler.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/scheduler/Scheduler.java index 97960bc..fb46842 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/scheduler/Scheduler.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/main/java/org/apache/hyracks/hdfs2/scheduler/Scheduler.java @@ -69,7 +69,8 @@ public class Scheduler { * the hyracks cluster toplogy * @throws HyracksException */ - public Scheduler(Map<String, NodeControllerInfo> ncNameToNcInfos, ClusterTopology topology) throws HyracksException { + public Scheduler(Map<String, NodeControllerInfo> ncNameToNcInfos, ClusterTopology topology) + throws HyracksException { scheduler = new org.apache.hyracks.hdfs.scheduler.Scheduler(ncNameToNcInfos, topology); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java index 0d0cd3e..b8351f3 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/dataflow/DataflowTest.java @@ -73,7 +73,6 @@ public class DataflowTest extends TestCase { private static final String PATH_TO_HADOOP_CONF = FileUtil.joinPath(TEST_RESOURCES, "hadoop", "conf"); protected static final String BUILD_DIR = FileUtil.joinPath("target", "build"); - private static final String DATA_PATH = FileUtil.joinPath(TEST_RESOURCES, "data", "customer.tbl"); protected static final String HDFS_INPUT_PATH = "/customer/"; protected static final String HDFS_OUTPUT_PATH = "/customer_result/"; @@ -151,11 +150,11 @@ public class DataflowTest extends TestCase { String[] readSchedule = scheduler.getLocationConstraints(splits); JobSpecification jobSpec = new JobSpecification(); - RecordDescriptor recordDesc = new RecordDescriptor( - new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer() }); + RecordDescriptor recordDesc = + new RecordDescriptor(new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer() }); - String[] locations = new String[] { HyracksUtils.NC1_ID, HyracksUtils.NC1_ID, HyracksUtils.NC2_ID, - HyracksUtils.NC2_ID }; + String[] locations = + new String[] { HyracksUtils.NC1_ID, HyracksUtils.NC1_ID, HyracksUtils.NC2_ID, HyracksUtils.NC2_ID }; HDFSReadOperatorDescriptor readOperator = new HDFSReadOperatorDescriptor(jobSpec, recordDesc, conf, splits, readSchedule, new TextKeyValueParserFactory()); PartitionConstraintHelper.addAbsoluteLocationConstraint(jobSpec, readOperator, locations); @@ -164,19 +163,21 @@ public class DataflowTest extends TestCase { new IBinaryComparatorFactory[] { RawBinaryComparatorFactory.INSTANCE }, recordDesc); PartitionConstraintHelper.addAbsoluteLocationConstraint(jobSpec, sortOperator, locations); - HDFSWriteOperatorDescriptor writeOperator = new HDFSWriteOperatorDescriptor(jobSpec, conf, - new TextTupleWriterFactory()); + HDFSWriteOperatorDescriptor writeOperator = + new HDFSWriteOperatorDescriptor(jobSpec, conf, new TextTupleWriterFactory()); PartitionConstraintHelper.addAbsoluteLocationConstraint(jobSpec, writeOperator, HyracksUtils.NC1_ID); jobSpec.connect(new OneToOneConnectorDescriptor(jobSpec), readOperator, 0, sortOperator, 0); - jobSpec.connect(new MToNPartitioningMergingConnectorDescriptor(jobSpec, new FieldHashPartitionComputerFactory( - new int[] { 0 }, new IBinaryHashFunctionFactory[] { RawBinaryHashFunctionFactory.INSTANCE }), - new int[] { 0 }, new IBinaryComparatorFactory[] { RawBinaryComparatorFactory.INSTANCE }, null), + jobSpec.connect( + new MToNPartitioningMergingConnectorDescriptor(jobSpec, + new FieldHashPartitionComputerFactory(new int[] { 0 }, + new IBinaryHashFunctionFactory[] { RawBinaryHashFunctionFactory.INSTANCE }), + new int[] { 0 }, new IBinaryComparatorFactory[] { RawBinaryComparatorFactory.INSTANCE }, null), sortOperator, 0, writeOperator, 0); jobSpec.addRoot(writeOperator); - IHyracksClientConnection client = new HyracksConnection(HyracksUtils.CC_HOST, - HyracksUtils.TEST_HYRACKS_CC_CLIENT_PORT); + IHyracksClientConnection client = + new HyracksConnection(HyracksUtils.CC_HOST, HyracksUtils.TEST_HYRACKS_CC_CLIENT_PORT); JobId jobId = client.startJob(jobSpec); client.waitForCompletion(jobId); @@ -195,8 +196,8 @@ public class DataflowTest extends TestCase { Path actual = new Path(ACTUAL_RESULT_DIR); dfs.copyToLocalFile(result, actual); - TestUtils.compareWithResult(new File(FileUtil.joinPath(EXPECTED_RESULT_PATH, "part-0")), new File( - FileUtil.joinPath(ACTUAL_RESULT_DIR, "customer_result", "part-0"))); + TestUtils.compareWithResult(new File(FileUtil.joinPath(EXPECTED_RESULT_PATH, "part-0")), + new File(FileUtil.joinPath(ACTUAL_RESULT_DIR, "customer_result", "part-0"))); return true; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java index bb28c79..b735833 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java @@ -58,8 +58,8 @@ public class SchedulerTest extends TestCase { * @throws Exception */ public void testSchedulerSimple() throws Exception { - Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, - 5098, 5097); + Map<String, NodeControllerInfo> ncNameToNcInfos = + TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, 5098, 5097); InputSplit[] fileSplits = new InputSplit[6]; fileSplits[0] = new FileSplit(new Path("part-1"), 0, 0, new String[] { "10.0.0.1", "10.0.0.2", "10.0.0.3" }); @@ -94,8 +94,8 @@ public class SchedulerTest extends TestCase { int dataPort = 5099; int resultPort = 5098; int messagingPort = 5097; - Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(4, "nc", "10.0.0.", - dataPort, resultPort, messagingPort); + Map<String, NodeControllerInfo> ncNameToNcInfos = + TestUtils.generateNodeControllerInfo(4, "nc", "10.0.0.", dataPort, resultPort, messagingPort); ncNameToNcInfos.put("nc7", new NodeControllerInfo("nc7", NodeStatus.ACTIVE, new NetworkAddress("10.0.0.7", dataPort), new NetworkAddress("10.0.0.5", resultPort), new NetworkAddress("10.0.0.5", messagingPort), 2)); @@ -112,8 +112,8 @@ public class SchedulerTest extends TestCase { fileSplits[5] = new FileSplit(new Path("part-6"), 0, 0, new String[] { "10.0.0.2", "10.0.0.3", "10.0.0.5" }); fileSplits[6] = new FileSplit(new Path("part-7"), 0, 0, new String[] { "10.0.0.1", "10.0.0.2", "10.0.0.3" }); fileSplits[7] = new FileSplit(new Path("part-8"), 0, 0, new String[] { "10.0.0.3", "10.0.0.4", "10.0.0.5" }); - fileSplits[8] = new FileSplit(new Path("part-12"), 0, 0, - new String[] { "10.0.0.14", "10.0.0.11", "10.0.0.13" }); + fileSplits[8] = + new FileSplit(new Path("part-12"), 0, 0, new String[] { "10.0.0.14", "10.0.0.11", "10.0.0.13" }); fileSplits[9] = new FileSplit(new Path("part-10"), 0, 0, new String[] { "10.0.0.2", "10.0.0.1", "10.0.0.6" }); fileSplits[10] = new FileSplit(new Path("part-11"), 0, 0, new String[] { "10.0.0.3", "10.0.0.4", "10.0.0.7" }); fileSplits[11] = new FileSplit(new Path("part-9"), 0, 0, new String[] { "10.0.0.4", "10.0.0.5", "10.0.0.6" }); @@ -121,14 +121,14 @@ public class SchedulerTest extends TestCase { Scheduler scheduler = new Scheduler(ncNameToNcInfos); String[] locationConstraints = scheduler.getLocationConstraints(fileSplits); - String[] expectedResults = new String[] { "nc1", "nc4", "nc4", "nc1", "nc3", "nc2", "nc2", "nc3", "nc12", "nc7", - "nc7", "nc12" }; + String[] expectedResults = + new String[] { "nc1", "nc4", "nc4", "nc1", "nc3", "nc2", "nc2", "nc3", "nc12", "nc7", "nc7", "nc12" }; for (int i = 0; i < locationConstraints.length; i++) { Assert.assertEquals(locationConstraints[i], expectedResults[i]); } - expectedResults = new String[] { "nc1", "nc4", "nc4", "nc1", "nc3", "nc2", "nc2", "nc3", "nc7", "nc12", "nc7", - "nc12" }; + expectedResults = + new String[] { "nc1", "nc4", "nc4", "nc1", "nc3", "nc2", "nc2", "nc3", "nc7", "nc12", "nc7", "nc12" }; ClusterTopology topology = parseTopology(); scheduler = new Scheduler(ncNameToNcInfos, topology); locationConstraints = scheduler.getLocationConstraints(fileSplits); @@ -143,8 +143,8 @@ public class SchedulerTest extends TestCase { * @throws Exception */ public void testSchedulerSmallerHDFS() throws Exception { - Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, - 5098, 5097); + Map<String, NodeControllerInfo> ncNameToNcInfos = + TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, 5098, 5097); InputSplit[] fileSplits = new InputSplit[12]; fileSplits[0] = new FileSplit(new Path("part-1"), 0, 0, new String[] { "10.0.0.1", "10.0.0.2", "10.0.0.3" }); @@ -160,8 +160,8 @@ public class SchedulerTest extends TestCase { fileSplits[10] = new FileSplit(new Path("part-11"), 0, 0, new String[] { "10.0.0.3", "10.0.0.4", "10.0.0.5" }); fileSplits[11] = new FileSplit(new Path("part-12"), 0, 0, new String[] { "10.0.0.2", "10.0.0.3", "10.0.0.5" }); - String[] expectedResults = new String[] { "nc1", "nc4", "nc4", "nc1", "nc3", "nc2", "nc2", "nc3", "nc5", "nc6", - "nc5", "nc6" }; + String[] expectedResults = + new String[] { "nc1", "nc4", "nc4", "nc1", "nc3", "nc2", "nc2", "nc3", "nc5", "nc6", "nc5", "nc6" }; Scheduler scheduler = new Scheduler(ncNameToNcInfos); String[] locationConstraints = scheduler.getLocationConstraints(fileSplits); @@ -184,8 +184,8 @@ public class SchedulerTest extends TestCase { * @throws Exception */ public void testSchedulerSmallerHDFSOdd() throws Exception { - Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, - 5098, 5097); + Map<String, NodeControllerInfo> ncNameToNcInfos = + TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, 5098, 5097); InputSplit[] fileSplits = new InputSplit[13]; fileSplits[0] = new FileSplit(new Path("part-1"), 0, 0, new String[] { "10.0.0.1", "10.0.0.2", "10.0.0.3" }); @@ -227,8 +227,8 @@ public class SchedulerTest extends TestCase { * @throws Exception */ public void testSchedulercBoundary() throws Exception { - Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, - 5098, 5097); + Map<String, NodeControllerInfo> ncNameToNcInfos = + TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, 5098, 5097); /** test empty file splits */ InputSplit[] fileSplits = new InputSplit[0]; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java index 3c9b1c0..8be6d69 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/dataflow/DataflowTest.java @@ -98,11 +98,11 @@ public class DataflowTest extends org.apache.hyracks.hdfs.dataflow.DataflowTest String[] readSchedule = scheduler.getLocationConstraints(splits); JobSpecification jobSpec = new JobSpecification(); - RecordDescriptor recordDesc = new RecordDescriptor( - new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer() }); + RecordDescriptor recordDesc = + new RecordDescriptor(new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer() }); - String[] locations = new String[] { HyracksUtils.NC1_ID, HyracksUtils.NC1_ID, HyracksUtils.NC2_ID, - HyracksUtils.NC2_ID }; + String[] locations = + new String[] { HyracksUtils.NC1_ID, HyracksUtils.NC1_ID, HyracksUtils.NC2_ID, HyracksUtils.NC2_ID }; HDFSReadOperatorDescriptor readOperator = new HDFSReadOperatorDescriptor(jobSpec, recordDesc, conf, splits, readSchedule, new TextKeyValueParserFactory()); PartitionConstraintHelper.addAbsoluteLocationConstraint(jobSpec, readOperator, locations); @@ -111,19 +111,21 @@ public class DataflowTest extends org.apache.hyracks.hdfs.dataflow.DataflowTest new IBinaryComparatorFactory[] { RawBinaryComparatorFactory.INSTANCE }, recordDesc); PartitionConstraintHelper.addAbsoluteLocationConstraint(jobSpec, sortOperator, locations); - HDFSWriteOperatorDescriptor writeOperator = new HDFSWriteOperatorDescriptor(jobSpec, conf, - new TextTupleWriterFactory()); + HDFSWriteOperatorDescriptor writeOperator = + new HDFSWriteOperatorDescriptor(jobSpec, conf, new TextTupleWriterFactory()); PartitionConstraintHelper.addAbsoluteLocationConstraint(jobSpec, writeOperator, HyracksUtils.NC1_ID); jobSpec.connect(new OneToOneConnectorDescriptor(jobSpec), readOperator, 0, sortOperator, 0); - jobSpec.connect(new MToNPartitioningMergingConnectorDescriptor(jobSpec, new FieldHashPartitionComputerFactory( - new int[] { 0 }, new IBinaryHashFunctionFactory[] { RawBinaryHashFunctionFactory.INSTANCE }), - new int[] { 0 }, new IBinaryComparatorFactory[] { RawBinaryComparatorFactory.INSTANCE }, null), + jobSpec.connect( + new MToNPartitioningMergingConnectorDescriptor(jobSpec, + new FieldHashPartitionComputerFactory(new int[] { 0 }, + new IBinaryHashFunctionFactory[] { RawBinaryHashFunctionFactory.INSTANCE }), + new int[] { 0 }, new IBinaryComparatorFactory[] { RawBinaryComparatorFactory.INSTANCE }, null), sortOperator, 0, writeOperator, 0); jobSpec.addRoot(writeOperator); - IHyracksClientConnection client = new HyracksConnection(HyracksUtils.CC_HOST, - HyracksUtils.TEST_HYRACKS_CC_CLIENT_PORT); + IHyracksClientConnection client = + new HyracksConnection(HyracksUtils.CC_HOST, HyracksUtils.TEST_HYRACKS_CC_CLIENT_PORT); JobId jobId = client.startJob(jobSpec); client.waitForCompletion(jobId); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java index 4d970ba..8223071 100644 --- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs2/scheduler/SchedulerTest.java @@ -43,8 +43,8 @@ public class SchedulerTest extends TestCase { * @throws Exception */ public void testSchedulerSimple() throws Exception { - Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, - 5098, 5097); + Map<String, NodeControllerInfo> ncNameToNcInfos = + TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, 5098, 5097); List<InputSplit> fileSplits = new ArrayList<>(); fileSplits.add(new FileSplit(new Path("part-1"), 0, 0, new String[] { "10.0.0.1", "10.0.0.2", "10.0.0.3" })); @@ -70,8 +70,8 @@ public class SchedulerTest extends TestCase { * @throws Exception */ public void testSchedulerLargerHDFS() throws Exception { - Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, - 5098, 5097); + Map<String, NodeControllerInfo> ncNameToNcInfos = + TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, 5098, 5097); List<InputSplit> fileSplits = new ArrayList<>(); fileSplits.add(new FileSplit(new Path("part-1"), 0, 0, new String[] { "10.0.0.1", "10.0.0.2", "10.0.0.3" })); @@ -90,8 +90,8 @@ public class SchedulerTest extends TestCase { Scheduler scheduler = new Scheduler(ncNameToNcInfos); String[] locationConstraints = scheduler.getLocationConstraints(fileSplits); - String[] expectedResults = new String[] { "nc1", "nc4", "nc6", "nc1", "nc4", "nc2", "nc2", "nc3", "nc6", "nc5", - "nc3", "nc5" }; + String[] expectedResults = + new String[] { "nc1", "nc4", "nc6", "nc1", "nc4", "nc2", "nc2", "nc3", "nc6", "nc5", "nc3", "nc5" }; for (int i = 0; i < locationConstraints.length; i++) { Assert.assertEquals(locationConstraints[i], expectedResults[i]); @@ -104,8 +104,8 @@ public class SchedulerTest extends TestCase { * @throws Exception */ public void testSchedulerSmallerHDFS() throws Exception { - Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, - 5098, 5097); + Map<String, NodeControllerInfo> ncNameToNcInfos = + TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, 5098, 5097); List<InputSplit> fileSplits = new ArrayList<>(); fileSplits.add(new FileSplit(new Path("part-1"), 0, 0, new String[] { "10.0.0.1", "10.0.0.2", "10.0.0.3" })); @@ -124,8 +124,8 @@ public class SchedulerTest extends TestCase { Scheduler scheduler = new Scheduler(ncNameToNcInfos); String[] locationConstraints = scheduler.getLocationConstraints(fileSplits); - String[] expectedResults = new String[] { "nc1", "nc4", "nc4", "nc1", "nc3", "nc2", "nc2", "nc3", "nc5", "nc6", - "nc5", "nc6" }; + String[] expectedResults = + new String[] { "nc1", "nc4", "nc4", "nc1", "nc3", "nc2", "nc2", "nc3", "nc5", "nc6", "nc5", "nc6" }; for (int i = 0; i < locationConstraints.length; i++) { Assert.assertEquals(locationConstraints[i], expectedResults[i]); @@ -138,8 +138,8 @@ public class SchedulerTest extends TestCase { * @throws Exception */ public void testSchedulerSmallerHDFSOdd() throws Exception { - Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, - 5098, 5097); + Map<String, NodeControllerInfo> ncNameToNcInfos = + TestUtils.generateNodeControllerInfo(6, "nc", "10.0.0.", 5099, 5098, 5097); List<InputSplit> fileSplits = new ArrayList<>(); fileSplits.add(new FileSplit(new Path("part-1"), 0, 0, new String[] { "10.0.0.1", "10.0.0.2", "10.0.0.3" })); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java index cb6ad0d..3ab2ab9 100644 --- a/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java +++ b/hyracks-fullstack/hyracks/hyracks-http/src/main/java/org/apache/hyracks/http/server/HttpRequestCapacityController.java @@ -68,8 +68,8 @@ public class HttpRequestCapacityController extends ChannelInboundHandlerAdapter HttpResponseEncoder encoder = new HttpResponseEncoder(); ChannelPromise promise = ctx.newPromise(); promise.addListener(ChannelFutureListener.CLOSE); - DefaultFullHttpResponse response = new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, - HttpResponseStatus.SERVICE_UNAVAILABLE); + DefaultFullHttpResponse response = + new DefaultFullHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.SERVICE_UNAVAILABLE); try { encoder.write(ctx, response, ctx.voidPromise()); ctx.writeAndFlush(ctx.alloc().buffer(0), promise); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java index 7688974..86c8c75 100644 --- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java +++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/IPCConnectionManager.java @@ -338,9 +338,8 @@ public class IPCConnectionManager { // reset failingLoops on a good loop failingLoops = 0; } catch (Exception e) { - int sleepSecs = (int)Math.pow(2, Math.min(11, failingLoops++)); - LOGGER.log(Level.ERROR, "Exception processing message; sleeping " + sleepSecs - + " seconds", e); + int sleepSecs = (int) Math.pow(2, Math.min(11, failingLoops++)); + LOGGER.log(Level.ERROR, "Exception processing message; sleeping " + sleepSecs + " seconds", e); try { Thread.sleep(TimeUnit.SECONDS.toMillis(sleepSecs)); } catch (InterruptedException e1) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/JavaSerializationBasedPayloadSerializerDeserializer.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/JavaSerializationBasedPayloadSerializerDeserializer.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/JavaSerializationBasedPayloadSerializerDeserializer.java index 2c1f0dc..c4263d2 100644 --- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/JavaSerializationBasedPayloadSerializerDeserializer.java +++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/JavaSerializationBasedPayloadSerializerDeserializer.java @@ -55,8 +55,8 @@ public class JavaSerializationBasedPayloadSerializerDeserializer implements IPay } private Object deserialize(ByteBuffer buffer, int length) throws Exception { - ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(buffer.array(), buffer.position(), - length)); + ObjectInputStream ois = + new ObjectInputStream(new ByteArrayInputStream(buffer.array(), buffer.position(), length)); Object object = ois.readObject(); ois.close(); return object; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/Message.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/Message.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/Message.java index 1f3f0c3..550ce45 100644 --- a/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/Message.java +++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/main/java/org/apache/hyracks/ipc/impl/Message.java @@ -103,8 +103,8 @@ class Message { int length = msgSize - HEADER_SIZE; try { IPayloadSerializerDeserializer serde = ipcHandle.getIPCSystem().getSerializerDeserializer(); - payload = flag == ERROR ? serde.deserializeException(buffer, length) : serde.deserializeObject(buffer, - length); + payload = flag == ERROR ? serde.deserializeException(buffer, length) + : serde.deserializeObject(buffer, length); } finally { buffer.position(finalPosition); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java b/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java index b454520..1a075d5 100644 --- a/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java +++ b/hyracks-fullstack/hyracks/hyracks-ipc/src/test/java/org/apache/hyracks/ipc/tests/IPCTest.java @@ -63,8 +63,8 @@ public class IPCTest { final Executor executor = Executors.newCachedThreadPool(); IIPCI ipci = new IIPCI() { @Override - public void deliverIncomingMessage(final IIPCHandle handle, final long mid, long rmid, - final Object payload, Exception exception) { + public void deliverIncomingMessage(final IIPCHandle handle, final long mid, long rmid, final Object payload, + Exception exception) { executor.execute(new Runnable() { @Override public void run() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DependencySet.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DependencySet.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DependencySet.java index 8e91be4..3aef194 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DependencySet.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DependencySet.java @@ -27,7 +27,7 @@ public class DependencySet { @SuppressWarnings("unused") // set by Maven configuration private String location; - @SuppressWarnings({"unused", "MismatchedQueryAndUpdateOfCollection"}) // set by Maven configuration + @SuppressWarnings({ "unused", "MismatchedQueryAndUpdateOfCollection" }) // set by Maven configuration private List<String> includes; private List<Pattern> patterns; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DownloadLicensesMojo.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DownloadLicensesMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DownloadLicensesMojo.java index 7d0e77d..1b2961f 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DownloadLicensesMojo.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/DownloadLicensesMojo.java @@ -39,10 +39,7 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.ProjectBuildingException; -@Mojo(name = "licensedownload", - requiresProject = true, - requiresDependencyResolution = ResolutionScope.TEST, - defaultPhase = LifecyclePhase.GENERATE_RESOURCES) +@Mojo(name = "licensedownload", requiresProject = true, requiresDependencyResolution = ResolutionScope.TEST, defaultPhase = LifecyclePhase.GENERATE_RESOURCES) public class DownloadLicensesMojo extends LicenseMojo { @Parameter(required = true) @@ -73,7 +70,7 @@ public class DownloadLicensesMojo extends LicenseMojo { private void doDownload(int timeoutMillis, int id, String url, String fileName) { try { - HttpURLConnection conn = (HttpURLConnection)new URL(url).openConnection(); + HttpURLConnection conn = (HttpURLConnection) new URL(url).openConnection(); conn.setConnectTimeout(timeoutMillis); conn.setReadTimeout(timeoutMillis); conn.setRequestMethod("GET"); @@ -90,4 +87,3 @@ public class DownloadLicensesMojo extends LicenseMojo { } } } - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java index 387d18e..0245eb3 100644 --- a/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java +++ b/hyracks-fullstack/hyracks/hyracks-maven-plugins/license-automation-plugin/src/main/java/org/apache/hyracks/maven/license/GenerateFileMojo.java @@ -45,12 +45,6 @@ import java.util.jar.JarEntry; import java.util.jar.JarFile; import java.util.regex.Pattern; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SequenceWriter; -import freemarker.cache.FileTemplateLoader; -import freemarker.template.Configuration; -import freemarker.template.Template; -import freemarker.template.TemplateException; import org.apache.commons.io.IOUtils; import org.apache.hyracks.maven.license.freemarker.IndentDirective; import org.apache.hyracks.maven.license.freemarker.LoadFileDirective; @@ -63,13 +57,19 @@ import org.apache.maven.plugins.annotations.Parameter; import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.project.ProjectBuildingException; -@Mojo(name = "generate", - requiresProject = true, - requiresDependencyResolution = ResolutionScope.TEST) +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SequenceWriter; +import freemarker.cache.FileTemplateLoader; +import freemarker.template.Configuration; +import freemarker.template.Template; +import freemarker.template.TemplateException; + +@Mojo(name = "generate", requiresProject = true, requiresDependencyResolution = ResolutionScope.TEST) public class GenerateFileMojo extends LicenseMojo { - public static final Pattern FOUNDATION_PATTERN = Pattern.compile("^\\s*This product includes software developed " + - "(at|by) The Apache Software Foundation \\(http://www.apache.org/\\).\\s*$".replace(" ", "\\s+"), + public static final Pattern FOUNDATION_PATTERN = Pattern.compile( + "^\\s*This product includes software developed " + + "(at|by) The Apache Software Foundation \\(http://www.apache.org/\\).\\s*$".replace(" ", "\\s+"), Pattern.DOTALL | Pattern.MULTILINE); public static final Comparator<String> WHITESPACE_NORMALIZED_COMPARATOR = @@ -121,7 +121,6 @@ public class GenerateFileMojo extends LicenseMojo { } } - private void resolveLicenseContent() throws IOException { Set<LicenseSpec> licenseSpecs = new HashSet<>(); for (LicensedProjects licensedProjects : licenseMap.values()) { @@ -158,7 +157,7 @@ public class GenerateFileMojo extends LicenseMojo { private void combineCommonGavs() { for (LicensedProjects licensedProjects : licenseMap.values()) { Map<String, Project> projectMap = new HashMap<>(); - for (Iterator<Project> iter = licensedProjects.getProjects().iterator(); iter.hasNext(); ) { + for (Iterator<Project> iter = licensedProjects.getProjects().iterator(); iter.hasNext();) { Project project = iter.next(); if (projectMap.containsKey(project.gav())) { Project first = projectMap.get(project.gav()); @@ -208,19 +207,17 @@ public class GenerateFileMojo extends LicenseMojo { private void readExtraMaps() throws IOException { final ObjectMapper objectMapper = new ObjectMapper(); for (ExtraLicenseFile extraLicenseFile : extraLicenseMaps) { - for (LicensedProjects projects : - objectMapper.readValue(extraLicenseFile.getFile(), LicensedProjects[].class)) { + for (LicensedProjects projects : objectMapper.readValue(extraLicenseFile.getFile(), + LicensedProjects[].class)) { LicenseSpec spec = urlToLicenseMap.get(projects.getLicense().getUrl()); if (spec != null) { // TODO(mblow): probably we should always favor the extra map... // propagate any license content we may have with what already has been loaded - if (projects.getLicense().getContent() != null && - spec.getContent() == null) { + if (projects.getLicense().getContent() != null && spec.getContent() == null) { spec.setContent(projects.getLicense().getContent()); } // propagate any license displayName we may have with what already has been loaded - if (projects.getLicense().getDisplayName() != null && - spec.getDisplayName() == null) { + if (projects.getLicense().getDisplayName() != null && spec.getDisplayName() == null) { spec.setDisplayName(projects.getLicense().getDisplayName()); } } @@ -235,8 +232,8 @@ public class GenerateFileMojo extends LicenseMojo { private void persistLicenseMap() throws IOException { if (licenseMapOutputFile != null) { licenseMapOutputFile.getParentFile().mkdirs(); - SequenceWriter sw = new ObjectMapper().writerWithDefaultPrettyPrinter() - .writeValues(licenseMapOutputFile).init(true); + SequenceWriter sw = + new ObjectMapper().writerWithDefaultPrettyPrinter().writeValues(licenseMapOutputFile).init(true); for (LicensedProjects entry : licenseMap.values()) { sw.write(entry); } @@ -321,7 +318,7 @@ public class GenerateFileMojo extends LicenseMojo { } private void resolveArtifactFiles(final String name, Predicate<JarEntry> filter, - BiConsumer<Project, String> consumer, UnaryOperator<String> contentTransformer) + BiConsumer<Project, String> consumer, UnaryOperator<String> contentTransformer) throws MojoExecutionException, IOException { for (Project p : getProjects()) { File artifactFile = new File(p.getArtifactPath()); @@ -332,8 +329,7 @@ public class GenerateFileMojo extends LicenseMojo { continue; } try (JarFile jarFile = new JarFile(artifactFile)) { - SortedMap<String, JarEntry> matches = gatherMatchingEntries(jarFile, - filter); + SortedMap<String, JarEntry> matches = gatherMatchingEntries(jarFile, filter); if (matches.isEmpty()) { getLog().warn("No " + name + " file found for " + p.gav()); } else { @@ -343,15 +339,14 @@ public class GenerateFileMojo extends LicenseMojo { } else { getLog().info(p.gav() + " has " + name + " file: " + matches.keySet()); } - resolveContent(p, jarFile, matches.values().iterator().next(), - contentTransformer, consumer, name); + resolveContent(p, jarFile, matches.values().iterator().next(), contentTransformer, consumer, name); } } } } private void resolveContent(Project project, JarFile jarFile, JarEntry entry, UnaryOperator<String> transformer, - BiConsumer<Project, String> contentConsumer, final String name) throws IOException { + BiConsumer<Project, String> contentConsumer, final String name) throws IOException { String text = IOUtils.toString(jarFile.getInputStream(entry), StandardCharsets.UTF_8); text = transformer.apply(text); text = LicenseUtil.trim(text); @@ -375,4 +370,3 @@ public class GenerateFileMojo extends LicenseMojo { return matches; } } -
