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

renamed index type

This commit is contained in:
jsteemann 2017-03-16 17:00:19 +01:00
parent e22586f40c
commit fd07af5216
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Indexes/Index.cpp
View File

@ -149,7 +149,7 @@ Index::IndexType Index::type(char const* type) {
return TRI_IDX_TYPE_SKIPLIST_INDEX;
}
if (::strcmp(type, "persistent") == 0 || ::strcmp(type, "rocksdb") == 0) {
return TRI_IDX_TYPE_ROCKSDB_INDEX;
return TRI_IDX_TYPE_PERSISTENT_INDEX;
}
if (::strcmp(type, "fulltext") == 0) {
return TRI_IDX_TYPE_FULLTEXT_INDEX;
@ -179,7 +179,7 @@ char const* Index::typeName(Index::IndexType type) {
return "hash";
case TRI_IDX_TYPE_SKIPLIST_INDEX:
return "skiplist";
case TRI_IDX_TYPE_ROCKSDB_INDEX:
case TRI_IDX_TYPE_PERSISTENT_INDEX:
return "persistent";
case TRI_IDX_TYPE_FULLTEXT_INDEX:
return "fulltext";

4
arangod/Indexes/Index.h
View File

@ -89,7 +89,7 @@ class Index {
TRI_IDX_TYPE_EDGE_INDEX,
TRI_IDX_TYPE_FULLTEXT_INDEX,
TRI_IDX_TYPE_SKIPLIST_INDEX,
TRI_IDX_TYPE_ROCKSDB_INDEX
TRI_IDX_TYPE_PERSISTENT_INDEX
};
public:
@ -188,7 +188,7 @@ class Index {
static bool allowExpansion(IndexType type) {
return (type == TRI_IDX_TYPE_HASH_INDEX ||
type == TRI_IDX_TYPE_SKIPLIST_INDEX ||
type == TRI_IDX_TYPE_ROCKSDB_INDEX);
type == TRI_IDX_TYPE_PERSISTENT_INDEX);
}
virtual IndexType type() const = 0;

4
arangod/MMFiles/MMFilesIndexFactory.cpp
View File

@ -319,7 +319,7 @@ int MMFilesIndexFactory::enhanceIndexDefinition(VPackSlice const definition,
res = EnhanceJsonIndexSkiplist(definition, enhanced, create);
break;
case Index::TRI_IDX_TYPE_ROCKSDB_INDEX:
case Index::TRI_IDX_TYPE_PERSISTENT_INDEX:
res = EnhanceJsonIndexPersistent(definition, enhanced, create);
break;
@ -420,7 +420,7 @@ std::shared_ptr<Index> MMFilesIndexFactory::prepareIndexFromSlice(
newIdx.reset(new arangodb::MMFilesSkiplistIndex(iid, col, info));
break;
}
case arangodb::Index::TRI_IDX_TYPE_ROCKSDB_INDEX: {
case arangodb::Index::TRI_IDX_TYPE_PERSISTENT_INDEX: {
newIdx.reset(new arangodb::MMFilesPersistentIndex(iid, col, info));
break;
}

2
arangod/MMFiles/MMFilesPersistentIndex.h
View File

@ -105,7 +105,7 @@ class MMFilesPersistentIndex final : public MMFilesPathBasedIndex {
public:
IndexType type() const override {
return Index::TRI_IDX_TYPE_ROCKSDB_INDEX;
return Index::TRI_IDX_TYPE_PERSISTENT_INDEX;
}
bool allowExpansion() const override { return true; }