Merge branch 'master' of github.com:saghmrossi/rocksdb

vinniefalco · Sep 17, 2014 · 4d05234 · 4d05234
2 parents f9eaaa6 + 60a4aa1
commit 4d05234
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 17 deletions.
diff --git a/db/db_test.cc b/db/db_test.cc
@@ -342,7 +342,7 @@ class DBTest {
     kUncompressed = 11,
     kNumLevel_3 = 12,
     kDBLogDir = 13,
-    kWalDir = 14,
+    kWalDirAndMmapReads = 14,
     kManifestFileSize = 15,
     kCompactOnFlush = 16,
     kPerfOptions = 17,
@@ -377,6 +377,7 @@ class DBTest {
     kSkipNoSeekToLast = 32,
     kSkipHashCuckoo = 64,
     kSkipFIFOCompaction = 128,
+    kSkipMmapReads = 256,
   };
 
 
@@ -436,6 +437,10 @@ class DBTest {
           option_config_ == kFIFOCompaction) {
         continue;
       }
+      if ((skip_mask & kSkipMmapReads) &&
+          option_config_ == kWalDirAndMmapReads) {
+        continue;
+      }
       break;
     }
 
@@ -539,8 +544,11 @@ class DBTest {
       case kDBLogDir:
         options.db_log_dir = test::TmpDir();
         break;
-      case kWalDir:
+      case kWalDirAndMmapReads:
         options.wal_dir = test::TmpDir() + "/wal";
+        // mmap reads should be orthogonal to WalDir setting, so we piggyback to
+        // this option config to test mmap reads as well
+        options.allow_mmap_reads = true;
         break;
       case kManifestFileSize:
         options.max_manifest_file_size = 50; // 50 bytes
@@ -1675,8 +1683,8 @@ TEST(DBTest, NonBlockingIteration) {
     // This test verifies block cache behaviors, which is not used by plain
     // table format.
     // Exclude kHashCuckoo as it does not support iteration currently
-  } while (ChangeOptions(kSkipPlainTable | kSkipNoSeekToLast |
-                         kSkipHashCuckoo));
+  } while (ChangeOptions(kSkipPlainTable | kSkipNoSeekToLast | kSkipHashCuckoo |
+                         kSkipMmapReads));
 }
 
 // A delete is skipped for key if KeyMayExist(key) returns False

diff --git a/java/rocksjni/memtablejni.cc b/java/rocksjni/memtablejni.cc
@@ -5,6 +5,7 @@
 //
 // This file implements the "bridge" between Java and C++ for MemTables.
 
+#include "rocksjni/portal.h"
 #include "include/org_rocksdb_HashSkipListMemTableConfig.h"
 #include "include/org_rocksdb_HashLinkedListMemTableConfig.h"
 #include "include/org_rocksdb_VectorMemTableConfig.h"
@@ -20,7 +21,7 @@ jlong Java_org_rocksdb_HashSkipListMemTableConfig_newMemTableFactoryHandle(
     JNIEnv* env, jobject jobj, jlong jbucket_count,
     jint jheight, jint jbranching_factor) {
   return reinterpret_cast<jlong>(rocksdb::NewHashSkipListRepFactory(
-      static_cast<size_t>(jbucket_count),
+      rocksdb::jlong_to_size_t(jbucket_count),
       static_cast<int32_t>(jheight),
       static_cast<int32_t>(jbranching_factor)));
 }
@@ -33,7 +34,7 @@ jlong Java_org_rocksdb_HashSkipListMemTableConfig_newMemTableFactoryHandle(
 jlong Java_org_rocksdb_HashLinkedListMemTableConfig_newMemTableFactoryHandle(
     JNIEnv* env, jobject jobj, jlong jbucket_count) {
   return reinterpret_cast<jlong>(rocksdb::NewHashLinkListRepFactory(
-       static_cast<size_t>(jbucket_count)));
+       rocksdb::jlong_to_size_t(jbucket_count)));
 }
 
 /*
@@ -44,7 +45,7 @@ jlong Java_org_rocksdb_HashLinkedListMemTableConfig_newMemTableFactoryHandle(
 jlong Java_org_rocksdb_VectorMemTableConfig_newMemTableFactoryHandle(
     JNIEnv* env, jobject jobj, jlong jreserved_size) {
   return reinterpret_cast<jlong>(new rocksdb::VectorRepFactory(
-      static_cast<size_t>(jreserved_size)));
+      rocksdb::jlong_to_size_t(jreserved_size)));
 }
 
 /*

diff --git a/java/rocksjni/options.cc b/java/rocksjni/options.cc
@@ -70,7 +70,7 @@ jboolean Java_org_rocksdb_Options_createIfMissing(
 void Java_org_rocksdb_Options_setWriteBufferSize(
     JNIEnv* env, jobject jobj, jlong jhandle, jlong jwrite_buffer_size) {
   reinterpret_cast<rocksdb::Options*>(jhandle)->write_buffer_size =
-          static_cast<size_t>(jwrite_buffer_size);
+          rocksdb::jlong_to_size_t(jwrite_buffer_size);
 }
 
 
@@ -362,7 +362,7 @@ jlong Java_org_rocksdb_Options_maxLogFileSize(
 void Java_org_rocksdb_Options_setMaxLogFileSize(
     JNIEnv* env, jobject jobj, jlong jhandle, jlong max_log_file_size) {
   reinterpret_cast<rocksdb::Options*>(jhandle)->max_log_file_size =
-      static_cast<size_t>(max_log_file_size);
+      rocksdb::jlong_to_size_t(max_log_file_size);
 }
 
 /*
@@ -383,7 +383,7 @@ jlong Java_org_rocksdb_Options_logFileTimeToRoll(
 void Java_org_rocksdb_Options_setLogFileTimeToRoll(
     JNIEnv* env, jobject jobj, jlong jhandle, jlong log_file_time_to_roll) {
   reinterpret_cast<rocksdb::Options*>(jhandle)->log_file_time_to_roll =
-      static_cast<size_t>(log_file_time_to_roll);
+      rocksdb::jlong_to_size_t(log_file_time_to_roll);
 }
 
 /*
@@ -404,7 +404,7 @@ jlong Java_org_rocksdb_Options_keepLogFileNum(
 void Java_org_rocksdb_Options_setKeepLogFileNum(
     JNIEnv* env, jobject jobj, jlong jhandle, jlong keep_log_file_num) {
   reinterpret_cast<rocksdb::Options*>(jhandle)->keep_log_file_num =
-      static_cast<size_t>(keep_log_file_num);
+      rocksdb::jlong_to_size_t(keep_log_file_num);
 }
 
 /*
@@ -509,7 +509,8 @@ void Java_org_rocksdb_Options_setTableCacheRemoveScanCountLimit(
 void Java_org_rocksdb_Options_useFixedLengthPrefixExtractor(
     JNIEnv* env, jobject jobj, jlong jhandle, jint jprefix_length) {
   reinterpret_cast<rocksdb::Options*>(jhandle)->prefix_extractor.reset(
-      rocksdb::NewFixedPrefixTransform(static_cast<size_t>(jprefix_length)));
+      rocksdb::NewFixedPrefixTransform(
+          rocksdb::jlong_to_size_t(jprefix_length)));
 }
 
 /*
@@ -573,7 +574,7 @@ jlong Java_org_rocksdb_Options_manifestPreallocationSize(
 void Java_org_rocksdb_Options_setManifestPreallocationSize(
     JNIEnv* env, jobject jobj, jlong jhandle, jlong preallocation_size) {
   reinterpret_cast<rocksdb::Options*>(jhandle)->manifest_preallocation_size =
-      static_cast<size_t>(preallocation_size);
+      rocksdb::jlong_to_size_t(preallocation_size);
 }
 
 /*
@@ -1245,7 +1246,7 @@ jlong Java_org_rocksdb_Options_arenaBlockSize(
 void Java_org_rocksdb_Options_setArenaBlockSize(
     JNIEnv* env, jobject jobj, jlong jhandle, jlong jarena_block_size) {
   reinterpret_cast<rocksdb::Options*>(jhandle)->arena_block_size =
-      static_cast<size_t>(jarena_block_size);
+      rocksdb::jlong_to_size_t(jarena_block_size);
 }
 
 /*
@@ -1410,7 +1411,7 @@ void Java_org_rocksdb_Options_setInplaceUpdateNumLocks(
     jlong jinplace_update_num_locks) {
   reinterpret_cast<rocksdb::Options*>(
       jhandle)->inplace_update_num_locks =
-          static_cast<size_t>(jinplace_update_num_locks);
+          rocksdb::jlong_to_size_t(jinplace_update_num_locks);
 }
 
 /*
@@ -1501,7 +1502,7 @@ void Java_org_rocksdb_Options_setMaxSuccessiveMerges(
     JNIEnv* env, jobject jobj, jlong jhandle,
     jlong jmax_successive_merges) {
   reinterpret_cast<rocksdb::Options*>(jhandle)->max_successive_merges =
-      static_cast<size_t>(jmax_successive_merges);
+      rocksdb::jlong_to_size_t(jmax_successive_merges);
 }
 
 /*

diff --git a/java/rocksjni/portal.h b/java/rocksjni/portal.h
@@ -11,12 +11,19 @@
 #define JAVA_ROCKSJNI_PORTAL_H_
 
 #include <jni.h>
+#include <limits>
 #include "rocksdb/db.h"
 #include "rocksdb/filter_policy.h"
 #include "rocksdb/utilities/backupable_db.h"
 
 namespace rocksdb {
 
+inline size_t jlong_to_size_t(const jlong& jvalue) {
+  return static_cast<uint64_t>(jvalue) <=
+      static_cast<uint64_t>(std::numeric_limits<size_t>::max()) ?
+      static_cast<size_t>(jvalue) : std::numeric_limits<size_t>::max();
+}
+
 // The portal class for org.rocksdb.RocksDB
 class RocksDBJni {
  public:

diff --git a/java/rocksjni/write_batch.cc b/java/rocksjni/write_batch.cc
@@ -30,7 +30,7 @@
 void Java_org_rocksdb_WriteBatch_newWriteBatch(
     JNIEnv* env, jobject jobj, jint jreserved_bytes) {
   rocksdb::WriteBatch* wb = new rocksdb::WriteBatch(
-      static_cast<size_t>(jreserved_bytes));
+      rocksdb::jlong_to_size_t(jreserved_bytes));
 
   rocksdb::WriteBatchJni::setHandle(env, jobj, wb);
 }