You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2026/10/12 19:39:11 UTC
(asterixdb) 03/04: [NO ISSUE][TEST] Run object_merge_duplicate_fields' result query first
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit bccc12e063b51ee47f2a4d49058f2337efcc3f7c
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Mon Oct 12 07:00:24 2026 -0400
[NO ISSUE][TEST] Run object_merge_duplicate_fields' result query first
- user model changes: no
- storage format changes: no
- interface changes: no
Details: SqlppExecutionWithCancellationTest failed the case with "no
result file for ...04.query.sqlpp; queryCount: 3". The cancellation
executor counts every cancelled query as one that produced a result, so
result files are looked up by position as though no query had failed.
With the three error queries ahead of the one result query, cancelling
them moved the lookup past the single result file.
Run the equal-values merge first and the three conflicts after it, so
the result query owns result index 0 whichever queries are cancelled.
The queries and expected errors are unchanged, and are in the same
order.
Ext-ref: MB-74440
Generated-by: Claude Opus 5.5 <no...@anthropic.com>
Change-Id: I22939daa3db79343d73e90c1398e184895c7b97b
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/22068
Reviewed-by: Michael Blow <mb...@apache.org>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Michael Blow <mb...@apache.org>
---
.../object_merge_duplicate_fields.01.query.sqlpp | 4 ++--
.../object_merge_duplicate_fields.02.query.sqlpp | 4 ++--
.../object_merge_duplicate_fields.03.query.sqlpp | 4 ++--
.../object_merge_duplicate_fields.04.query.sqlpp | 4 ++--
...e_duplicate_fields.04.adm => object_merge_duplicate_fields.01.adm} | 0
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.01.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.01.query.sqlpp
index fab387715c..d0a5398f51 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.01.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.01.query.sqlpp
@@ -17,5 +17,5 @@
* under the License.
*/
--- Conflicting values for one field: the error names that field
-object_merge({"id": 1, "price": 10}, {"id": 1, "price": 12});
+-- Equal values for a shared field are not a conflict
+object_merge({"id": 1, "price": 10}, {"id": 1, "qty": 3});
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.02.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.02.query.sqlpp
index 7b1ba4774a..fab387715c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.02.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.02.query.sqlpp
@@ -17,5 +17,5 @@
* under the License.
*/
--- The conflict is inside a nested object: the error names the nested field
-object_merge({"id": 1, "address": {"city": "Irvine"}}, {"id": 1, "address": {"city": "Austin"}});
+-- Conflicting values for one field: the error names that field
+object_merge({"id": 1, "price": 10}, {"id": 1, "price": 12});
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.03.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.03.query.sqlpp
index edafbe6328..7b1ba4774a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.03.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.03.query.sqlpp
@@ -17,5 +17,5 @@
* under the License.
*/
--- Conflicting values for one field: the error names that field
-object_add_fields({"id": 1, "price": 10}, [{"field-name": "price", "field-value": 12}]);
+-- The conflict is inside a nested object: the error names the nested field
+object_merge({"id": 1, "address": {"city": "Irvine"}}, {"id": 1, "address": {"city": "Austin"}});
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.04.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.04.query.sqlpp
index d0a5398f51..edafbe6328 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.04.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.04.query.sqlpp
@@ -17,5 +17,5 @@
* under the License.
*/
--- Equal values for a shared field are not a conflict
-object_merge({"id": 1, "price": 10}, {"id": 1, "qty": 3});
+-- Conflicting values for one field: the error names that field
+object_add_fields({"id": 1, "price": 10}, [{"field-name": "price", "field-value": 12}]);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.04.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.01.adm
similarity index 100%
rename from asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.04.adm
rename to asterixdb/asterix-app/src/test/resources/runtimets/results/objects/object_merge_duplicate_fields/object_merge_duplicate_fields.01.adm