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

Edge index fixes

This commit is contained in:
Simon Grätzer 2017-03-28 10:13:07 +02:00
parent 80c91341e8
commit d6b7df6ba1
3 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arangod/RocksDBEngine/RocksDBCollection.cpp
View File

@ -798,3 +798,11 @@ int RocksDBCollection::updateDocument(transaction::Methods* trx,
// TODO
return TRI_ERROR_NO_ERROR;
}
Result RocksDBCollection::lookupDocumentToken(transaction::Methods* trx,
arangodb::velocypack::Slice key, RocksDBToken &outToken) {
// TODO fix as soon as we got a real primary index
ManagedDocumentResult result;
outToken = primaryIndex()->lookupKey(trx, key, result);
return outToken.revisionId() > 0 ? Result() : Result(TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND);
}

4
arangod/RocksDBEngine/RocksDBCollection.h
View File

@ -36,6 +36,7 @@ class LogicalCollection;
class ManagedDocumentResult;
class Result;
class RocksDBPrimaryMockIndex;
struct RocksDBToken;
class RocksDBCollection final : public PhysicalCollection {
friend class RocksDBEngine;
@ -170,6 +171,9 @@ class RocksDBCollection final : public PhysicalCollection {
std::function<bool(LogicalCollection*)> callback) override;
uint64_t objectId() const { return _objectId; }
Result lookupDocumentToken(transaction::Methods* trx,
arangodb::velocypack::Slice key, RocksDBToken &outToken);
private:
/// @brief return engine-specific figures

27
arangod/RocksDBEngine/RocksDBEdgeIndex.cpp
View File

@ -84,6 +84,8 @@ bool RocksDBEdgeIndexIterator::next(TokenCallback const& cb, size_t limit) {
TRI_ASSERT(limit > 0); // Someone called with limit == 0. Api broken
return false;
}
RocksDBCollection *rocksColl = RocksDBCollection::toRocksDBCollection(_collection);
while (limit > 0) {
VPackSlice fromTo = _iterator.value();
@ -105,15 +107,16 @@ bool RocksDBEdgeIndexIterator::next(TokenCallback const& cb, size_t limit) {
VPackSlice edgeKey = VPackSlice(iter->key().data() + prefixSize);
TRI_ASSERT(edgeKey.isString());
// TODO how to make a primary index lookup?
//RocksDBCollection *coll = RocksDBCollection::toRocksDBCollection(_collection);
//RocksDBKey::PrimaryIndexValue(<#uint64_t indexId#>, <#const std::string &primaryKey#>)
cb(RocksDBToken(0));
if (--limit == 0) {
break;
// TODO do we need to handle failed lookups here?
RocksDBToken token;
Result res = rocksColl->lookupDocumentToken(_trx, edgeKey, token);
if (res.ok()) {
cb(token);
if (--limit == 0) {
break;
}
}
iter->Next();
}
if (limit > 0) {
@ -126,7 +129,9 @@ bool RocksDBEdgeIndexIterator::next(TokenCallback const& cb, size_t limit) {
return true;
}
void RocksDBEdgeIndexIterator::reset() { THROW_ARANGO_NOT_YET_IMPLEMENTED(); }
void RocksDBEdgeIndexIterator::reset() {
_iterator.reset();
}
// ============================= Index ====================================
@ -145,10 +150,10 @@ RocksDBEdgeIndex::RocksDBEdgeIndex(rocksdb::TransactionDB* db,
{arangodb::basics::AttributeName(StaticStrings::ToString,
false)}})*/
TRI_ASSERT(iid != 0);
#warning how to look this up?
#warning fix object ID
TRI_voc_tick_t databaseId = collection->vocbase()->id();
RocksDBKey entry = RocksDBKey::Index(databaseId, collection->cid(), iid);
_objectId = 0;//entry.key;
_objectId = 3413415 + iid;//entry.key;
}
RocksDBEdgeIndex::~RocksDBEdgeIndex() {}