1
0
Fork 0

Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api

This commit is contained in:
Dan Larkin 2017-03-28 11:42:59 -04:00
commit 77c95181d8
5 changed files with 34 additions and 39 deletions

View File

@ -38,8 +38,8 @@
#include "RocksDBEngine/RocksDBCommon.h"
#include "RocksDBEngine/RocksDBKey.h"
#include "RocksDBEngine/RocksDBToken.h"
#include "RocksDBEngine/RocksDBTypes.h"
#include "RocksDBEngine/RocksDBTransactionState.h"
#include "RocksDBEngine/RocksDBTypes.h"
#include <rocksdb/db.h>
#include <rocksdb/options.h>
@ -86,25 +86,20 @@ bool RocksDBEdgeIndexIterator::next(TokenCallback const& cb, size_t limit) {
TRI_ASSERT(limit > 0); // Someone called with limit == 0. Api broken
return false;
}
// aquire rocksdb transaction
RocksDBTransactionState *state = rocksutils::toRocksTransactionState(_trx);
rocksdb::Transaction *rtrx = state->rocksTransaction();
RocksDBTransactionState* state = rocksutils::toRocksTransactionState(_trx);
rocksdb::Transaction* rtrx = state->rocksTransaction();
auto rocksColl = RocksDBCollection::toRocksDBCollection(_collection);
while (limit > 0) {
VPackSlice fromTo = _iterator.value();
TRI_ASSERT(fromTo.isString());
// if (tmp.isObject()) {
// tmp = tmp.get(StaticStrings::IndexEq);
//}
RocksDBKey prefix =
RocksDBKey::EdgeIndexPrefix(_index->_objectId, fromTo.copyString());
rocksdb::ReadOptions readOptions;
std::unique_ptr<rocksdb::Iterator> iter(
rtrx->GetIterator(readOptions));
std::unique_ptr<rocksdb::Iterator> iter(rtrx->GetIterator(state->readOptions()));
rocksdb::Slice rSlice(prefix.string());
iter->Seek(rSlice);
@ -113,7 +108,7 @@ bool RocksDBEdgeIndexIterator::next(TokenCallback const& cb, size_t limit) {
size_t edgeKeySize = iter->key().size() - rSlice.size();
const char* edgeKey = iter->key().data() + rSlice.size();
// TODO do we need to handle failed lookups here?
// aquire the document token through the primary index
RocksDBToken token;
Result res = rocksColl->lookupDocumentToken(
_trx, StringRef(edgeKey, edgeKeySize), token);
@ -122,7 +117,7 @@ bool RocksDBEdgeIndexIterator::next(TokenCallback const& cb, size_t limit) {
if (--limit == 0) {
break;
}
}
} // TODO do we need to handle failed lookups here?
iter->Next();
}
@ -144,8 +139,8 @@ RocksDBEdgeIndex::RocksDBEdgeIndex(TRI_idx_iid_t iid,
arangodb::LogicalCollection* collection,
std::string const& attr)
: RocksDBIndex(iid, collection, std::vector<std::vector<AttributeName>>(
{{AttributeName(attr, false)}}),
false, false),
{{AttributeName(attr, false)}}),
false, false),
_directionAttr(attr) {
/*std::vector<std::vector<arangodb::basics::AttributeName>>(
{{arangodb::basics::AttributeName(StaticStrings::FromString,
@ -234,8 +229,9 @@ int RocksDBEdgeIndex::insert(transaction::Methods* trx,
// aquire rocksdb transaction
RocksDBTransactionState* state = rocksutils::toRocksTransactionState(trx);
rocksdb::Transaction* rtrx = state->rocksTransaction();
rocksdb::Status status = rtrx->Put(rocksdb::Slice(key.string()), rocksdb::Slice());
rocksdb::Status status =
rtrx->Put(rocksdb::Slice(key.string()), rocksdb::Slice());
if (status.ok()) {
return TRI_ERROR_NO_ERROR;
} else {
@ -254,9 +250,9 @@ int RocksDBEdgeIndex::remove(transaction::Methods* trx,
primaryKey.copyString());
// aquire rocksdb transaction
RocksDBTransactionState *state = rocksutils::toRocksTransactionState(trx);
rocksdb::Transaction *rtrx = state->rocksTransaction();
RocksDBTransactionState* state = rocksutils::toRocksTransactionState(trx);
rocksdb::Transaction* rtrx = state->rocksTransaction();
rocksdb::Status status = rtrx->Delete(rocksdb::Slice(key.string()));
if (status.ok()) {
return TRI_ERROR_NO_ERROR;
@ -271,11 +267,10 @@ void RocksDBEdgeIndex::batchInsert(
transaction::Methods* trx,
std::vector<std::pair<TRI_voc_rid_t, VPackSlice>> const& documents,
arangodb::basics::LocalTaskQueue* queue) {
// aquire rocksdb transaction
RocksDBTransactionState *state = rocksutils::toRocksTransactionState(trx);
rocksdb::Transaction *rtrx = state->rocksTransaction();
RocksDBTransactionState* state = rocksutils::toRocksTransactionState(trx);
rocksdb::Transaction* rtrx = state->rocksTransaction();
for (std::pair<TRI_voc_rid_t, VPackSlice> const& doc : documents) {
VPackSlice primaryKey = doc.second.get(StaticStrings::KeyString);
VPackSlice fromTo = doc.second.get(_directionAttr);

View File

@ -63,14 +63,15 @@ class RocksDBEdgeIndexIterator final : public IndexIterator {
arangodb::velocypack::ArrayIterator _iterator;
RocksDBEdgeIndex const* _index;
};
class RocksDBEdgeIndex final : public RocksDBIndex {
friend class RocksDBEdgeIndexIterator;
public:
RocksDBEdgeIndex() = delete;
RocksDBEdgeIndex(TRI_idx_iid_t, arangodb::LogicalCollection*, std::string const&);
RocksDBEdgeIndex(TRI_idx_iid_t, arangodb::LogicalCollection*,
std::string const&);
~RocksDBEdgeIndex();

View File

@ -41,6 +41,7 @@
#include <rocksdb/options.h>
#include <rocksdb/utilities/optimistic_transaction_db.h>
#include <rocksdb/utilities/transaction.h>
#include <rocksdb/status.h>
using namespace arangodb;
@ -75,6 +76,8 @@ int RocksDBTransactionState::beginTransaction(transaction::Hints hints) {
StorageEngine* engine = EngineSelectorFeature::ENGINE;
rocksdb::TransactionDB* db = static_cast<RocksDBEngine*>(engine)->db();
_rocksTransaction.reset(db->BeginTransaction(rocksdb::WriteOptions(), rocksdb::TransactionOptions()));
// _rocksTransaction->SetSnapshot()
} else {
TRI_ASSERT(_status == transaction::Status::RUNNING);
}
@ -172,3 +175,4 @@ int RocksDBTransactionState::addOperation(TRI_voc_rid_t revisionId,
THROW_ARANGO_NOT_YET_IMPLEMENTED();
return 0;
}

View File

@ -32,12 +32,14 @@
#include "Transaction/Methods.h"
#include "VocBase/AccessMode.h"
#include "VocBase/voc-types.h"
#include "rocksdb/status.h"
#include "rocksdb/options.h"
#include <rocksdb/options.h>
struct TRI_vocbase_t;
namespace rocksdb {
class Transaction;
class Slice;
class Iterator;
}
namespace arangodb {
@ -74,17 +76,17 @@ class RocksDBTransactionState final : public TransactionState {
rocksdb::Transaction* rocksTransaction() {
return _rocksTransaction.get();
}
rocksdb::ReadOptions& readOptions(){
rocksdb::ReadOptions const& readOptions(){
return _rocksReadOptions;
}
private:
std::unique_ptr<rocksdb::Transaction> _rocksTransaction;
rocksdb::ReadOptions _rocksReadOptions;
bool _hasOperations;
};
}
#endif

View File

@ -532,13 +532,6 @@ void ApplicationServer::prepare() {
void ApplicationServer::start() {
LOG_TOPIC(TRACE, Logger::STARTUP) << "ApplicationServer::start";
usleep(1000000);
usleep(1000000);
usleep(1000000);
usleep(1000000);
usleep(1000000);
usleep(1000000);
int res = TRI_ERROR_NO_ERROR;