fixes

jsteemann · jsteemann · commit f3474835910e · 2016-04-19T01:23:06.000+02:00
diff --git a/arangod/Indexes/RocksDBFeature.cpp b/arangod/Indexes/RocksDBFeature.cpp
@@ -77,9 +77,12 @@ int RocksDBFeature::initialize(std::string const& path) {
   rocksdb::BlockBasedTableOptions tableOptions;
   tableOptions.cache_index_and_filter_blocks = true;
   tableOptions.filter_policy.reset(rocksdb::NewBloomFilterPolicy(12, false));
-
-  _options.prefix_extractor.reset(rocksdb::NewFixedPrefixTransform(RocksDBIndex::minimalPrefixSize()));
-  _options.table_factory.reset(rocksdb::NewBlockBasedTableFactory(tableOptions));
+  
+  // TODO: using the prefix extractor will lead to the comparator being
+  // called with just the key prefix (which the comparator currently cannot handle)
+  // _options.prefix_extractor.reset(rocksdb::NewFixedPrefixTransform(RocksDBIndex::minimalPrefixSize()));
+  // _options.table_factory.reset(rocksdb::NewBlockBasedTableFactory(tableOptions));
+  
   _options.create_if_missing = true;
   _options.max_open_files = -1;
   _options.comparator = _comparator;
@@ -199,14 +202,23 @@ int RocksDBFeature::dropPrefix(std::string const& prefix) {
     // go on and delete the remaining keys (delete files in range does not necessarily
     // find them all, just complete files
     
+    auto comparator = RocksDBFeature::instance()->comparator();
     rocksdb::DB* db = _db->GetBaseDB();
 
     rocksdb::WriteBatch batch;
     
     std::unique_ptr<rocksdb::Iterator> it(db->NewIterator(rocksdb::ReadOptions()));
 
+    it->Seek(lower);
     while (it->Valid()) {
       batch.Delete(it->key());
+      
+      int res = comparator->Compare(it->key(), upper);
+
+      if (res >= 0) {
+        break;
+      }
+
       it->Next();
     }
     
diff --git a/arangod/Indexes/RocksDBIndex.cpp b/arangod/Indexes/RocksDBIndex.cpp
@@ -94,6 +94,7 @@ RocksDBIterator::RocksDBIterator(arangodb::Transaction* trx,
   
   TRI_idx_iid_t const id = index->id();
   std::string const prefix = RocksDBIndex::buildPrefix(trx->vocbase()->_id, _primaryIndex->collection()->_info.id(), id);
+  TRI_ASSERT(prefix.size() == RocksDBIndex::keyPrefixSize());
 
   _leftEndpoint.reset(new arangodb::velocypack::Buffer<char>());
   _leftEndpoint->reserve(RocksDBIndex::keyPrefixSize() + left.byteSize());
@@ -104,6 +105,9 @@ RocksDBIterator::RocksDBIterator(arangodb::Transaction* trx,
   _rightEndpoint->reserve(RocksDBIndex::keyPrefixSize() + right.byteSize());
   _rightEndpoint->append(prefix.c_str(), prefix.size());
   _rightEndpoint->append(right.startAs<char const>(), right.byteSize());
+
+  TRI_ASSERT(_leftEndpoint->size() > 8);
+  TRI_ASSERT(_rightEndpoint->size() > 8);
     
   // LOG(TRACE) << "iterator left key: " << left.toJson();
   // LOG(TRACE) << "iterator right key: " << right.toJson();
