You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by al...@apache.org on 2024/09/14 00:26:31 UTC
(asterixdb) 12/14: Merge branch 'gerrit/neo' into 'gerrit/trinity'
This is an automated email from the ASF dual-hosted git repository.
alsuliman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 9f5a8d08b9033eaa2b9e4e8c16547c7c47843e50
Merge: 610457bee6 b7d078a5d7
Author: Ali Alsuliman <al...@gmail.com>
AuthorDate: Thu Sep 12 21:50:18 2024 -0700
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Ext-ref: MB-63494
Change-Id: I7e0bbcbe7ab0d7e0ad25d2f9ca95d10803076d47
.../{testsuite_sqlpp.xml => sqlpp_queries.xml} | 39 +-
.../test/resources/runtimets/testsuite_sqlpp.xml | 16121 +------------------
2 files changed, 14 insertions(+), 16146 deletions(-)
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
index 03bd819d82,c63de247ad..01735842ed
--- a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
@@@ -7335,21 -7295,11 +7320,21 @@@
<output-dir compare="Text">query-ASTERIXDB-3403</output-dir>
</compilation-unit>
</test-case>
+ <test-case FilePath="misc">
+ <compilation-unit name="query-ASTERIXDB-3415">
+ <output-dir compare="Text">query-ASTERIXDB-3415</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="misc">
+ <compilation-unit name="query-ASTERIXDB-3481">
- <output-dir compare="Text">query-ASTERIXDB-3481</output-dir>
++ <output-dir compare="Text">query-ASTERIXDB-3481</output-dir>
++ </compilation-unit>
++ </test-case>
+ <test-case FilePath="misc">
+ <compilation-unit name="query-ASTERIXDB-3490">
+ <output-dir compare="Text">query-ASTERIXDB-3490</output-dir>
</compilation-unit>
</test-case>
- <test-case FilePath="misc">
- <compilation-unit name="query-ASTERIXDB-3490">
- <output-dir compare="Text">query-ASTERIXDB-3490</output-dir>
- </compilation-unit>
- </test-case>
<test-case FilePath="misc">
<compilation-unit name="query-ASTERIXDB-3316">
<output-dir compare="Text">query-ASTERIXDB-3316</output-dir>