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

[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 f831fde3cffff8b1f79e09f510723071101d08c9
Merge: 9e4252781a a5a42dcb2d
Author: Michael Blow <mi...@couchbase.com>
AuthorDate: Fri Nov 3 21:17:28 2023 -0400

    Merge branch 'gerrit/trinity' into 'master'
    
    Change-Id: I5e541e8190f77eb0719ae8423e8e984d56768b58

 .../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 +-
 asterixdb/pom.xml                                  | 16 ++++++++++-----
 .../api/HeuristicCompilerFactoryBuilder.java       |  5 +++++
 .../hyracks/algebricks/compiler/api/ICompiler.java |  2 ++
 .../core/algebra/base/IOptimizationContext.java    |  4 ++++
 hyracks-fullstack/pom.xml                          | 16 ++++++++++-----
 10 files changed, 71 insertions(+), 25 deletions(-)

diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AsterixOptimizationContext.java
index 7b2dd7a9b1,05e7f7b8a6..f13e3f281a
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AsterixOptimizationContext.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AsterixOptimizationContext.java
@@@ -21,8 -21,10 +21,10 @@@ package org.apache.asterix.optimizer.ba
  
  import java.util.HashSet;
  import java.util.Set;
+ import java.util.function.Predicate;
  
++import org.apache.asterix.common.metadata.MetadataConstants;
  import org.apache.asterix.metadata.declared.DataSource;
 -import org.apache.asterix.metadata.utils.MetadataConstants;
  import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
  import org.apache.hyracks.algebricks.core.algebra.expressions.IConflictingTypeResolver;
  import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionEvalSizeComputer;