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 2025/11/21 20:36:11 UTC

(asterixdb) branch master updated (7e0a077dbc -> 98ec06361e)

This is an automated email from the ASF dual-hosted git repository.

mblow pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


    from 7e0a077dbc Merge branch 'gerrit/phoenix' into 'master'
     new b5ea37dfb4 Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 5eb9a84bc9 Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 536f737a00 Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new c67c9048cb Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 620a0681d5 Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 3fa48e7a8b Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 86f90c5697 Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new f2ab5ab013 [NO ISSUE][*DB][EXT] Avoid serialization of JsonFactory
     new 2d32075e0b Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 899600421e Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new a1b16f551c Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new ee3ffc2eb3 Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new eaf499048c Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 43efddcd3f Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 5efdb9fba7 Merge trinity into morpheus
     new 1c13adc42c Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
     new 98ec06361e Null merge branch 'gerrit/morpheus' into 'master'

The 17 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


(asterixdb) 11/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit a1b16f551cf23e86246d71c6d24ec578a32af916
Merge: 899600421e 77704ebea4
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sat Sep 13 07:46:06 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][HYR][STO] FileMapManager performance improvements
     * [NO ISSUE][HYR][STO] Add missing serialVersionUID
    
    Ext-ref: MB-68501
    Change-Id: Ic76db908ca6b1c9db20d1e24df16d303addd8292

 .../algebricks/algebricks-core/pom.xml             |  2 +-
 .../hyracks/hyracks-data/hyracks-data-std/pom.xml  |  2 +-
 .../am/lsm/common/impls/VirtualBufferCache.java    | 33 +++-----
 .../hyracks/hyracks-storage-common/pom.xml         |  4 +
 .../storage/common/file/FileMapManager.java        | 54 +++++++++++---
 .../storage/common/file/IFileMapManager.java       | 19 +++++
 .../common/file/SynchronizedFileMapManager.java    | 87 ++++++++++++++++++++++
 hyracks-fullstack/hyracks/hyracks-util/pom.xml     |  2 +-
 hyracks-fullstack/pom.xml                          |  2 +-
 9 files changed, 171 insertions(+), 34 deletions(-)



(asterixdb) 12/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit ee3ffc2eb3fc219159f0fc41966288bdf698df71
Merge: a1b16f551c a89c1aeaf1
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Oct 2 08:09:59 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [ASTERIXDB-3647][TEST] Use InfiniteRetryPolicy
     * [NO ISSUE][HYR][STO] Update FileMapManager serialVersionUID
    
    Ext-ref: MB-64900,MB-68501
    Change-Id: I0b92920fa88ba2143942c24681b929ad95d5234e

 .../test/active/ActiveEventsListenerTest.java      |  5 +--
 .../asterix/test/active/InfiniteRetryPolicy.java   | 45 ++++++++++++++++++++++
 .../storage/common/file/FileMapManager.java        |  4 +-
 3 files changed, 48 insertions(+), 6 deletions(-)


(asterixdb) 06/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 3fa48e7a8b3b26d0b4fef3fec3f80266483ce02e
Merge: 620a0681d5 4565c0d72f
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Tue Aug 26 09:40:49 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][MISC] Update nimbus-jose-jwt to 10.0.2 to address CVE
    
    Ext-ref: MB-68222
    Change-Id: I1fda7919f237834130eac309aedbd7109e61346c

 asterixdb/pom.xml                              | 4 ----
 hyracks-fullstack/hyracks/hyracks-hdfs/pom.xml | 4 ----
 hyracks-fullstack/pom.xml                      | 9 +++++----
 3 files changed, 5 insertions(+), 12 deletions(-)



(asterixdb) 14/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 43efddcd3f588da02d8256d0975dd0d7de9bd616
Merge: eaf499048c e27f6f95ad
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Oct 8 16:27:41 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][*DB][STO] Fix IndexOutOfBoundsException removing last page...
    
    Ext-ref: MB-68818
    Change-Id: I218224fcaf7922193a3a4d5c17d9b327a3be396d

 .../dataflow/GlobalVirtualBufferCacheTest.java     | 100 +++++++++++++++++++++
 .../common/context/GlobalVirtualBufferCache.java   |   6 +-
 2 files changed, 103 insertions(+), 3 deletions(-)


(asterixdb) 16/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 1c13adc42c4f1ed68d0fcd5b35e955f123585085
Merge: 5efdb9fba7 6f4186cc5f
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Nov 7 12:36:07 2025 -0500

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [ASTERIXDB-3670][COMP] Fix ArrayIndexOutOfBoundsException with array index
    
    Ext-ref: MB-69201
    Change-Id: I4f7ee4481a95f57f6f345e22f084048ddc5c7c6b

 .../optimizer/rules/am/AccessMethodUtils.java      |  3 +
 .../optimizer/rules/am/BTreeAccessMethod.java      |  3 +
 .../optimizer/rules/am/RTreeAccessMethod.java      |  4 +-
 .../use-case-5/query1.sqlpp                        | 41 +++++++++++++
 .../use-case-5/query2.sqlpp                        | 42 +++++++++++++
 .../use-case-5/query1.plan                         | 69 ++++++++++++++++++++++
 .../use-case-5/query2.plan                         | 69 ++++++++++++++++++++++
 7 files changed, 230 insertions(+), 1 deletion(-)


(asterixdb) 13/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit eaf499048c04630b7d720690144d05c566b48247
Merge: ee3ffc2eb3 48509e02c4
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Tue Oct 7 15:35:18 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][*DB] += valid tx check, allow active setRunning to throw
     * [NO ISSUE][HYR][MISC] Add utility method to abbreviate a stack overflow error
     * [NO ISSUE][*DB][EXT] Make IDataParser extend Closeable, misc
     * [NO ISSUE][EXT]: Use ABFSS instead of deprecated WASBS
    
    Ext-ref: MB-68285
    Change-Id: I91308f51d578cf9031a8a299eee07f4695e422fe

 .../java/org/apache/asterix/active/ActiveManager.java  |  1 +
 .../asterix/app/active/ActiveEntityEventsListener.java |  2 +-
 .../org/apache/asterix/app/active/RecoveryTask.java    |  3 ++-
 .../org/apache/asterix/external/api/IDataParser.java   | 13 +++++++++----
 .../apache/asterix/external/api/IRecordConverter.java  |  9 +++++++--
 .../dataflow/FeedRecordDataFlowController.java         |  2 ++
 .../util/azure/blob_storage/AzureConstants.java        |  2 +-
 .../org/apache/asterix/metadata/MetadataManager.java   |  9 +++++++++
 .../java/org/apache/asterix/metadata/MetadataNode.java | 12 ++++++++++++
 .../apache/asterix/metadata/api/IMetadataManager.java  |  3 +++
 .../org/apache/asterix/metadata/api/IMetadataNode.java |  2 ++
 asterixdb/pom.xml                                      | 16 +++++-----------
 .../org/apache/hyracks/api/util/ExceptionUtils.java    | 18 ++++++++++++++++++
 .../data/std/util/ByteArrayAccessibleOutputStream.java | 18 ++++++++++++++++++
 .../org/apache/hyracks/http/server/utils/HttpUtil.java |  6 ++++--
 .../common/dataflow/IndexDropOperatorNodePushable.java |  2 +-
 .../storage/am/lsm/common/impls/LSMHarness.java        | 16 ++++++++++++++++
 17 files changed, 111 insertions(+), 23 deletions(-)



(asterixdb) 01/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit b5ea37dfb4014b9083d9deca1215d84635079834
Merge: b6c7b27ac3 f232e2d8ec
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Jul 10 15:25:00 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
    Ext-ref: MB-67347
    Change-Id: Icbfd7bf62d46e4b8334c974cab314faa985f7525

 .../index-leftouterjoin-example.1.ddl.sqlpp        | 36 ++++++++++++++++++++++
 .../index-leftouterjoin-example.2.update.sqlpp     | 25 +++++++++++++++
 .../index-leftouterjoin-example.3.query.sqlpp      | 23 ++++++++++++++
 .../index-leftouterjoin-example.4.query.sqlpp      | 23 ++++++++++++++
 .../index-leftouterjoin-example.5.query.sqlpp      | 23 ++++++++++++++
 .../index-leftouterjoin-example.1.adm              |  2 ++
 .../index-leftouterjoin-example.2.adm              |  3 ++
 .../index-leftouterjoin-example.3.adm              |  2 ++
 .../src/test/resources/runtimets/sqlpp_queries.xml |  5 +++
 ...MBTreeBatchPointSearchOperatorNodePushable.java |  5 +++
 10 files changed, 147 insertions(+)


(asterixdb) 02/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 5eb9a84bc9ecdeff481ee0a921f8396269074b7b
Merge: b5ea37dfb4 9c02ec70f2
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sat Aug 2 08:09:29 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
    Change-Id: Ic7e9d5b4c2b92b9f8cbe98209ab65ac4f1e72036

 .../src/main/java/org/apache/hyracks/util/ExitUtil.java        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)


(asterixdb) 04/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit c67c9048cb96d14669de7a90ef8da1cab89ad914
Merge: 536f737a00 37fd8f74f2
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Aug 22 14:50:09 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][HYR][MISC] Update commons-lang3 to 3.18.0 for CVE-2025-48924
     * [NO ISSUE][OTH] Update parquet version
    
    Ext-ref: MB-68104,MB-68151
    Change-Id: I047d5b25ee4e610ceeb55fbf537a72178e113f59

 asterixdb/asterix-server/pom.xml |  4 ++--
 asterixdb/pom.xml                | 39 ++++++++++++++++++++++++++++++++++++++-
 hyracks-fullstack/pom.xml        |  2 +-
 3 files changed, 41 insertions(+), 4 deletions(-)



(asterixdb) 10/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 899600421e9332247e3ab09cb218992360754885
Merge: 2d32075e0b acb1ad9b07
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Sep 10 06:42:48 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][*DB][NET] Upgrade Netty to 4.1.125.Final
    
    Ext-ref: MB-68446
    Change-Id: I4cfb07022a9fd3e41c907dff059431ea640109cb

 asterixdb/pom.xml         | 2 +-
 hyracks-fullstack/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)



(asterixdb) 08/17: [NO ISSUE][*DB][EXT] Avoid serialization of JsonFactory

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit f2ab5ab0138b96004755ddc2c1d77647fbf20244
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Thu Sep 4 16:47:44 2025 -0400

    [NO ISSUE][*DB][EXT] Avoid serialization of JsonFactory
    
    Use a static JsonFactory in JSONDataParserFactory to avoid
    serialization overhead and binary compatibility complications in the
    future.
    
    (cherry picked from commit 8a15298fb6)
    
    Ext-ref: MB-68387
    Change-Id: I5b855538fff6530ae3ae6ce45e2b8d68801d1e94
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/20343
    Reviewed-by: Michael Blow <mb...@apache.org>
    Tested-by: Michael Blow <mb...@apache.org>
---
 .../asterix/external/parser/factory/JSONDataParserFactory.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/JSONDataParserFactory.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/JSONDataParserFactory.java
index f9d50d39ec..b672b20fcc 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/JSONDataParserFactory.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/JSONDataParserFactory.java
@@ -41,16 +41,15 @@ import com.fasterxml.jackson.core.JsonParser;
 
 public class JSONDataParserFactory extends AbstractRecordStreamParserFactory<char[]> {
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 2L;
     private static final List<String> PARSER_FORMAT = Collections.unmodifiableList(
             Arrays.asList(ExternalDataConstants.FORMAT_JSON_LOWER_CASE, ExternalDataConstants.FORMAT_JSON_UPPER_CASE));
     private static final List<ATypeTag> UNSUPPORTED_TYPES = Collections
             .unmodifiableList(Arrays.asList(ATypeTag.MULTISET, ATypeTag.POINT3D, ATypeTag.CIRCLE, ATypeTag.RECTANGLE,
                     ATypeTag.INTERVAL, ATypeTag.DAYTIMEDURATION, ATypeTag.DURATION, ATypeTag.BINARY));
+    private static final JsonFactory jsonFactory;
 
-    private final JsonFactory jsonFactory;
-
-    public JSONDataParserFactory() {
+    static {
         jsonFactory = new JsonFactory();
         jsonFactory.configure(JsonParser.Feature.STRICT_DUPLICATE_DETECTION, true);
         jsonFactory.configure(JsonFactory.Feature.CANONICALIZE_FIELD_NAMES, true);


(asterixdb) 09/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 2d32075e0bdcb46f842e478effb5ff3f3fbe076f
Merge: f2ab5ab013 212b5647e9
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sat Sep 6 09:32:42 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][RT] Notify joblet cleanup if joblet creation fails
    
    Ext-ref: MB-68387
    Change-Id: I4df47ed4d0755e68d4cd849d43c7229feb1e8408

 .../nc/work/FailedJobletCreationCleanupWork.java   | 61 ++++++++++++++++++++++
 .../hyracks/control/nc/work/StartTasksWork.java    |  6 ++-
 2 files changed, 66 insertions(+), 1 deletion(-)


(asterixdb) 17/17: Null merge branch 'gerrit/morpheus' into 'master'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 98ec06361eb435ea77824b32f6cfae0f249c1ee3
Merge: 7e0a077dbc 1c13adc42c
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Nov 21 15:25:57 2025 -0500

    Null merge branch 'gerrit/morpheus' into 'master'
    
     * [NO ISSUE][*DB][EXT] Avoid serialization of JsonFactory (MB-68387)
    
    Change-Id: Ied46992edbae0999f0af887716112d49946add89



(asterixdb) 15/17: Merge trinity into morpheus

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 5efdb9fba786934dc2ccd8f51fe24c0982e92668
Merge: 43efddcd3f 3f91981236
Author: Ian Maxon <ia...@maxons.email>
AuthorDate: Tue Oct 28 14:33:15 2025 -0700

    Merge trinity into morpheus
    
    * [ASTERIXDB-3658][RT]Remove operator descriptions from profile (MB-68975)
    
    Ext-ref: MB-68975
    Change-Id: I716c7c40531261eb3b7191182367d45df31cab0b

 .../src/test/resources/runtimets/profiled.xml      | 17 +++++++++++++
 .../long-description.1.query.sqlpp                 | 29 ++++++++++++++++++++++
 .../long-description/long-description.1.adm        |  0
 .../non-unary-subplan.3.regexjson                  |  2 +-
 .../meta/AlgebricksMetaOperatorDescriptor.java     | 12 ++++-----
 .../api/dataflow/ProfiledOperatorNodePushable.java |  5 ++--
 6 files changed, 56 insertions(+), 9 deletions(-)


(asterixdb) 05/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 620a0681d56ceaf8a2b0fdf9ad939afaadda1142
Merge: c67c9048cb 8b342cc119
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sun Aug 24 12:03:25 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][HYR] Update Jackson to 2.19.2 to address CVEs
    
    Ext-ref: MB-68123
    Change-Id: I032a9e8ce79fe1eeaa59afc077062ff0a1cff7b0

 .../asterix/common/config/ConfigUsageTest.java     |   2 +-
 .../api/cluster_state_1/cluster_state_1.1.regexadm |   6 +
 .../cluster_state_1_full.1.regexadm                |   6 +
 .../cluster_state_1_less.1.regexadm                |   6 +
 .../src/test/resources/runtimets/sqlpp_queries.xml |   2 +-
 .../runtimets/testsuite_sqlpp_profiled.xml         |   2 +-
 .../asterix/common/api/IPropertiesFactory.java     |   3 +
 .../asterix/common/config/AsterixProperties.java   |  10 +-
 .../asterix/common/config/JacksonProperties.java   | 138 +++++++++++++++++++++
 .../asterix/common/config/PropertiesFactory.java   |   5 +
 asterixdb/pom.xml                                  |  56 +++++++--
 .../org/apache/hyracks/control/cc/CCDriver.java    |   5 +-
 .../control/common/config/ConfigManager.java       |   7 +-
 .../control/common/controllers/NCConfig.java       |   3 +-
 .../java/org/apache/hyracks/util/StorageUtil.java  |  23 ++--
 .../org/apache/hyracks/util/StorageUnitTest.java   |  17 ++-
 hyracks-fullstack/pom.xml                          |  96 +++++++++++++-
 17 files changed, 351 insertions(+), 36 deletions(-)



(asterixdb) 07/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 86f90c5697a38322aee34a99c894e4bd7dbb09bf
Merge: 3fa48e7a8b 15067de0e0
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Sep 3 21:26:30 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE] Add missing licenses
     * [NO ISSUE][*HYR][MISC] += Lazy helper for deferred initialization
    
    Ext-ref: MB-68256
    Change-Id: I1d8f65421e6584affd58405b2c84eb9a9f3e2f65

 .../apache/asterix/test/common/TestExecutor.java   |  7 ++++
 asterixdb/asterix-server/pom.xml                   |  4 ++
 ...microsoft.azure--msal4j--1.22.0_MIT_License.txt | 21 +++++++++++
 ...4j-persistence-extension--1.3.0_MIT_License.txt | 22 +++++++++++
 ...content.com_luben_zstd-jni_v1.5.6-6_LICENSE.txt | 26 +++++++++++++
 .../content/www.bouncycastle.org_licence.html.txt  | 19 +++++++---
 .../java/org/apache/hyracks/api/util/Lazy.java     | 43 ++++++++++++++++++++++
 7 files changed, 137 insertions(+), 5 deletions(-)


(asterixdb) 03/17: Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Posted by mb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mblow pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git

commit 536f737a00403ab2cf1c7b6fc2a11ace70d95e83
Merge: 5eb9a84bc9 d23cc23ddc
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Sun Aug 10 16:12:25 2025 -0400

    Merge branch 'gerrit/trinity' into 'gerrit/morpheus'
    
     * [NO ISSUE][OTH] Extend create/drop view/synonym calls with the request parameters
    
    Ext-ref: MB-55519
    Change-Id: Id4a69dd83bf590ddd5f5e4902297ec79c3f19748

 .../asterix/app/translator/QueryTranslator.java    | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 deletions(-)