Skip to content

Commit

Permalink
Merge branch 'master' into format_fetchvertices
Browse files Browse the repository at this point in the history
  • Loading branch information
nevermore3 authored Sep 16, 2021
2 parents d492659 + 4ceb06e commit 7efb371
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 103 deletions.
2 changes: 1 addition & 1 deletion tests/common/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ def load_csv_data(
for line in schemas.splitlines():
resp_ok(sess, line.strip(), True)

# wait heartbeat_interval_secs seconds for schema synchronization
# wait heartbeat_interval_secs + 1 seconds for schema synchronization
time.sleep(2)

for fd in config["files"]:
Expand Down
2 changes: 1 addition & 1 deletion tests/tck/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def wait_all_jobs_finished(sess, jobs=[]):
times = 4 * get_running_jobs(sess)
while jobs and times > 0:
jobs = [job for job in jobs if not is_job_finished(sess, job)]
time.sleep(0.5)
time.sleep(1)
times -= 1
return len(jobs) == 0

Expand Down
34 changes: 2 additions & 32 deletions tests/tck/features/index/Index.IntVid.feature
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,6 @@ Feature: IndexTest_Vid_Int
hash("Tom"): ("Tom", 18, 11.11, `timestamp`("2000-10-10T10:00:00"))
"""
Then the execution should be successful
When executing query:
"""
REBUILD TAG INDEX single_tag_index;
"""
Then the execution should be successful
When executing query:
"""
REBUILD TAG INDEX single_tag_index OFFLINE;
"""
Then a SyntaxError should be raised at runtime:
When executing query:
"""
REBUILD TAG INDEX multi_tag_index;
"""
Then the execution should be successful
When executing query:
"""
REBUILD TAG INDEX multi_tag_index OFFLINE;
Expand Down Expand Up @@ -222,21 +207,6 @@ Feature: IndexTest_Vid_Int
hash("May") -> hash("Tim"): ("Like", 18, 11.11, `timestamp`("2000-10-10T10:00:00"))
"""
Then the execution should be successful
When executing query:
"""
REBUILD EDGE INDEX single_edge_index
"""
Then the execution should be successful
When executing query:
"""
REBUILD EDGE INDEX single_edge_index OFFLINE;
"""
Then a SyntaxError should be raised at runtime:
When executing query:
"""
REBUILD EDGE INDEX multi_edge_1_index
"""
Then the execution should be successful
When executing query:
"""
REBUILD EDGE INDEX multi_edge_1_index OFFLINE;
Expand Down Expand Up @@ -618,7 +588,7 @@ Feature: IndexTest_Vid_Int
"""
Then the result should be, in any order:
| Name | Index Status |
And wait 3 seconds
And wait 6 seconds
When submit a job:
"""
REBUILD TAG INDEX tag_index_status
Expand Down Expand Up @@ -666,7 +636,7 @@ Feature: IndexTest_Vid_Int
"""
Then the result should be, in any order:
| Name | Index Status |
And wait 3 seconds
And wait 6 seconds
When submit a job:
"""
REBUILD EDGE INDEX edge_index_status
Expand Down
38 changes: 4 additions & 34 deletions tests/tck/features/index/Index.feature
Original file line number Diff line number Diff line change
Expand Up @@ -69,21 +69,6 @@ Feature: IndexTest_Vid_String
"Tom": ("Tom", 18, 11.11, `timestamp`("2000-10-10T10:00:00"))
"""
Then the execution should be successful
When executing query:
"""
REBUILD TAG INDEX single_tag_index;
"""
Then the execution should be successful
When executing query:
"""
REBUILD TAG INDEX single_tag_index OFFLINE;
"""
Then a SyntaxError should be raised at runtime:
When executing query:
"""
REBUILD TAG INDEX multi_tag_index;
"""
Then the execution should be successful
When executing query:
"""
REBUILD TAG INDEX multi_tag_index OFFLINE;
Expand Down Expand Up @@ -222,21 +207,6 @@ Feature: IndexTest_Vid_String
"May" -> "Tim": ("Like", 18, 11.11, `timestamp`("2000-10-10T10:00:00"))
"""
Then the execution should be successful
When executing query:
"""
REBUILD EDGE INDEX single_edge_index
"""
Then the execution should be successful
When executing query:
"""
REBUILD EDGE INDEX single_edge_index OFFLINE;
"""
Then a SyntaxError should be raised at runtime:
When executing query:
"""
REBUILD EDGE INDEX multi_edge_1_index
"""
Then the execution should be successful
When executing query:
"""
REBUILD EDGE INDEX multi_edge_1_index OFFLINE;
Expand Down Expand Up @@ -557,7 +527,7 @@ Feature: IndexTest_Vid_String
CREATE TAG INDEX single_person_index ON tag_1(col1)
"""
Then the execution should be successful
And wait 3 seconds
And wait 6 seconds
When try to execute query:
"""
INSERT VERTEX
Expand All @@ -576,7 +546,7 @@ Feature: IndexTest_Vid_String
CREATE TAG INDEX single_person_index2 ON tag_1(col5)
"""
Then the execution should be successful
And wait 3 seconds
And wait 6 seconds
When try to execute query:
"""
INSERT VERTEX
Expand Down Expand Up @@ -624,7 +594,7 @@ Feature: IndexTest_Vid_String
"""
Then the result should be, in any order:
| Name | Index Status |
And wait 3 seconds
And wait 6 seconds
When submit a job:
"""
REBUILD TAG INDEX tag_index_status
Expand Down Expand Up @@ -672,7 +642,7 @@ Feature: IndexTest_Vid_String
"""
Then the result should be, in any order:
| Name | Index Status |
And wait 3 seconds
And wait 6 seconds
When submit a job:
"""
REBUILD EDGE INDEX edge_index_status
Expand Down
28 changes: 4 additions & 24 deletions tests/tck/features/index/TagEdgeIndex.feature
Original file line number Diff line number Diff line change
Expand Up @@ -80,20 +80,10 @@ Feature: tag and edge index tests from pytest
CREATE TAG INDEX disorder_tag_index ON tag_1(col3, col2)
"""
Then the execution should be successful
And wait 3 seconds
And wait 6 seconds
When submit a job:
"""
REBUILD TAG INDEX single_tag_index
"""
Then wait the job to finish
When submit a job:
"""
REBUILD TAG INDEX multi_tag_index
"""
Then wait the job to finish
When submit a job:
"""
REBUILD TAG INDEX disorder_tag_index
REBUILD TAG INDEX single_tag_index, multi_tag_index, disorder_tag_index
"""
Then wait the job to finish
When executing query:
Expand Down Expand Up @@ -326,21 +316,11 @@ Feature: tag and edge index tests from pytest
CREATE EDGE INDEX disorder_edge_index ON edge_1(col3, col2)
"""
Then the execution should be successful
And wait 3 seconds
And wait 6 seconds
# Rebuild Edge Index
When submit a job:
"""
REBUILD EDGE INDEX single_edge_index
"""
Then wait the job to finish
When submit a job:
"""
REBUILD EDGE INDEX multi_edge_index
"""
Then wait the job to finish
When submit a job:
"""
REBUILD EDGE INDEX disorder_edge_index
REBUILD EDGE INDEX single_edge_index, multi_edge_index, disorder_edge_index
"""
Then wait the job to finish
When executing query:
Expand Down
4 changes: 1 addition & 3 deletions tests/tck/features/lookup/EdgeIndexFullScan.feature
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Feature: Lookup edge index full scan
"""
CREATE EDGE edge_1(col1_str string, col2_int int);
"""
And wait 3 seconds
# index on col1_str
And having executed:
"""
Expand All @@ -23,7 +22,7 @@ Feature: Lookup edge index full scan
"""
CREATE EDGE INDEX col2_int_index ON edge_1(col2_int)
"""
And wait 3 seconds
And wait 6 seconds
And having executed:
"""
INSERT EDGE
Expand All @@ -33,7 +32,6 @@ Feature: Lookup edge index full scan
'102'->'103':('Yellow', 22),
'103'->'101':('Blue', 33);
"""
And wait 3 seconds

Scenario: Edge with relational RegExp filter[1]
When executing query:
Expand Down
11 changes: 3 additions & 8 deletions tests/tck/features/match/SeekById.intVid.feature
Original file line number Diff line number Diff line change
Expand Up @@ -279,22 +279,17 @@ Feature: Match seek by id
"""
CREATE TAG player(name string, age int);
"""
When try to execute query:
"""
INSERT VERTEX player(name, age) VALUES -100:("Tim", 32);
"""
Then the execution should be successful
When executing query:
"""
CREATE TAG INDEX player_name_index ON player(name(10));
"""
Then the execution should be successful
And wait 6 seconds
When submit a job:
When try to execute query:
"""
REBUILD TAG INDEX player_name_index;
INSERT VERTEX player(name, age) VALUES -100:("Tim", 32);
"""
Then wait the job to finish
Then the execution should be successful
When executing query:
"""
MATCH (v) WHERE id(v) == -100 RETURN v;
Expand Down

0 comments on commit 7efb371

Please sign in to comment.