diff --git a/src/context/test/CMakeLists.txt b/src/context/test/CMakeLists.txt
index bcbe73fd176908484f9b185497e9f015247b8108..82eb6b828eac265b42341f051cb88548113fce00 100644
--- a/src/context/test/CMakeLists.txt
+++ b/src/context/test/CMakeLists.txt
@@ -20,6 +20,7 @@ SET(CONTEXT_TEST_LIBS
$<TARGET_OBJECTS:common_common_thrift_obj>
$<TARGET_OBJECTS:common_graph_thrift_obj>
$<TARGET_OBJECTS:common_storage_thrift_obj>
+ $<TARGET_OBJECTS:common_time_function_obj>
$<TARGET_OBJECTS:util_obj>
$<TARGET_OBJECTS:context_obj>
$<TARGET_OBJECTS:parser_obj>
diff --git a/src/daemons/CMakeLists.txt b/src/daemons/CMakeLists.txt
index da82687a5329c2cb03a3fb430ac90c04aeee5b5f..a05778776e7c9d5275ff4cc8e27899d7e204a2de 100644
--- a/src/daemons/CMakeLists.txt
+++ b/src/daemons/CMakeLists.txt
@@ -23,6 +23,7 @@ nebula_add_executable(
$<TARGET_OBJECTS:context_obj>
$<TARGET_OBJECTS:graph_flags_obj>
$<TARGET_OBJECTS:graph_auth_obj>
+ $<TARGET_OBJECTS:common_time_function_obj>
$<TARGET_OBJECTS:common_expression_obj>
$<TARGET_OBJECTS:common_http_client_obj>
$<TARGET_OBJECTS:common_network_obj>
diff --git a/src/exec/logic/test/CMakeLists.txt b/src/exec/logic/test/CMakeLists.txt
index 8aa40b84e81f076d196d1fe24e61d409d49917bc..84ce4d8a8e5143ccd05b7e3b02a3e57a6f23cd5a 100644
--- a/src/exec/logic/test/CMakeLists.txt
+++ b/src/exec/logic/test/CMakeLists.txt
@@ -4,6 +4,7 @@
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
SET(EXEC_LOGIC_TEST_LIBS
+ $<TARGET_OBJECTS:common_time_function_obj>
$<TARGET_OBJECTS:common_expression_obj>
$<TARGET_OBJECTS:common_network_obj>
$<TARGET_OBJECTS:common_process_obj>
diff --git a/src/exec/mutate/MutateExecutor.h b/src/exec/mutate/MutateExecutor.h
index e9554adb81680a1a0c4f46aa73baf57dc33f5df3..1fb03114056ac682296dbee966e8e3141180d38f 100644
--- a/src/exec/mutate/MutateExecutor.h
+++ b/src/exec/mutate/MutateExecutor.h
@@ -24,15 +24,66 @@ protected:
using RpcResponse = nebula::storage::StorageRpcResponse<nebula::storage::cpp2::ExecResponse>;
Status handleResponse(const RpcResponse &resp, const std::string &executorName) {
auto completeness = resp.completeness();
+ Status status;
if (completeness != 100) {
const auto& failedCodes = resp.failedParts();
+ std::vector<std::string> errorMsgs;
for (auto it = failedCodes.begin(); it != failedCodes.end(); it++) {
LOG(ERROR) << executorName << " failed, error "
<< storage::cpp2::_ErrorCode_VALUES_TO_NAMES.at(it->second)
<< ", part " << it->first;
+ status = handleErrorCode(it->second, it->first);
+ if (status.ok()) {
+ continue;
+ }
+ errorMsgs.emplace_back(status.toString());
}
- return Status::Error("%s not complete, completeness: %d",
- executorName.c_str(), completeness);
+ return Status::Error("%s not complete, completeness: %d, error: %s",
+ executorName.c_str(),
+ completeness,
+ folly::join(", ", errorMsgs).c_str());
+ }
+ return Status::OK();
+ }
+
+ Status handleErrorCode(nebula::storage::cpp2::ErrorCode code, PartitionID partId) {
+ switch (code) {
+ case storage::cpp2::ErrorCode::E_INVALID_VID:
+ return Status::Error("Invalid vid.");
+ case storage::cpp2::ErrorCode::E_INVALID_FIELD_VALUE: {
+ std::string error = "Invalid field value: may be the filed is not NULL "
+ "or without default value or wrong schema.";
+ return Status::Error(std::move(error));
+ }
+ case storage::cpp2::ErrorCode::E_INVALID_FILTER:
+ return Status::Error("Invalid filter.");
+ case storage::cpp2::ErrorCode::E_INVALID_UPDATER:
+ return Status::Error("Invalid Update col or yield col.");
+ case storage::cpp2::ErrorCode::E_TAG_NOT_FOUND:
+ return Status::Error("Tag not found.");
+ case storage::cpp2::ErrorCode::E_TAG_PROP_NOT_FOUND:
+ return Status::Error("Tag prop not found.");
+ case storage::cpp2::ErrorCode::E_EDGE_NOT_FOUND:
+ return Status::Error("Edge not found.");
+ case storage::cpp2::ErrorCode::E_EDGE_PROP_NOT_FOUND:
+ return Status::Error("Edge prop not found.");
+ case storage::cpp2::ErrorCode::E_INVALID_DATA:
+ return Status::Error("Invalid data, may be wrong value type.");
+ case storage::cpp2::ErrorCode::E_NOT_NULLABLE:
+ return Status::Error("The not null field cannot be null.");
+ case storage::cpp2::ErrorCode::E_FIELD_UNSET:
+ return Status::Error("The not null field doesn't have a default value.");
+ case storage::cpp2::ErrorCode::E_OUT_OF_RANGE:
+ return Status::Error("Out of range value.");
+ case storage::cpp2::ErrorCode::E_ATOMIC_OP_FAILED:
+ return Status::Error("Atomic operation failed.");
+ case storage::cpp2::ErrorCode::E_FILTER_OUT:
+ return Status::OK();
+ default:
+ auto status = Status::Error("Unknown error, part: %d, error code: %d.",
+ partId, static_cast<int32_t>(code));
+ LOG(ERROR) << status;
+ return status;
}
return Status::OK();
}
diff --git a/src/exec/mutate/UpdateExecutor.cpp b/src/exec/mutate/UpdateExecutor.cpp
index d00a25862df50fac1291c5921c81af89567af7ab..8dde755062b97f3ad319327553b438dd5a97b080 100644
--- a/src/exec/mutate/UpdateExecutor.cpp
+++ b/src/exec/mutate/UpdateExecutor.cpp
@@ -40,50 +40,10 @@ StatusOr<DataSet> UpdateBaseExecutor::handleResult(DataSet &&data) {
return result;
}
-Status UpdateBaseExecutor::handleErrorCode(nebula::storage::cpp2::ErrorCode code,
- PartitionID partId) {
- switch (code) {
- case storage::cpp2::ErrorCode::E_INVALID_FIELD_VALUE:
- return Status::Error(
- "Invalid field value: may be the filed without default value or wrong schema");
- case storage::cpp2::ErrorCode::E_INVALID_FILTER:
- return Status::Error("Invalid filter.");
- case storage::cpp2::ErrorCode::E_INVALID_UPDATER:
- return Status::Error("Invalid Update col or yield col.");
- case storage::cpp2::ErrorCode::E_TAG_NOT_FOUND:
- return Status::Error("Tag `%s' not found.", schemaName_.c_str());
- case storage::cpp2::ErrorCode::E_TAG_PROP_NOT_FOUND:
- return Status::Error("Tag prop not found.");
- case storage::cpp2::ErrorCode::E_EDGE_NOT_FOUND:
- return Status::Error("Edge `%s' not found.", schemaName_.c_str());
- case storage::cpp2::ErrorCode::E_EDGE_PROP_NOT_FOUND:
- return Status::Error("Edge prop not found.");
- case storage::cpp2::ErrorCode::E_INVALID_DATA:
- return Status::Error("Invalid data, may be wrong value type.");
- case storage::cpp2::ErrorCode::E_NOT_NULLABLE:
- return Status::Error("The not null field cannot be null.");
- case storage::cpp2::ErrorCode::E_FIELD_UNSET:
- return Status::Error("The not null field doesn't have a default value.");
- case storage::cpp2::ErrorCode::E_OUT_OF_RANGE:
- return Status::Error("Out of range value.");
- case storage::cpp2::ErrorCode::E_ATOMIC_OP_FAILED:
- return Status::Error("Atomic operation failed.");
- case storage::cpp2::ErrorCode::E_FILTER_OUT:
- return Status::OK();
- default:
- auto status = Status::Error("Unknown error, part: %d, error code: %d.",
- partId, static_cast<int32_t>(code));
- LOG(ERROR) << status;
- return status;
- }
- return Status::OK();
-}
-
folly::Future<Status> UpdateVertexExecutor::execute() {
SCOPED_TIMER(&execTime_);
auto *uvNode = asNode<UpdateVertex>(node());
yieldNames_ = uvNode->getYieldNames();
- schemaName_ = uvNode->getName();
time::Duration updateVertTime;
return qctx()->getStorageClient()->updateVertex(uvNode->getSpaceId(),
uvNode->getVId(),
@@ -123,7 +83,6 @@ folly::Future<Status> UpdateVertexExecutor::execute() {
folly::Future<Status> UpdateEdgeExecutor::execute() {
SCOPED_TIMER(&execTime_);
auto *ueNode = asNode<UpdateEdge>(node());
- schemaName_ = ueNode->getName();
storage::cpp2::EdgeKey edgeKey;
edgeKey.set_src(ueNode->getSrcId());
edgeKey.set_ranking(ueNode->getRank());
diff --git a/src/exec/mutate/UpdateExecutor.h b/src/exec/mutate/UpdateExecutor.h
index 99bef8cccc9cf6c0ab548f6fb9585337ba398ec7..8aa55f6292a3836d4b216367aaa79bec5822ad33 100644
--- a/src/exec/mutate/UpdateExecutor.h
+++ b/src/exec/mutate/UpdateExecutor.h
@@ -8,28 +8,25 @@
#define EXEC_MUTATE_UPDATEEXECUTOR_H_
#include "common/base/StatusOr.h"
-#include "exec/Executor.h"
+#include "exec/mutate/MutateExecutor.h"
namespace nebula {
namespace graph {
-class UpdateBaseExecutor : public Executor {
+class UpdateBaseExecutor : public MutateExecutor {
public:
UpdateBaseExecutor(const std::string &execName,
const PlanNode *node,
QueryContext *ectx)
- : Executor(execName, node, ectx) {}
+ : MutateExecutor(execName, node, ectx) {}
virtual ~UpdateBaseExecutor() {}
protected:
StatusOr<DataSet> handleResult(DataSet &&data);
- Status handleErrorCode(nebula::storage::cpp2::ErrorCode code, PartitionID partId);
-
protected:
std::vector<std::string> yieldNames_;
- std::string schemaName_;
};
class UpdateVertexExecutor final : public UpdateBaseExecutor {
diff --git a/src/exec/query/test/CMakeLists.txt b/src/exec/query/test/CMakeLists.txt
index cb280339289df256622ea2701fa45d3430f686bc..cc883259b11a9250dc9a5de7b9ddb1460bd6b0c7 100644
--- a/src/exec/query/test/CMakeLists.txt
+++ b/src/exec/query/test/CMakeLists.txt
@@ -4,6 +4,7 @@
# attached with Common Clause Condition 1.0, found in the LICENSES directory.
SET(EXEC_QUERY_TEST_OBJS
+ $<TARGET_OBJECTS:common_time_function_obj>
$<TARGET_OBJECTS:common_expression_obj>
$<TARGET_OBJECTS:common_network_obj>
$<TARGET_OBJECTS:common_process_obj>
diff --git a/src/mock/test/CMakeLists.txt b/src/mock/test/CMakeLists.txt
index fef57fdbf404cef4dad5a22d97421ec7b2bb1699..a2f1a85601fd75af716c75c610475bfbdc676c0e 100644
--- a/src/mock/test/CMakeLists.txt
+++ b/src/mock/test/CMakeLists.txt
@@ -19,6 +19,7 @@ set(GRAPH_TEST_LIB
$<TARGET_OBJECTS:idgenerator_obj>
$<TARGET_OBJECTS:context_obj>
$<TARGET_OBJECTS:graph_auth_obj>
+ $<TARGET_OBJECTS:common_time_function_obj>
$<TARGET_OBJECTS:common_graph_client_obj>
$<TARGET_OBJECTS:common_expression_obj>
$<TARGET_OBJECTS:common_http_client_obj>
diff --git a/src/parser/test/CMakeLists.txt b/src/parser/test/CMakeLists.txt
index ba1837af79fa1608d0c4bdb576a5ad9ffababec3..a20f179d448c164d7c2f9f4a5eec390742f9c6f7 100644
--- a/src/parser/test/CMakeLists.txt
+++ b/src/parser/test/CMakeLists.txt
@@ -5,6 +5,7 @@
set(PARSER_TEST_LIBS
$<TARGET_OBJECTS:parser_obj>
+ $<TARGET_OBJECTS:common_time_function_obj>
$<TARGET_OBJECTS:common_expression_obj>
$<TARGET_OBJECTS:common_network_obj>
$<TARGET_OBJECTS:common_fs_obj>
diff --git a/src/planner/test/CMakeLists.txt b/src/planner/test/CMakeLists.txt
index c640cd58cb6ba1bb2d6f674ec6cf390b84441f5d..3c639639a3a6060d679f779c9786bed3422c1a87 100644
--- a/src/planner/test/CMakeLists.txt
+++ b/src/planner/test/CMakeLists.txt
@@ -8,6 +8,7 @@ nebula_add_test(
SOURCES
ExecutionPlanTest.cpp
OBJECTS
+ $<TARGET_OBJECTS:common_time_function_obj>
$<TARGET_OBJECTS:common_expression_obj>
$<TARGET_OBJECTS:common_http_client_obj>
$<TARGET_OBJECTS:common_network_obj>
@@ -25,7 +26,6 @@ nebula_add_test(
$<TARGET_OBJECTS:common_meta_obj>
$<TARGET_OBJECTS:common_ws_obj>
$<TARGET_OBJECTS:common_ws_common_obj>
- # $<TARGET_OBJECTS:meta_gflags_man_obj>
$<TARGET_OBJECTS:common_thread_obj>
$<TARGET_OBJECTS:common_time_obj>
$<TARGET_OBJECTS:common_fs_obj>
diff --git a/src/util/SchemaUtil.cpp b/src/util/SchemaUtil.cpp
index fcd75c7431e95ea98ffa18e349fc292fb7ecbb7c..768da9044378bb54afa462e3c96c6694f36304af 100644
--- a/src/util/SchemaUtil.cpp
+++ b/src/util/SchemaUtil.cpp
@@ -5,6 +5,7 @@
*/
#include "common/base/Base.h"
+#include "common/function/TimeFunction.h"
#include "util/SchemaUtil.h"
#include "context/QueryExpressionContext.h"
@@ -105,7 +106,7 @@ StatusOr<nebula::Value> SchemaUtil::toSchemaValue(const meta::cpp2::PropertyType
<< ", v type " << v.type();
return Status::Error("Wrong type");
}
- auto timestamp = toTimestamp(v);
+ auto timestamp = TimeFunction::toTimestamp(v);
if (!timestamp.ok()) {
return timestamp.status();
}
@@ -118,7 +119,7 @@ StatusOr<nebula::Value> SchemaUtil::toSchemaValue(const meta::cpp2::PropertyType
<< ", v type " << v.type();
return Status::Error("Wrong type");
}
- auto date = toDate(v);
+ auto date = TimeFunction::toDate(v);
if (!date.ok()) {
return date.status();
}
@@ -131,7 +132,7 @@ StatusOr<nebula::Value> SchemaUtil::toSchemaValue(const meta::cpp2::PropertyType
<< ", v type " << v.type();
return Status::Error("Wrong type");
}
- auto datetime = toDateTime(v);
+ auto datetime = TimeFunction::toDateTime(v);
if (!datetime.ok()) {
return datetime.status();
}
@@ -143,36 +144,6 @@ StatusOr<nebula::Value> SchemaUtil::toSchemaValue(const meta::cpp2::PropertyType
}
}
-// static
-StatusOr<nebula::Timestamp> SchemaUtil::toTimestamp(const Value &) {
- nebula::Timestamp timestamp = 0;
- return timestamp;
-}
-
-// static
-StatusOr<nebula::Date> SchemaUtil::toDate(const Value &) {
- // TODO: Add Date processing
- nebula::Date date;
- date.year = 0;
- date.month = 0;
- date.day = 0;
- return date;
-}
-
-// static
-StatusOr<nebula::DateTime> SchemaUtil::toDateTime(const Value &) {
- // TODO: Add AateTime processing
- nebula::DateTime dateTime;
- dateTime.year = 0;
- dateTime.month = 0;
- dateTime.day = 0;
- dateTime.hour = 0;
- dateTime.minute = 0;
- dateTime.sec = 0;
- dateTime.microsec = 0;
- dateTime.timezone = 0;
- return dateTime;
-}
// static
Status SchemaUtil::setTTLDuration(SchemaPropItem* schemaProp, meta::cpp2::Schema& schema) {
diff --git a/src/util/SchemaUtil.h b/src/util/SchemaUtil.h
index b7c14795327257a2635a90fa22c662c1d099993e..76151a816d3b0747a56be7cac55d96c995012181 100644
--- a/src/util/SchemaUtil.h
+++ b/src/util/SchemaUtil.h
@@ -36,15 +36,6 @@ public:
static StatusOr<nebula::Value> toSchemaValue(const meta::cpp2::PropertyType type,
const Value &v);
- // Conver int64 or string to Timestamp
- static StatusOr<nebula::Timestamp> toTimestamp(const Value &v);
-
- // Conver int64 or string to Date
- static StatusOr<nebula::Date> toDate(const Value &v);
-
- // Conver int64 or string to DateTime
- static StatusOr<nebula::DateTime> toDateTime(const Value &v);
-
static Status setTTLDuration(SchemaPropItem* schemaProp, meta::cpp2::Schema& schema);
static Status setTTLCol(SchemaPropItem* schemaProp, meta::cpp2::Schema& schema);
diff --git a/src/util/test/CMakeLists.txt b/src/util/test/CMakeLists.txt
index ead3eb1bde62b50717e25790e252fcc0c99f7c9f..a47381d5822a6e84e88c68b38a28c36af7c791a8 100644
--- a/src/util/test/CMakeLists.txt
+++ b/src/util/test/CMakeLists.txt
@@ -12,6 +12,7 @@ nebula_add_test(
$<TARGET_OBJECTS:common_expression_obj>
$<TARGET_OBJECTS:common_function_manager_obj>
$<TARGET_OBJECTS:common_time_obj>
+ $<TARGET_OBJECTS:common_time_function_obj>
$<TARGET_OBJECTS:idgenerator_obj>
LIBRARIES
gtest
diff --git a/src/validator/test/CMakeLists.txt b/src/validator/test/CMakeLists.txt
index c05ef4ea7fe0ceb6b107e6b6017424b97ab96f2d..f5c32cf70461fa65523fcfa35684a7ce90b186a7 100644
--- a/src/validator/test/CMakeLists.txt
+++ b/src/validator/test/CMakeLists.txt
@@ -19,6 +19,7 @@ set(VALIDATOR_TEST_LIBS
$<TARGET_OBJECTS:idgenerator_obj>
$<TARGET_OBJECTS:context_obj>
$<TARGET_OBJECTS:graph_auth_obj>
+ $<TARGET_OBJECTS:common_time_function_obj>
$<TARGET_OBJECTS:common_expression_obj>
$<TARGET_OBJECTS:common_network_obj>
$<TARGET_OBJECTS:common_fs_obj>
diff --git a/src/validator/test/MockSchemaManager.cpp b/src/validator/test/MockSchemaManager.cpp
index 11be8d1acd4b718aeae6a04f0259f49418e61eea..283721cb71702298033e98d7ac2619f60d7f81f3 100644
--- a/src/validator/test/MockSchemaManager.cpp
+++ b/src/validator/test/MockSchemaManager.cpp
@@ -36,7 +36,7 @@ void MockSchemaManager::init() {
// like {start : timestamp, end : datetime}
std::shared_ptr<meta::NebulaSchemaProvider> likeSchema(new meta::NebulaSchemaProvider(0));
likeSchema->addField("start", meta::cpp2::PropertyType::TIMESTAMP);
- likeSchema->addField("end", meta::cpp2::PropertyType::DATETIME);
+ likeSchema->addField("end", meta::cpp2::PropertyType::TIMESTAMP);
likeSchema->addField("likeness", meta::cpp2::PropertyType::INT64);
edgeSchemas.emplace(3, likeSchema);
diff --git a/tests/admin/test_parts.py b/tests/admin/test_parts.py
index 5444f61dcf9077a362c2ab58149398dbdafbf6f6..7e25a9e50d03db1ad3ffba498f637512211189f9 100644
--- a/tests/admin/test_parts.py
+++ b/tests/admin/test_parts.py
@@ -20,7 +20,7 @@ class TestParts(NebulaTestSuite):
self.check_resp_succeeded(resp)
# Wait for leader info
- time.sleep(self.delay)
+ time.sleep(self.delay + 5)
@classmethod
def cleanup(self):
diff --git a/tests/mutate/test_delete_vertices.py b/tests/mutate/test_delete_vertices.py
index 3f1f02e430a18e46351d4f5c1bcfcc357c59f9ae..8f7e34fab7a9c6ab9751d0fce3ed60ab3bd858ae 100644
--- a/tests/mutate/test_delete_vertices.py
+++ b/tests/mutate/test_delete_vertices.py
@@ -8,7 +8,7 @@
import time
import pytest
-from tests.common.nebula_test_suite import NebulaTestSuite
+from tests.common.nebula_test_suite import NebulaTestSuite, T_NULL
class TestDeleteVertices(NebulaTestSuite):
@@ -35,35 +35,33 @@ class TestDeleteVertices(NebulaTestSuite):
["Tim Duncan"]]
self.check_out_of_order_result(resp, expect_result)
- # does not support
- # resp = self.execute_query(' FETCH PROP ON player "Tony Parker" YIELD player.name, player.age')
- # self.check_resp_succeeded(resp)
- # expect_result = [["Tony Parker", "Tony Parker", 36]]
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query(' FETCH PROP ON player "Tony Parker" YIELD player.name, player.age')
+ self.check_resp_succeeded(resp)
+ # 2.0, fetch when has yield clause, not return the vid
+ expect_result = [["Tony Parker", 36]]
+ self.check_out_of_order_result(resp, expect_result)
- # does not support
- # resp = self.execute_query('FETCH PROP ON serve "Tony Parker"->"Spurs" '
- # 'YIELD serve.start_year, serve.end_year')
- # self.check_resp_failed(resp)
- # expect_result = ["serve._src", "serve._dst", "serve._rank", "serve.start_year", "serve.end_year"]
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON serve "Tony Parker"->"Spurs" '
+ 'YIELD serve.start_year, serve.end_year')
+ self.check_resp_succeeded(resp)
+ expect_result = [['Tony Parker', 'Spurs', 0, 1999, 2018]]
+ self.check_out_of_order_result(resp, expect_result)
# delete vertex
resp = self.execute('DELETE VERTEX "Tony Parker"')
self.check_resp_succeeded(resp)
# check
- # does not support
- # resp = self.execute_query('FETCH PROP ON player "Tony Parker" YIELD player.name, player.age')
- # self.check_resp_failed(resp)
- # expect_result = []
- # self.check_out_of_order_result(resp, expect_result)
-
- # resp = self.execute_query('FETCH PROP ON serve "Tony Parker"->"Spurs" '
- # 'YIELD serve.start_year, serve.end_year')
- # self.check_resp_failed(resp)
- # expect_result = []
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON player "Tony Parker" YIELD player.name, player.age')
+ self.check_resp_succeeded(resp)
+ expect_result = []
+ self.check_out_of_order_result(resp, expect_result)
+
+ resp = self.execute_query('FETCH PROP ON serve "Tony Parker"->"Spurs" '
+ 'YIELD serve.start_year, serve.end_year')
+ self.check_resp_succeeded(resp)
+ expect_result = []
+ self.check_out_of_order_result(resp, expect_result)
resp = self.execute_query('GO FROM "Boris Diaw" OVER like')
self.check_resp_succeeded(resp)
@@ -102,10 +100,10 @@ class TestDeleteVertices(NebulaTestSuite):
expect_result = [[4823234394086728974]]
self.check_out_of_order_result(resp, expect_result)
- # resp = self.execute_query('FETCH PROP ON player hash("Grant Hill") YIELD player.name, player.age')
- # self.check_resp_succeeded(resp)
- # expect_result = [[6293765385213992205, "Grant Hill", 46]]
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON player hash("Grant Hill") YIELD player.name, player.age')
+ self.check_resp_succeeded(resp)
+ expect_result = [[6293765385213992205, "Grant Hill", 46]]
+ self.check_out_of_order_result(resp, expect_result)
resp = self.execute_query('FETCH PROP ON serve hash("Grant Hill")->hash("Pistons") '
'YIELD serve.start_year, serve.end_year')
@@ -128,10 +126,10 @@ class TestDeleteVertices(NebulaTestSuite):
expect_result = []
self.check_out_of_order_result(resp, expect_result)
- # resp = self.execute_query('FETCH PROP ON player hash("Grant Hill") YIELD player.name, player.age')
- # self.check_resp_succeeded(resp)
- # expect_result = []
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON player hash("Grant Hill") YIELD player.name, player.age')
+ self.check_resp_succeeded(resp)
+ expect_result = []
+ self.check_out_of_order_result(resp, expect_result)
# delete not exist vertex
resp = self.execute('DELETE VERTEX hash("Non-existing Vertex")')
@@ -145,38 +143,38 @@ class TestDeleteVertices(NebulaTestSuite):
resp = self.execute('DELETE VERTEX hash("A Loner")')
self.check_resp_succeeded(resp)
- # resp = self.execute_query('FETCH PROP ON player hash("A Loner") YIELD player.name, player.age')
- # self.check_resp_succeeded(resp)
- # expect_result = []
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON player hash("A Loner") YIELD player.name, player.age')
+ self.check_resp_succeeded(resp)
+ expect_result = []
+ self.check_out_of_order_result(resp, expect_result)
@pytest.mark.skip(reason="does not support uuid")
def test_delete_with_uuid(self):
- # resp = self.execute_query('FETCH PROP ON player UUID("Grant Hill") YIELD player.name, player.age')
- # self.check_resp_succeeded(resp)
- # expect_result = [["Grant Hill", 46]]
- # self.check_result(resp, expect_result, {0})
+ resp = self.execute_query('FETCH PROP ON player UUID("Grant Hill") YIELD player.name, player.age')
+ self.check_resp_succeeded(resp)
+ expect_result = [["Grant Hill", 46]]
+ self.check_result(resp, expect_result, {0})
- # resp = self.execute_query('FETCH PROP ON serve UUID("Grant Hill")->UUID("Pistons") '
- # 'YIELD serve.start_year, serve.end_year')
- # self.check_resp_succeeded(resp)
- # expect_result = [1994, 2000]
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON serve UUID("Grant Hill")->UUID("Pistons") '
+ 'YIELD serve.start_year, serve.end_year')
+ self.check_resp_succeeded(resp)
+ expect_result = [1994, 2000]
+ self.check_out_of_order_result(resp, expect_result)
# delete vertex
resp = self.execute('DELETE VERTEX UUID("Grant Hill")')
self.check_resp_succeeded(resp)
- # resp = self.execute_query('FETCH PROP ON player UUID("Grant Hill") YIELD player.name, player.age')
- # self.check_resp_succeeded(resp)
- # expect_result = []
- # self.check_result(resp, expect_result, {0})
+ resp = self.execute_query('FETCH PROP ON player UUID("Grant Hill") YIELD player.name, player.age')
+ self.check_resp_succeeded(resp)
+ expect_result = []
+ self.check_result(resp, expect_result, {0})
- # resp = self.execute_query('FETCH PROP ON serve UUID("Grant Hill")->UUID("Pistons") '
- # 'YIELD serve.start_year, serve.end_year')
- # self.check_resp_succeeded(resp)
- # expect_result = []
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON serve UUID("Grant Hill")->UUID("Pistons") '
+ 'YIELD serve.start_year, serve.end_year')
+ self.check_resp_succeeded(resp)
+ expect_result = []
+ self.check_out_of_order_result(resp, expect_result)
# delete not exist vertex
resp = self.execute('DELETE VERTEX UUID("Non-existing Vertex")')
@@ -190,10 +188,10 @@ class TestDeleteVertices(NebulaTestSuite):
resp = self.execute('DELETE VERTEX UUID("A Loner")')
self.check_resp_succeeded(resp)
- # resp = self.execute_query('FETCH PROP ON player UUID("A Loner") YIELD player.name, player.age')
- # self.check_resp_succeeded(resp)
- # expect_result = []
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON player UUID("A Loner") YIELD player.name, player.age')
+ self.check_resp_succeeded(resp)
+ expect_result = []
+ self.check_out_of_order_result(resp, expect_result)
def test_delete_with_no_edge(self):
resp = self.execute('create space deletenoedges_space;'
@@ -208,6 +206,8 @@ class TestDeleteVertices(NebulaTestSuite):
resp = self.execute('DELETE VERTEX "101"')
self.check_resp_succeeded(resp)
- # doesn't support fetch
- # resp = self.execute_query('FETCH PROP ON person "101" yield person.name, person.age')
- # self.check_resp_succeeded(resp)
+ resp = self.execute_query('FETCH PROP ON person "101" yield person.name, person.age')
+ # 2.0: when vertex not exist, return NULL
+ self.check_resp_succeeded(resp)
+ expect_result = [[T_NULL, T_NULL]]
+ self.check_out_of_order_result(resp, expect_result)
diff --git a/tests/mutate/test_insert_1.py b/tests/mutate/test_insert_1.py
index 71f1b1dbb1101ab5a0df72a931a7b6cda0ca8892..7f9c1c6c311aa40dcd8ae23196ab029f5c6dcdbb 100644
--- a/tests/mutate/test_insert_1.py
+++ b/tests/mutate/test_insert_1.py
@@ -101,11 +101,11 @@ class TestInsert1(NebulaTestSuite):
'"Laura"->"Amber":(88)')
self.check_resp_failed(resp)
- # insert edge invalid timestamp, TODO
- # resp = self.execute('INSERT EDGE study(start_time, end_time) '
- # 'VALUES "Laura"->"sun_school":'
- # '("2300-01-01 10:00:00", now()+3600*24*365*3)')
- # self.check_resp_failed(resp)
+ # insert edge invalid timestamp,
+ resp = self.execute('INSERT EDGE study(start_time, end_time) '
+ 'VALUES "Laura"->"sun_school":'
+ '("2300-01-01 10:00:00", now()+3600*24*365*3)')
+ self.check_resp_failed(resp)
def test_insert_succeeded(self):
# insert vertex succeeded
@@ -117,19 +117,19 @@ class TestInsert1(NebulaTestSuite):
self.check_resp_succeeded(resp)
# check result, does not support
- # resp = self.execute('FETCH PROP ON person "Conan"')
- # self.check_resp_succeeded(resp)
- # expect_result = [['Conan', 'Conan', 10]]
- # self.check_out_of_order_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON person "Conan"')
+ self.check_resp_succeeded(resp)
+ expect_result = [['Conan', 'Conan', 10]]
+ self.check_out_of_order_result(resp, expect_result)
# insert vertex with uuid
# resp = self.execute('INSERT VERTEX person(name, age) VALUES uuid("Tom"):("Tom", 22)')
# self.check_resp_succeeded(resp)
# insert vertex with timestamp succeeded, timestamp not supported, TODO
- # resp = self.execute('INSERT VERTEX school(name, create_time) VALUES '
- # '"sun_school":("sun_school", "2010-01-01 10:00:00")')
- # self.check_resp_succeeded(resp)
+ resp = self.execute('INSERT VERTEX school(name, create_time) VALUES '
+ '"sun_school":("sun_school", "2010-01-01 10:00:00")')
+ self.check_resp_succeeded(resp)
# insert vertex with timestamp succeeded uuid
# resp = self.execute('INSERT VERTEX school(name, create_time) VALUES '
@@ -152,10 +152,10 @@ class TestInsert1(NebulaTestSuite):
self.check_resp_succeeded(resp)
# check result, does not support
- # resp = self.execute('FETCH PROP ON schoolmate "Tom"->"Bob"')
- # self.check_resp_succeeded(resp)
- # expect_result = [['Tom', 'Bob', 0, 87, 'Superman']]
- # self.check_result(resp, expect_result)
+ resp = self.execute_query('FETCH PROP ON schoolmate "Tom"->"Bob"')
+ self.check_resp_succeeded(resp)
+ expect_result = [['Tom', 'Bob', 0, 87, 'Superman']]
+ self.check_result(resp, expect_result)
# insert edge with timestamp succeed
resp = self.execute('INSERT EDGE study(start_time, end_time) '
@@ -170,9 +170,9 @@ class TestInsert1(NebulaTestSuite):
# self.check_resp_succeeded(resp)
# get result, type cast is not yet implemented in go
- # resp = self.execute('GO FROM "Laura" OVER study '
- # 'YIELD $$.school.name, study._dst,'
- # '$$.school.create_time, (string)study.start_time')
+ # resp = self.execute_query('GO FROM "Laura" OVER study '
+ # 'YIELD $$.school.name, study._dst,'
+ # '$$.school.create_time, (string)study.start_time')
# self.check_resp_succeeded(resp)
# expect_result = [["sun_school", "sun_school", 1262311200, "1546308000"]]
# self.check_result(resp, expect_result)
@@ -185,11 +185,11 @@ class TestInsert1(NebulaTestSuite):
# expect_result = [["sun_school", 1262311200, "1546308000"]]
# self.check_result(resp, expect_result)
- # fetch sun_school, does not support
- # resp = self.execute('FETCH PROP ON school "sun_school"')
- # self.check_resp_succeeded(resp)
- # expect_result = [["sun_school", "sun_school", 1262311200]]
- # self.check_result(resp, expect_result)
+ # fetch sun_school
+ resp = self.execute_query('FETCH PROP ON school "sun_school"')
+ self.check_resp_succeeded(resp)
+ expect_result = [["sun_school", "sun_school", 1262311200]]
+ self.check_result(resp, expect_result)
# fetch sun_school by uuid
# resp = self.execute('FETCH PROP ON school uuid("sun_school")')
@@ -214,15 +214,16 @@ class TestInsert1(NebulaTestSuite):
'VALUES "Bob":(9, "Bob", 20191106001, "four")')
self.check_resp_succeeded(resp)
- # check result, does not support
- # resp = self.execute('FETCH PROP ON person "Bob"')
- # self.check_resp_succeeded(resp)
- # expect_result = [['Bob', 'Bob', 9]]
- # self.check_out_of_order_result(resp, expect_result)
- # resp = self.execute('FETCH PROP ON student "Bob"')
- # self.check_resp_succeeded(resp)
- # expect_result = [['Bob', 'Bob', 20191106001]]
- # self.check_out_of_order_result(resp, expect_result)
+ # check result
+ resp = self.execute_query('FETCH PROP ON person "Bob"')
+ self.check_resp_succeeded(resp)
+ expect_result = [['Bob', 'Bob', 9]]
+ self.check_result(resp, expect_result)
+
+ resp = self.execute_query('FETCH PROP ON student "Bob"')
+ self.check_resp_succeeded(resp)
+ expect_result = [['Bob', 'four', 20191106001]]
+ self.check_result(resp, expect_result)
# multi vertex multi tags
resp = self.execute('INSERT VERTEX person(name, age),student(grade, number) '
@@ -259,11 +260,14 @@ class TestInsert1(NebulaTestSuite):
# 'uuid("Tom")->uuid("Peter"):(83, "Petter")')
# self.check_resp_succeeded(resp)
- # get result, does not support get dst vertex
+ # get result
resp = self.execute_query('GO FROM "Tom" OVER schoolmate YIELD $^.person.name,'
'schoolmate.likeness, $$.person.name')
self.check_resp_succeeded(resp)
- expect_result = [['Tom', 85, 'Lucy'], ['Tom', 81, 'Kitty'], ['Tom', 83, 'Peter'], ['Tom', 87, 'Bob']]
+ expect_result = [['Tom', 85, 'Lucy'],
+ ['Tom', 81, 'Kitty'],
+ ['Tom', 83, 'Peter'],
+ ['Tom', 87, 'Bob']]
self.check_out_of_order_result(resp, expect_result)
# get result use uuid
@@ -290,7 +294,8 @@ class TestInsert1(NebulaTestSuite):
'schoolmate.likeness, $$.person.name,'
'$$.student.grade, $$.student.number')
self.check_resp_succeeded(resp)
- expect_result = [[90, 'Laura', 'three', 20190901008], [95, 'Amber', 'four', 20180901003]]
+ expect_result = [[90, 'Laura', 'three', 20190901008],
+ [95, 'Amber', 'four', 20180901003]]
self.check_out_of_order_result(resp, expect_result)
# get multi tag use uuid through go
@@ -362,7 +367,7 @@ class TestInsert1(NebulaTestSuite):
expect_result = [['Joy', 90, 'Petter', 19, 456]]
self.check_result(resp, expect_result)
- # uuid, TODO: does not support get dst vertex
+ # uuid
# resp = self.execute('GO FROM uuid("Joy") OVER schoolmate YIELD $^.person.name,'
# 'schoolmate.likeness, $$.person.name, $$.person.age,$$.employee.name')
# self.check_resp_succeeded(resp)
@@ -472,18 +477,20 @@ class TestInsert1(NebulaTestSuite):
resp = self.execute_query('GO FROM "Tom" OVER schoolmateWithDefault YIELD $^.person.name,'
'schoolmateWithDefault.likeness, $$.person.name')
self.check_resp_succeeded(resp)
- expect_result = [['Tom', 80, 'Lucy'], ['Tom', 80, 'Kitty'], ['Tom', 80, 'Peter']]
+ expect_result = [['Tom', 80, 'Lucy'],
+ ['Tom', 80, 'Kitty'],
+ ['Tom', 80, 'Peter']]
self.check_out_of_order_result(resp, expect_result)
- # timestamp has not implement
- # resp = self.execute_query('GO FROM "Lucy" OVER schoolmateWithDefault YIELD '
- # 'schoolmateWithDefault.likeness, $$.personWithDefault.name,'
- # '$$.personWithDefault.birthday, $$.personWithDefault.department,'
- # '$$.studentWithDefault.grade, $$.studentWithDefault.number')
- # self.check_resp_succeeded(resp)
- # expect_result = [[80, 'Laura', 1578621600, 'engineering', 'one', 20190901008],
- # [80, 'Amber', 1578621600, 'engineering', 'one', 20180901003]]
- # self.check_out_of_order_result(resp, expect_result)
+
+ resp = self.execute_query('GO FROM "Lucy" OVER schoolmateWithDefault YIELD '
+ 'schoolmateWithDefault.likeness, $$.personWithDefault.name,'
+ '$$.personWithDefault.birthday, $$.personWithDefault.department,'
+ '$$.studentWithDefault.grade, $$.studentWithDefault.number')
+ self.check_resp_succeeded(resp)
+ expect_result = [[80, 'Laura', 1578621600, 'engineering', 'one', 20190901008],
+ [80, 'Amber', 1578621600, 'engineering', 'one', 20180901003]]
+ self.check_out_of_order_result(resp, expect_result)
def test_multi_version(self):
# insert multi version vertex
diff --git a/tests/mutate/test_insert_2.py b/tests/mutate/test_insert_2.py
index 8cb188e66222cdf16e7cb75b12339652720f379a..185ad1ae39eed2472fe44fb53307a9e0c6f6e7e7 100644
--- a/tests/mutate/test_insert_2.py
+++ b/tests/mutate/test_insert_2.py
@@ -8,7 +8,7 @@
import time
import pytest
-from tests.common.nebula_test_suite import NebulaTestSuite
+from tests.common.nebula_test_suite import NebulaTestSuite, T_NULL
class TestInsert2(NebulaTestSuite):
@@ -30,11 +30,11 @@ class TestInsert2(NebulaTestSuite):
self.check_resp_succeeded(resp)
def test_insert_out_of_range_id_size(self):
- resp = self.execute('INSERT VERTEX person(name, age) VALUES "12345678901":("Tom", "2")')
+ resp = self.execute('INSERT VERTEX student(name, age) VALUES "12345678901":("Tom", "2")')
self.check_resp_failed(resp)
def test_insert_not_null_prop(self):
- resp = self.execute('INSERT VERTEX person(name, age) VALUES "Tom":(NULL, 12)')
+ resp = self.execute('INSERT VERTEX student(name, age) VALUES "Tom":(NULL, 12)')
self.check_resp_failed(resp)
def test_insert_with_fix_string(self):
@@ -46,13 +46,8 @@ class TestInsert2(NebulaTestSuite):
resp = self.execute('INSERT VERTEX course(name) VALUES "English":("English")')
self.check_resp_succeeded(resp)
- def test_insert_with_name_label(self):
- resp = self.execute('INSERT VERTEX course(name) VALUES "English":(English)')
- self.check_resp_failed(resp)
-
- @pytest.mark.skip(reason="does not support fetch")
- def test_insert_with_fix_string(self):
- resp = self.execute('FETCH PROP ON course "English"')
+ # check
+ resp = self.execute_query('FETCH PROP ON course "English"')
self.check_resp_succeeded(resp)
- expect_result = [['English', 'Engli', 'NULL']]
+ expect_result = [['English', 'Engli', T_NULL]]
self.check_out_of_order_result(resp, expect_result)
diff --git a/tests/query/v1/test_fetch_empty.py b/tests/query/v1/test_fetch_empty.py
index 68e1f667b713a25cfa8fc6736525bb6756d7ac2c..2b5b623ed51dd139b997ca0e5250bd3783ad5b22 100644
--- a/tests/query/v1/test_fetch_empty.py
+++ b/tests/query/v1/test_fetch_empty.py
@@ -44,36 +44,36 @@ class TestFetchEmptyVertices(NebulaTestSuite):
resp = self.execute('DROP SPACE empty')
self.check_resp_succeeded(resp)
- @pytest.mark.skip(reason="does not support fetch")
def test_empty_props(self):
# empty_tag_0
- resp = self.execute('FETCH PROP ON empty_tag_0 "1"')
+ resp = self.execute_query('FETCH PROP ON empty_tag_0 "1"')
self.check_resp_succeeded(resp)
expect_result = [['1']]
self.check_result(resp, expect_result)
# *
- resp = self.execute('FETCH PROP ON * "1"')
+ resp = self.execute_query('FETCH PROP ON * "1"')
self.check_resp_succeeded(resp)
expect_result = [['1']]
self.check_result(resp, expect_result)
# edge
- resp = self.execute('FETCH PROP ON empty_edge "1"->"2"')
+ resp = self.execute_query('FETCH PROP ON empty_edge "1"->"2"')
self.check_resp_succeeded(resp)
expect_result = [['1', '2', 0]]
self.check_result(resp, expect_result)
- @pytest.mark.skip(reason="does not support fetch")
def test_input_with_empty_props(self):
- resp = self.execute('GO FROM "1" OVER empty_edge YIELD empty_edge._dst as id'
- '| FETCH PROP ON empty_tag_0 $-.id')
+ resp = self.execute_query('GO FROM "1" OVER empty_edge '
+ 'YIELD empty_edge._dst as id'
+ '| FETCH PROP ON empty_tag_0 $-.id')
self.check_resp_succeeded(resp)
expect_result = [['2']]
self.check_result(resp, expect_result)
- resp = self.execute('GO FROM 1 OVER empty_edge YIELD empty_edge._src as src, empty_edge._dst as dst'
- '| FETCH PROP ON empty_edge $-.src->$-.dst')
+ resp = self.execute_query('GO FROM "1" OVER empty_edge '
+ 'YIELD empty_edge._src as src, empty_edge._dst as dst'
+ '| FETCH PROP ON empty_edge $-.src->$-.dst')
self.check_resp_succeeded(resp)
expect_result = [['1', '2', 0]]
self.check_result(resp, expect_result)