Skip to content

Commit

Permalink
try to remove Atomic Edge
Browse files Browse the repository at this point in the history
  • Loading branch information
liuyu85cn committed Apr 8, 2022
1 parent f08004a commit 72a57f3
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 15 deletions.
7 changes: 0 additions & 7 deletions src/graph/executor/admin/SpaceExecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ folly::Future<Status> DescSpaceExecutor::execute() {
"Charset",
"Collate",
"Vid Type",
"Atomic Edge",
"Zones",
"Comment"};
Row row;
Expand All @@ -92,12 +91,6 @@ folly::Future<Status> 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);
Expand Down
16 changes: 8 additions & 8 deletions tests/tck/features/schema/Comment.feature
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ Feature: Schema Comment
DESC SPACE <space_name>;
"""
Then the result should be, in any order:
| ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Atomic Edge | Zones | Comment |
| /\d+/ | "<space_name>" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | false | /^.+?\d$/ | "<space_comment>" |
| ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Zones | Comment |
| /\d+/ | "<space_name>" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | /^.+?\d$/ | "<space_comment>" |
When executing query:
"""
DROP SPACE <space_name>;
Expand All @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 72a57f3

Please sign in to comment.