diff --git a/src/executor/admin/SpaceExecutor.cpp b/src/executor/admin/SpaceExecutor.cpp
index de16383f4480126ef31c7e24d863a7ca1e5bc36c..adb244c40d06671927c33c699982c54276a93f54 100644
--- a/src/executor/admin/SpaceExecutor.cpp
+++ b/src/executor/admin/SpaceExecutor.cpp
@@ -55,9 +55,9 @@ folly::Future<Status> DescSpaceExecutor::execute() {
row.values.emplace_back(properties.get_replica_factor());
row.values.emplace_back(properties.get_charset_name());
row.values.emplace_back(properties.get_collate_name());
- row.values.emplace_back(
- ColumnTypeDef(properties.get_vid_type(), properties.get_vid_size())
- .toString());
+ auto &vid = properties.get_vid_type();
+ auto vidSize = vid.__isset.type_length ? *vid.get_type_length() : 0;
+ row.values.emplace_back(ColumnTypeDef(vid.get_type(), vidSize).toString());
dataSet.rows.emplace_back(std::move(row));
return finish(ResultBuilder()
.value(Value(std::move(dataSet)))
@@ -135,15 +135,16 @@ folly::Future<Status> ShowCreateSpaceExecutor::execute() {
row.values.emplace_back(properties.get_space_name());
auto fmt = "CREATE SPACE `%s` (partition_num = %d, replica_factor = %d, "
"charset = %s, collate = %s, vid_type = %s)";
- row.values.emplace_back(folly::stringPrintf(
- fmt,
- properties.get_space_name().c_str(),
- properties.get_partition_num(),
- properties.get_replica_factor(),
- properties.get_charset_name().c_str(),
- properties.get_collate_name().c_str(),
- ColumnTypeDef(properties.get_vid_type(), properties.get_vid_size())
- .toString().c_str()));
+ auto &vid = properties.get_vid_type();
+ auto vidSize = vid.__isset.type_length ? *vid.get_type_length() : 0;
+ row.values.emplace_back(
+ folly::stringPrintf(fmt,
+ properties.get_space_name().c_str(),
+ properties.get_partition_num(),
+ properties.get_replica_factor(),
+ properties.get_charset_name().c_str(),
+ properties.get_collate_name().c_str(),
+ ColumnTypeDef(vid.get_type(), vidSize).toString().c_str()));
dataSet.rows.emplace_back(std::move(row));
return finish(ResultBuilder()
.value(Value(std::move(dataSet)))
diff --git a/src/mock/MetaCache.cpp b/src/mock/MetaCache.cpp
index 11cd3e4fd44bdb3763edc9da40ffff373694b579..2ab26cde7a215c59554c8185cc5fa93679298b26 100644
--- a/src/mock/MetaCache.cpp
+++ b/src/mock/MetaCache.cpp
@@ -36,10 +36,12 @@ Status MetaCache::createSpace(const meta::cpp2::CreateSpaceReq &req, GraphSpaceI
space.set_space_id(spaceId);
space.set_properties(std::move(properties));
spaces_[spaceId] = space;
+ auto &vid = space.get_properties().get_vid_type();
+ auto vidSize = vid.__isset.type_length ? *vid.get_type_length() : 0;
VLOG(1) << "space name: " << space.get_properties().get_space_name()
<< ", partition_num: " << space.get_properties().get_partition_num()
<< ", replica_factor: " << space.get_properties().get_replica_factor()
- << ", rvid_size: " << space.get_properties().get_vid_size();
+ << ", vid_size: " << vidSize;
cache_[spaceId] = SpaceInfoCache();
roles_.emplace(spaceId, UserRoles());
return Status::OK();
@@ -53,10 +55,13 @@ StatusOr<meta::cpp2::SpaceItem> MetaCache::getSpace(const meta::cpp2::GetSpaceRe
return Status::Error("Space `%s' not found", req.get_space_name().c_str());
}
const auto spaceInfo = spaces_.find(findIter->second);
- VLOG(1) << "space name: " << spaceInfo->second.get_properties().get_space_name()
- << ", partition_num: " << spaceInfo->second.get_properties().get_partition_num()
- << ", replica_factor: " << spaceInfo->second.get_properties().get_replica_factor()
- << ", rvid_size: " << spaceInfo->second.get_properties().get_vid_size();
+ DCHECK(spaceInfo != spaces_.end());
+ auto &properties = spaceInfo->second.get_properties();
+ auto& vid = properties.get_vid_type();
+ VLOG(1) << "space name: " << properties.get_space_name()
+ << ", partition_num: " << properties.get_partition_num()
+ << ", replica_factor: " << properties.get_replica_factor()
+ << ", vid_size: " << (vid.__isset.type_length ? *vid.get_type_length() : 0);
return spaceInfo->second;
}
diff --git a/src/mock/test/TestMock.cpp b/src/mock/test/TestMock.cpp
index 34c7c812e0e901613b941df37e0ff298dc91660c..fae8d756da48a0eb60f1529ecf6774186bbf6519 100644
--- a/src/mock/test/TestMock.cpp
+++ b/src/mock/test/TestMock.cpp
@@ -56,14 +56,14 @@ TEST_F(MockServerTest, TestMeta) {
ASSERT_EQ(spaceId1, getStatus.value().get_space_id());
ASSERT_EQ(10, getStatus.value().get_properties().get_partition_num());
ASSERT_EQ(1, getStatus.value().get_properties().get_replica_factor());
- ASSERT_EQ(8, getStatus.value().get_properties().get_vid_size());
+ ASSERT_EQ(8, *getStatus.value().get_properties().get_vid_type().get_type_length());
getStatus = metaClient->getSpace(spaceName2).get();
ASSERT_TRUE(getStatus.ok());
ASSERT_EQ(spaceId2, getStatus.value().get_space_id());
ASSERT_EQ(100, getStatus.value().get_properties().get_partition_num());
ASSERT_EQ(3, getStatus.value().get_properties().get_replica_factor());
- ASSERT_EQ(8, getStatus.value().get_properties().get_vid_size());
+ ASSERT_EQ(8, *getStatus.value().get_properties().get_vid_type().get_type_length());
// List spaces
auto listStatus = metaClient->listSpaces().get();
@@ -202,5 +202,3 @@ TEST_F(MockServerTest, DISABLED_TestStorage) {
} // namespace graph
} // namespace nebula
-
-
diff --git a/src/util/SchemaUtil.cpp b/src/util/SchemaUtil.cpp
index 381e3088dbee3647335c47303df84fb65feb99e5..aecb50f1e93d86ef4ca35aca968c228781012667 100644
--- a/src/util/SchemaUtil.cpp
+++ b/src/util/SchemaUtil.cpp
@@ -358,6 +358,10 @@ Value::Type SchemaUtil::propTypeToValueType(meta::cpp2::PropertyType propType) {
return Value::Type::__EMPTY__;
}
+bool SchemaUtil::isValidVid(const Value &value, const meta::cpp2::ColumnTypeDef &type) {
+ return isValidVid(value, type.get_type());
+}
+
bool SchemaUtil::isValidVid(const Value &value, meta::cpp2::PropertyType type) {
auto vidType = propTypeToValueType(type);
if ((vidType != Value::Type::STRING
diff --git a/src/util/SchemaUtil.h b/src/util/SchemaUtil.h
index dbbfa1725c2f980820918f5ecee95846990eb0df..9c75cb5d4f3de4c31c318ad4c4cd7619f6f456c4 100644
--- a/src/util/SchemaUtil.h
+++ b/src/util/SchemaUtil.h
@@ -54,6 +54,8 @@ public:
static Value::Type propTypeToValueType(meta::cpp2::PropertyType propType);
+ static bool isValidVid(const Value &value, const meta::cpp2::ColumnTypeDef &type);
+
static bool isValidVid(const Value& value, meta::cpp2::PropertyType type);
static bool isValidVid(const Value& value);
diff --git a/src/util/ToJson.cpp b/src/util/ToJson.cpp
index fd8f54ffe818d806000e4e8dee9470fe801305f0..7d659d70f776dac43fe7dacdc2a71f4dca01451f 100644
--- a/src/util/ToJson.cpp
+++ b/src/util/ToJson.cpp
@@ -64,7 +64,8 @@ folly::dynamic toJson(const meta::cpp2::SpaceDesc &desc) {
obj.insert("replicaFactor", desc.replica_factor);
obj.insert("charset", desc.charset_name);
obj.insert("collate", desc.collate_name);
- obj.insert("vidType", ColumnTypeDef(desc.vid_type, desc.vid_size).toString());
+ auto vidSize = desc.vid_type.__isset.type_length ? *desc.vid_type.get_type_length() : 0;
+ obj.insert("vidType", ColumnTypeDef(desc.vid_type.get_type(), vidSize).toString());
return obj;
}
diff --git a/src/validator/AdminValidator.cpp b/src/validator/AdminValidator.cpp
index fb2db6227ebed9c9c6acce664504c3dd34bcd524..8e496ea444d6ca5eaf0f18d5c52547a50c201488 100644
--- a/src/validator/AdminValidator.cpp
+++ b/src/validator/AdminValidator.cpp
@@ -50,16 +50,16 @@ Status CreateSpaceValidator::validateImpl() {
<< meta::cpp2::_PropertyType_VALUES_TO_NAMES.at(typeDef.type);
return Status::Error(ss.str());
}
- spaceDesc_.vid_type = typeDef.type;
+ spaceDesc_.vid_type.set_type(typeDef.type);
if (typeDef.type == meta::cpp2::PropertyType::INT64) {
- spaceDesc_.vid_size = 8;
+ spaceDesc_.vid_type.set_type_length(8);
} else {
if (typeDef.typeLen <= 0) {
return Status::Error("Vid size should be a positive number: %d",
typeDef.typeLen);
}
- spaceDesc_.vid_size = typeDef.typeLen;
+ spaceDesc_.vid_type.set_type_length(typeDef.typeLen);
}
break;
}
diff --git a/src/validator/MutateValidator.cpp b/src/validator/MutateValidator.cpp
index 954e0cbf28acc6f2bb6e04fee8ef2dcaf2cb0a75..326b9d58a6c9eb0260c44d90d97a1929e871bdfd 100644
--- a/src/validator/MutateValidator.cpp
+++ b/src/validator/MutateValidator.cpp
@@ -529,10 +529,10 @@ Status UpdateValidator::getCondition() {
if (clause != nullptr) {
auto filter = clause->filter();
if (filter != nullptr) {
- auto encodeStr = filter->encode();
- auto copyFilterExpr = Expression::decode(encodeStr);
+ std::string encodeStr;
+ auto copyFilterExpr = filter->clone();
NG_LOG_AND_RETURN_IF_ERROR(
- checkAndResetSymExpr(copyFilterExpr.get(), name_, encodeStr));
+ checkAndResetSymExpr(copyFilterExpr.get(), name_, encodeStr));
condition_ = std::move(encodeStr);
}
}
@@ -549,9 +549,8 @@ Status UpdateValidator::getReturnProps() {
} else {
yieldColNames_.emplace_back(*col->alias());
}
- auto encodeStr = col->expr()->encode();
- auto copyColExpr = Expression::decode(encodeStr);
-
+ std::string encodeStr;
+ auto copyColExpr = col->expr()->clone();
NG_LOG_AND_RETURN_IF_ERROR(checkAndResetSymExpr(copyColExpr.get(), name_, encodeStr));
returnProps_.emplace_back(std::move(encodeStr));
}
@@ -585,8 +584,8 @@ Status UpdateValidator::getUpdateProps() {
LOG(ERROR) << "valueExpr is nullptr";
return Status::SyntaxError("Empty update item field value.");
}
- auto encodeStr = valueExpr->encode();
- auto copyValueExpr = Expression::decode(encodeStr);
+ std::string encodeStr;
+ auto copyValueExpr = valueExpr->clone();
NG_LOG_AND_RETURN_IF_ERROR(checkAndResetSymExpr(copyValueExpr.get(), *symName, encodeStr));
updatedProp.set_value(std::move(encodeStr));
updatedProp.set_name(fieldName);
diff --git a/src/validator/TraversalValidator.cpp b/src/validator/TraversalValidator.cpp
index b8c130c87e06340e0e8332a76300aa109f8beca4..83d5a106cf38a77d146b3184ddf7080159d0f26c 100644
--- a/src/validator/TraversalValidator.cpp
+++ b/src/validator/TraversalValidator.cpp
@@ -28,11 +28,12 @@ Status TraversalValidator::validateStarts(const VerticesClause* clause, Starts&
if (!type.ok()) {
return type.status();
}
- if (type.value() != SchemaUtil::propTypeToValueType(space_.spaceDesc.vid_type)) {
+ auto vidType = space_.spaceDesc.vid_type.get_type();
+ if (type.value() != SchemaUtil::propTypeToValueType(vidType)) {
std::stringstream ss;
ss << "`" << src->toString() << "', the srcs should be type of "
- << meta::cpp2::_PropertyType_VALUES_TO_NAMES.at(space_.spaceDesc.vid_type)
- << ", but was`" << type.value() << "'";
+ << meta::cpp2::_PropertyType_VALUES_TO_NAMES.at(vidType) << ", but was`"
+ << type.value() << "'";
return Status::Error(ss.str());
}
starts.srcRef = src;
@@ -51,10 +52,10 @@ Status TraversalValidator::validateStarts(const VerticesClause* clause, Starts&
expr->toString().c_str());
}
auto vid = expr->eval(ctx(nullptr));
- if (!SchemaUtil::isValidVid(vid, space_.spaceDesc.vid_type)) {
+ auto vidType = space_.spaceDesc.vid_type.get_type();
+ if (!SchemaUtil::isValidVid(vid, vidType)) {
std::stringstream ss;
- ss << "Vid should be a "
- << meta::cpp2::_PropertyType_VALUES_TO_NAMES.at(space_.spaceDesc.vid_type);
+ ss << "Vid should be a " << meta::cpp2::_PropertyType_VALUES_TO_NAMES.at(vidType);
return Status::Error(ss.str());
}
starts.vids.emplace_back(std::move(vid));
diff --git a/tests/admin/test_configs.py b/tests/admin/test_configs.py
index 4862e0691db524e936f92b2672f90cddfb5b73d1..6c1b8309ed2cccd1a558fb831faa30d0742edf9d 100644
--- a/tests/admin/test_configs.py
+++ b/tests/admin/test_configs.py
@@ -69,13 +69,12 @@ class TestConfigs(NebulaTestSuite):
expected_result = [['STORAGE', 'v', 'int', 'MUTABLE', 3],
['STORAGE', 'wal_ttl', 'int', 'MUTABLE', 14400],
['STORAGE', 'minloglevel', 'int', 'MUTABLE', 0],
- ['STORAGE', 'enable_reservoir_sampling', 'bool', 'MUTABLE', False],
['STORAGE', 'custom_filter_interval_secs', 'int', 'MUTABLE', 86400],
['STORAGE', 'slow_op_threshhold_ms', 'int', 'MUTABLE', 50],
['STORAGE', 'heartbeat_interval_secs', 'int', 'MUTABLE', 1],
['STORAGE', 'meta_client_retry_times', 'int', 'MUTABLE', 3],
['STORAGE', 'rocksdb_db_options', 'map', 'MUTABLE', {}],
- ['STORAGE', 'max_edge_returned_per_vertex', 'int', 'MUTABLE', 2147483647],
+ ['STORAGE', 'enable_multi_versions', 'bool', 'MUTABLE', False],
['STORAGE', 'rocksdb_column_family_options', 'map', 'MUTABLE',
{"write_buffer_size":"67108864","max_bytes_for_level_base":"268435456","max_write_buffer_number":"4"}],
['STORAGE', 'rocksdb_block_based_table_options', 'map', 'MUTABLE', {"block_size":"8192"}]]