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 2023/11/04 02:07:11 UTC

(asterixdb) 02/04: Merge branch 'gerrit/neo' into 'gerrit/trinity'

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 aedf22e67af31576ec4cb7b9fbf11f94e0e2865d
Merge: fc29c99d30 a700ae3420
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Wed Nov 1 16:35:41 2023 -0400

    Merge branch 'gerrit/neo' into 'gerrit/trinity'
    
    Change-Id: I97758ae19ec66541bbf9625a31a01e73de0670df

 .../optimizer/base/AsterixOptimizationContext.java | 24 ++++++++++++++++++++++
 .../rules/SetAsterixMemoryRequirementsRule.java    |  3 ---
 .../apache/asterix/api/common/APIFramework.java    | 22 +++++++++++---------
 .../misc/metadata_only_01/metadata_only_01.1.regex |  2 +-
 .../misc/metadata_only_01/metadata_only_01.2.regex |  2 +-
 .../api/HeuristicCompilerFactoryBuilder.java       |  5 +++++
 .../hyracks/algebricks/compiler/api/ICompiler.java |  2 ++
 .../core/algebra/base/IOptimizationContext.java    |  4 ++++
 8 files changed, 49 insertions(+), 15 deletions(-)