From c73d13bb817a512037f94f286ab315d06be20e30 Mon Sep 17 00:00:00 2001 From: fyrz Date: Tue, 28 Oct 2014 18:37:53 +0100 Subject: [PATCH] [RocksJava] Integrate review comments from yhchiang --- java/org/rocksdb/ChecksumType.java | 14 +++++++------- java/org/rocksdb/EncodingType.java | 12 ++++++------ java/org/rocksdb/IndexType.java | 12 ++++++------ .../rocksdb/test/BlockBasedTableConfigTest.java | 17 ----------------- java/org/rocksdb/test/PlainTableConfigTest.java | 9 --------- 5 files changed, 19 insertions(+), 45 deletions(-) diff --git a/java/org/rocksdb/ChecksumType.java b/java/org/rocksdb/ChecksumType.java index a538c4ea6..e685376bf 100644 --- a/java/org/rocksdb/ChecksumType.java +++ b/java/org/rocksdb/ChecksumType.java @@ -6,7 +6,7 @@ package org.rocksdb; /** - * Checksum types used in conjunction with BlockBasedTable.. + * Checksum types used in conjunction with BlockBasedTable. */ public enum ChecksumType { /** @@ -22,12 +22,6 @@ public enum ChecksumType { */ kxxHash((byte) 2); - private final byte value_; - - private ChecksumType(byte value) { - value_ = value; - } - /** * Returns the byte value of the enumerations value * @@ -36,4 +30,10 @@ public enum ChecksumType { public byte getValue() { return value_; } + + private ChecksumType(byte value) { + value_ = value; + } + + private final byte value_; } diff --git a/java/org/rocksdb/EncodingType.java b/java/org/rocksdb/EncodingType.java index a372b0d0f..d639542aa 100644 --- a/java/org/rocksdb/EncodingType.java +++ b/java/org/rocksdb/EncodingType.java @@ -38,12 +38,6 @@ public enum EncodingType { */ kPrefix((byte) 1); - private final byte value_; - - private EncodingType(byte value) { - value_ = value; - } - /** * Returns the byte value of the enumerations value * @@ -52,4 +46,10 @@ public enum EncodingType { public byte getValue() { return value_; } + + private EncodingType(byte value) { + value_ = value; + } + + private final byte value_; } diff --git a/java/org/rocksdb/IndexType.java b/java/org/rocksdb/IndexType.java index 3399b4452..f3c104566 100644 --- a/java/org/rocksdb/IndexType.java +++ b/java/org/rocksdb/IndexType.java @@ -20,12 +20,6 @@ public enum IndexType { */ kHashSearch((byte) 1); - private final byte value_; - - private IndexType(byte value) { - value_ = value; - } - /** * Returns the byte value of the enumerations value * @@ -34,4 +28,10 @@ public enum IndexType { public byte getValue() { return value_; } + + private IndexType(byte value) { + value_ = value; + } + + private final byte value_; } diff --git a/java/org/rocksdb/test/BlockBasedTableConfigTest.java b/java/org/rocksdb/test/BlockBasedTableConfigTest.java index 1f7a62698..3f54d5a78 100644 --- a/java/org/rocksdb/test/BlockBasedTableConfigTest.java +++ b/java/org/rocksdb/test/BlockBasedTableConfigTest.java @@ -14,49 +14,32 @@ public class BlockBasedTableConfigTest { public static void main(String[] args) { BlockBasedTableConfig blockBasedTableConfig = new BlockBasedTableConfig(); - assert(!blockBasedTableConfig.noBlockCache()); blockBasedTableConfig.setNoBlockCache(true); assert(blockBasedTableConfig.noBlockCache()); - assert(blockBasedTableConfig.blockCacheSize() == (8*1024*1024)); blockBasedTableConfig.setBlockCacheSize(8*1024); assert(blockBasedTableConfig.blockCacheSize() == (8*1024)); - assert(blockBasedTableConfig.blockSizeDeviation() == 10); blockBasedTableConfig.setBlockSizeDeviation(12); assert(blockBasedTableConfig.blockSizeDeviation() == 12); - assert(blockBasedTableConfig.blockRestartInterval() == 16); blockBasedTableConfig.setBlockRestartInterval(15); assert(blockBasedTableConfig.blockRestartInterval() == 15); - assert(blockBasedTableConfig.wholeKeyFiltering()); blockBasedTableConfig.setWholeKeyFiltering(false); assert(!blockBasedTableConfig.wholeKeyFiltering()); - assert(!blockBasedTableConfig.cacheIndexAndFilterBlocks()); blockBasedTableConfig.setCacheIndexAndFilterBlocks(true); assert(blockBasedTableConfig.cacheIndexAndFilterBlocks()); - assert(blockBasedTableConfig.hashIndexAllowCollision()); blockBasedTableConfig.setHashIndexAllowCollision(false); assert(!blockBasedTableConfig.hashIndexAllowCollision()); - assert(blockBasedTableConfig.blockCacheCompressedSize() == 0); blockBasedTableConfig.setBlockCacheCompressedSize(40); assert(blockBasedTableConfig.blockCacheCompressedSize() == 40); - assert(blockBasedTableConfig.checksumType().equals( - ChecksumType.kCRC32c)); blockBasedTableConfig.setChecksumType(ChecksumType.kNoChecksum); - assert(blockBasedTableConfig.checksumType().equals( - ChecksumType.kNoChecksum)); blockBasedTableConfig.setChecksumType(ChecksumType.kxxHash); assert(blockBasedTableConfig.checksumType().equals( ChecksumType.kxxHash)); - assert(blockBasedTableConfig.indexType().equals( - IndexType.kBinarySearch)); blockBasedTableConfig.setIndexType(IndexType.kHashSearch); assert(blockBasedTableConfig.indexType().equals( IndexType.kHashSearch)); - assert(blockBasedTableConfig.blockCacheCompressedNumShardBits() - == 0); blockBasedTableConfig.setBlockCacheCompressedNumShardBits(4); assert(blockBasedTableConfig.blockCacheCompressedNumShardBits() == 4); - assert(blockBasedTableConfig.cacheNumShardBits() == 0); blockBasedTableConfig.setCacheNumShardBits(5); assert(blockBasedTableConfig.cacheNumShardBits() == 5); System.out.println("BlockBasedTableConfig test passed"); diff --git a/java/org/rocksdb/test/PlainTableConfigTest.java b/java/org/rocksdb/test/PlainTableConfigTest.java index d8edb9618..888f35d81 100644 --- a/java/org/rocksdb/test/PlainTableConfigTest.java +++ b/java/org/rocksdb/test/PlainTableConfigTest.java @@ -12,30 +12,21 @@ public class PlainTableConfigTest { public static void main(String[] args) { PlainTableConfig plainTableConfig = new PlainTableConfig(); - assert(plainTableConfig.keySize() == 0); plainTableConfig.setKeySize(5); assert(plainTableConfig.keySize() == 5); - assert(plainTableConfig.bloomBitsPerKey() == 10); plainTableConfig.setBloomBitsPerKey(11); assert(plainTableConfig.bloomBitsPerKey() == 11); - assert(plainTableConfig.hashTableRatio() == 0.75); plainTableConfig.setHashTableRatio(0.95); assert(plainTableConfig.hashTableRatio() == 0.95); - assert(plainTableConfig.indexSparseness() == 16); plainTableConfig.setIndexSparseness(18); assert(plainTableConfig.indexSparseness() == 18); - assert(plainTableConfig.hugePageTlbSize() == 0); plainTableConfig.setHugePageTlbSize(1); assert(plainTableConfig.hugePageTlbSize() == 1); - assert(plainTableConfig.encodingType().equals( - EncodingType.kPlain)); plainTableConfig.setEncodingType(EncodingType.kPrefix); assert(plainTableConfig.encodingType().equals( EncodingType.kPrefix)); - assert(!plainTableConfig.fullScanMode()); plainTableConfig.setFullScanMode(true); assert(plainTableConfig.fullScanMode()); - assert(!plainTableConfig.storeIndexInFile()); plainTableConfig.setStoreIndexInFile(true); assert(plainTableConfig.storeIndexInFile()); System.out.println("PlainTableConfig test passed");