From bf6795aea0339961f3458a9f2e220eda3dac7d13 Mon Sep 17 00:00:00 2001 From: Xiaopeng Zhang Date: Mon, 1 Feb 2021 14:43:25 -0800 Subject: [PATCH] fix java sample typo and replace deprecated code with latest (#7906) Summary: 1. replace deprecated code in sample java with latest api 2. fix optimistictransaction sample code typo Pull Request resolved: https://github.com/facebook/rocksdb/pull/7906 Reviewed By: ajkr Differential Revision: D26127429 Pulled By: jay-zhuang fbshipit-source-id: f015ad1435f565cffb8798a4fb5afc44c72d73d7 --- .../java/OptimisticTransactionSample.java | 2 +- .../main/java/RocksDBColumnFamilySample.java | 6 ++-- java/samples/src/main/java/RocksDBSample.java | 29 +++++++------------ 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/java/samples/src/main/java/OptimisticTransactionSample.java b/java/samples/src/main/java/OptimisticTransactionSample.java index 1633d1f2b..7e7a22e94 100644 --- a/java/samples/src/main/java/OptimisticTransactionSample.java +++ b/java/samples/src/main/java/OptimisticTransactionSample.java @@ -111,7 +111,7 @@ public class OptimisticTransactionSample { // Read a key using the snapshot. readOptions.setSnapshot(snapshot); final byte[] value = txn.getForUpdate(readOptions, key1, true); - assert(value == value1); + assert (value == null); try { // Attempt to commit transaction diff --git a/java/samples/src/main/java/RocksDBColumnFamilySample.java b/java/samples/src/main/java/RocksDBColumnFamilySample.java index 650b1b2f6..72f5731a1 100644 --- a/java/samples/src/main/java/RocksDBColumnFamilySample.java +++ b/java/samples/src/main/java/RocksDBColumnFamilySample.java @@ -53,8 +53,8 @@ public class RocksDBColumnFamilySample { try { // put and get from non-default column family - db.put(columnFamilyHandles.get(0), new WriteOptions(), - "key".getBytes(), "value".getBytes()); + db.put( + columnFamilyHandles.get(1), new WriteOptions(), "key".getBytes(), "value".getBytes()); // atomic write try (final WriteBatch wb = new WriteBatch()) { @@ -62,7 +62,7 @@ public class RocksDBColumnFamilySample { "value2".getBytes()); wb.put(columnFamilyHandles.get(1), "key3".getBytes(), "value3".getBytes()); - wb.remove(columnFamilyHandles.get(0), "key".getBytes()); + wb.delete(columnFamilyHandles.get(1), "key".getBytes()); db.write(new WriteOptions(), wb); } diff --git a/java/samples/src/main/java/RocksDBSample.java b/java/samples/src/main/java/RocksDBSample.java index 8fb2f15cc..0637c1114 100644 --- a/java/samples/src/main/java/RocksDBSample.java +++ b/java/samples/src/main/java/RocksDBSample.java @@ -45,7 +45,7 @@ public class RocksDBSample { .setStatistics(stats) .setWriteBufferSize(8 * SizeUnit.KB) .setMaxWriteBufferNumber(3) - .setMaxBackgroundCompactions(10) + .setMaxBackgroundJobs(10) .setCompressionType(CompressionType.SNAPPY_COMPRESSION) .setCompactionStyle(CompactionStyle.UNIVERSAL); } catch (final IllegalArgumentException e) { @@ -55,7 +55,7 @@ public class RocksDBSample { assert (options.createIfMissing() == true); assert (options.writeBufferSize() == 8 * SizeUnit.KB); assert (options.maxWriteBufferNumber() == 3); - assert (options.maxBackgroundCompactions() == 10); + assert (options.maxBackgroundJobs() == 10); assert (options.compressionType() == CompressionType.SNAPPY_COMPRESSION); assert (options.compactionStyle() == CompactionStyle.UNIVERSAL); @@ -87,24 +87,17 @@ public class RocksDBSample { options.setRateLimiter(rateLimiter); final BlockBasedTableConfig table_options = new BlockBasedTableConfig(); - table_options.setBlockCacheSize(64 * SizeUnit.KB) - .setFilter(bloomFilter) - .setCacheNumShardBits(6) + Cache cache = new LRUCache(64 * 1024, 6); + table_options.setBlockCache(cache) + .setFilterPolicy(bloomFilter) .setBlockSizeDeviation(5) .setBlockRestartInterval(10) .setCacheIndexAndFilterBlocks(true) - .setHashIndexAllowCollision(false) - .setBlockCacheCompressedSize(64 * SizeUnit.KB) - .setBlockCacheCompressedNumShardBits(10); + .setBlockCacheCompressed(new LRUCache(64 * 1000, 10)); - assert (table_options.blockCacheSize() == 64 * SizeUnit.KB); - assert (table_options.cacheNumShardBits() == 6); assert (table_options.blockSizeDeviation() == 5); assert (table_options.blockRestartInterval() == 10); assert (table_options.cacheIndexAndFilterBlocks() == true); - assert (table_options.hashIndexAllowCollision() == false); - assert (table_options.blockCacheCompressedSize() == 64 * SizeUnit.KB); - assert (table_options.blockCacheCompressedNumShardBits() == 10); options.setTableFormatConfig(table_options); assert (options.tableFactoryName().equals("BlockBasedTable")); @@ -203,7 +196,7 @@ public class RocksDBSample { len = db.get(readOptions, testKey, enoughArray); assert (len == testValue.length); - db.remove(testKey); + db.delete(testKey); len = db.get(testKey, enoughArray); assert (len == RocksDB.NOT_FOUND); @@ -284,15 +277,15 @@ public class RocksDBSample { } } - Map values = db.multiGet(keys); + List values = db.multiGetAsList(keys); assert (values.size() == keys.size()); - for (final byte[] value1 : values.values()) { + for (final byte[] value1 : values) { assert (value1 != null); } - values = db.multiGet(new ReadOptions(), keys); + values = db.multiGetAsList(new ReadOptions(), keys); assert (values.size() == keys.size()); - for (final byte[] value1 : values.values()) { + for (final byte[] value1 : values) { assert (value1 != null); } } catch (final RocksDBException e) {