mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
This commit is contained in:
commit
fbd8446562
|
@ -297,7 +297,7 @@ void RocksDBEdgeIndexIterator::lookupInRocksDB(StringRef fromTo) {
|
||||||
rocksdb::Comparator const* cmp = _index->comparator();
|
rocksdb::Comparator const* cmp = _index->comparator();
|
||||||
|
|
||||||
cache::Cache *cc = _cache.get();
|
cache::Cache *cc = _cache.get();
|
||||||
_builder.openArray();
|
_builder.openArray(true);
|
||||||
auto end = _bounds.end();
|
auto end = _bounds.end();
|
||||||
while (_iterator->Valid() && (cmp->Compare(_iterator->key(), end) < 0)) {
|
while (_iterator->Valid() && (cmp->Compare(_iterator->key(), end) < 0)) {
|
||||||
TRI_voc_rid_t revisionId = RocksDBKey::revisionId(_iterator->key());
|
TRI_voc_rid_t revisionId = RocksDBKey::revisionId(_iterator->key());
|
||||||
|
@ -636,7 +636,7 @@ void RocksDBEdgeIndex::warmup(arangodb::transaction::Methods* trx) {
|
||||||
needsInsert = false;
|
needsInsert = false;
|
||||||
} else {
|
} else {
|
||||||
needsInsert = true;
|
needsInsert = true;
|
||||||
builder.openArray();
|
builder.openArray(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -669,7 +669,7 @@ void RocksDBEdgeIndex::warmup(arangodb::transaction::Methods* trx) {
|
||||||
needsInsert = false;
|
needsInsert = false;
|
||||||
} else {
|
} else {
|
||||||
needsInsert = true;
|
needsInsert = true;
|
||||||
builder.openArray();
|
builder.openArray(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (needsInsert) {
|
if (needsInsert) {
|
||||||
|
|
Loading…
Reference in New Issue