Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove Atomic Edge #4127

Merged
merged 4 commits into from
Apr 13, 2022
Merged

remove Atomic Edge #4127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a22f5e
try to remove Atomic Edge
liuyu85cn Apr 8, 2022
675dca5
remove some space
liuyu85cn Apr 8, 2022
12cf066
remove zone
liuyu85cn Apr 12, 2022
68f04c0
Merge branch 'master' into remove_atomic_edge
critical27 Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions src/graph/executor/admin/SpaceExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,6 @@ folly::Future<Status> DescSpaceExecutor::execute() {
"Charset",
"Collate",
"Vid Type",
"Atomic Edge",
"Comment"};
Row row;
row.values.emplace_back(spaceId);
Expand All @@ -86,12 +85,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);

if (properties.comment_ref().has_value()) {
row.values.emplace_back(*properties.comment_ref());
Expand Down
20 changes: 10 additions & 10 deletions tests/tck/features/schema/Comment.feature
View file
Open in desktop
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 | Comment |
| /\d+/ | "<space_name>" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | false | "<space_comment>" |
| ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Comment |
| /\d+/ | "<space_name>" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | "<space_comment>" |
When executing query:
"""
DROP SPACE <space_name>;
Expand All @@ -47,15 +47,15 @@ Feature: Schema Comment
SHOW CREATE SPACE test_comment_not_set;
"""
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*)/ |
| 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\), \) 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 | Comment |
| /\d+/ | "test_comment_not_set" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | false | EMPTY |
| ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Comment |
| /\d+/ | "test_comment_not_set" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | EMPTY |
When executing query:
"""
DROP SPACE test_comment_not_set;
Expand All @@ -74,15 +74,15 @@ Feature: Schema Comment
SHOW CREATE SPACE test_comment_empty;
"""
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 = '']+/ |
| 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\), \) 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 | Comment |
| /\d+/ | "test_comment_empty" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | false | "" |
| ID | Name | Partition Number | Replica Factor | Charset | Collate | Vid Type | Comment |
| /\d+/ | "test_comment_empty" | 100 | 1 | "utf8" | "utf8_bin" | "FIXED_STRING(8)" | "" |
When executing query:
"""
DROP SPACE test_comment_empty;
Expand Down