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

Now the logical collection actually reads the planId if it existing.

This commit is contained in:
Michael Hackstein 2016-08-31 14:42:20 +02:00
parent 4d53f29d9e
commit a47c5df5d0
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arangod/VocBase/LogicalCollection.cpp
View File

@ -135,6 +135,27 @@ static TRI_voc_cid_t ReadCid(VPackSlice info) {
return cid; return cid;
} }
static TRI_voc_cid_t ReadPlanId(VPackSlice info, TRI_voc_cid_t cid) {
if (!info.isObject()) {
// ERROR CASE
return 0;
}
VPackSlice id = info.get("planId");
if (id.isNone()) {
return cid;
}
if (id.isString()) {
// string cid, e.g. "9988488"
return arangodb::basics::StringUtils::uint64(id.copyString());
} else if (id.isNumber()) {
// numeric cid, e.g. 9988488
return id.getNumericValue<uint64_t>();
}
// TODO Throw error for invalid type?
return cid;
}
static std::string const ReadStringValue(VPackSlice info, static std::string const ReadStringValue(VPackSlice info,
std::string const& name, std::string const& name,
std::string const& def) { std::string const& def) {
@ -328,7 +349,7 @@ LogicalCollection::LogicalCollection(
LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase, VPackSlice info) LogicalCollection::LogicalCollection(TRI_vocbase_t* vocbase, VPackSlice info)
: _internalVersion(0), : _internalVersion(0),
_cid(ReadCid(info)), _cid(ReadCid(info)),
_planId(_cid), _planId(ReadPlanId(info, _cid)),
_type(ReadNumericValue<TRI_col_type_e, int>(info, "type", _type(ReadNumericValue<TRI_col_type_e, int>(info, "type",
TRI_COL_TYPE_UNKNOWN)), TRI_COL_TYPE_UNKNOWN)),
_name(ReadStringValue(info, "name", "")), _name(ReadStringValue(info, "name", "")),