]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
Crash on Windows, because of shared_ptr reinterpret cast (#3999)
authorTomas Kolda <kolto01@ca.com>
Mon, 18 Jun 2018 03:54:22 +0000 (20:54 -0700)
committerSagar Vemuri <svemuri@fb.com>
Fri, 29 Jun 2018 19:32:44 +0000 (12:32 -0700)
Summary:
For more details see #3998
Closes https://github.com/facebook/rocksdb/pull/3999

Differential Revision: D8458905

Pulled By: sagar0

fbshipit-source-id: d6e09182933253a08eaf81ac7cfe50ed3b6576c5

java/rocksjni/options.cc
java/rocksjni/transaction.cc

index bd33bc22ff84a35e1789a4d932b6e050cd141a95..95387530639442d3a29077c7d5da56a7dac03790 100644 (file)
@@ -3230,7 +3230,7 @@ Java_org_rocksdb_ColumnFamilyOptions_setCompactionFilterFactoryHandle(
     JNIEnv* /*env*/, jobject /*jobj*/, jlong jopt_handle,
     jlong jcompactionfilterfactory_handle) {
   auto* cff_factory =
-      reinterpret_cast<std::shared_ptr<rocksdb::CompactionFilterFactory>*>(
+      reinterpret_cast<std::shared_ptr<rocksdb::CompactionFilterFactoryJniCallback>*>(
           jcompactionfilterfactory_handle);
   reinterpret_cast<rocksdb::ColumnFamilyOptions*>(jopt_handle)
       ->compaction_filter_factory = *cff_factory;
index 42c1b47d291caa7c1892ca0c528a84af5ab09294..2c09155a47ff064ff50d389dfa98cd38d6160062 100644 (file)
@@ -48,7 +48,7 @@ void Java_org_rocksdb_Transaction_setSnapshotOnNextOperation__JJ(
     jlong jtxn_notifier_handle) {
   auto* txn = reinterpret_cast<rocksdb::Transaction*>(jhandle);
   auto* txn_notifier =
-      reinterpret_cast<std::shared_ptr<rocksdb::TransactionNotifier>*>(
+      reinterpret_cast<std::shared_ptr<rocksdb::TransactionNotifierJniCallback>*>(
           jtxn_notifier_handle);
   txn->SetSnapshotOnNextOperation(*txn_notifier);
 }