http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java index d49a6dd..ddf1741 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoin.java @@ -110,8 +110,7 @@ public class OptimizedHybridHashJoin { private int[] probePSizeInTups; public OptimizedHybridHashJoin(IHyracksTaskContext ctx, int memSizeInFrames, int numOfPartitions, - String probeRelName, - String buildRelName, int[] probeKeys, int[] buildKeys, IBinaryComparator[] comparators, + String probeRelName, String buildRelName, int[] probeKeys, int[] buildKeys, IBinaryComparator[] comparators, RecordDescriptor probeRd, RecordDescriptor buildRd, ITuplePartitionComputer probeHpc, ITuplePartitionComputer buildHpc, IPredicateEvaluator predEval, boolean isLeftOuter, IMissingWriterFactory[] nullWriterFactories1) { @@ -259,8 +258,8 @@ public class OptimizedHybridHashJoin { break; } try { - for (int pid = spilledStatus.nextSetBit(0); pid >= 0 - && pid < numOfPartitions; pid = spilledStatus.nextSetBit(pid + 1)) { + for (int pid = spilledStatus.nextSetBit(0); pid >= 0 && pid < numOfPartitions; pid = + spilledStatus.nextSetBit(pid + 1)) { if (bufferManager.getNumTuples(pid) > 0) { bufferManager.flushPartition(pid, getSpillWriterOrCreateNewOneIfNotExist(pid, whichSide)); bufferManager.clearPartition(pid); @@ -293,16 +292,15 @@ public class OptimizedHybridHashJoin { // For partitions in main memory, we deduct their size from the free space. int inMemTupCount = 0; - for (int p = spilledStatus.nextClearBit(0); p >= 0 - && p < numOfPartitions; p = spilledStatus.nextClearBit(p + 1)) { + for (int p = spilledStatus.nextClearBit(0); p >= 0 && p < numOfPartitions; p = + spilledStatus.nextClearBit(p + 1)) { freeSpace -= bufferManager.getPhysicalSize(p); inMemTupCount += buildPSizeInTups[p]; } // Calculates the expected hash table size for the given number of tuples in main memory // and deducts it from the free space. - long hashTableByteSizeForInMemTuples = SerializableHashTable.getExpectedTableByteSize(inMemTupCount, - frameSize); + long hashTableByteSizeForInMemTuples = SerializableHashTable.getExpectedTableByteSize(inMemTupCount, frameSize); freeSpace -= hashTableByteSizeForInMemTuples; // In the case where free space is less than zero after considering the hash table size, @@ -317,8 +315,9 @@ public class OptimizedHybridHashJoin { int pidToSpill = selectSinglePartitionToSpill(freeSpace, inMemTupCount, frameSize); if (pidToSpill >= 0) { // There is a suitable one. We spill that partition to the disk. - long hashTableSizeDecrease = -SerializableHashTable.calculateByteSizeDeltaForTableSizeChange( - inMemTupCount, -buildPSizeInTups[pidToSpill], frameSize); + long hashTableSizeDecrease = + -SerializableHashTable.calculateByteSizeDeltaForTableSizeChange(inMemTupCount, + -buildPSizeInTups[pidToSpill], frameSize); freeSpace = freeSpace + bufferManager.getPhysicalSize(pidToSpill) + hashTableSizeDecrease; inMemTupCount -= buildPSizeInTups[pidToSpill]; spillPartition(pidToSpill); @@ -327,8 +326,8 @@ public class OptimizedHybridHashJoin { } else { // There is no single suitable partition. So, we need to spill multiple partitions to the disk // in order to accommodate the hash table. - for (int p = spilledStatus.nextClearBit(0); p >= 0 - && p < numOfPartitions; p = spilledStatus.nextClearBit(p + 1)) { + for (int p = spilledStatus.nextClearBit(0); p >= 0 && p < numOfPartitions; p = + spilledStatus.nextClearBit(p + 1)) { int spaceToBeReturned = bufferManager.getPhysicalSize(p); int numberOfTuplesToBeSpilled = buildPSizeInTups[p]; if (spaceToBeReturned == 0 || numberOfTuplesToBeSpilled == 0) { @@ -340,9 +339,9 @@ public class OptimizedHybridHashJoin { // Since the number of tuples in memory has been decreased, // the hash table size will be decreased, too. // We put minus since the method returns a negative value to represent a newly reclaimed space. - long expectedHashTableSizeDecrease = -SerializableHashTable - .calculateByteSizeDeltaForTableSizeChange(inMemTupCount, -numberOfTuplesToBeSpilled, - frameSize); + long expectedHashTableSizeDecrease = + -SerializableHashTable.calculateByteSizeDeltaForTableSizeChange(inMemTupCount, + -numberOfTuplesToBeSpilled, frameSize); freeSpace = freeSpace + spaceToBeReturned + expectedHashTableSizeDecrease; // Adjusts the hash table size inMemTupCount -= numberOfTuplesToBeSpilled; @@ -356,8 +355,7 @@ public class OptimizedHybridHashJoin { // If more partitions have been spilled to the disk, calculate the expected hash table size again // before bringing some partitions to main memory. if (moreSpilled) { - hashTableByteSizeForInMemTuples = SerializableHashTable.getExpectedTableByteSize(inMemTupCount, - frameSize); + hashTableByteSizeForInMemTuples = SerializableHashTable.getExpectedTableByteSize(inMemTupCount, frameSize); } // Brings back some partitions if there is enough free space. @@ -387,8 +385,8 @@ public class OptimizedHybridHashJoin { long minSpaceAfterSpill = (long) memSizeInFrames * frameSize; int minSpaceAfterSpillPartID = -1; - for (int p = spilledStatus.nextClearBit(0); p >= 0 - && p < numOfPartitions; p = spilledStatus.nextClearBit(p + 1)) { + for (int p = spilledStatus.nextClearBit(0); p >= 0 && p < numOfPartitions; p = + spilledStatus.nextClearBit(p + 1)) { if (buildPSizeInTups[p] == 0 || bufferManager.getPhysicalSize(p) == 0) { continue; } @@ -408,8 +406,8 @@ public class OptimizedHybridHashJoin { } private int selectPartitionsToReload(long freeSpace, int pid, int inMemTupCount) { - for (int i = spilledStatus.nextSetBit(pid); i >= 0 - && i < numOfPartitions; i = spilledStatus.nextSetBit(i + 1)) { + for (int i = spilledStatus.nextSetBit(pid); i >= 0 && i < numOfPartitions; i = + spilledStatus.nextSetBit(i + 1)) { int spilledTupleCount = buildPSizeInTups[i]; // Expected hash table size increase after reloading this partition long expectedHashTableByteSizeIncrease = SerializableHashTable.calculateByteSizeDeltaForTableSizeChange( @@ -452,10 +450,10 @@ public class OptimizedHybridHashJoin { private void createInMemoryJoiner(int inMemTupCount) throws HyracksDataException { ISerializableTable table = new SerializableHashTable(inMemTupCount, ctx, bufferManagerForHashTable); - this.inMemJoiner = new InMemoryHashJoin(ctx, new FrameTupleAccessor(probeRd), probeHpc, - new FrameTupleAccessor(buildRd), buildRd, buildHpc, - new FrameTuplePairComparator(probeKeys, buildKeys, comparators), isLeftOuter, nonMatchWriters, table, - predEvaluator, isReversed, bufferManagerForHashTable); + this.inMemJoiner = + new InMemoryHashJoin(ctx, new FrameTupleAccessor(probeRd), probeHpc, new FrameTupleAccessor(buildRd), + buildRd, buildHpc, new FrameTuplePairComparator(probeKeys, buildKeys, comparators), isLeftOuter, + nonMatchWriters, table, predEvaluator, isReversed, bufferManagerForHashTable); } private void loadDataInMemJoin() throws HyracksDataException { @@ -632,8 +630,8 @@ public class OptimizedHybridHashJoin { buf.append("(A) Spilled partitions" + "\n"); int spilledTupleCount = 0; int spilledPartByteSize = 0; - for (int pid = spilledStatus.nextSetBit(0); pid >= 0 - && pid < numOfPartitions; pid = spilledStatus.nextSetBit(pid + 1)) { + for (int pid = spilledStatus.nextSetBit(0); pid >= 0 && pid < numOfPartitions; pid = + spilledStatus.nextSetBit(pid + 1)) { if (whichSide == SIDE.BUILD) { spilledTupleCount += buildPSizeInTups[pid]; spilledPartByteSize += buildRFWriters[pid].getFileSize(); @@ -653,8 +651,8 @@ public class OptimizedHybridHashJoin { buf.append("(B) In-memory partitions" + "\n"); int inMemoryTupleCount = 0; int inMemoryPartByteSize = 0; - for (int pid = spilledStatus.nextClearBit(0); pid >= 0 - && pid < numOfPartitions; pid = spilledStatus.nextClearBit(pid + 1)) { + for (int pid = spilledStatus.nextClearBit(0); pid >= 0 && pid < numOfPartitions; pid = + spilledStatus.nextClearBit(pid + 1)) { if (whichSide == SIDE.BUILD) { inMemoryTupleCount += buildPSizeInTups[pid]; inMemoryPartByteSize += bufferManager.getPhysicalSize(pid);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java index 8dbe9b0..9eeb363 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/join/OptimizedHybridHashJoinOperatorDescriptor.java @@ -268,17 +268,19 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD comparators[i] = comparatorFactories[i].createBinaryComparator(); } - final IPredicateEvaluator predEvaluator = (predEvaluatorFactory == null ? null - : predEvaluatorFactory.createPredicateEvaluator()); + final IPredicateEvaluator predEvaluator = + (predEvaluatorFactory == null ? null : predEvaluatorFactory.createPredicateEvaluator()); IOperatorNodePushable op = new AbstractUnaryInputSinkOperatorNodePushable() { private BuildAndPartitionTaskState state = new BuildAndPartitionTaskState( ctx.getJobletContext().getJobId(), new TaskId(getActivityId(), partition)); - ITuplePartitionComputer probeHpc = new FieldHashPartitionComputerFamily(probeKeys, - hashFunctionGeneratorFactories).createPartitioner(0); - ITuplePartitionComputer buildHpc = new FieldHashPartitionComputerFamily(buildKeys, - hashFunctionGeneratorFactories).createPartitioner(0); + ITuplePartitionComputer probeHpc = + new FieldHashPartitionComputerFamily(probeKeys, hashFunctionGeneratorFactories) + .createPartitioner(0); + ITuplePartitionComputer buildHpc = + new FieldHashPartitionComputerFamily(buildKeys, hashFunctionGeneratorFactories) + .createPartitioner(0); boolean isFailed = false; @Override @@ -287,8 +289,8 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD throw new HyracksDataException("Not enough memory is assigend for Hybrid Hash Join."); } state.memForJoin = memSizeInFrames - 2; - state.numOfPartitions = getNumberOfPartitions(state.memForJoin, inputsize0, fudgeFactor, - nPartitions); + state.numOfPartitions = + getNumberOfPartitions(state.memForJoin, inputsize0, fudgeFactor, nPartitions); state.hybridHJ = new OptimizedHybridHashJoin(ctx, state.memForJoin, state.numOfPartitions, PROBE_REL, BUILD_REL, probeKeys, buildKeys, comparators, probeRd, buildRd, probeHpc, buildHpc, predEvaluator, isLeftOuter, nonMatchWriterFactories); @@ -355,21 +357,21 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD final RecordDescriptor buildRd = recordDescProvider.getInputRecordDescriptor(buildAid, 0); final RecordDescriptor probeRd = recordDescProvider.getInputRecordDescriptor(getActivityId(), 0); final IBinaryComparator[] comparators = new IBinaryComparator[comparatorFactories.length]; - final ITuplePairComparator nljComparatorProbe2Build = tuplePairComparatorFactoryProbe2Build - .createTuplePairComparator(ctx); - final ITuplePairComparator nljComparatorBuild2Probe = tuplePairComparatorFactoryBuild2Probe - .createTuplePairComparator(ctx); - final IPredicateEvaluator predEvaluator = predEvaluatorFactory == null ? null - : predEvaluatorFactory.createPredicateEvaluator(); + final ITuplePairComparator nljComparatorProbe2Build = + tuplePairComparatorFactoryProbe2Build.createTuplePairComparator(ctx); + final ITuplePairComparator nljComparatorBuild2Probe = + tuplePairComparatorFactoryBuild2Probe.createTuplePairComparator(ctx); + final IPredicateEvaluator predEvaluator = + predEvaluatorFactory == null ? null : predEvaluatorFactory.createPredicateEvaluator(); for (int i = 0; i < comparatorFactories.length; i++) { comparators[i] = comparatorFactories[i].createBinaryComparator(); } - final IMissingWriter[] nonMatchWriter = isLeftOuter ? new IMissingWriter[nonMatchWriterFactories.length] - : null; - final ArrayTupleBuilder nullTupleBuild = isLeftOuter ? new ArrayTupleBuilder(buildRd.getFieldCount()) - : null; + final IMissingWriter[] nonMatchWriter = + isLeftOuter ? new IMissingWriter[nonMatchWriterFactories.length] : null; + final ArrayTupleBuilder nullTupleBuild = + isLeftOuter ? new ArrayTupleBuilder(buildRd.getFieldCount()) : null; if (isLeftOuter) { DataOutput out = nullTupleBuild.getDataOutput(); for (int i = 0; i < nonMatchWriterFactories.length; i++) { @@ -432,8 +434,8 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD } BitSet partitionStatus = state.hybridHJ.getPartitionStatus(); rPartbuff.reset(); - for (int pid = partitionStatus.nextSetBit(0); pid >= 0; pid = partitionStatus - .nextSetBit(pid + 1)) { + for (int pid = partitionStatus.nextSetBit(0); pid >= 0; pid = + partitionStatus.nextSetBit(pid + 1)) { RunFileReader bReader = state.hybridHJ.getBuildRFReader(pid); RunFileReader pReader = state.hybridHJ.getProbeRFReader(pid); @@ -474,10 +476,12 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD //The buildSideReader should be always the original buildSideReader, so should the probeSideReader private void joinPartitionPair(RunFileReader buildSideReader, RunFileReader probeSideReader, int buildSizeInTuple, int probeSizeInTuple, int level) throws HyracksDataException { - ITuplePartitionComputer probeHpc = new FieldHashPartitionComputerFamily(probeKeys, - hashFunctionGeneratorFactories).createPartitioner(level); - ITuplePartitionComputer buildHpc = new FieldHashPartitionComputerFamily(buildKeys, - hashFunctionGeneratorFactories).createPartitioner(level); + ITuplePartitionComputer probeHpc = + new FieldHashPartitionComputerFamily(probeKeys, hashFunctionGeneratorFactories) + .createPartitioner(level); + ITuplePartitionComputer buildHpc = + new FieldHashPartitionComputerFamily(buildKeys, hashFunctionGeneratorFactories) + .createPartitioner(level); int frameSize = ctx.getInitialFrameSize(); long buildPartSize = (long) Math.ceil((double) buildSideReader.getFileSize() / (double) frameSize); @@ -492,10 +496,10 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD } // Calculate the expected hash table size for the both side. - long expectedHashTableSizeForBuildInFrame = SerializableHashTable - .getExpectedTableFrameCount(buildSizeInTuple, frameSize); - long expectedHashTableSizeForProbeInFrame = SerializableHashTable - .getExpectedTableFrameCount(probeSizeInTuple, frameSize); + long expectedHashTableSizeForBuildInFrame = + SerializableHashTable.getExpectedTableFrameCount(buildSizeInTuple, frameSize); + long expectedHashTableSizeForProbeInFrame = + SerializableHashTable.getExpectedTableFrameCount(probeSizeInTuple, frameSize); //Apply in-Mem HJ if possible if (!skipInMemoryHJ && ((buildPartSize + expectedHashTableSizeForBuildInFrame < state.memForJoin) @@ -646,9 +650,8 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD } else { //Case 2.1.2 - Switch to NLJ if (LOGGER.isDebugEnabled()) { - LOGGER.debug( - "\t\t>>>Case 2.1.2 - SWITCHED to NLJ RecursiveHHJ WITH " - + "(isLeftOuter || build<probe) - [Level " + level + "]"); + LOGGER.debug("\t\t>>>Case 2.1.2 - SWITCHED to NLJ RecursiveHHJ WITH " + + "(isLeftOuter || build<probe) - [Level " + level + "]"); } for (int rPid = rPStatus.nextSetBit(0); rPid >= 0; rPid = rPStatus.nextSetBit(rPid + 1)) { RunFileReader rbrfw = rHHj.getBuildRFReader(rPid); @@ -696,8 +699,8 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD probeTupleAccessor.reset(rPartbuff.getBuffer()); for (int tid = 0; tid < probeTupleAccessor.getTupleCount(); tid++) { FrameUtils.appendConcatToWriter(writer, nullResultAppender, probeTupleAccessor, tid, - nullTupleBuild.getFieldEndOffsets(), nullTupleBuild.getByteArray(), 0, - nullTupleBuild.getSize()); + nullTupleBuild.getFieldEndOffsets(), nullTupleBuild.getByteArray(), 0, + nullTupleBuild.getSize()); } } nullResultAppender.write(writer, true); @@ -713,13 +716,13 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD boolean isReversed = pKeys == OptimizedHybridHashJoinOperatorDescriptor.this.buildKeys && bKeys == OptimizedHybridHashJoinOperatorDescriptor.this.probeKeys; assert isLeftOuter ? !isReversed : true : "LeftOut Join can not reverse roles"; - IDeallocatableFramePool framePool = new DeallocatableFramePool(ctx, - state.memForJoin * ctx.getInitialFrameSize()); + IDeallocatableFramePool framePool = + new DeallocatableFramePool(ctx, state.memForJoin * ctx.getInitialFrameSize()); ISimpleFrameBufferManager bufferManager = new FramePoolBackedFrameBufferManager(framePool); ISerializableTable table = new SerializableHashTable(tabSize, ctx, bufferManager); - InMemoryHashJoin joiner = new InMemoryHashJoin(ctx, new FrameTupleAccessor(probeRDesc), - hpcRepProbe, new FrameTupleAccessor(buildRDesc), buildRDesc, hpcRepBuild, + InMemoryHashJoin joiner = new InMemoryHashJoin(ctx, new FrameTupleAccessor(probeRDesc), hpcRepProbe, + new FrameTupleAccessor(buildRDesc), buildRDesc, hpcRepBuild, new FrameTuplePairComparator(pKeys, bKeys, comparators), isLeftOuter, nonMatchWriter, table, predEvaluator, isReversed, bufferManager); @@ -777,11 +780,11 @@ public class OptimizedHybridHashJoinOperatorDescriptor extends AbstractOperatorD // Hence the reverse relation is different. boolean isReversed = outerRd == buildRd && innerRd == probeRd; assert isLeftOuter ? !isReversed : true : "LeftOut Join can not reverse roles"; - ITuplePairComparator nljComptorOuterInner = isReversed ? nljComparatorBuild2Probe - : nljComparatorProbe2Build; - NestedLoopJoin nlj = new NestedLoopJoin(ctx, new FrameTupleAccessor(outerRd), - new FrameTupleAccessor(innerRd), nljComptorOuterInner, memorySize, predEvaluator, - isLeftOuter, nonMatchWriter); + ITuplePairComparator nljComptorOuterInner = + isReversed ? nljComparatorBuild2Probe : nljComparatorProbe2Build; + NestedLoopJoin nlj = + new NestedLoopJoin(ctx, new FrameTupleAccessor(outerRd), new FrameTupleAccessor(innerRd), + nljComptorOuterInner, memorySize, predEvaluator, isLeftOuter, nonMatchWriter); nlj.setIsReversed(isReversed); IFrame cacheBuff = new VSizeFrame(ctx); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java index 0629168..7b687c4 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/ConstantTupleSourceOperatorDescriptor.java @@ -34,8 +34,8 @@ public class ConstantTupleSourceOperatorDescriptor extends AbstractSingleActivit private byte[] tupleData; private int tupleSize; - public ConstantTupleSourceOperatorDescriptor(IOperatorDescriptorRegistry spec, RecordDescriptor recDesc, int[] fieldSlots, - byte[] tupleData, int tupleSize) { + public ConstantTupleSourceOperatorDescriptor(IOperatorDescriptorRegistry spec, RecordDescriptor recDesc, + int[] fieldSlots, byte[] tupleData, int tupleSize) { super(spec, 0, 1); this.tupleData = tupleData; this.fieldSlots = fieldSlots; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/IdentityOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/IdentityOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/IdentityOperatorDescriptor.java index 156198a..29c8fed 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/IdentityOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/IdentityOperatorDescriptor.java @@ -40,7 +40,7 @@ public class IdentityOperatorDescriptor extends AbstractSingleActivityOperatorDe @Override public IOperatorNodePushable createPushRuntime(final IHyracksTaskContext ctx, final IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) - throws HyracksDataException { + throws HyracksDataException { return new AbstractUnaryInputUnaryOutputOperatorNodePushable() { @Override public void open() throws HyracksDataException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/LimitOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/LimitOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/LimitOperatorDescriptor.java index 4fc1ad2..a190686 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/LimitOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/LimitOperatorDescriptor.java @@ -46,7 +46,7 @@ public class LimitOperatorDescriptor extends AbstractSingleActivityOperatorDescr @Override public IOperatorNodePushable createPushRuntime(final IHyracksTaskContext ctx, final IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) - throws HyracksDataException { + throws HyracksDataException { return new AbstractUnaryInputUnaryOutputOperatorNodePushable() { private FrameTupleAccessor fta; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializerTaskState.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializerTaskState.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializerTaskState.java index 31cbaad..6ba11ca 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializerTaskState.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializerTaskState.java @@ -59,8 +59,8 @@ public class MaterializerTaskState extends AbstractStateObject { } public void open(IHyracksTaskContext ctx) throws HyracksDataException { - FileReference file = ctx.getJobletContext() - .createManagedWorkspaceFile(MaterializerTaskState.class.getSimpleName()); + FileReference file = + ctx.getJobletContext().createManagedWorkspaceFile(MaterializerTaskState.class.getSimpleName()); out = new RunFileWriter(file, ctx.getIoManager()); out.open(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializingOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializingOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializingOperatorDescriptor.java index d3e87d4..3f97752 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializingOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/misc/MaterializingOperatorDescriptor.java @@ -59,8 +59,8 @@ public class MaterializingOperatorDescriptor extends AbstractOperatorDescriptor @Override public void contributeActivities(IActivityGraphBuilder builder) { if (isSingleActivity) { - MaterializerReaderActivityNode mra = new MaterializerReaderActivityNode( - new ActivityId(odId, MATERIALIZER_READER_ACTIVITY_ID)); + MaterializerReaderActivityNode mra = + new MaterializerReaderActivityNode(new ActivityId(odId, MATERIALIZER_READER_ACTIVITY_ID)); builder.addActivity(this, mra); builder.addSourceEdge(0, mra, 0); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java index d081bdb..b0cc40c 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/result/ResultWriterOperatorDescriptor.java @@ -76,8 +76,8 @@ public class ResultWriterOperatorDescriptor extends AbstractSingleActivityOperat PrintStream printStream = new PrintStream(frameOutputStream); final RecordDescriptor outRecordDesc = recordDescProvider.getInputRecordDescriptor(getActivityId(), 0); - final IResultSerializer resultSerializer = resultSerializerFactory.createResultSerializer(outRecordDesc, - printStream); + final IResultSerializer resultSerializer = + resultSerializerFactory.createResultSerializer(outRecordDesc, printStream); final FrameTupleAccessor frameTupleAccessor = new FrameTupleAccessor(outRecordDesc); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/RunMergingFrameReader.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/RunMergingFrameReader.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/RunMergingFrameReader.java index 3cbe86b..4d9e813 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/RunMergingFrameReader.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/RunMergingFrameReader.java @@ -72,9 +72,8 @@ public class RunMergingFrameReader implements IFrameReader { // right now we didn't take multiple key normalizers for frame merger, since during this step it won't be // too many cache misses (merging multiple runs sequentially). // but still, we can apply a special optimization if there is only 1 sort field - this.normalizedKeyDecisive = - nmkComputer != null ? nmkComputer.getNormalizedKeyProperties().isDecisive() && comparators.length == 1 - : false; + this.normalizedKeyDecisive = nmkComputer != null + ? nmkComputer.getNormalizedKeyProperties().isDecisive() && comparators.length == 1 : false; this.recordDesc = recordDesc; this.topK = topK; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TopKSorterOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TopKSorterOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TopKSorterOperatorDescriptor.java index a90d48f..dea770a 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TopKSorterOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/TopKSorterOperatorDescriptor.java @@ -41,9 +41,9 @@ public class TopKSorterOperatorDescriptor extends AbstractSorterOperatorDescript public TopKSorterOperatorDescriptor(IOperatorDescriptorRegistry spec, int framesLimit, int topK, int[] sortFields, INormalizedKeyComputerFactory firstKeyNormalizerFactory, IBinaryComparatorFactory[] comparatorFactories, RecordDescriptor recordDescriptor) { - this(spec, framesLimit, topK, sortFields, - firstKeyNormalizerFactory != null ? new INormalizedKeyComputerFactory[] { firstKeyNormalizerFactory } - : null, + this(spec, framesLimit, topK, + sortFields, firstKeyNormalizerFactory != null + ? new INormalizedKeyComputerFactory[] { firstKeyNormalizerFactory } : null, comparatorFactories, recordDescriptor); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java index 7d4db64..8ff77ca 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppender.java @@ -42,7 +42,7 @@ public class DeletableFrameTupleAppender implements IAppendDeletableFrameTupleAc private int tupleCount; private int freeDataEndOffset; private int deletedSpace; - private byte[] array; // to speed up the array visit a little + private byte[] array; // to speed up the array visit a little public DeletableFrameTupleAppender(RecordDescriptor recordDescriptor) { this.recordDescriptor = recordDescriptor; @@ -146,7 +146,7 @@ public class DeletableFrameTupleAppender implements IAppendDeletableFrameTupleAc endOffset = getTupleEndOffset(i); if (endOffset >= 0) { int length = endOffset - startOffset; - assert ( length >= 0); + assert (length >= 0); if (freeDataEndOffset != startOffset) { System.arraycopy(array, startOffset, array, freeDataEndOffset, length); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/GroupVSizeFrame.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/GroupVSizeFrame.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/GroupVSizeFrame.java index d9460aa..1f45032 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/GroupVSizeFrame.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/sort/util/GroupVSizeFrame.java @@ -26,8 +26,7 @@ import org.apache.hyracks.api.exceptions.HyracksDataException; public class GroupVSizeFrame extends VSizeFrame { - public GroupVSizeFrame(IHyracksCommonContext ctx, int frameSize) - throws HyracksDataException { + public GroupVSizeFrame(IHyracksCommonContext ctx, int frameSize) throws HyracksDataException { super(ctx, frameSize); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/IResetableComparable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/IResetableComparable.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/IResetableComparable.java index 1b202e5..7cb6356 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/IResetableComparable.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/IResetableComparable.java @@ -19,5 +19,5 @@ package org.apache.hyracks.dataflow.std.structures; -public interface IResetableComparable<T> extends IResetable<T>, Comparable<T>{ +public interface IResetableComparable<T> extends IResetable<T>, Comparable<T> { } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/ISerializableTable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/ISerializableTable.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/ISerializableTable.java index 015ddb3..51f9984 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/ISerializableTable.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/ISerializableTable.java @@ -57,8 +57,7 @@ public interface ISerializableTable { * @return the number of frames that are reclaimed. * @throws HyracksDataException */ - int collectGarbage(ITuplePointerAccessor bufferAccessor, ITuplePartitionComputer tpc) - throws HyracksDataException; + int collectGarbage(ITuplePointerAccessor bufferAccessor, ITuplePartitionComputer tpc) throws HyracksDataException; /** * Prints out the internal information of this table. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/MaxHeap.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/MaxHeap.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/MaxHeap.java index 4c9d05d..87d17da 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/MaxHeap.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/MaxHeap.java @@ -64,4 +64,3 @@ public class MaxHeap extends AbstractHeap implements IMaxHeap<IResetableComparab trickleDown(0); } } - http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SerializableHashTable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SerializableHashTable.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SerializableHashTable.java index ca97be3..e6da7c9 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SerializableHashTable.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SerializableHashTable.java @@ -45,8 +45,7 @@ public class SerializableHashTable extends SimpleSerializableHashTable { } public SerializableHashTable(int tableSize, final IHyracksFrameMgrContext ctx, - ISimpleFrameBufferManager bufferManager, double garbageCollectionThreshold) - throws HyracksDataException { + ISimpleFrameBufferManager bufferManager, double garbageCollectionThreshold) throws HyracksDataException { super(tableSize, ctx, false); this.bufferManager = bufferManager; @@ -142,8 +141,8 @@ public class SerializableHashTable extends SimpleSerializableHashTable { // Step #2. Advances the reader until it hits the end of the given frame. while (gcInfo.currentReadIntOffsetInPageForGC < frameCapacity) { - nextSlotIntPosInPageForGC = findNextSlotInPage(currentReadContentFrameForGC, - gcInfo.currentReadIntOffsetInPageForGC); + nextSlotIntPosInPageForGC = + findNextSlotInPage(currentReadContentFrameForGC, gcInfo.currentReadIntOffsetInPageForGC); if (nextSlotIntPosInPageForGC == INVALID_VALUE) { // There isn't a valid slot in the page. Exits the loop #2 and reads the next frame. @@ -174,8 +173,8 @@ public class SerializableHashTable extends SimpleSerializableHashTable { } // Migrates this slot to the current offset in Writer's Frame if possible. - currentPageChanged = MigrateSlot(gcInfo, bufferAccessor, tpc, capacityInIntCount, - nextSlotIntPosInPageForGC); + currentPageChanged = + MigrateSlot(gcInfo, bufferAccessor, tpc, capacityInIntCount, nextSlotIntPosInPageForGC); if (currentPageChanged) { currentReadContentFrameForGC = contents.get(gcInfo.currentReadPageForGC); @@ -385,8 +384,8 @@ public class SerializableHashTable extends SimpleSerializableHashTable { * given tuple pointer. */ private void updateHeaderToContentPointerInHeaderFrame(ITuplePointerAccessor bufferAccessor, - ITuplePartitionComputer tpc, TuplePointer hashedTuple, int newContentFrame, - int newOffsetInContentFrame) throws HyracksDataException { + ITuplePartitionComputer tpc, TuplePointer hashedTuple, int newContentFrame, int newOffsetInContentFrame) + throws HyracksDataException { // Finds the original hash value. We assume that bufferAccessor and tpc is already assigned. bufferAccessor.reset(hashedTuple); int entry = tpc.partition(bufferAccessor, hashedTuple.getTupleIndex(), tableSize); @@ -401,7 +400,6 @@ public class SerializableHashTable extends SimpleSerializableHashTable { headerFrame.writeInt(offsetInHeaderFrame + 1, newOffsetInContentFrame); } - /** * Tries to find the next valid slot position in the given content frame from the current position. */ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SimpleSerializableHashTable.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SimpleSerializableHashTable.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SimpleSerializableHashTable.java index 6497a53..cfc58ce 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SimpleSerializableHashTable.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/structures/SimpleSerializableHashTable.java @@ -309,16 +309,16 @@ public class SimpleSerializableHashTable implements ISerializableTable { lastContentFrame.writeInt(lastOffsetInCurrentFrame + 2, pointer.getFrameIndex()); lastContentFrame.writeInt(lastOffsetInCurrentFrame + 3, pointer.getTupleIndex()); int newLastOffsetInContentFrame = lastOffsetInCurrentFrame + entryCapacity * 2; - newLastOffsetInContentFrame = newLastOffsetInContentFrame < frameCapacity ? newLastOffsetInContentFrame - : frameCapacity - 1; + newLastOffsetInContentFrame = + newLastOffsetInContentFrame < frameCapacity ? newLastOffsetInContentFrame : frameCapacity - 1; currentOffsetInEachFrameList.set(currentFrameNumber, newLastOffsetInContentFrame); requiredIntCapacity = entryCapacity * 2 - (frameCapacity - lastOffsetInCurrentFrame); while (requiredIntCapacity > 0) { currentFrameNumber++; requiredIntCapacity -= frameCapacity; - newLastOffsetInContentFrame = requiredIntCapacity < 0 ? requiredIntCapacity + frameCapacity - : frameCapacity - 1; + newLastOffsetInContentFrame = + requiredIntCapacity < 0 ? requiredIntCapacity + frameCapacity : frameCapacity - 1; currentOffsetInEachFrameList.set(currentFrameNumber, newLastOffsetInContentFrame); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/union/UnionAllOperatorDescriptor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/union/UnionAllOperatorDescriptor.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/union/UnionAllOperatorDescriptor.java index 967977e..a03d8d7 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/union/UnionAllOperatorDescriptor.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/union/UnionAllOperatorDescriptor.java @@ -62,7 +62,7 @@ public class UnionAllOperatorDescriptor extends AbstractOperatorDescriptor { @Override public IOperatorNodePushable createPushRuntime(IHyracksTaskContext ctx, IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) - throws HyracksDataException { + throws HyracksDataException { return new UnionOperator(); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/util/ReferencedPriorityQueue.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/util/ReferencedPriorityQueue.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/util/ReferencedPriorityQueue.java index cc6c2d9..2681fe6 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/util/ReferencedPriorityQueue.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/main/java/org/apache/hyracks/dataflow/std/util/ReferencedPriorityQueue.java @@ -113,7 +113,7 @@ public class ReferencedPriorityQueue { ReferenceEntry tmp = entries[slot]; entries[slot] = curr; curr = tmp;// winner to pass up - }// else curr wins + } // else curr wins slot >>= 1; } // set new entries[0] http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/AbstractTupleMemoryManagerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/AbstractTupleMemoryManagerTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/AbstractTupleMemoryManagerTest.java index 11148a2..0e42397 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/AbstractTupleMemoryManagerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/AbstractTupleMemoryManagerTest.java @@ -40,8 +40,8 @@ import org.apache.hyracks.dataflow.std.structures.TuplePointer; import org.apache.hyracks.util.IntSerDeUtils; public abstract class AbstractTupleMemoryManagerTest { - ISerializerDeserializer[] fieldsSerDer = new ISerializerDeserializer[] { - IntegerSerializerDeserializer.INSTANCE, new UTF8StringSerializerDeserializer() }; + ISerializerDeserializer[] fieldsSerDer = new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, + new UTF8StringSerializerDeserializer() }; RecordDescriptor recordDescriptor = new RecordDescriptor(fieldsSerDer); ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(recordDescriptor.getFieldCount()); FrameTupleAccessor inFTA = new FrameTupleAccessor(recordDescriptor); @@ -61,9 +61,7 @@ public abstract class AbstractTupleMemoryManagerTest { assertEquals(map.size(), mapInserted.size()); } - protected Map<Integer, Integer> prepareFixedSizeTuples( - int tuplePerFrame, - int extraMetaBytePerFrame, + protected Map<Integer, Integer> prepareFixedSizeTuples(int tuplePerFrame, int extraMetaBytePerFrame, int extraMetaBytePerRecord) throws HyracksDataException { Map<Integer, Integer> dataSet = new HashMap<>(); ByteBuffer buffer = ByteBuffer.allocate(Common.BUDGET); @@ -72,8 +70,7 @@ public abstract class AbstractTupleMemoryManagerTest { appender.reset(frame, true); int sizePerTuple = (Common.MIN_FRAME_SIZE - 1 - tuplePerFrame * 4 - 4 - extraMetaBytePerFrame) / tuplePerFrame; - int sizeChar = - sizePerTuple - extraMetaBytePerRecord - fieldsSerDer.length * 4 - 4 - 2; //2byte to write str length + int sizeChar = sizePerTuple - extraMetaBytePerRecord - fieldsSerDer.length * 4 - 4 - 2; //2byte to write str length assert (sizeChar > 0); for (int i = 0; i < Common.NUM_MIN_FRAME * tuplePerFrame; i++) { tupleBuilder.reset(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBestFitUsingTreeMapTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBestFitUsingTreeMapTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBestFitUsingTreeMapTest.java index 992c7f6..e5a4091 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBestFitUsingTreeMapTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/FrameFreeSlotBestFitUsingTreeMapTest.java @@ -54,11 +54,10 @@ public class FrameFreeSlotBestFitUsingTreeMapTest { } @Test - public void testReset(){ + public void testReset() { testAll(); policy.reset(); testAll(); } - } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableFramesMemoryManagerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableFramesMemoryManagerTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableFramesMemoryManagerTest.java index 9d4a9a1..21680eb 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableFramesMemoryManagerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableFramesMemoryManagerTest.java @@ -157,12 +157,12 @@ public class VariableFramesMemoryManagerTest { framesMemoryManager.getFrame(i, info); fta.reset(info.getBuffer(), info.getStartOffset(), info.getLength()); for (int t = 0; t < fta.getTupleCount(); t++) { - int id = parseTuple(fta.getBuffer(), fta.getTupleStartOffset(t) + fta.getFieldSlotsLength() + fta - .getFieldStartOffset(t, 0)); + int id = parseTuple(fta.getBuffer(), + fta.getTupleStartOffset(t) + fta.getFieldSlotsLength() + fta.getFieldStartOffset(t, 0)); // System.out.println("frameid:" + i + ",tuple:" + t + ",has id:" + id + ",length:" + // (fta.getTupleEndOffset(t) - fta.getTupleStartOffset(t) - fta.getFieldSlotsLength())); - assertTrue(tupleSet.remove(id) == fta.getTupleEndOffset(t) - fta.getTupleStartOffset(t) - fta - .getFieldSlotsLength()); + assertTrue(tupleSet.remove(id) == fta.getTupleEndOffset(t) - fta.getTupleStartOffset(t) + - fta.getFieldSlotsLength()); } } assertTrue(tupleSet.isEmpty()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableTupleMemoryManagerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableTupleMemoryManagerTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableTupleMemoryManagerTest.java index e2a231f..8cc6df3 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableTupleMemoryManagerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/buffermanager/VariableTupleMemoryManagerTest.java @@ -155,8 +155,7 @@ public class VariableTupleMemoryManagerTest extends AbstractTupleMemoryManagerTe } private ByteBuffer deleteRandomSelectedTuples(Map<Integer, Integer> map, Map<TuplePointer, Integer> mapInserted, - int minNumOfRecordTobeDeleted) - throws HyracksDataException { + int minNumOfRecordTobeDeleted) throws HyracksDataException { ByteBuffer buffer = ByteBuffer.allocate(Common.BUDGET); FixedSizeFrame frame = new FixedSizeFrame(buffer); FrameTupleAppender appender = new FrameTupleAppender(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppenderTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppenderTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppenderTest.java index 7686540..468f879 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppenderTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/sort/util/DeletableFrameTupleAppenderTest.java @@ -39,10 +39,8 @@ import org.junit.Test; public class DeletableFrameTupleAppenderTest { DeletableFrameTupleAppender appender; - ISerializerDeserializer[] fields = new ISerializerDeserializer[] { - IntegerSerializerDeserializer.INSTANCE, - new UTF8StringSerializerDeserializer(), - }; + ISerializerDeserializer[] fields = new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, + new UTF8StringSerializerDeserializer(), }; RecordDescriptor recordDescriptor = new RecordDescriptor(fields); ArrayTupleBuilder builder = new ArrayTupleBuilder(recordDescriptor.getFieldCount()); static final char TEST_CH = 'x'; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MaxHeapTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MaxHeapTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MaxHeapTest.java index 16b24c4..7e31956 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MaxHeapTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MaxHeapTest.java @@ -97,7 +97,7 @@ public class MaxHeapTest extends AbstracHeapTest { maxHeap.peekMax(peekI); maxHeap.getMax(maxI); assertTrue(peekI.compareTo(maxI) == 0); - assertEquals( i++, capacity - 1 - maxI.i); + assertEquals(i++, capacity - 1 - maxI.i); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MinHeapTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MinHeapTest.java b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MinHeapTest.java index 1a5fba3..be10095 100644 --- a/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MinHeapTest.java +++ b/hyracks-fullstack/hyracks/hyracks-dataflow-std/src/test/java/org/apache/hyracks/dataflow/std/structures/MinHeapTest.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -public class MinHeapTest extends AbstracHeapTest{ +public class MinHeapTest extends AbstracHeapTest { @Test public void testInitialMinHeap() { @@ -102,5 +102,4 @@ public class MinHeapTest extends AbstracHeapTest{ } } - } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/InsertPipelineExample.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/InsertPipelineExample.java b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/InsertPipelineExample.java index 48377e3..8ac34d8 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/InsertPipelineExample.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/InsertPipelineExample.java @@ -144,7 +144,8 @@ public class InsertPipelineExample { // B-Tree tuple, etc. IFileSplitProvider primarySplitProvider = JobHelper.createFileSplitProvider(splitNCs, options.primaryBTreeName); - IIndexDataflowHelperFactory primaryHelperFactory = new IndexDataflowHelperFactory(storageManager, primarySplitProvider); + IIndexDataflowHelperFactory primaryHelperFactory = + new IndexDataflowHelperFactory(storageManager, primarySplitProvider); // create operator descriptor TreeIndexInsertUpdateDeleteOperatorDescriptor primaryInsert = http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexBulkLoadExample.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexBulkLoadExample.java b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexBulkLoadExample.java index 203d22c..2fb1cee 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexBulkLoadExample.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexBulkLoadExample.java @@ -145,7 +145,8 @@ public class PrimaryIndexBulkLoadExample { // to field 0 of B-Tree tuple, // etc. IFileSplitProvider btreeSplitProvider = JobHelper.createFileSplitProvider(splitNCs, options.btreeName); - IIndexDataflowHelperFactory dataflowHelperFactory = new IndexDataflowHelperFactory(storageManager, btreeSplitProvider); + IIndexDataflowHelperFactory dataflowHelperFactory = + new IndexDataflowHelperFactory(storageManager, btreeSplitProvider); TreeIndexBulkLoadOperatorDescriptor btreeBulkLoad = new TreeIndexBulkLoadOperatorDescriptor(spec, recDesc, fieldPermutation, 0.7f, false, 1000L, true, dataflowHelperFactory); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexSearchExample.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexSearchExample.java b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexSearchExample.java index 603dc6b..c32b72c 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexSearchExample.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/PrimaryIndexSearchExample.java @@ -139,7 +139,8 @@ public class PrimaryIndexSearchExample { // into search op IFileSplitProvider btreeSplitProvider = JobHelper.createFileSplitProvider(splitNCs, options.btreeName); - IIndexDataflowHelperFactory dataflowHelperFactory = new IndexDataflowHelperFactory(storageManager, btreeSplitProvider); + IIndexDataflowHelperFactory dataflowHelperFactory = + new IndexDataflowHelperFactory(storageManager, btreeSplitProvider); BTreeSearchOperatorDescriptor btreeSearchOp = new BTreeSearchOperatorDescriptor(spec, recDesc, lowKeyFields, highKeyFields, true, true, dataflowHelperFactory, false, false, null, NoOpOperationCallbackFactory.INSTANCE, null, null, false); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexBulkLoadExample.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexBulkLoadExample.java b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexBulkLoadExample.java index 7507f10..a8bea08 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexBulkLoadExample.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexBulkLoadExample.java @@ -117,7 +117,8 @@ public class SecondaryIndexBulkLoadExample { // use a disk-order scan to read primary index IFileSplitProvider primarySplitProvider = JobHelper.createFileSplitProvider(splitNCs, options.primaryBTreeName); - IIndexDataflowHelperFactory primaryHelperFactory = new IndexDataflowHelperFactory(storageManager, primarySplitProvider); + IIndexDataflowHelperFactory primaryHelperFactory = + new IndexDataflowHelperFactory(storageManager, primarySplitProvider); TreeIndexDiskOrderScanOperatorDescriptor btreeScanOp = new TreeIndexDiskOrderScanOperatorDescriptor(spec, recDesc, primaryHelperFactory, NoOpOperationCallbackFactory.INSTANCE); JobHelper.createPartitionConstraint(spec, btreeScanOp, splitNCs); @@ -139,7 +140,8 @@ public class SecondaryIndexBulkLoadExample { // tuple int[] fieldPermutation = { 1, 0 }; IFileSplitProvider btreeSplitProvider = JobHelper.createFileSplitProvider(splitNCs, options.secondaryBTreeName); - IIndexDataflowHelperFactory secondaryHelperFactory = new IndexDataflowHelperFactory(storageManager, btreeSplitProvider); + IIndexDataflowHelperFactory secondaryHelperFactory = + new IndexDataflowHelperFactory(storageManager, btreeSplitProvider); TreeIndexBulkLoadOperatorDescriptor btreeBulkLoad = new TreeIndexBulkLoadOperatorDescriptor(spec, null, fieldPermutation, 0.7f, false, 1000L, true, secondaryHelperFactory); JobHelper.createPartitionConstraint(spec, btreeBulkLoad, splitNCs); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexSearchExample.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexSearchExample.java b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexSearchExample.java index 1e909ef..ccf20fe 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexSearchExample.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/btree-example/btreeclient/src/main/java/org/apache/hyracks/examples/btree/client/SecondaryIndexSearchExample.java @@ -183,7 +183,8 @@ public class SecondaryIndexSearchExample { // op IFileSplitProvider primarySplitProvider = JobHelper.createFileSplitProvider(splitNCs, options.primaryBTreeName); - IIndexDataflowHelperFactory primaryHelperFactory = new IndexDataflowHelperFactory(storageManager, primarySplitProvider); + IIndexDataflowHelperFactory primaryHelperFactory = + new IndexDataflowHelperFactory(storageManager, primarySplitProvider); BTreeSearchOperatorDescriptor primarySearchOp = new BTreeSearchOperatorDescriptor(spec, primaryRecDesc, primaryLowKeyFields, primaryHighKeyFields, true, true, primaryHelperFactory, false, false, null, NoOpOperationCallbackFactory.INSTANCE, null, null, false); 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/am/btree/DataSetConstants.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/am/btree/DataSetConstants.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/am/btree/DataSetConstants.java index d6775cc..db51ed2 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/am/btree/DataSetConstants.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/am/btree/DataSetConstants.java @@ -31,19 +31,17 @@ import org.apache.hyracks.dataflow.common.data.parsers.UTF8StringParserFactory; public class DataSetConstants { - public static final RecordDescriptor inputRecordDesc = new RecordDescriptor( - new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), + public static final RecordDescriptor inputRecordDesc = + new RecordDescriptor(new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }); - public static final IValueParserFactory[] inputParserFactories = - new IValueParserFactory[] { UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, - UTF8StringParserFactory.INSTANCE }; + public static final IValueParserFactory[] inputParserFactories = new IValueParserFactory[] { + UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, + UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, + UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE, UTF8StringParserFactory.INSTANCE }; // field, type and key declarations for primary index public static int[] primaryFieldPermutation = { 0, 1, 2, 4, 5, 7 }; @@ -54,10 +52,9 @@ public class DataSetConstants { public static final IBinaryComparatorFactory[] filterCmpFactories = new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY) }; - public static final ITypeTraits[] primaryTypeTraits = - new ITypeTraits[] { UTF8StringPointable.TYPE_TRAITS, UTF8StringPointable.TYPE_TRAITS, - UTF8StringPointable.TYPE_TRAITS, UTF8StringPointable.TYPE_TRAITS, UTF8StringPointable.TYPE_TRAITS, - UTF8StringPointable.TYPE_TRAITS }; + public static final ITypeTraits[] primaryTypeTraits = new ITypeTraits[] { UTF8StringPointable.TYPE_TRAITS, + UTF8StringPointable.TYPE_TRAITS, UTF8StringPointable.TYPE_TRAITS, UTF8StringPointable.TYPE_TRAITS, + UTF8StringPointable.TYPE_TRAITS, UTF8StringPointable.TYPE_TRAITS }; public static final IBinaryComparatorFactory[] primaryComparatorFactories = new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY) }; @@ -65,18 +62,16 @@ public class DataSetConstants { public static final int[] primaryBloomFilterKeyFields = new int[] { 0 }; - public static final RecordDescriptor primaryRecDesc = new RecordDescriptor( - new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer() }); + public static final RecordDescriptor primaryRecDesc = new RecordDescriptor(new ISerializerDeserializer[] { + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }); - public static final RecordDescriptor primaryAndFilterRecDesc = new RecordDescriptor( - new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer() }); + public static final RecordDescriptor primaryAndFilterRecDesc = new RecordDescriptor(new ISerializerDeserializer[] { + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }); // field, type and key declarations for secondary indexes @@ -94,11 +89,10 @@ public class DataSetConstants { new IBinaryComparatorFactory[] { PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY), PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY) }; - public static final RecordDescriptor secondaryRecDesc = new RecordDescriptor( - new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer() }); - public static final RecordDescriptor secondaryWithFilterRecDesc = new RecordDescriptor( - new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), + public static final RecordDescriptor secondaryRecDesc = new RecordDescriptor(new ISerializerDeserializer[] { + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }); + public static final RecordDescriptor secondaryWithFilterRecDesc = + new RecordDescriptor(new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }); } 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/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesOperatorTestHelper.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesOperatorTestHelper.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesOperatorTestHelper.java index d230f38..5b091a2 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesOperatorTestHelper.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/am/lsm/rtree/LSMRTreeWithAntiMatterTuplesOperatorTestHelper.java @@ -39,7 +39,6 @@ public class LSMRTreeWithAntiMatterTuplesOperatorTestHelper extends LSMTreeOpera public static final boolean IS_POINT_MBR = false; public static final boolean DURABLE = true; - public LSMRTreeWithAntiMatterTuplesOperatorTestHelper(IOManager ioManager) { super(ioManager); } 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/comm/SerializationDeserializationTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/comm/SerializationDeserializationTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/comm/SerializationDeserializationTest.java index 7a675bc..1bb58b8 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/comm/SerializationDeserializationTest.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/comm/SerializationDeserializationTest.java @@ -48,8 +48,8 @@ import org.junit.Test; public class SerializationDeserializationTest { private static final Logger LOGGER = LogManager.getLogger(); - private static final String DBLP_FILE = "data" + File.separator + "device1" + File.separator + "data" - + File.separator + "dblp.txt"; + private static final String DBLP_FILE = + "data" + File.separator + "device1" + File.separator + "data" + File.separator + "dblp.txt"; private static class SerDeserRunner { private final IHyracksTaskContext ctx; 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/integration/AbstractIntegrationTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java index ae27ac9..0931501 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractIntegrationTest.java @@ -106,7 +106,7 @@ public abstract class AbstractIntegrationTest { ncConfig1.setClusterListenAddress("127.0.0.1"); ncConfig1.setDataListenAddress("127.0.0.1"); ncConfig1.setResultListenAddress("127.0.0.1"); - ncConfig1.setIODevices(new String [] { joinPath(System.getProperty("user.dir"), "target", "data", "device0") }); + ncConfig1.setIODevices(new String[] { joinPath(System.getProperty("user.dir"), "target", "data", "device0") }); nc1 = new NodeControllerService(ncConfig1); nc1.start(); @@ -116,7 +116,7 @@ public abstract class AbstractIntegrationTest { ncConfig2.setClusterListenAddress("127.0.0.1"); ncConfig2.setDataListenAddress("127.0.0.1"); ncConfig2.setResultListenAddress("127.0.0.1"); - ncConfig2.setIODevices(new String [] { joinPath(System.getProperty("user.dir"), "target", "data", "device1") }); + ncConfig2.setIODevices(new String[] { joinPath(System.getProperty("user.dir"), "target", "data", "device1") }); nc2 = new NodeControllerService(ncConfig2); nc2.start(); 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/integration/AbstractMultiNCIntegrationTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractMultiNCIntegrationTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractMultiNCIntegrationTest.java index 7100895..58da8a2 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractMultiNCIntegrationTest.java +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/AbstractMultiNCIntegrationTest.java @@ -245,8 +245,7 @@ public abstract class AbstractMultiNCIntegrationTest { @Override public JobSubmissionStatus allocate(JobSpecification job) throws HyracksException { return maxRAM > job.getRequiredClusterCapacity().getAggregatedMemoryByteSize() - ? JobSubmissionStatus.EXECUTE - : JobSubmissionStatus.QUEUE; + ? JobSubmissionStatus.EXECUTE : JobSubmissionStatus.QUEUE; } @Override
