http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8Token.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8Token.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8Token.java index ccc2c81..ed2f3be 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8Token.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/AbstractUTF8Token.java @@ -115,8 +115,7 @@ public abstract class AbstractUTF8Token implements IToken { // The preChar and postChar are required to be a single byte utf8 char, e.g. ASCII char. protected void serializeToken(UTF8StringBuilder builder, GrowableArray out, int numPreChars, int numPostChars, - char preChar, char postChar) - throws IOException { + char preChar, char postChar) throws IOException { handleTokenTypeTag(out.getDataOutput());
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizer.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizer.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizer.java index cd37ffa..3a5224c 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizer.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizer.java @@ -72,10 +72,11 @@ public class DelimitedUTF8StringBinaryTokenizer extends AbstractUTF8StringBinary int tokenStart = tokensStart.get(i); curTokenCount++; // assume we found it int offset = 0; - for (int charPos= 0; charPos < tokenLength; charPos++) { + for (int charPos = 0; charPos < tokenLength; charPos++) { // case insensitive comparison - if (Character.toLowerCase(UTF8StringUtil.charAt(sentenceBytes, currentTokenStart + offset)) - != Character.toLowerCase(UTF8StringUtil.charAt(sentenceBytes, tokenStart + offset))) { + if (Character.toLowerCase( + UTF8StringUtil.charAt(sentenceBytes, currentTokenStart + offset)) != Character + .toLowerCase(UTF8StringUtil.charAt(sentenceBytes, tokenStart + offset))) { curTokenCount--; break; } @@ -93,7 +94,6 @@ public class DelimitedUTF8StringBinaryTokenizer extends AbstractUTF8StringBinary tokenCount++; } - // TODO Why we bother to get the tokenCount in advance? It seems a caller's problem. @Override public short getTokensCount() { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java index 81254fc..e583c7d 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/DelimitedUTF8StringBinaryTokenizerFactory.java @@ -19,16 +19,15 @@ package org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers; -public class DelimitedUTF8StringBinaryTokenizerFactory implements - IBinaryTokenizerFactory { +public class DelimitedUTF8StringBinaryTokenizerFactory implements IBinaryTokenizerFactory { private static final long serialVersionUID = 1L; private final boolean ignoreTokenCount; private final boolean sourceHasTypeTag; private final ITokenFactory tokenFactory; - public DelimitedUTF8StringBinaryTokenizerFactory(boolean ignoreTokenCount, - boolean sourceHasTypeTag, ITokenFactory tokenFactory) { + public DelimitedUTF8StringBinaryTokenizerFactory(boolean ignoreTokenCount, boolean sourceHasTypeTag, + ITokenFactory tokenFactory) { this.ignoreTokenCount = ignoreTokenCount; this.sourceHasTypeTag = sourceHasTypeTag; this.tokenFactory = tokenFactory; @@ -36,7 +35,6 @@ public class DelimitedUTF8StringBinaryTokenizerFactory implements @Override public IBinaryTokenizer createTokenizer() { - return new DelimitedUTF8StringBinaryTokenizer(ignoreTokenCount, - sourceHasTypeTag, tokenFactory); + return new DelimitedUTF8StringBinaryTokenizer(ignoreTokenCount, sourceHasTypeTag, tokenFactory); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramUTF8StringBinaryTokenizer.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramUTF8StringBinaryTokenizer.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramUTF8StringBinaryTokenizer.java index 8bd0c50..711a82f 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramUTF8StringBinaryTokenizer.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramUTF8StringBinaryTokenizer.java @@ -79,8 +79,9 @@ public class NGramUTF8StringBinaryTokenizer extends AbstractUTF8StringBinaryToke tokenCount++; // assume found int offset = 0; for (int j = 0; j < gramLength; j++) { - if (Character.toLowerCase(UTF8StringUtil.charAt(sentenceBytes, currentTokenStart + offset)) - != Character.toLowerCase(UTF8StringUtil.charAt(sentenceBytes, tmpIndex + offset))) { + if (Character + .toLowerCase(UTF8StringUtil.charAt(sentenceBytes, currentTokenStart + offset)) != Character + .toLowerCase(UTF8StringUtil.charAt(sentenceBytes, tmpIndex + offset))) { tokenCount--; break; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/InvertedIndexTokenizingTupleIterator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/InvertedIndexTokenizingTupleIterator.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/InvertedIndexTokenizingTupleIterator.java index 2ade6db..78c8e4d 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/InvertedIndexTokenizingTupleIterator.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/InvertedIndexTokenizingTupleIterator.java @@ -39,7 +39,8 @@ public class InvertedIndexTokenizingTupleIterator { protected final IBinaryTokenizer tokenizer; protected ITupleReference inputTuple; - public InvertedIndexTokenizingTupleIterator(int tokensFieldCount, int invListFieldCount, IBinaryTokenizer tokenizer) { + public InvertedIndexTokenizingTupleIterator(int tokensFieldCount, int invListFieldCount, + IBinaryTokenizer tokenizer) { this.invListFieldCount = invListFieldCount; this.tupleBuilder = new ArrayTupleBuilder(tokensFieldCount + invListFieldCount); this.tupleReference = new ArrayTupleReference(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java index a477baf..e4267e2 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java @@ -175,7 +175,6 @@ public abstract class LSMRTreeAbstractCursor implements ILSMIndexCursor { open = false; } - @Override public ITupleReference getTuple() { return frameTuple; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java index 1825003..1ca75cb 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/api/IGenericPrimitiveSerializerDeserializer.java @@ -21,7 +21,6 @@ package org.apache.hyracks.storage.am.rtree.api; import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer; -public interface IGenericPrimitiveSerializerDeserializer<T> extends - ISerializerDeserializer<T> { +public interface IGenericPrimitiveSerializerDeserializer<T> extends ISerializerDeserializer<T> { public double getValue(byte[] bytes, int offset); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RStarTreePolicy.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RStarTreePolicy.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RStarTreePolicy.java index 7ae616a..1681eee 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RStarTreePolicy.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RStarTreePolicy.java @@ -71,10 +71,12 @@ public class RStarTreePolicy implements IRTreePolicy { @Override public void split(ITreeIndexFrame leftFrame, ByteBuffer buf, ITreeIndexFrame rightFrame, ISlotManager slotManager, - ITreeIndexTupleReference frameTuple, ITupleReference tuple, ISplitKey splitKey) throws HyracksDataException { + ITreeIndexTupleReference frameTuple, ITupleReference tuple, ISplitKey splitKey) + throws HyracksDataException { RTreeSplitKey rTreeSplitKey = ((RTreeSplitKey) splitKey); RTreeTypeAwareTupleWriter rTreeTupleWriterleftRTreeFrame = ((RTreeTypeAwareTupleWriter) tupleWriter); - RTreeTypeAwareTupleWriter rTreeTupleWriterRightFrame = ((RTreeTypeAwareTupleWriter) rightFrame.getTupleWriter()); + RTreeTypeAwareTupleWriter rTreeTupleWriterRightFrame = + ((RTreeTypeAwareTupleWriter) rightFrame.getTupleWriter()); RTreeNSMFrame leftRTreeFrame = ((RTreeNSMFrame) leftFrame); @@ -92,10 +94,10 @@ public class RStarTreePolicy implements IRTreePolicy { for (int k = 0; k < leftRTreeFrame.getTupleCount(); ++k) { frameTuple.resetByTupleIndex(leftRTreeFrame, k); - double LowerKey = keyValueProviders[i] - .getValue(frameTuple.getFieldData(i), frameTuple.getFieldStart(i)); - double UpperKey = keyValueProviders[j] - .getValue(frameTuple.getFieldData(j), frameTuple.getFieldStart(j)); + double LowerKey = + keyValueProviders[i].getValue(frameTuple.getFieldData(i), frameTuple.getFieldStart(i)); + double UpperKey = + keyValueProviders[j].getValue(frameTuple.getFieldData(j), frameTuple.getFieldStart(j)); tupleEntries1.add(k, LowerKey); tupleEntries2.add(k, UpperKey); @@ -186,8 +188,8 @@ public class RStarTreePolicy implements IRTreePolicy { if (tupleEntries1.get(i).getTupleIndex() != -1) { frameTuple.resetByTupleIndex(leftRTreeFrame, tupleEntries1.get(i).getTupleIndex()); rightFrame.insert(frameTuple, -1); - ((UnorderedSlotManager) slotManager).modifySlot( - slotManager.getSlotOff(tupleEntries1.get(i).getTupleIndex()), -1); + ((UnorderedSlotManager) slotManager) + .modifySlot(slotManager.getSlotOff(tupleEntries1.get(i).getTupleIndex()), -1); totalBytes += leftRTreeFrame.getTupleSize(frameTuple); numOfDeletedTuples++; } else { @@ -198,8 +200,8 @@ public class RStarTreePolicy implements IRTreePolicy { ((UnorderedSlotManager) slotManager).deleteEmptySlots(); // maintain space information - buf.putInt(totalFreeSpaceOff, buf.getInt(totalFreeSpaceOff) + totalBytes - + (slotManager.getSlotSize() * numOfDeletedTuples)); + buf.putInt(totalFreeSpaceOff, + buf.getInt(totalFreeSpaceOff) + totalBytes + (slotManager.getSlotSize() * numOfDeletedTuples)); // compact both pages rightFrame.compact(); @@ -238,8 +240,8 @@ public class RStarTreePolicy implements IRTreePolicy { tupleEntries2.clear(); } - public void generateDist(ITreeIndexFrame leftRTreeFrame, ITreeIndexTupleReference frameTuple, - ITupleReference tuple, TupleEntryArrayList entries, Rectangle rec, int start, int end) { + public void generateDist(ITreeIndexFrame leftRTreeFrame, ITreeIndexTupleReference frameTuple, ITupleReference tuple, + TupleEntryArrayList entries, Rectangle rec, int start, int end) { int j = 0; while (entries.get(j).getTupleIndex() == -1) { j++; @@ -302,20 +304,19 @@ public class RStarTreePolicy implements IRTreePolicy { int c = ((RTreeNSMInteriorFrame) frame).pointerCmp(frameTuple, cmpFrameTuple, cmp); if (c != 0) { - double intersection = RTreeComputationUtils.overlappedArea(frameTuple, tuple, - cmpFrameTuple, cmp, keyValueProviders); + double intersection = RTreeComputationUtils.overlappedArea(frameTuple, tuple, cmpFrameTuple, + cmp, keyValueProviders); if (intersection != 0.0) { - difference += intersection - - RTreeComputationUtils.overlappedArea(frameTuple, null, cmpFrameTuple, cmp, - keyValueProviders); + difference += intersection - RTreeComputationUtils.overlappedArea(frameTuple, null, + cmpFrameTuple, cmp, keyValueProviders); } } else { id = j; } } - double enlargedArea = RTreeComputationUtils.enlargedArea(cmpFrameTuple, tuple, cmp, - keyValueProviders); + double enlargedArea = + RTreeComputationUtils.enlargedArea(cmpFrameTuple, tuple, cmp, keyValueProviders); if (difference < minOverlap) { minOverlap = difference; minEnlargedArea = enlargedArea; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeComputationUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeComputationUtils.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeComputationUtils.java index 31ade3c..281dff5 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeComputationUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeComputationUtils.java @@ -71,8 +71,8 @@ public class RTreeComputationUtils { double pHigh1, pLow1; if (tupleToBeInserted != null) { int c = cmp.getComparators()[i].compare(tuple1.getFieldData(i), tuple1.getFieldStart(i), - tuple1.getFieldLength(i), tupleToBeInserted.getFieldData(i), - tupleToBeInserted.getFieldStart(i), tupleToBeInserted.getFieldLength(i)); + tuple1.getFieldLength(i), tupleToBeInserted.getFieldData(i), tupleToBeInserted.getFieldStart(i), + tupleToBeInserted.getFieldLength(i)); if (c < 0) { pLow1 = keyValueProviders[i].getValue(tuple1.getFieldData(i), tuple1.getFieldStart(i)); } else { @@ -81,8 +81,8 @@ public class RTreeComputationUtils { } c = cmp.getComparators()[j].compare(tuple1.getFieldData(j), tuple1.getFieldStart(j), - tuple1.getFieldLength(j), tupleToBeInserted.getFieldData(j), - tupleToBeInserted.getFieldStart(j), tupleToBeInserted.getFieldLength(j)); + tuple1.getFieldLength(j), tupleToBeInserted.getFieldData(j), tupleToBeInserted.getFieldStart(j), + tupleToBeInserted.getFieldLength(j)); if (c > 0) { pHigh1 = keyValueProviders[j].getValue(tuple1.getFieldData(j), tuple1.getFieldStart(j)); } else { @@ -124,16 +124,16 @@ public class RTreeComputationUtils { int maxFieldPos = cmp.getKeyFieldCount() / 2; for (int i = 0; i < maxFieldPos; i++) { int j = maxFieldPos + i; - int c = cmp.getComparators()[i] - .compare(tuple1.getFieldData(i), tuple1.getFieldStart(i), tuple1.getFieldLength(i), - tuple2.getFieldData(i), tuple2.getFieldStart(i), tuple2.getFieldLength(i)); + int c = cmp.getComparators()[i].compare(tuple1.getFieldData(i), tuple1.getFieldStart(i), + tuple1.getFieldLength(i), tuple2.getFieldData(i), tuple2.getFieldStart(i), + tuple2.getFieldLength(i)); if (c > 0) { return false; } - c = cmp.getComparators()[j] - .compare(tuple1.getFieldData(j), tuple1.getFieldStart(j), tuple1.getFieldLength(j), - tuple2.getFieldData(j), tuple2.getFieldStart(j), tuple2.getFieldLength(j)); + c = cmp.getComparators()[j].compare(tuple1.getFieldData(j), tuple1.getFieldStart(j), + tuple1.getFieldLength(j), tuple2.getFieldData(j), tuple2.getFieldStart(j), + tuple2.getFieldLength(j)); if (c < 0) { return false; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMFrame.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMFrame.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMFrame.java index ba542ea..05d04f6 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMFrame.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMFrame.java @@ -115,8 +115,7 @@ public abstract class RTreeNSMFrame extends TreeIndexNSMFrame implements IRTreeF @Override public void split(ITreeIndexFrame rightFrame, ITupleReference tuple, ISplitKey splitKey, - IExtraPageBlockHelper extraPageBlockHelper, IBufferCache bufferCache) - throws HyracksDataException { + IExtraPageBlockHelper extraPageBlockHelper, IBufferCache bufferCache) throws HyracksDataException { rtreePolicy.split(this, buf, rightFrame, slotManager, frameTuple, tuple, splitKey); } @@ -166,15 +165,12 @@ public abstract class RTreeNSMFrame extends TreeIndexNSMFrame implements IRTreeF @Override public String toString() { - return new StringBuilder(this.getClass().getSimpleName()).append('\n').append( - "Tuple Count: " + getTupleCount()).append('\n').append("Free Space offset: " + buf - .getInt(Constants.FREE_SPACE_OFFSET)).append('\n').append("Level: " + buf - .get(Constants.LEVEL_OFFSET)).append('\n').append("LSN: " - + buf.getLong(PAGE_LSN_OFFSET)).append('\n').append( - "Total Free Space: " + buf.getInt(TOTAL_FREE_SPACE_OFFSET)).append( - '\n').append("Flag: " + buf.get( - FLAG_OFFSET)).append('\n') - .append("NSN: " + buf.getLong(PAGE_NSN_OFFSET)).append('\n').append("Right Page:") - .append(buf.getInt(RIGHT_PAGE_OFFSET)).toString(); + return new StringBuilder(this.getClass().getSimpleName()).append('\n').append("Tuple Count: " + getTupleCount()) + .append('\n').append("Free Space offset: " + buf.getInt(Constants.FREE_SPACE_OFFSET)).append('\n') + .append("Level: " + buf.get(Constants.LEVEL_OFFSET)).append('\n') + .append("LSN: " + buf.getLong(PAGE_LSN_OFFSET)).append('\n') + .append("Total Free Space: " + buf.getInt(TOTAL_FREE_SPACE_OFFSET)).append('\n') + .append("Flag: " + buf.get(FLAG_OFFSET)).append('\n').append("NSN: " + buf.getLong(PAGE_NSN_OFFSET)) + .append('\n').append("Right Page:").append(buf.getInt(RIGHT_PAGE_OFFSET)).toString(); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java index b8b5a8c..5550e1f 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMInteriorFrameFactory.java @@ -38,8 +38,8 @@ public class RTreeNSMInteriorFrameFactory extends RTreeFrameFactory { for (int i = 0; i < keyValueProviders.length; i++) { keyValueProviders[i] = keyValueProviderFactories[i].createPrimitiveValueProvider(); } - return new RTreeNSMInteriorFrame(tupleWriterFactory.createTupleWriter(), keyValueProviders, - rtreePolicyType, isPointMBR); + return new RTreeNSMInteriorFrame(tupleWriterFactory.createTupleWriter(), keyValueProviders, rtreePolicyType, + isPointMBR); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java index e112b86..16b22c0 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreeNSMLeafFrameFactory.java @@ -38,8 +38,8 @@ public class RTreeNSMLeafFrameFactory extends RTreeFrameFactory { for (int i = 0; i < keyValueProviders.length; i++) { keyValueProviders[i] = keyValueProviderFactories[i].createPrimitiveValueProvider(); } - return new RTreeNSMLeafFrame(tupleWriterFactory.createTupleWriter(), keyValueProviders, - rtreePolicyType, isPointMBR); + return new RTreeNSMLeafFrame(tupleWriterFactory.createTupleWriter(), keyValueProviders, rtreePolicyType, + isPointMBR); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicy.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicy.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicy.java index 0dea4c2..623ef21 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicy.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicy.java @@ -62,10 +62,12 @@ public class RTreePolicy implements IRTreePolicy { @Override public void split(ITreeIndexFrame leftFrame, ByteBuffer buf, ITreeIndexFrame rightFrame, ISlotManager slotManager, - ITreeIndexTupleReference frameTuple, ITupleReference tuple, ISplitKey splitKey) throws HyracksDataException { + ITreeIndexTupleReference frameTuple, ITupleReference tuple, ISplitKey splitKey) + throws HyracksDataException { RTreeSplitKey rTreeSplitKey = ((RTreeSplitKey) splitKey); RTreeTypeAwareTupleWriter rTreeTupleWriterLeftFrame = ((RTreeTypeAwareTupleWriter) tupleWriter); - RTreeTypeAwareTupleWriter rTreeTupleWriterRightFrame = ((RTreeTypeAwareTupleWriter) rightFrame.getTupleWriter()); + RTreeTypeAwareTupleWriter rTreeTupleWriterRightFrame = + ((RTreeTypeAwareTupleWriter) rightFrame.getTupleWriter()); RTreeNSMFrame leftRTreeFrame = ((RTreeNSMFrame) leftFrame); @@ -75,10 +77,10 @@ public class RTreePolicy implements IRTreePolicy { for (int i = 0; i < maxFieldPos; i++) { int j = maxFieldPos + i; frameTuple.resetByTupleIndex(leftRTreeFrame, 0); - double leastLowerValue = keyValueProviders[i].getValue(frameTuple.getFieldData(i), - frameTuple.getFieldStart(i)); - double greatestUpperValue = keyValueProviders[j].getValue(frameTuple.getFieldData(j), - frameTuple.getFieldStart(j)); + double leastLowerValue = + keyValueProviders[i].getValue(frameTuple.getFieldData(i), frameTuple.getFieldStart(i)); + double greatestUpperValue = + keyValueProviders[j].getValue(frameTuple.getFieldData(j), frameTuple.getFieldStart(j)); double leastUpperValue = leastLowerValue; double greatestLowerValue = greatestUpperValue; int leastUpperIndex = 0; @@ -88,16 +90,16 @@ public class RTreePolicy implements IRTreePolicy { int tupleCount = leftRTreeFrame.getTupleCount(); for (int k = 1; k < tupleCount; ++k) { frameTuple.resetByTupleIndex(leftRTreeFrame, k); - double lowerValue = keyValueProviders[i].getValue(frameTuple.getFieldData(i), - frameTuple.getFieldStart(i)); + double lowerValue = + keyValueProviders[i].getValue(frameTuple.getFieldData(i), frameTuple.getFieldStart(i)); if (lowerValue > greatestLowerValue) { greatestLowerIndex = k; cmpFrameTuple.resetByTupleIndex(leftRTreeFrame, k); greatestLowerValue = keyValueProviders[i].getValue(cmpFrameTuple.getFieldData(i), cmpFrameTuple.getFieldStart(i)); } - double higherValue = keyValueProviders[j].getValue(frameTuple.getFieldData(j), - frameTuple.getFieldStart(j)); + double higherValue = + keyValueProviders[j].getValue(frameTuple.getFieldData(j), frameTuple.getFieldStart(j)); if (higherValue < leastUpperValue) { leastUpperIndex = k; cmpFrameTuple.resetByTupleIndex(leftRTreeFrame, k); @@ -169,8 +171,8 @@ public class RTreePolicy implements IRTreePolicy { ((UnorderedSlotManager) slotManager).deleteEmptySlots(); // maintain space information - buf.putInt(totalFreeSpaceOff, buf.getInt(totalFreeSpaceOff) + totalBytes - + (slotManager.getSlotSize() * numOfDeletedTuples)); + buf.putInt(totalFreeSpaceOff, + buf.getInt(totalFreeSpaceOff) + totalBytes + (slotManager.getSlotSize() * numOfDeletedTuples)); // compact both pages rightFrame.compact(); @@ -196,7 +198,8 @@ public class RTreePolicy implements IRTreePolicy { splitKey.initData(splitKeySize); leftRTreeFrame.adjustMBR(); - rTreeTupleWriterLeftFrame.writeTupleFields(leftRTreeFrame.getMBRTuples(), 0, rTreeSplitKey.getLeftPageBuffer(), 0); + rTreeTupleWriterLeftFrame.writeTupleFields(leftRTreeFrame.getMBRTuples(), 0, rTreeSplitKey.getLeftPageBuffer(), + 0); rTreeSplitKey.getLeftTuple().resetByTupleOffset(rTreeSplitKey.getLeftPageBuffer().array(), 0); ((IRTreeFrame) rightFrame).adjustMBR(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicyType.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicyType.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicyType.java index 8ca9842..d9dbd81 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicyType.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/frames/RTreePolicyType.java @@ -20,5 +20,6 @@ package org.apache.hyracks.storage.am.rtree.frames; public enum RTreePolicyType { - RTREE, RSTARTREE + RTREE, + RSTARTREE } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java index d6d69bb..8798241 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/EntriesOrder.java @@ -20,5 +20,6 @@ package org.apache.hyracks.storage.am.rtree.impls; public enum EntriesOrder { - ASCENDING, DESCENDING + ASCENDING, + DESCENDING } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java index f6bdcfb..11a5b2b 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTreeSplitKey.java @@ -35,8 +35,7 @@ public class RTreeSplitKey implements ISplitKey { public int keySize = 0; - public RTreeSplitKey(ITreeIndexTupleReference leftTuple, - ITreeIndexTupleReference rightTuple) { + public RTreeSplitKey(ITreeIndexTupleReference leftTuple, ITreeIndexTupleReference rightTuple) { this.leftTuple = leftTuple; this.rightTuple = rightTuple; } @@ -114,8 +113,7 @@ public class RTreeSplitKey implements ISplitKey { rightPageBuf.putInt(keySize, page); } - public ISplitKey duplicate(ITreeIndexTupleReference copyLeftTuple, - ITreeIndexTupleReference copyRightTuple) { + public ISplitKey duplicate(ITreeIndexTupleReference copyLeftTuple, ITreeIndexTupleReference copyRightTuple) { RTreeSplitKey copy = new RTreeSplitKey(copyLeftTuple, copyRightTuple); copy.leftPageData = leftPageData.clone(); copy.leftPageBuf = ByteBuffer.wrap(copy.leftPageData); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/Rectangle.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/Rectangle.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/Rectangle.java index cbfd245..c74f712 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/Rectangle.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/Rectangle.java @@ -64,13 +64,13 @@ public class Rectangle { public void enlarge(ITupleReference tupleToBeInserted, IPrimitiveValueProvider[] valueProviders) { for (int i = 0; i < getDim(); i++) { int j = getDim() + i; - double low = valueProviders[i].getValue(tupleToBeInserted.getFieldData(i), - tupleToBeInserted.getFieldStart(i)); + double low = + valueProviders[i].getValue(tupleToBeInserted.getFieldData(i), tupleToBeInserted.getFieldStart(i)); if (getLow(i) > low) { setLow(i, low); } - double high = valueProviders[j].getValue(tupleToBeInserted.getFieldData(j), - tupleToBeInserted.getFieldStart(j)); + double high = + valueProviders[j].getValue(tupleToBeInserted.getFieldData(j), tupleToBeInserted.getFieldStart(j)); if (getHigh(i) < high) { setHigh(i, high); } @@ -84,8 +84,8 @@ public class Rectangle { for (int i = 0; i < getDim(); i++) { int j = getDim() + i; - double low = valueProviders[i].getValue(tupleToBeInserted.getFieldData(i), - tupleToBeInserted.getFieldStart(i)); + double low = + valueProviders[i].getValue(tupleToBeInserted.getFieldData(i), tupleToBeInserted.getFieldStart(i)); double lowAfterEnlargement; if (getLow(i) > low) { lowAfterEnlargement = low; @@ -93,8 +93,8 @@ public class Rectangle { lowAfterEnlargement = getLow(i); } - double high = valueProviders[j].getValue(tupleToBeInserted.getFieldData(j), - tupleToBeInserted.getFieldStart(j)); + double high = + valueProviders[j].getValue(tupleToBeInserted.getFieldData(j), tupleToBeInserted.getFieldStart(j)); double highAfterEnlargement; if (getHigh(i) < high) { highAfterEnlargement = high; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparator.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparator.java index 3194674..447940f 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparator.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/HilbertDoubleComparator.java @@ -54,8 +54,8 @@ public class HilbertDoubleComparator implements ILinearizeComparator { private IntArrayList stateStack = new IntArrayList(1000, 200); private DoubleArrayList boundsStack = new DoubleArrayList(2000, 400); - private IPrimitiveValueProvider valueProvider = DoublePrimitiveValueProviderFactory.INSTANCE - .createPrimitiveValueProvider(); + private IPrimitiveValueProvider valueProvider = + DoublePrimitiveValueProviderFactory.INSTANCE.createPrimitiveValueProvider(); private double[] a; private double[] b; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparator.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparator.java index 30eb991..13aed8c 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparator.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/linearize/ZCurveDoubleComparator.java @@ -36,8 +36,8 @@ public class ZCurveDoubleComparator implements ILinearizeComparator { private double stepsize; private DoubleArrayList boundsStack = new DoubleArrayList(2000, 400); - private IPrimitiveValueProvider valueProvider = DoublePrimitiveValueProviderFactory.INSTANCE - .createPrimitiveValueProvider(); + private IPrimitiveValueProvider valueProvider = + DoublePrimitiveValueProviderFactory.INSTANCE.createPrimitiveValueProvider(); private double[] a; private double[] b; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/AsyncFIFOPageQueueManager.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/AsyncFIFOPageQueueManager.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/AsyncFIFOPageQueueManager.java index b4f364c..dbead1e 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/AsyncFIFOPageQueueManager.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/AsyncFIFOPageQueueManager.java @@ -34,7 +34,7 @@ public class AsyncFIFOPageQueueManager implements Runnable { protected BufferCache bufferCache; volatile protected PageQueue pageQueue; - public AsyncFIFOPageQueueManager(BufferCache bufferCache){ + public AsyncFIFOPageQueueManager(BufferCache bufferCache) { this.bufferCache = bufferCache; } @@ -43,7 +43,8 @@ public class AsyncFIFOPageQueueManager implements Runnable { public final IFIFOPageWriter writer; protected PageQueue(IBufferCache bufferCache, IFIFOPageWriter writer) { - if(DEBUG) System.out.println("[FIFO] New Queue"); + if (DEBUG) + System.out.println("[FIFO] New Queue"); this.bufferCache = bufferCache; this.writer = writer; } @@ -59,10 +60,9 @@ public class AsyncFIFOPageQueueManager implements Runnable { @Override public void put(ICachedPage page) throws HyracksDataException { try { - if(!poisoned.get()) { + if (!poisoned.get()) { queue.put(page); - } - else{ + } else { throw new HyracksDataException("Queue is closing"); } } catch (InterruptedException e) { @@ -72,22 +72,21 @@ public class AsyncFIFOPageQueueManager implements Runnable { } } - public PageQueue createQueue(IFIFOPageWriter writer) { if (pageQueue == null) { - synchronized(this){ + synchronized (this) { if (pageQueue == null) { writerThread = new Thread(this); writerThread.setName("FIFO Writer Thread"); writerThread.start(); - pageQueue = new PageQueue(bufferCache,writer); + pageQueue = new PageQueue(bufferCache, writer); } } } return pageQueue; } - public void destroyQueue(){ + public void destroyQueue() { poisoned.set(true); if (writerThread == null) { synchronized (this) { @@ -99,16 +98,16 @@ public class AsyncFIFOPageQueueManager implements Runnable { //Dummy cached page to act as poison pill CachedPage poisonPill = new CachedPage(); - poisonPill.setQueueInfo(new QueueInfo(true,true)); + poisonPill.setQueueInfo(new QueueInfo(true, true)); - try{ + try { synchronized (poisonPill) { queue.put(poisonPill); - while(queue.contains(poisonPill)){ + while (queue.contains(poisonPill)) { poisonPill.wait(); } } - } catch (InterruptedException e){ + } catch (InterruptedException e) { Thread.currentThread().interrupt(); } } @@ -139,26 +138,30 @@ public class AsyncFIFOPageQueueManager implements Runnable { @Override public void run() { - if (DEBUG) System.out.println("[FIFO] Writer started"); + if (DEBUG) + System.out.println("[FIFO] Writer started"); boolean die = false; while (!die) { ICachedPage entry; try { entry = queue.take(); - } catch(InterruptedException e) { + } catch (InterruptedException e) { Thread.currentThread().interrupt(); break; } - if (entry.getQueueInfo() != null && entry.getQueueInfo().hasWaiters()){ - synchronized(entry) { - if(entry.getQueueInfo().isPoison()) { die = true; } + if (entry.getQueueInfo() != null && entry.getQueueInfo().hasWaiters()) { + synchronized (entry) { + if (entry.getQueueInfo().isPoison()) { + die = true; + } entry.notifyAll(); continue; } } - if (DEBUG) System.out.println("[FIFO] Write " + BufferedFileHandle.getFileId(((CachedPage)entry).dpid)+"," - + BufferedFileHandle.getPageId(((CachedPage)entry).dpid)); + if (DEBUG) + System.out.println("[FIFO] Write " + BufferedFileHandle.getFileId(((CachedPage) entry).dpid) + "," + + BufferedFileHandle.getPageId(((CachedPage) entry).dpid)); try { pageQueue.getWriter().write(entry, bufferCache); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java index 302c7b2..1443bbc 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java @@ -1307,21 +1307,17 @@ public class BufferCache implements IBufferCacheInternal, ILifeCycleComponent { finishQueue(); if (cycleCount > MAX_PIN_ATTEMPT_CYCLES) { cycleCount = 0; // suppress warning below - throw new HyracksDataException( - "Unable to find free page in buffer cache after " + MAX_PIN_ATTEMPT_CYCLES - + " cycles (buffer cache undersized?)" + (DEBUG - ? " ; " + (masterPinCount.get() - startingPinCount) - + " successful pins since start of cycle" - : "")); + throw new HyracksDataException("Unable to find free page in buffer cache after " + + MAX_PIN_ATTEMPT_CYCLES + " cycles (buffer cache undersized?)" + + (DEBUG ? " ; " + (masterPinCount.get() - startingPinCount) + + " successful pins since start of cycle" : "")); } } } finally { if (cycleCount > PIN_ATTEMPT_CYCLES_WARNING_THRESHOLD && LOGGER.isWarnEnabled()) { LOGGER.warn("Took " + cycleCount + " cycles to find free page in buffer cache. (buffer cache " - + "undersized?)" + (DEBUG - ? " ; " + (masterPinCount.get() - startingPinCount) - + " successful pins since start of cycle" - : "")); + + "undersized?)" + (DEBUG ? " ; " + (masterPinCount.get() - startingPinCount) + + " successful pins since start of cycle" : "")); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java index a6a3bc8..87a15d3 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/ClockPageReplacementStrategy.java @@ -170,7 +170,7 @@ public class ClockPageReplacementStrategy implements IPageReplacementStrategy { return; } final int newSize = pageSize * multiplier; - ByteBuffer oldBuffer = ((CachedPage)cPage).buffer; + ByteBuffer oldBuffer = ((CachedPage) cPage).buffer; oldBuffer.position(0); final int delta = multiplier - origMultiplier; if (multiplier < origMultiplier) { @@ -194,8 +194,7 @@ public class ClockPageReplacementStrategy implements IPageReplacementStrategy { } @Override - public void fixupCapacityOnLargeRead(ICachedPageInternal cPage) - throws HyracksDataException { + public void fixupCapacityOnLargeRead(ICachedPageInternal cPage) throws HyracksDataException { ByteBuffer oldBuffer = ((CachedPage) cPage).buffer; final int multiplier = cPage.getFrameSizeMultiplier(); final int newSize = pageSize * multiplier; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IFIFOPageWriter.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IFIFOPageWriter.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IFIFOPageWriter.java index 7380261..567c01e 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IFIFOPageWriter.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IFIFOPageWriter.java @@ -17,7 +17,6 @@ package org.apache.hyracks.storage.common.buffercache; import org.apache.hyracks.api.exceptions.HyracksDataException; - public interface IFIFOPageWriter { public void write(ICachedPage page, BufferCache bufferCache) throws HyracksDataException; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IPageReplacementStrategy.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IPageReplacementStrategy.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IPageReplacementStrategy.java index d3bcce5..bbf3b45 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IPageReplacementStrategy.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IPageReplacementStrategy.java @@ -39,8 +39,7 @@ public interface IPageReplacementStrategy { public int getNumPages(); - void fixupCapacityOnLargeRead(ICachedPageInternal cPage) - throws HyracksDataException; + void fixupCapacityOnLargeRead(ICachedPageInternal cPage) throws HyracksDataException; public int getPageSize(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/QueueInfo.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/QueueInfo.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/QueueInfo.java index bc69bc8..d86319d 100644 --- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/QueueInfo.java +++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/QueueInfo.java @@ -18,24 +18,24 @@ */ package org.apache.hyracks.storage.common.buffercache; -public class QueueInfo implements IQueueInfo{ +public class QueueInfo implements IQueueInfo { private final boolean poison; private final boolean waiters; - public QueueInfo(boolean waiters, boolean poison){ + public QueueInfo(boolean waiters, boolean poison) { this.waiters = waiters; this.poison = poison; } @Override - public boolean hasWaiters(){ + public boolean hasWaiters() { return waiters; } @Override - public boolean isPoison(){ + public boolean isPoison() { return poison; } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java index cd6ea2e..9e863eb 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexBulkLoadTest.java @@ -39,8 +39,8 @@ public abstract class OrderedIndexBulkLoadTest extends OrderedIndexTestDriver { @Override protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, - ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) - throws Exception { + ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, + ITupleReference prefixHighKey) throws Exception { OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java index 7378cf1..b7cf4a0 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexDeleteTest.java @@ -54,8 +54,8 @@ public abstract class OrderedIndexDeleteTest extends OrderedIndexTestDriver { } else if (fieldSerdes[0] instanceof UTF8StringSerializerDeserializer) { orderedIndexTestUtils.insertStringTuples(ctx, numTuplesToInsert, false, getRandom()); } - int numTuplesPerDeleteRound = (int) Math - .ceil((float) ctx.getCheckTuples().size() / (float) numDeleteRounds); + int numTuplesPerDeleteRound = + (int) Math.ceil((float) ctx.getCheckTuples().size() / (float) numDeleteRounds); for (int j = 0; j < numDeleteRounds; j++) { orderedIndexTestUtils.deleteTuples(ctx, numTuplesPerDeleteRound, getRandom()); orderedIndexTestUtils.checkPointSearches(ctx); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java index 9a08401..8aa3f14 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexSortedInsertTest.java @@ -45,8 +45,8 @@ public abstract class OrderedIndexSortedInsertTest extends OrderedIndexTestDrive @Override protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, - ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) - throws Exception { + ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, + ITupleReference prefixHighKey) throws Exception { OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.java index 3dac0db..c43d41f 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestDriver.java @@ -62,8 +62,8 @@ public abstract class OrderedIndexTestDriver { LOGGER.info("BTree " + getTestOpName() + " Test With One Int Key And Value."); } - ISerializerDeserializer[] fieldSerdes = { IntegerSerializerDeserializer.INSTANCE, - IntegerSerializerDeserializer.INSTANCE }; + ISerializerDeserializer[] fieldSerdes = + { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }; // Range search in [-1000, 1000] ITupleReference lowKey = TupleUtils.createIntegerTuple(-1000); ITupleReference highKey = TupleUtils.createIntegerTuple(1000); @@ -79,8 +79,8 @@ public abstract class OrderedIndexTestDriver { LOGGER.info("BTree " + getTestOpName() + " Test With Two Int Keys."); } - ISerializerDeserializer[] fieldSerdes = { IntegerSerializerDeserializer.INSTANCE, - IntegerSerializerDeserializer.INSTANCE }; + ISerializerDeserializer[] fieldSerdes = + { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }; // Range search in [50 0, 50 500] ITupleReference lowKey = TupleUtils.createIntegerTuple(50, 0); @@ -101,9 +101,9 @@ public abstract class OrderedIndexTestDriver { LOGGER.info("BTree " + getTestOpName() + " Test With Two Int Keys And Values."); } - ISerializerDeserializer[] fieldSerdes = { IntegerSerializerDeserializer.INSTANCE, - IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE, - IntegerSerializerDeserializer.INSTANCE }; + ISerializerDeserializer[] fieldSerdes = + { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE, + IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }; // Range search in [50 100, 100 100] ITupleReference lowKey = TupleUtils.createIntegerTuple(-100, -100); @@ -124,8 +124,8 @@ public abstract class OrderedIndexTestDriver { LOGGER.info("BTree " + getTestOpName() + " Test With One String Key And Value."); } - ISerializerDeserializer[] fieldSerdes = { new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer() }; + ISerializerDeserializer[] fieldSerdes = + { new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }; // Range search in ["cbf", cc7"] ITupleReference lowKey = TupleUtils.createTuple(fieldSerdes, "cbf"); @@ -142,8 +142,8 @@ public abstract class OrderedIndexTestDriver { LOGGER.info("BTree " + getTestOpName() + " Test With Two String Keys."); } - ISerializerDeserializer[] fieldSerdes = { new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer() }; + ISerializerDeserializer[] fieldSerdes = + { new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }; // Range search in ["cbf", "ddd", cc7", "eee"] ITupleReference lowKey = TupleUtils.createTuple(fieldSerdes, "cbf", "ddd"); @@ -164,9 +164,9 @@ public abstract class OrderedIndexTestDriver { LOGGER.info("BTree " + getTestOpName() + " Test With Two String Keys And Values."); } - ISerializerDeserializer[] fieldSerdes = { new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer() }; + ISerializerDeserializer[] fieldSerdes = + { new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }; // Range search in ["cbf", "ddd", cc7", "eee"] ITupleReference lowKey = TupleUtils.createTuple(fieldSerdes, "cbf", "ddd"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java index 4a9e0ed..bf3c8e5 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexTestUtils.java @@ -58,8 +58,8 @@ public class OrderedIndexTestUtils extends TreeIndexTestUtils { private static void compareActualAndExpected(ITupleReference actual, CheckTuple expected, ISerializerDeserializer[] fieldSerdes) throws HyracksDataException { for (int i = 0; i < fieldSerdes.length; i++) { - ByteArrayInputStream inStream = new ByteArrayInputStream(actual.getFieldData(i), actual.getFieldStart(i), - actual.getFieldLength(i)); + ByteArrayInputStream inStream = + new ByteArrayInputStream(actual.getFieldData(i), actual.getFieldStart(i), actual.getFieldLength(i)); DataInput dataIn = new DataInputStream(inStream); Object actualObj = fieldSerdes[i].deserialize(dataIn); if (!actualObj.equals(expected.getField(i))) { @@ -99,20 +99,20 @@ public class OrderedIndexTestUtils extends TreeIndexTestUtils { MultiComparator lowKeyCmp = BTreeUtils.getSearchMultiComparator(ctx.getComparatorFactories(), lowKey); MultiComparator highKeyCmp = BTreeUtils.getSearchMultiComparator(ctx.getComparatorFactories(), highKey); IIndexCursor searchCursor = ctx.getIndexAccessor().createSearchCursor(false); - RangePredicate rangePred = new RangePredicate(lowKey, highKey, lowKeyInclusive, highKeyInclusive, lowKeyCmp, - highKeyCmp); + RangePredicate rangePred = + new RangePredicate(lowKey, highKey, lowKeyInclusive, highKeyInclusive, lowKeyCmp, highKeyCmp); ctx.getIndexAccessor().search(searchCursor, rangePred); // Get the subset of elements from the expected set within given key // range. CheckTuple lowKeyCheck = createCheckTupleFromTuple(lowKey, ctx.getFieldSerdes(), lowKeyCmp.getKeyFieldCount()); - CheckTuple highKeyCheck = createCheckTupleFromTuple(highKey, ctx.getFieldSerdes(), - highKeyCmp.getKeyFieldCount()); + CheckTuple highKeyCheck = + createCheckTupleFromTuple(highKey, ctx.getFieldSerdes(), highKeyCmp.getKeyFieldCount()); SortedSet<CheckTuple> expectedSubset = null; if (lowKeyCmp.getKeyFieldCount() < ctx.getKeyFieldCount() || highKeyCmp.getKeyFieldCount() < ctx.getKeyFieldCount()) { // Searching on a key prefix (low key or high key or both). - expectedSubset = getPrefixExpectedSubset((TreeSet<CheckTuple>) ctx.getCheckTuples(), lowKeyCheck, - highKeyCheck); + expectedSubset = + getPrefixExpectedSubset((TreeSet<CheckTuple>) ctx.getCheckTuples(), lowKeyCheck, highKeyCheck); } else { // Searching on all key fields. expectedSubset = ((TreeSet<CheckTuple>) ctx.getCheckTuples()).subSet(lowKeyCheck, lowKeyInclusive, @@ -246,8 +246,8 @@ public class OrderedIndexTestUtils extends TreeIndexTestUtils { throws HyracksDataException { int fieldCount = ctx.getFieldCount(); int numTuples = checkTuples.size(); - ArrayTupleBuilder tupleBuilder = filtered ? new ArrayTupleBuilder(fieldCount + 1) - : new ArrayTupleBuilder(fieldCount); + ArrayTupleBuilder tupleBuilder = + filtered ? new ArrayTupleBuilder(fieldCount + 1) : new ArrayTupleBuilder(fieldCount); ArrayTupleReference tuple = new ArrayTupleReference(); int c = 1; @@ -298,7 +298,7 @@ public class OrderedIndexTestUtils extends TreeIndexTestUtils { // because we ignore duplicate keys. ctx.insertCheckTuple(createStringCheckTuple(fieldValues, ctx.getKeyFieldCount()), ctx.getCheckTuples()); if (filtered) { - addFilterField(ctx,minMax); + addFilterField(ctx, minMax); } } catch (HyracksDataException e) { // Ignore duplicate key insertions. @@ -476,8 +476,8 @@ public class OrderedIndexTestUtils extends TreeIndexTestUtils { } @Override - public void checkExpectedResults(IIndexCursor cursor, Collection checkTuples, - ISerializerDeserializer[] fieldSerdes, int keyFieldCount, Iterator<CheckTuple> checkIter) throws Exception { + public void checkExpectedResults(IIndexCursor cursor, Collection checkTuples, ISerializerDeserializer[] fieldSerdes, + int keyFieldCount, Iterator<CheckTuple> checkIter) throws Exception { int actualCount = 0; try { while (cursor.hasNext()) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java index 2118f8c..3417066 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexUpsertTest.java @@ -45,8 +45,8 @@ public abstract class OrderedIndexUpsertTest extends OrderedIndexTestDriver { @Override protected void runTest(ISerializerDeserializer[] fieldSerdes, int numKeys, BTreeLeafFrameType leafType, - ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, ITupleReference prefixHighKey) - throws Exception { + ITupleReference lowKey, ITupleReference highKey, ITupleReference prefixLowKey, + ITupleReference prefixHighKey) throws Exception { OrderedIndexTestContext ctx = createTestContext(fieldSerdes, numKeys, leafType, false); ctx.getIndex().create(); ctx.getIndex().activate(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java index 8a6996b..31c55b3 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/CheckTuple.java @@ -19,7 +19,7 @@ package org.apache.hyracks.storage.am.common; -@SuppressWarnings({"rawtypes", "unchecked"}) +@SuppressWarnings({ "rawtypes", "unchecked" }) public class CheckTuple<T extends Comparable<T>> implements Comparable<T> { protected final int numKeys; protected final Comparable[] fields; @@ -101,7 +101,7 @@ public class CheckTuple<T extends Comparable<T>> implements Comparable<T> { StringBuilder strBuilder = new StringBuilder(); for (int i = 0; i < fields.length; i++) { strBuilder.append(fields[i].toString()); - if (i != fields.length-1) { + if (i != fields.length - 1) { strBuilder.append(" "); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java index 6ac02e1..2c08ba0 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java @@ -44,8 +44,8 @@ public abstract class IndexTestContext<T extends CheckTuple> implements IIndexTe IndexAccessParameters actx = new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE); this.indexAccessor = index.createAccessor(actx); - this.tupleBuilder = filtered ? new ArrayTupleBuilder(fieldSerdes.length + 1) - : new ArrayTupleBuilder(fieldSerdes.length); + this.tupleBuilder = + filtered ? new ArrayTupleBuilder(fieldSerdes.length + 1) : new ArrayTupleBuilder(fieldSerdes.length); } @Override http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationCallback.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationCallback.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationCallback.java index 60d88e5..d796ece 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationCallback.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationCallback.java @@ -25,7 +25,7 @@ import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference; import org.apache.hyracks.storage.common.IModificationOperationCallback; import org.apache.hyracks.storage.common.ISearchOperationCallback; -public enum TestOperationCallback implements ISearchOperationCallback,IModificationOperationCallback { +public enum TestOperationCallback implements ISearchOperationCallback, IModificationOperationCallback { INSTANCE; private static final int RANDOM_SEED = 50; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationSelector.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationSelector.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationSelector.java index f804f89..e4c4332 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationSelector.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TestOperationSelector.java @@ -21,7 +21,6 @@ package org.apache.hyracks.storage.am.common; import org.apache.hyracks.storage.am.common.datagen.ProbabilityHelper; - public class TestOperationSelector { public static enum TestOperation { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java index 43258dd..f0b01a2 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/TreeIndexTestUtils.java @@ -108,8 +108,8 @@ public abstract class TreeIndexTestUtils { CheckTuple checkTuple = createCheckTuple(fieldSerdes.length, numKeys); int fieldCount = Math.min(fieldSerdes.length, tuple.getFieldCount()); for (int i = 0; i < fieldCount; i++) { - ByteArrayInputStream inStream = new ByteArrayInputStream(tuple.getFieldData(i), tuple.getFieldStart(i), - tuple.getFieldLength(i)); + ByteArrayInputStream inStream = + new ByteArrayInputStream(tuple.getFieldData(i), tuple.getFieldStart(i), tuple.getFieldLength(i)); DataInput dataIn = new DataInputStream(inStream); Comparable fieldObj = (Comparable) fieldSerdes[i].deserialize(dataIn); checkTuple.appendField(fieldObj); @@ -142,8 +142,8 @@ public abstract class TreeIndexTestUtils { while (diskOrderCursor.hasNext()) { diskOrderCursor.next(); ITupleReference tuple = diskOrderCursor.getTuple(); - CheckTuple checkTuple = createCheckTupleFromTuple(tuple, ctx.getFieldSerdes(), - ctx.getKeyFieldCount()); + CheckTuple checkTuple = + createCheckTupleFromTuple(tuple, ctx.getFieldSerdes(), ctx.getKeyFieldCount()); if (!checkDiskOrderScanResult(tuple, checkTuple, ctx)) { fail("Disk-order scan returned unexpected answer: " + checkTuple.toString()); } @@ -315,8 +315,8 @@ public abstract class TreeIndexTestUtils { throws HyracksDataException { int fieldCount = ctx.getFieldCount(); int numTuples = checkTuples.size(); - ArrayTupleBuilder tupleBuilder = filtered ? new ArrayTupleBuilder(fieldCount + 1) - : new ArrayTupleBuilder(fieldCount); + ArrayTupleBuilder tupleBuilder = + filtered ? new ArrayTupleBuilder(fieldCount + 1) : new ArrayTupleBuilder(fieldCount); ArrayTupleReference tuple = new ArrayTupleReference(); // Perform bulk load. IIndexBulkLoader bulkLoader = ctx.getIndex().createBulkLoader(0.7f, false, numTuples, false); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/IFieldValueGenerator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/IFieldValueGenerator.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/IFieldValueGenerator.java index dbd4bfc..986eccc 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/IFieldValueGenerator.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/IFieldValueGenerator.java @@ -21,5 +21,6 @@ package org.apache.hyracks.storage.am.common.datagen; public interface IFieldValueGenerator<T> { public T next(); + public void reset(); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/PersonNameFieldValueGenerator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/PersonNameFieldValueGenerator.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/PersonNameFieldValueGenerator.java index 256eaf5..da7f52c 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/PersonNameFieldValueGenerator.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/PersonNameFieldValueGenerator.java @@ -40,8 +40,7 @@ public class PersonNameFieldValueGenerator implements IFieldValueGenerator<Strin private List<String> firstNames = new ArrayList<>(); private List<String> lastNames = new ArrayList<>(); - public PersonNameFieldValueGenerator(Random rnd, double middleInitialProb) - throws IOException { + public PersonNameFieldValueGenerator(Random rnd, double middleInitialProb) throws IOException { this.rnd = rnd; this.middleInitialProb = middleInitialProb; initNames(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleBatch.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleBatch.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleBatch.java index c34c7bc..84cda9b 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleBatch.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleBatch.java @@ -31,7 +31,8 @@ public class TupleBatch { private final TupleGenerator[] tupleGens; public final AtomicBoolean inUse = new AtomicBoolean(false); - public TupleBatch(int size, IFieldValueGenerator[] fieldGens, ISerializerDeserializer[] fieldSerdes, int payloadSize) { + public TupleBatch(int size, IFieldValueGenerator[] fieldGens, ISerializerDeserializer[] fieldSerdes, + int payloadSize) { this.size = size; tupleGens = new TupleGenerator[size]; for (int i = 0; i < size; i++) { @@ -40,7 +41,7 @@ public class TupleBatch { } public void generate() throws IOException { - for(TupleGenerator tupleGen : tupleGens) { + for (TupleGenerator tupleGen : tupleGens) { tupleGen.next(); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleGenerator.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleGenerator.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleGenerator.java index 4f26065..eb76e67 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleGenerator.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/datagen/TupleGenerator.java @@ -27,7 +27,7 @@ import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder; import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference; import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference; -@SuppressWarnings({"rawtypes", "unchecked" }) +@SuppressWarnings({ "rawtypes", "unchecked" }) public class TupleGenerator { protected final ISerializerDeserializer[] fieldSerdes; protected final IFieldValueGenerator[] fieldGens; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java index ce486fd..2d3289c 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeDeleteTest.java @@ -56,8 +56,8 @@ public abstract class AbstractRTreeDeleteTest extends AbstractRTreeTestDriver { } else if (fieldSerdes[0] instanceof DoubleSerializerDeserializer) { rTreeTestUtils.insertDoubleTuples(ctx, numTuplesToInsert, getRandom()); } - int numTuplesPerDeleteRound = (int) Math - .ceil((float) ctx.getCheckTuples().size() / (float) numDeleteRounds); + int numTuplesPerDeleteRound = + (int) Math.ceil((float) ctx.getCheckTuples().size() / (float) numDeleteRounds); for (int j = 0; j < numDeleteRounds; j++) { rTreeTestUtils.deleteTuples(ctx, numTuplesPerDeleteRound, getRandom()); rTreeTestUtils.checkScan(ctx);
