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 68aa9af6d87260e424c3c23055a5e81905b0b34e
Merge: 685603ab56 6cac3c6520
Author: Ali Alsuliman <[email protected]>
AuthorDate: Fri Sep 13 11:12:23 2024 -0700

    Merge branch 'gerrit/goldfish' into 'master'
    
    Change-Id: Ie8dd9fb354c3cf3252eeb328e12539189c203527

 .../rules/CancelUnnestWithNestedListifyRule.java   |  10 +-
 .../optimizerts/queries/remove_listify.sqlpp       |  48 ++++++++
 .../optimizerts/results/remove_listify.plan        |  36 ++++++
 .../results/subquery/in_correlated.plan            |  15 +--
 .../results/subquery/in_correlated_ps.plan         |  28 ++---
 .../ASTERIXDB-3499/ASTERIXDB-3499.001.ddl.sqlpp    |  30 +++++
 .../ASTERIXDB-3499/ASTERIXDB-3499.002.update.sqlpp |  33 ++++++
 .../ASTERIXDB-3499/ASTERIXDB-3499.003.update.sqlpp |  33 ++++++
 .../ASTERIXDB-3499/ASTERIXDB-3499.004.ddl.sqlpp    |  23 ++++
 .../ASTERIXDB-3499/ASTERIXDB-3499.005.query.sqlpp  |  25 +++++
 .../query-ASTERIXDB-3490.1.ddl.sqlpp               |  39 +++++++
 .../query-ASTERIXDB-3490.2.update.sqlpp            | 123 +++++++++++++++++++++
 .../query-ASTERIXDB-3490.3.query.sqlpp             |  48 ++++++++
 .../query-ASTERIXDB-3490.4.query.sqlpp             |  49 ++++++++
 .../misc/remove_listify/remove_listify.1.ddl.sqlpp |  30 +++++
 .../remove_listify/remove_listify.2.update.sqlpp   | 100 +++++++++++++++++
 .../remove_listify/remove_listify.3.query.sqlpp    |  38 +++++++
 .../cache-residency/cache-residency.002.regexjson  |   4 +-
 .../filter/ASTERIXDB-3499/ASTERIXDB-3499.005.adm   |   2 +
 .../query-ASTERIXDB-3490.3.adm                     |   1 +
 .../query-ASTERIXDB-3490.4.adm                     |   1 +
 .../misc/remove_listify/remove_listify.3.adm       |  15 +++
 .../src/test/resources/runtimets/sqlpp_queries.xml |  43 +++++--
 .../PrimaryScanColumnTupleWithMetaProjector.java   |   4 +-
 ...UpsertPreviousColumnTupleWithMetaProjector.java |   4 +-
 .../query/QueryColumnTupleProjectorFactory.java    |   2 +-
 .../query/QueryColumnWithMetaTupleProjector.java   |   7 +-
 .../values/writer/BooleanColumnValuesWriter.java   |   1 +
 .../apache/asterix/common/context/DatasetInfo.java |  14 +++
 .../metadata/declared/MetadataProvider.java        |   3 +-
 .../physical/AbstractHashJoinPOperator.java        |   4 +-
 .../algebra/util/OperatorManipulationUtil.java     |   9 ++
 .../cloud/CloudColumnIndexDiskCacheManager.java    |   4 +-
 33 files changed, 768 insertions(+), 58 deletions(-)

diff --cc 
asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson
index 7c4f553d60,7c4f553d60..b3f8c7c75f
--- 
a/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson
+++ 
b/asterixdb/asterix-app/src/test/resources/runtimets/results/api/cache-residency/cache-residency.002.regexjson
@@@ -4,7 -4,7 +4,7 @@@
                "*": "*"
        },
        "type": "application/x-adm",
--      "results": [ "{ \"$1\": 17 }" ],
++      "results": [ "R{.*}" ],
        "plans": "R{.*}",
        "status": "success",
        "metrics": {
@@@ -14,7 -14,7 +14,7 @@@
                "queueWaitTime": "R{.*}",
                "resultCount": 1,
                "resultSize": "R{.*}",
--              "processedObjects": 17,
++              "processedObjects": "R{.*}",
                "bufferCacheHitRatio": "100.00%",
                "bufferCachePageReadCount": 1
        }
diff --cc asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
index f77350f575,39b667daf6..2bbc5a27c0
--- a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
@@@ -7497,15 -7407,20 +7502,25 @@@
        </compilation-unit>
      </test-case>
      <test-case FilePath="misc">
-       <compilation-unit name="query-ASTERIXDB-3481">
-         <output-dir compare="Text">query-ASTERIXDB-3481</output-dir>
+       <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>
+       </compilation-unit>
+     </test-case>
+     <test-case FilePath="misc">
+       <compilation-unit name="remove_listify">
+         <output-dir compare="Text">remove_listify</output-dir>
        </compilation-unit>
      </test-case>
 +    <test-case FilePath="misc">
 +      <compilation-unit name="query-ASTERIXDB-3410">
 +        <output-dir compare="Text">query-ASTERIXDB-3410</output-dir>
 +      </compilation-unit>
 +    </test-case>
    </test-group>
    <test-group name="multipart-dataverse">
      <test-case FilePath="multipart-dataverse">

Reply via email to