Repository: asterixdb Updated Branches: refs/heads/master e5190b99b -> cb9ca9753
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/AbstractRTreeTestDriver.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestDriver.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestDriver.java index 1f71889..9064225 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestDriver.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeTestDriver.java @@ -71,8 +71,8 @@ public abstract class AbstractRTreeTestDriver { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }; int numKeys = 4; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils - .createPrimitiveValueProviderFactories(numKeys, IntegerPointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = + RTreeUtils.createPrimitiveValueProviderFactories(numKeys, IntegerPointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000, -1000 // and the top right coordinates are 1000, 1000 ITupleReference key = TupleUtils.createIntegerTuple(-1000, -1000, 1000, 1000); @@ -92,8 +92,8 @@ public abstract class AbstractRTreeTestDriver { DoubleSerializerDeserializer.INSTANCE, DoubleSerializerDeserializer.INSTANCE }; int numKeys = 4; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils - .createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = + RTreeUtils.createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000.0, // -1000.0 and the top right coordinates are 1000.0, 1000.0 ITupleReference key = TupleUtils.createDoubleTuple(-1000.0, -1000.0, 1000.0, 1000.0); @@ -115,13 +115,13 @@ public abstract class AbstractRTreeTestDriver { DoubleSerializerDeserializer.INSTANCE, DoubleSerializerDeserializer.INSTANCE }; int numKeys = 8; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils - .createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = + RTreeUtils.createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000.0, // -1000.0, -1000.0, -1000.0 and the top right coordinates are 1000.0, // 1000.0, 1000.0, 1000.0 - ITupleReference key = TupleUtils.createDoubleTuple(-1000.0, -1000.0, -1000.0, -1000.0, 1000.0, 1000.0, 1000.0, - 1000.0); + ITupleReference key = + TupleUtils.createDoubleTuple(-1000.0, -1000.0, -1000.0, -1000.0, 1000.0, 1000.0, 1000.0, 1000.0); runTest(fieldSerdes, valueProviderFactories, numKeys, key, RTreePolicyType.RTREE); } @@ -143,8 +143,8 @@ public abstract class AbstractRTreeTestDriver { IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }; int numKeys = 4; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils - .createPrimitiveValueProviderFactories(numKeys, IntegerPointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = + RTreeUtils.createPrimitiveValueProviderFactories(numKeys, IntegerPointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000, -1000 // and the top right coordinates are 1000, 1000 ITupleReference key = TupleUtils.createIntegerTuple(-1000, -1000, 1000, 1000); @@ -170,8 +170,8 @@ public abstract class AbstractRTreeTestDriver { DoubleSerializerDeserializer.INSTANCE, DoubleSerializerDeserializer.INSTANCE }; int numKeys = 4; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils - .createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = + RTreeUtils.createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000.0, // -1000.0 and the top right coordinates are 1000.0, 1000.0 ITupleReference key = TupleUtils.createDoubleTuple(-1000.0, -1000.0, 1000.0, 1000.0); @@ -199,13 +199,13 @@ public abstract class AbstractRTreeTestDriver { DoubleSerializerDeserializer.INSTANCE, DoubleSerializerDeserializer.INSTANCE }; int numKeys = 8; - IPrimitiveValueProviderFactory[] valueProviderFactories = RTreeUtils - .createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); + IPrimitiveValueProviderFactory[] valueProviderFactories = + RTreeUtils.createPrimitiveValueProviderFactories(numKeys, DoublePointable.FACTORY); // Range search, the rectangle bottom left coordinates are -1000.0, // -1000.0, -1000.0, -1000.0 and the top right coordinates are 1000.0, // 1000.0, 1000.0, 1000.0 - ITupleReference key = TupleUtils.createDoubleTuple(-1000.0, -1000.0, -1000.0, -1000.0, 1000.0, 1000.0, 1000.0, - 1000.0); + ITupleReference key = + TupleUtils.createDoubleTuple(-1000.0, -1000.0, -1000.0, -1000.0, 1000.0, 1000.0, 1000.0, 1000.0); runTest(fieldSerdes, valueProviderFactories, numKeys, key, RTreePolicyType.RSTARTREE); } 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/RTreeTestUtils.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/RTreeTestUtils.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/RTreeTestUtils.java index 300a1ff..f48da3a 100644 --- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/RTreeTestUtils.java +++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/RTreeTestUtils.java @@ -173,8 +173,8 @@ public class RTreeTestUtils 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-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreePageSizePerf.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreePageSizePerf.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreePageSizePerf.java index 2d355da..95c308a 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreePageSizePerf.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/BTreePageSizePerf.java @@ -35,7 +35,7 @@ public class BTreePageSizePerf { public static void main(String[] args) throws Exception { // Disable logging so we can better see the output times. Enumeration<String> loggers = LogManager.getLogManager().getLoggerNames(); - while(loggers.hasMoreElements()) { + while (loggers.hasMoreElements()) { String loggerName = loggers.nextElement(); Logger logger = LogManager.getLogManager().getLogger(loggerName); logger.setLevel(Level.OFF); @@ -45,10 +45,12 @@ public class BTreePageSizePerf { int batchSize = 10000; int numBatches = numTuples / batchSize; - ISerializerDeserializer[] fieldSerdes = new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }; + ISerializerDeserializer[] fieldSerdes = + new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }; ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes, 30); - IBinaryComparatorFactory[] cmpFactories = SerdeUtils.serdesToComparatorFactories(fieldSerdes, fieldSerdes.length); + IBinaryComparatorFactory[] cmpFactories = + SerdeUtils.serdesToComparatorFactories(fieldSerdes, fieldSerdes.length); runExperiment(numBatches, batchSize, 1024, 100000, fieldSerdes, cmpFactories, typeTraits); runExperiment(numBatches, batchSize, 2048, 100000, fieldSerdes, cmpFactories, typeTraits); @@ -61,7 +63,9 @@ public class BTreePageSizePerf { runExperiment(numBatches, batchSize, 262144, 391, fieldSerdes, cmpFactories, typeTraits); } - private static void runExperiment(int numBatches, int batchSize, int pageSize, int numPages, ISerializerDeserializer[] fieldSerdes, IBinaryComparatorFactory[] cmpFactories, ITypeTraits[] typeTraits) throws Exception { + private static void runExperiment(int numBatches, int batchSize, int pageSize, int numPages, + ISerializerDeserializer[] fieldSerdes, IBinaryComparatorFactory[] cmpFactories, ITypeTraits[] typeTraits) + throws Exception { System.out.println("PAGE SIZE: " + pageSize); System.out.println("NUM PAGES: " + numPages); System.out.println("MEMORY: " + (pageSize * numPages)); @@ -72,7 +76,8 @@ public class BTreePageSizePerf { runner.init(); int numThreads = 1; for (int i = 0; i < repeats; i++) { - DataGenThread dataGen = new DataGenThread(numThreads, numBatches, batchSize, fieldSerdes, 30, 50, 10, false); + DataGenThread dataGen = + new DataGenThread(numThreads, numBatches, batchSize, fieldSerdes, 30, 50, 10, false); dataGen.start(); times[i] = runner.runExperiment(dataGen, numThreads); System.out.println("TIME " + i + ": " + times[i] + "ms"); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/PerfExperiment.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/PerfExperiment.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/PerfExperiment.java index 3f14f62..16d1208 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/PerfExperiment.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/PerfExperiment.java @@ -41,7 +41,7 @@ public class PerfExperiment { logger.setLevel(Level.OFF); } boolean sorted = Boolean.parseBoolean(args[0]); - int numThreads = Integer.parseInt(args[1]); + int numThreads = Integer.parseInt(args[1]); //int numTuples = 100000; // 100K //int numTuples = 1000000; // 1M @@ -58,11 +58,12 @@ public class PerfExperiment { int numBatches = numTuples / batchSize; int payLoadSize = 240; - ISerializerDeserializer[] fieldSerdes = new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }; + ISerializerDeserializer[] fieldSerdes = + new ISerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE }; ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes, payLoadSize); - IBinaryComparatorFactory[] cmpFactories = SerdeUtils.serdesToComparatorFactories(fieldSerdes, - fieldSerdes.length); + IBinaryComparatorFactory[] cmpFactories = + SerdeUtils.serdesToComparatorFactories(fieldSerdes, fieldSerdes.length); int[] bloomFilterKeyFields = new int[cmpFactories.length]; for (int i = 0; i < bloomFilterKeyFields.length; i++) { bloomFilterKeyFields[i] = i; @@ -73,8 +74,8 @@ public class PerfExperiment { int repeats = 1; long[] times = new long[repeats]; -// int numThreads = 4; -// boolean sorted = true; + // int numThreads = 4; + // boolean sorted = true; for (int i = 0; i < repeats; i++) { //ConcurrentSkipListRunner runner = new ConcurrentSkipListRunner(numBatches, batchSize, tupleSize, typeTraits, cmp); //InMemoryBTreeRunner runner = new InMemoryBTreeRunner(numBatches, 8192, 100000, typeTraits, cmpFactories); @@ -90,7 +91,8 @@ public class PerfExperiment { int onDiskNumPages = 16384; // 2GB LSMTreeRunner runner = new LSMTreeRunner(numBatches, inMemPageSize, inMemNumPages, onDiskPageSize, onDiskNumPages, typeTraits, cmpFactories, bloomFilterKeyFields, bloomFilterFalsePositiveRate); - DataGenThread dataGen = new DataGenThread(numThreads, numBatches, batchSize, fieldSerdes, payLoadSize, 50, 10, sorted); + DataGenThread dataGen = + new DataGenThread(numThreads, numBatches, batchSize, fieldSerdes, payLoadSize, 50, 10, sorted); dataGen.start(); runner.reset(); times[i] = runner.runExperiment(dataGen, numThreads); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java index 4c51520..c0d9bb8 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/tuples/LSMBTreeTuplesTest.java @@ -70,10 +70,11 @@ public class LSMBTreeTuplesTest { // Create and write tuple to bytes using an LSMBTreeTupleWriter. LSMBTreeTupleWriter maxMatterTupleWriter = new LSMBTreeTupleWriter(maxTypeTraits, numKeyFields, false, false); - ITupleReference maxTuple = TupleUtils.createTuple(maxFieldSerdes, (Object[])maxFields); + ITupleReference maxTuple = TupleUtils.createTuple(maxFieldSerdes, (Object[]) maxFields); ByteBuffer maxMatterBuf = writeTuple(maxTuple, maxMatterTupleWriter); // Tuple reference should work for both matter and antimatter tuples (doesn't matter which factory creates it). - LSMBTreeTupleReference maxLsmBTreeTuple = (LSMBTreeTupleReference) maxMatterTupleWriter.createTupleReference(); + LSMBTreeTupleReference maxLsmBTreeTuple = + (LSMBTreeTupleReference) maxMatterTupleWriter.createTupleReference(); ISerializerDeserializer[] fieldSerdes = Arrays.copyOfRange(maxFieldSerdes, 0, numFields); ITypeTraits[] typeTraits = SerdeUtils.serdesToTypeTraits(fieldSerdes); @@ -84,7 +85,7 @@ public class LSMBTreeTuplesTest { fields[j] = fieldGens[j].next(); } // Create and write tuple to bytes using an LSMBTreeTupleWriter. - ITupleReference tuple = TupleUtils.createTuple(fieldSerdes, (Object[])fields); + ITupleReference tuple = TupleUtils.createTuple(fieldSerdes, (Object[]) fields); LSMBTreeTupleWriter matterTupleWriter = new LSMBTreeTupleWriter(typeTraits, numKeyFields, false, false); LSMBTreeTupleWriter antimatterTupleWriter = new LSMBTreeTupleWriter(typeTraits, numKeyFields, true, false); @@ -98,7 +99,8 @@ public class LSMBTreeTuplesTest { } // Tuple reference should work for both matter and antimatter tuples (doesn't matter which factory creates it). - LSMBTreeTupleReference lsmBTreeTuple = (LSMBTreeTupleReference) matterTupleWriter.createTupleReference(); + LSMBTreeTupleReference lsmBTreeTuple = + (LSMBTreeTupleReference) matterTupleWriter.createTupleReference(); // Use LSMBTree tuple reference to interpret the written tuples. // Repeat the block inside to test that repeated resetting to matter/antimatter tuples works. @@ -145,7 +147,8 @@ public class LSMBTreeTuplesTest { } } - private void checkTuple(LSMBTreeTupleReference tuple, int expectedFieldCount, boolean expectedAntimatter, ISerializerDeserializer[] fieldSerdes, Object[] expectedFields) throws HyracksDataException { + private void checkTuple(LSMBTreeTupleReference tuple, int expectedFieldCount, boolean expectedAntimatter, + ISerializerDeserializer[] fieldSerdes, Object[] expectedFields) throws HyracksDataException { assertEquals(expectedFieldCount, tuple.getFieldCount()); assertEquals(expectedAntimatter, tuple.isAntimatter()); Object[] deserMatterTuple = TupleUtils.deserializeTuple(tuple, fieldSerdes); @@ -156,22 +159,20 @@ public class LSMBTreeTuplesTest { @Test public void testLSMBTreeTuple() throws HyracksDataException { - ISerializerDeserializer[] intFields = new IntegerSerializerDeserializer[] { - IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE, - IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE, - IntegerSerializerDeserializer.INSTANCE }; + ISerializerDeserializer[] intFields = + new IntegerSerializerDeserializer[] { IntegerSerializerDeserializer.INSTANCE, + IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE, + IntegerSerializerDeserializer.INSTANCE, IntegerSerializerDeserializer.INSTANCE }; testLSMBTreeTuple(intFields); - ISerializerDeserializer[] stringFields = new ISerializerDeserializer[] { + ISerializerDeserializer[] stringFields = new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - new UTF8StringSerializerDeserializer() }; + new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer() }; testLSMBTreeTuple(stringFields); - ISerializerDeserializer[] mixedFields = new ISerializerDeserializer[] { - new UTF8StringSerializerDeserializer(), IntegerSerializerDeserializer.INSTANCE, - new UTF8StringSerializerDeserializer(), new UTF8StringSerializerDeserializer(), - IntegerSerializerDeserializer.INSTANCE }; + ISerializerDeserializer[] mixedFields = new ISerializerDeserializer[] { new UTF8StringSerializerDeserializer(), + IntegerSerializerDeserializer.INSTANCE, new UTF8StringSerializerDeserializer(), + new UTF8StringSerializerDeserializer(), IntegerSerializerDeserializer.INSTANCE }; testLSMBTreeTuple(mixedFields); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMComponentFilterReferenceTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMComponentFilterReferenceTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMComponentFilterReferenceTest.java index af37d80..6ec661e 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMComponentFilterReferenceTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/LSMComponentFilterReferenceTest.java @@ -49,7 +49,7 @@ public class LSMComponentFilterReferenceTest { byte[] serFilter = filter.getByteArray(); LSMComponentFilterReference deserFilter = new LSMComponentFilterReference( new TypeAwareTupleWriter((new ITypeTraits[] { IntegerPointable.TYPE_TRAITS }))); - deserFilter.set(serFilter,0,20); + deserFilter.set(serFilter, 0, 20); Assert.assertTrue(deserFilter.isMaxTupleSet() && deserFilter.isMinTupleSet()); Assert.assertEquals( TupleUtils.deserializeTuple(deserFilter.getMinTuple(), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualFreePageManagerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualFreePageManagerTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualFreePageManagerTest.java index f4ec55d..fd85824 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualFreePageManagerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/VirtualFreePageManagerTest.java @@ -35,7 +35,8 @@ public class VirtualFreePageManagerTest { private final int NUM_PAGES = 100; - private void testInMemoryFreePageManager(VirtualFreePageManager virtualFreePageManager) throws HyracksDataException { + private void testInMemoryFreePageManager(VirtualFreePageManager virtualFreePageManager) + throws HyracksDataException { // The first two pages are reserved for the BTree's metadata page and // root page. int capacity = NUM_PAGES - 2; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexMultiThreadTestDriver.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexMultiThreadTestDriver.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexMultiThreadTestDriver.java index 9ae9940..bfe70e6 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexMultiThreadTestDriver.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/multithread/LSMInvertedIndexMultiThreadTestDriver.java @@ -40,6 +40,7 @@ public class LSMInvertedIndexMultiThreadTestDriver extends IndexMultiThreadTestD } public DataGenThread createDatagenThread(int numThreads, int numBatches, int batchSize) { - return new DataGenThread(numThreads, numBatches, batchSize, fieldSerdes, fieldGens, RANDOM_SEED, 2 * numThreads); + return new DataGenThread(numThreads, numBatches, batchSize, fieldSerdes, fieldGens, RANDOM_SEED, + 2 * numThreads); } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramTokenizerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramTokenizerTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramTokenizerTest.java index 6e764c3..b536ef2 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramTokenizerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/NGramTokenizerTest.java @@ -75,8 +75,8 @@ public class NGramTokenizerTest { void runTestNGramTokenizerWithCountedHashedUTF8Tokens(boolean prePost) throws IOException { HashedUTF8NGramTokenFactory tokenFactory = new HashedUTF8NGramTokenFactory(); - NGramUTF8StringBinaryTokenizer tokenizer = new NGramUTF8StringBinaryTokenizer(gramLength, prePost, false, - false, tokenFactory); + NGramUTF8StringBinaryTokenizer tokenizer = + new NGramUTF8StringBinaryTokenizer(gramLength, prePost, false, false, tokenFactory); tokenizer.reset(inputBuffer, 0, inputBuffer.length); ArrayList<String> expectedGrams = new ArrayList<String>(); @@ -124,8 +124,8 @@ public class NGramTokenizerTest { void runTestNGramTokenizerWithHashedUTF8Tokens(boolean prePost) throws IOException { HashedUTF8NGramTokenFactory tokenFactory = new HashedUTF8NGramTokenFactory(); - NGramUTF8StringBinaryTokenizer tokenizer = new NGramUTF8StringBinaryTokenizer(gramLength, prePost, true, false, - tokenFactory); + NGramUTF8StringBinaryTokenizer tokenizer = + new NGramUTF8StringBinaryTokenizer(gramLength, prePost, true, false, tokenFactory); tokenizer.reset(inputBuffer, 0, inputBuffer.length); ArrayList<String> expectedGrams = new ArrayList<String>(); @@ -164,8 +164,8 @@ public class NGramTokenizerTest { void runTestNGramTokenizerWithUTF8Tokens(boolean prePost) throws IOException { UTF8NGramTokenFactory tokenFactory = new UTF8NGramTokenFactory(); - NGramUTF8StringBinaryTokenizer tokenizer = new NGramUTF8StringBinaryTokenizer(gramLength, prePost, true, false, - tokenFactory); + NGramUTF8StringBinaryTokenizer tokenizer = + new NGramUTF8StringBinaryTokenizer(gramLength, prePost, true, false, tokenFactory); tokenizer.reset(inputBuffer, 0, inputBuffer.length); ArrayList<String> expectedGrams = new ArrayList<String>(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java index 78ba6a3..11a0b02 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/tokenizers/WordTokenizerTest.java @@ -108,8 +108,8 @@ public class WordTokenizerTest { public void testWordTokenizerWithCountedHashedUTF8Tokens() throws IOException { HashedUTF8WordTokenFactory tokenFactory = new HashedUTF8WordTokenFactory(); - DelimitedUTF8StringBinaryTokenizer tokenizer = new DelimitedUTF8StringBinaryTokenizer(false, false, - tokenFactory); + DelimitedUTF8StringBinaryTokenizer tokenizer = + new DelimitedUTF8StringBinaryTokenizer(false, false, tokenFactory); tokenizer.reset(inputBuffer, 0, inputBuffer.length); @@ -140,8 +140,8 @@ public class WordTokenizerTest { public void testWordTokenizerWithHashedUTF8Tokens() throws IOException { HashedUTF8WordTokenFactory tokenFactory = new HashedUTF8WordTokenFactory(); - DelimitedUTF8StringBinaryTokenizer tokenizer = new DelimitedUTF8StringBinaryTokenizer(true, false, - tokenFactory); + DelimitedUTF8StringBinaryTokenizer tokenizer = + new DelimitedUTF8StringBinaryTokenizer(true, false, tokenFactory); tokenizer.reset(inputBuffer, 0, inputBuffer.length); @@ -172,8 +172,8 @@ public class WordTokenizerTest { public void testWordTokenizerWithUTF8Tokens() throws IOException { UTF8WordTokenFactory tokenFactory = new UTF8WordTokenFactory(); - DelimitedUTF8StringBinaryTokenizer tokenizer = new DelimitedUTF8StringBinaryTokenizer(true, false, - tokenFactory); + DelimitedUTF8StringBinaryTokenizer tokenizer = + new DelimitedUTF8StringBinaryTokenizer(true, false, tokenFactory); tokenizer.reset(inputBuffer, 0, inputBuffer.length); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/IOManagerPathTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/IOManagerPathTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/IOManagerPathTest.java index 3d6e3ef..e2a875b 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/IOManagerPathTest.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-common-test/src/test/java/org/apache/hyracks/storage/common/IOManagerPathTest.java @@ -38,8 +38,8 @@ public class IOManagerPathTest { public void testPrefixNames() throws HyracksDataException { IODeviceHandle shorter = new IODeviceHandle(new File("/tmp/tst/1"), "storage"); IODeviceHandle longer = new IODeviceHandle(new File("/tmp/tst/11"), "storage"); - IOManager ioManager = new IOManager(Arrays.asList(new IODeviceHandle[] { shorter, longer }), - new DefaultDeviceResolver()); + IOManager ioManager = + new IOManager(Arrays.asList(new IODeviceHandle[] { shorter, longer }), new DefaultDeviceResolver()); FileReference f = ioManager.resolveAbsolutePath("/tmp/tst/11/storage/Foo_idx_foo/my_btree"); Assert.assertEquals("/tmp/tst/11/storage/Foo_idx_foo/my_btree", f.getAbsolutePath()); } @@ -48,8 +48,8 @@ public class IOManagerPathTest { public void testDuplicates() throws HyracksDataException { IODeviceHandle first = new IODeviceHandle(new File("/tmp/tst/1"), "storage"); IODeviceHandle second = new IODeviceHandle(new File("/tmp/tst/1"), "storage"); - IOManager ioManager = new IOManager(Arrays.asList(new IODeviceHandle[] { first, second }), - new DefaultDeviceResolver()); + IOManager ioManager = + new IOManager(Arrays.asList(new IODeviceHandle[] { first, second }), new DefaultDeviceResolver()); } @After http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/StorageUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/StorageUtil.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/StorageUtil.java index dbfe6f9..e4969f0 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/StorageUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/StorageUtil.java @@ -166,7 +166,7 @@ public class StorageUtil { return bytes + " B"; } final int baseValue = (63 - Long.numberOfLeadingZeros(bytes)) / 10; - final char bytePrefix = " kMGTPE" .charAt(baseValue); + final char bytePrefix = " kMGTPE".charAt(baseValue); final long divisor = 1L << (baseValue * 10); if (bytes % divisor == 0) { return String.format("%d %sB", bytes / divisor, bytePrefix); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Parser.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Parser.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Parser.java index 257daee..9f527e9 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Parser.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Parser.java @@ -152,7 +152,7 @@ public class Base64Parser { break; } - j++; // text.charAt(j) is now at some base64 char, so +1 to make it the size + j++; // text.charAt(j) is now at some base64 char, so +1 to make it the size int padSize = length - j; if (padSize > 2) // something is wrong with base64. be safe and go with the upper bound { @@ -180,7 +180,7 @@ public class Base64Parser { break; } - j++; // text.charAt(j) is now at some base64 char, so +1 to make it the size + j++; // text.charAt(j) is now at some base64 char, so +1 to make it the size int padSize = length - j; if (padSize > 2) // something is wrong with base64. be safe and go with the upper bound { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Printer.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Printer.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Printer.java index 0e1c078..65557b1 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Printer.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/Base64Printer.java @@ -34,12 +34,8 @@ public class Base64Printer { int i; for (i = offset; remaining >= 3; remaining -= 3, i += 3) { appendable.append(encode(input[i] >> 2)); - appendable.append(encode( - ((input[i] & 0x3) << 4) - | ((input[i + 1] >> 4) & 0xF))); - appendable.append(encode( - ((input[i + 1] & 0xF) << 2) - | ((input[i + 2] >> 6) & 0x3))); + appendable.append(encode(((input[i] & 0x3) << 4) | ((input[i + 1] >> 4) & 0xF))); + appendable.append(encode(((input[i + 1] & 0xF) << 2) | ((input[i + 2] >> 6) & 0x3))); appendable.append(encode(input[i + 2] & 0x3F)); } // encode when exactly 1 element (left) to encode @@ -52,8 +48,7 @@ public class Base64Printer { // encode when exactly 2 elements (left) to encode if (remaining == 2) { appendable.append(encode(input[i] >> 2)); - appendable.append(encode(((input[i] & 0x3) << 4) - | ((input[i + 1] >> 4) & 0xF))); + appendable.append(encode(((input[i] & 0x3) << 4) | ((input[i + 1] >> 4) & 0xF))); appendable.append(encode((input[i + 1] & 0xF) << 2)); appendable.append('='); } @@ -73,12 +68,8 @@ public class Base64Printer { int i; for (i = offset; remaining >= 3; remaining -= 3, i += 3) { buf[ptr++] = encode(input[i] >> 2); - buf[ptr++] = encode( - ((input[i] & 0x3) << 4) - | ((input[i + 1] >> 4) & 0xF)); - buf[ptr++] = encode( - ((input[i + 1] & 0xF) << 2) - | ((input[i + 2] >> 6) & 0x3)); + buf[ptr++] = encode(((input[i] & 0x3) << 4) | ((input[i + 1] >> 4) & 0xF)); + buf[ptr++] = encode(((input[i + 1] & 0xF) << 2) | ((input[i + 2] >> 6) & 0x3)); buf[ptr++] = encode(input[i + 2] & 0x3F); } // encode when exactly 1 element (left) to encode @@ -91,8 +82,7 @@ public class Base64Printer { // encode when exactly 2 elements (left) to encode if (remaining == 2) { buf[ptr++] = encode(input[i] >> 2); - buf[ptr++] = encode(((input[i] & 0x3) << 4) - | ((input[i + 1] >> 4) & 0xF)); + buf[ptr++] = encode(((input[i] & 0x3) << 4) | ((input[i + 1] >> 4) & 0xF)); buf[ptr++] = encode((input[i + 1] & 0xF) << 2); buf[ptr++] = '='; } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/HexParser.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/HexParser.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/HexParser.java index ba7276b..46bc0a4 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/HexParser.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/bytes/HexParser.java @@ -21,9 +21,7 @@ package org.apache.hyracks.util.bytes; public class HexParser { public static boolean isValidHexChar(char c) { - if (c >= '0' && c <= '9' - || c >= 'a' && c <= 'f' - || c >= 'A' && c <= 'F') { + if (c >= '0' && c <= '9' || c >= 'a' && c <= 'f' || c >= 'A' && c <= 'F') { return true; } return false; @@ -79,19 +77,17 @@ public class HexParser { } } - public static void generateByteArrayFromHexString(char[] input, int start, int length, byte[] output, - int offset) { + public static void generateByteArrayFromHexString(char[] input, int start, int length, byte[] output, int offset) { for (int i = 0; i < length; i += 2) { - output[offset + i / 2] = (byte) ((getValueFromValidHexChar(input[start + i]) << 4) + - getValueFromValidHexChar(input[start + i + 1])); + output[offset + i / 2] = (byte) ((getValueFromValidHexChar(input[start + i]) << 4) + + getValueFromValidHexChar(input[start + i + 1])); } } - public static void generateByteArrayFromHexString(byte[] input, int start, int length, byte[] output, - int offset) { + public static void generateByteArrayFromHexString(byte[] input, int start, int length, byte[] output, int offset) { for (int i = 0; i < length; i += 2) { - output[offset + i / 2] = (byte) ((getValueFromValidHexChar((char) input[start + i]) << 4) + - getValueFromValidHexChar((char) input[start + i + 1])); + output[offset + i / 2] = (byte) ((getValueFromValidHexChar((char) input[start + i]) << 4) + + getValueFromValidHexChar((char) input[start + i + 1])); } } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java index cd654d7..5d69448 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/string/UTF8StringUtil.java @@ -541,8 +541,8 @@ public class UTF8StringUtil { if (((char2 & 0xC0) != 0x80) || ((char3 & 0xC0) != 0x80)) { throw new UTFDataFormatException("malformed input around byte " + (count - 1)); } - chararr[chararr_count++] = (char) (((c & 0x0F) << 12) | ((char2 & 0x3F) << 6) - | ((char3 & 0x3F) << 0)); + chararr[chararr_count++] = + (char) (((c & 0x0F) << 12) | ((char2 & 0x3F) << 6) | ((char3 & 0x3F) << 0)); break; default: /* 10xx xxxx, 1111 xxxx */ http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java index 5313514..ea3793d 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/trace/Tracer.java @@ -38,8 +38,8 @@ public class Tracer implements ITracer { protected static final Level TRACE_LOG_LEVEL = Level.INFO; protected static final String CAT = "Tracer"; - protected static final ThreadLocal<DateFormat> DATE_FORMAT = ThreadLocal - .withInitial(() -> new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")); + protected static final ThreadLocal<DateFormat> DATE_FORMAT = + ThreadLocal.withInitial(() -> new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX")); protected final Logger traceLog; protected long categories; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/MathTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/MathTest.java b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/MathTest.java index c3443c8..a8762cd 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/MathTest.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/MathTest.java @@ -32,9 +32,9 @@ public class MathTest { Random random = new Random(System.currentTimeMillis()); for (int i = 0; i < 31; i++) { assertTrue(MathUtil.log2Floor((int) Math.pow(2, i)) == i); - for(int x = 0; x < 10; x++){ + for (int x = 0; x < 10; x++) { float extra = random.nextFloat(); - while (extra >= 1.0){ + while (extra >= 1.0) { extra = random.nextFloat(); } assertTrue(MathUtil.log2Floor((int) Math.pow(2, i + extra)) == i); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/string/UTF8StringUtilTest.java ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/string/UTF8StringUtilTest.java b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/string/UTF8StringUtilTest.java index f200384..5a614f0 100644 --- a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/string/UTF8StringUtilTest.java +++ b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/string/UTF8StringUtilTest.java @@ -92,7 +92,11 @@ public class UTF8StringUtilTest { return r2 == 0; } - enum OPTION {STANDARD, RAW_BYTE, LOWERCASE} + enum OPTION { + STANDARD, + RAW_BYTE, + LOWERCASE + } public void testCompare(String str1, String str2, OPTION option) throws IOException { byte[] buffer1 = writeStringToBytes(str1); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/pom.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml index e03fb8a..a82355d 100644 --- a/hyracks-fullstack/pom.xml +++ b/hyracks-fullstack/pom.xml @@ -377,6 +377,21 @@ </execution> </executions> </plugin> + <plugin> + <groupId>net.revelc.code.formatter</groupId> + <artifactId>formatter-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>${source-format.goal}</goal> + </goals> + </execution> + </executions> + <configuration> + <configFile>${root.dir}/AsterixCodeFormatProfile.xml</configFile> + <skipFormatting>${source-format.skip}</skipFormatting> + </configuration> + </plugin> </plugins> <pluginManagement> <plugins> @@ -523,31 +538,6 @@ </properties> </profile> <profile> - <id>source-format</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>net.revelc.code.formatter</groupId> - <artifactId>formatter-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>${source-format.goal}</goal> - </goals> - </execution> - </executions> - <configuration> - <configFile>${root.dir}/AsterixCodeFormatProfile.xml</configFile> - <skipFormatting>${source-format.skip}</skipFormatting> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>skip-assembly</id> <activation> <file> http://git-wip-us.apache.org/repos/asf/asterixdb/blob/cb9ca975/hyracks-fullstack/src/main/assembly/source.xml ---------------------------------------------------------------------- diff --git a/hyracks-fullstack/src/main/assembly/source.xml b/hyracks-fullstack/src/main/assembly/source.xml index f5dd61f..4d668ce 100644 --- a/hyracks-fullstack/src/main/assembly/source.xml +++ b/hyracks-fullstack/src/main/assembly/source.xml @@ -24,24 +24,9 @@ <directory>${project.basedir}</directory> <outputDirectory>/</outputDirectory> <useDefaultExcludes>true</useDefaultExcludes> - <includes> - <include>**/LICENSE</include> - <include>**/NOTICE</include> - <include>**/README</include> - <include>**/src/**</include> - <include>**/results/**</include> - <include>**/pom.xml</include> - <include>**/build*.xml</include> - <include>**/findbugs*.xml</include> - <include>**/*.tbl</include> - <include>**/*.tsv</include> - <include>**/*.js</include> - <include>**/*.txt</include> - <include>**/*.piglet</include> - <include>**/*.ddl</include> - </includes> <excludes> - <exclude>**/${project.build.directory}/**</exclude> + <exclude>${project.build.directory}/**</exclude> + <exclude>release.properties</exclude> </excludes> </fileSet> </fileSets>
