Support multiple query statements in e2e test framework #3437
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
yiyun-sj
force-pushed
the
support-multiple-query-statements
branch
from
e286f8c to
90da710
Compare
yiyun-sj
force-pushed
the
support-multiple-query-statements
branch
from
74d49c8 to
5dd5ed3
Compare
yiyun-sj
force-pushed
the
support-multiple-query-statements
branch
from
5dd5ed3 to
d0b530e
Compare
ray6080
approved these changes
May 6, 2024
| OK, | ||
| HASH, | ||
| TUPLES, | ||
| TUPLES_CSV, |
| ResultType type; | ||
| std::vector<std::string> expectedTuples; | ||
| uint64_t numTuples = 0; | ||
| std::string expectedMessage; // errorMsg || CSVFile || hashValue |
There was a problem hiding this comment.
Can u directly reuse expectedTuples for message too with a renaming of expectedTuples to expectedResult?
There was a problem hiding this comment.
Sure, we will just use expectedResult[0] for all the single string results then.
(I originally wanted to use union to make things more clear but that has some constructor/destructor issues for compile)
| @@ -94,6 +94,7 @@ class TestParser { | |||
| void genGroupName(); | |||
| void parseHeader(); | |||
| void parseBody(); | |||
| void extractAllResults(TestStatement* statement); | |||
There was a problem hiding this comment.
extractAllResults -> extractExpectedResults.
test/test_runner/test_parser.cpp
Outdated
| extractExpectedResult(statement); | ||
| } while (nextLine()); | ||
| } | ||
|
|
||
| void TestParser::extractExpectedResult(TestStatement* statement) { |
There was a problem hiding this comment.
TestQueryResult TestParser:: extractExpectedResultFromToken()
I would rename the function to extractExpectedResultFromToken, and return TestQueryResult without passing in TestStatement, which should be handled by extractAllResults to push in query result. This looks cleaner to me.
ted-wq-x
pushed a commit
to ted-wq-x/kuzu
that referenced
this pull request
Nov 14, 2024
* preliminary implementation to support multiple query statements * Run clang-format * update one test case to use multiple query statements * fix compile error * support multiple queries to multiple results * Run clang-format * remove comment * fix msvc compile error * address comments * Run clang-format --------- Co-authored-by: CI Bot <yiyun-sj@users.noreply.github.com> (cherry picked from commit cc43956)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Testing Multiple Query Statements
Example