Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixing export

This commit is contained in:
Simon Grätzer 2017-04-05 14:03:58 +02:00
parent d61cdd23ee
commit 342613bd59
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arangod/RocksDBEngine/RocksDBCollectionExport.cpp
View File

@ -54,10 +54,12 @@ RocksDBCollectionExport::RocksDBCollectionExport(
RocksDBCollectionExport::~RocksDBCollectionExport() {}
void RocksDBCollectionExport::run(uint64_t maxWaitTime, size_t limit) {
StorageEngine* engine = EngineSelectorFeature::ENGINE;
// none of this should matter on rocksdb
// try to acquire the exclusive lock on the compaction
engine->preventCompaction(_collection->vocbase(),
/*
StorageEngine* engine = EngineSelectorFeature::ENGINE;
engine->preventCompaction(_collection->vocbase(),
[this](TRI_vocbase_t* vocbase) {
// TODO: do something under compaction lock?
});
@ -74,7 +76,7 @@ void RocksDBCollectionExport::run(uint64_t maxWaitTime, size_t limit) {
}
usleep(SleepTime);
}
}
}*/
{
SingleCollectionTransaction trx(
@ -105,10 +107,14 @@ void RocksDBCollectionExport::run(uint64_t maxWaitTime, size_t limit) {
if (limit == 0) {
return false;
}
if (_collection->readDocumentConditional(&trx, token, 0, mmdr)) {
if (_collection->readDocument(&trx, token, mmdr)) {
_vpack.emplace_back(VPackSlice(mmdr.vpack()));
--limit;
}
/*if (_collection->readDocumentConditional(&trx, token, 0, mmdr)) {
_vpack.emplace_back(VPackSlice(mmdr.vpack()));
--limit;
}*/
return true;
});

3
arangod/RocksDBEngine/RocksDBEngine.cpp
View File

@ -126,7 +126,8 @@ void RocksDBEngine::start() {
_options.max_open_files = -1;
_options.comparator = _cmp.get();
_options.WAL_ttl_seconds = counter_sync_seconds * 2;
// TODO: prefix_extractior + memtable_insert_with_hint_prefix
rocksdb::Status status =
rocksdb::TransactionDB::Open(_options, transactionOptions, _path, &_db);