This is an automated email from the ASF dual-hosted git repository. imaxon pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 27562debb36efee63891a55ccc44c4b8d519709c Merge: bee318fb0a a2e1e197ca Author: Michael Blow <[email protected]> AuthorDate: Mon Feb 23 17:44:13 2026 -0500 Merge branch 'gerrit/morpheus' into 'master' * [ASTERIXDB-3677][COMP] Fix nested star operators failure (MB-70076) * [NO ISSUE][HYR][NET] Upgrade gRPC to address Netty CVE (MB-70641) * [NO ISSUE][MISC] Update Log4j to 2.25.3 for CVE (MB-70643) * [NO ISSUE][*DB][EXT] Update Apache Hadoop -> 3.4.2 for CVE (MB-70644) Change-Id: Ic7feef98087205543e831d44edd1d9acea5045cb .../java/org/apache/asterix/optimizer/rules/cbo/Stats.java | 2 +- asterixdb/pom.xml | 11 +++-------- hyracks-fullstack/pom.xml | 2 +- 3 files changed, 5 insertions(+), 10 deletions(-) diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java index 476ef27f1f,38d817b454..bdcbe3cd1c --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/cbo/Stats.java @@@ -19,36 -19,15 +19,36 @@@ package org.apache.asterix.optimizer.rules.cbo; +import static org.apache.asterix.om.functions.BuiltinFunctions.getBuiltinFunctionInfo; + import java.util.ArrayList; +import java.util.Arrays; import java.util.List; +import java.util.Objects; -import org.apache.asterix.common.metadata.DataverseName; +import org.apache.asterix.compiler.provider.IRuleSetFactory; +import org.apache.asterix.lang.common.expression.LiteralExpr; +import org.apache.asterix.lang.common.literal.StringLiteral; +import org.apache.asterix.lang.common.util.FunctionUtil; import org.apache.asterix.metadata.declared.DataSource; -import org.apache.asterix.metadata.declared.DataSourceId; -import org.apache.asterix.metadata.declared.MetadataProvider; +import org.apache.asterix.metadata.declared.SampleDataSource; import org.apache.asterix.metadata.entities.Index; +import org.apache.asterix.om.base.ADouble; +import org.apache.asterix.om.base.AInt64; +import org.apache.asterix.om.base.ARecord; +import org.apache.asterix.om.base.IAObject; +import org.apache.asterix.om.constants.AsterixConstantValue; +import org.apache.asterix.om.exceptions.ExceptionUtil; +import org.apache.asterix.om.functions.BuiltinFunctionInfo; +import org.apache.asterix.om.functions.BuiltinFunctions; +import org.apache.asterix.optimizer.base.AnalysisUtil; +import org.apache.asterix.optimizer.rules.am.array.AbstractOperatorFromSubplanRewrite; +import org.apache.asterix.translator.ConstantHelper; - import org.apache.commons.collections.CollectionUtils; ++import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.mutable.Mutable; +import org.apache.commons.lang3.mutable.MutableObject; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; +import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression; import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator; import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext; diff --cc asterixdb/pom.xml index 8d9a5c818e,a91b3e07af..aecb8b5b07 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@@ -81,29 -81,16 +81,29 @@@ <shim.stage>none</shim.stage> <pytestlib.stage>none</pytestlib.stage> <skip-npm-touch.stage>none</skip-npm-touch.stage> + <azurite.npm.install.stage>none</azurite.npm.install.stage> + <azurite.install.stage>none</azurite.install.stage> + <azurite.stage>none</azurite.stage> + <gcs.download.stage>none</gcs.download.stage> + <gcs.install.stage>none</gcs.install.stage> + <gcs.stage>none</gcs.stage> <!-- Versions under dependencymanagement or used in many projects via properties --> - <algebricks.version>0.3.8.3-SNAPSHOT</algebricks.version> - <hyracks.version>0.3.8.3-SNAPSHOT</hyracks.version> + <algebricks.version>0.3.10-SNAPSHOT</algebricks.version> + <hyracks.version>0.3.10-SNAPSHOT</hyracks.version> - <hadoop.version>3.4.1</hadoop.version> + <hadoop.version>3.4.2</hadoop.version> <jacoco.version>0.7.6.201602180812</jacoco.version> - <log4j.version>2.22.1</log4j.version> + <log4j.version>2.25.3</log4j.version> + <!-- IMPORTANT: please keep the aws-crt version in sync with that defined in the AWS SDK BOM --> + <!-- you can get this by inspecting the aws-sdk-java-pom for the SDK version. e.g. + $ curl -s https://repo1.maven.org/maven2/software/amazon/awssdk/aws-sdk-java-pom/2.31.57/aws-sdk-java-pom-2.31.57.pom | grep awscrt.version + <awscrt.version>0.38.1</awscrt.version> + --> <awsjavasdk.version>2.29.27</awsjavasdk.version> - <parquet.version>1.15.2</parquet.version> <!-- NOTICE: please update transitives from parquet below on any change --> - <hadoop-awsjavasdk.version>1.12.779</hadoop-awsjavasdk.version> + <awsjavasdk.crt.version>0.33.3</awsjavasdk.crt.version> + + <parquet.version>1.16.0</parquet.version> + <hadoop-awsjavasdk.version>1.12.788</hadoop-awsjavasdk.version> <azureblobjavasdk.version>12.31.1</azureblobjavasdk.version> <azurecommonjavasdk.version>12.30.1</azurecommonjavasdk.version>
