From 72a57f35e7b93b3e5a0b6f3bac91ed684fd9a1ec Mon Sep 17 00:00:00 2001 From: liuyu <52276794+liuyu85cn@users.noreply.github.com> Date: Fri, 8 Apr 2022 22:46:37 +0800 Subject: [PATCH] try to remove Atomic Edge --- src/graph/executor/admin/SpaceExecutor.cpp | 7 ------- tests/tck/features/schema/Comment.feature | 16 ++++++++-------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/src/graph/executor/admin/SpaceExecutor.cpp b/src/graph/executor/admin/SpaceExecutor.cpp index d08fca3b7e8..d4df5fc0bd8 100644 --- a/src/graph/executor/admin/SpaceExecutor.cpp +++ b/src/graph/executor/admin/SpaceExecutor.cpp @@ -81,7 +81,6 @@ folly::Future DescSpaceExecutor::execute() { "Charset", "Collate", "Vid Type", - "Atomic Edge", "Zones", "Comment"}; Row row; @@ -92,12 +91,6 @@ folly::Future DescSpaceExecutor::execute() { row.values.emplace_back(properties.get_charset_name()); row.values.emplace_back(properties.get_collate_name()); row.values.emplace_back(SchemaUtil::typeToString(properties.get_vid_type())); - bool sAtomicEdge{false}; - if (properties.isolation_level_ref().has_value() && - (*properties.isolation_level_ref() == meta::cpp2::IsolationLevel::TOSS)) { - sAtomicEdge = true; - } - row.values.emplace_back(sAtomicEdge); auto zoneNames = folly::join(",", properties.get_zone_names()); row.values.emplace_back(zoneNames); diff --git a/tests/tck/features/schema/Comment.feature b/tests/tck/features/schema/Comment.feature index deb866a161e..8336206aa28 100644 --- a/tests/tck/features/schema/Comment.feature +++ b/tests/tck/features/schema/Comment.feature @@ -22,8 +22,8 @@ Feature: Schema Comment DESC SPACE ; """ Then the result should be, in any order: - | ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Atomic Edge | Zones | Comment | - | /\d+/ | "" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | false | /^.+?\d$/ | "" | + | ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Zones | Comment | + | /\d+/ | "" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | /^.+?\d$/ | "" | When executing query: """ DROP SPACE ; @@ -48,14 +48,14 @@ Feature: Schema Comment """ Then the result should be, in any order: | Space | Create Space | - | "test_comment_not_set" | /[CREATE SPACE `test_comment_not_set` \(partition_num = 100, replica_factor = 1, charset = utf8, collate = utf8_bin, vid_type = FIXED_STRING\(8\), atomic_edge = false\) ON]+\s(\w*)/ | + | "test_comment_not_set" | /[CREATE SPACE `test_comment_not_set` \(partition_num = 100, replica_factor = 1, charset = utf8, collate = utf8_bin, vid_type = FIXED_STRING\(8\), \) ON]+\s(\w*)/ | When executing query: """ DESC SPACE test_comment_not_set; """ Then the result should be, in any order: - | ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Atomic Edge | Zones | Comment | - | /\d+/ | "test_comment_not_set" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | false | /^.+?\d$/ | EMPTY | + | ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Zones | Comment | + | /\d+/ | "test_comment_not_set" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | /^.+?\d$/ | EMPTY | When executing query: """ DROP SPACE test_comment_not_set; @@ -75,14 +75,14 @@ Feature: Schema Comment """ Then the result should be, in any order: | Space | Create Space | - | "test_comment_empty" | /[CREATE SPACE `test_comment_empty` \(partition_num = 100, replica_factor = 1, charset = utf8, collate = utf8_bin, vid_type = FIXED_STRING\(8\), atomic_edge = false\) ON]+\s(\w*)\s[comment = '']+/ | + | "test_comment_empty" | /[CREATE SPACE `test_comment_empty` \(partition_num = 100, replica_factor = 1, charset = utf8, collate = utf8_bin, vid_type = FIXED_STRING\(8\), \) ON]+\s(\w*)\s[comment = '']+/ | When executing query: """ DESC SPACE test_comment_empty; """ Then the result should be, in any order: - | ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Atomic Edge | Zones | Comment | - | /\d+/ | "test_comment_empty" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | false | /^.+?\d$/ | "" | + | ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Zones | Comment | + | /\d+/ | "test_comment_empty" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | /^.+?\d$/ | "" | When executing query: """ DROP SPACE test_comment_empty;