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

Removed temporary allowPartialIndex from IndexInformation. This is an internal variable and should never bother the user

This commit is contained in:
Michael Hackstein 2015-10-30 09:25:21 +01:00
parent d8c6132e5c
commit d7bbd1e9e2
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Indexes/HashIndex.cpp
View File

@ -331,7 +331,7 @@ HashIndex::HashIndex (TRI_idx_iid_t iid,
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
HashIndex::HashIndex (TRI_json_t const* json) HashIndex::HashIndex (TRI_json_t const* json)
: PathBasedIndex(json), : PathBasedIndex(json, false),
_uniqueArray(nullptr) { _uniqueArray(nullptr) {
} }
@ -395,8 +395,7 @@ triagens::basics::Json HashIndex::toJson (TRI_memory_zone_t* zone,
auto json = Index::toJson(zone, withFigures); auto json = Index::toJson(zone, withFigures);
json("unique", triagens::basics::Json(zone, _unique)) json("unique", triagens::basics::Json(zone, _unique))
("sparse", triagens::basics::Json(zone, _sparse)) ("sparse", triagens::basics::Json(zone, _sparse));
("allowPartialIndex", triagens::basics::Json(zone, _allowPartialIndex));
return json; return json;
} }

4
arangod/Indexes/PathBasedIndex.cpp
View File

@ -93,12 +93,12 @@ PathBasedIndex::PathBasedIndex (TRI_idx_iid_t iid,
/// this is used in the cluster coordinator case /// this is used in the cluster coordinator case
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
PathBasedIndex::PathBasedIndex (TRI_json_t const* json) PathBasedIndex::PathBasedIndex (TRI_json_t const* json, bool allowPartialIndex)
: Index(json), : Index(json),
_shaper(nullptr), _shaper(nullptr),
_paths(), _paths(),
_useExpansion(false), _useExpansion(false),
_allowPartialIndex(triagens::basics::JsonHelper::getBooleanValue(json, "allowPartialIndex", false)) { _allowPartialIndex(allowPartialIndex) {
TRI_ASSERT(! _fields.empty()); TRI_ASSERT(! _fields.empty());

2
arangod/Indexes/PathBasedIndex.h
View File

@ -93,7 +93,7 @@ namespace triagens {
bool sparse, bool sparse,
bool allowPartialIndex); bool allowPartialIndex);
explicit PathBasedIndex (struct TRI_json_t const*); explicit PathBasedIndex (struct TRI_json_t const*, bool);
~PathBasedIndex (); ~PathBasedIndex ();

5
arangod/Indexes/SkiplistIndex.cpp
View File

@ -805,7 +805,7 @@ SkiplistIndex::SkiplistIndex (TRI_idx_iid_t iid,
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
SkiplistIndex::SkiplistIndex (TRI_json_t const* json) SkiplistIndex::SkiplistIndex (TRI_json_t const* json)
: PathBasedIndex(json), : PathBasedIndex(json, true),
CmpElmElm(this), CmpElmElm(this),
CmpKeyElm(this), CmpKeyElm(this),
_skiplistIndex(nullptr) { _skiplistIndex(nullptr) {
@ -838,8 +838,7 @@ triagens::basics::Json SkiplistIndex::toJson (TRI_memory_zone_t* zone,
auto json = Index::toJson(zone, withFigures); auto json = Index::toJson(zone, withFigures);
json("unique", triagens::basics::Json(zone, _unique)) json("unique", triagens::basics::Json(zone, _unique))
("sparse", triagens::basics::Json(zone, _sparse)) ("sparse", triagens::basics::Json(zone, _sparse));
("allowPartialIndex", triagens::basics::Json(zone, _allowPartialIndex));
return json; return json;
} }