You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by al...@apache.org on 2023/03/18 02:54:45 UTC
[asterixdb] 11/11: Merge branch 'neo' into master
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 138a3098294c90e2a47ab473584207b797ff281e
Merge: bc24e14190 81bde67c3e
Author: Ali Alsuliman <al...@gmail.com>
AuthorDate: Fri Mar 17 13:01:49 2023 -0700
Merge branch 'neo' into master
Change-Id: I85fa54a43491e45b30c88b0ea880fa093dccd08e
.../provider/SqlppCompilationProvider.java | 16 ++---
.../optimizer/rules/cbo/EnumerateJoinsRule.java | 17 +++--
.../asterix/optimizer/rules/cbo/JoinEnum.java | 6 ++
.../apache/asterix/optimizer/rules/cbo/Stats.java | 33 +++++++++-
.../asterix/app/function/DumpIndexDatasource.java | 7 ++
.../asterix/app/function/DumpIndexReader.java | 4 ++
.../org/apache/asterix/utils/RebalanceUtil.java | 18 +++--
.../optimizerts/results_cbo/ch2/ch2_q16.plan | 65 ++++++++++++++++++
.../optimizerts/results_cbo/ch2/ch2_q21.plan | 28 ++++----
..._shipping_broadcast.plan => q12_broadcast.plan} | 18 ++---
...ing_broadcast_ps.plan => q12_broadcast_ps.plan} | 36 +++++-----
.../optimizerts/results_cbo/tpch/q12_shipping.plan | 20 +++---
.../results_cbo/tpch/q12_shipping_broadcast.plan | 18 ++---
.../tpch/q12_shipping_broadcast_ps.plan | 36 +++++-----
.../results_cbo/tpch/q12_shipping_ps.plan | 40 ++++++------
.../analyze-dataset-1.20.ddl.sqlpp | 5 +-
.../analyze-dataset-1.21.query.sqlpp | 9 ++-
.../analyze-dataset-1.22.ddl.sqlpp | 6 +-
.../analyze-dataset-1.23.query.sqlpp | 2 +-
.../analyze-dataset-1.24.ddl.sqlpp | 6 +-
.../analyze-dataset-1.25.query.sqlpp | 2 +-
...24.ddl.sqlpp => analyze-dataset-1.26.ddl.sqlpp} | 0
...uery.sqlpp => analyze-dataset-1.27.query.sqlpp} | 0
.../analyze-dataset-with-indexes.04.query.sqlpp | 2 +-
.../analyze-dataset-with-indexes.06.query.sqlpp | 4 +-
.../misc/dump_index/dump_index.2.update.sqlpp | 3 +-
.../cardinality-hint-warning.01.ddl.sqlpp} | 7 +-
.../cardinality-hint-warning.02.query.sqlpp} | 16 +++--
.../cardinality-hint-warning.03.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.04.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.05.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.06.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.07.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.08.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.09.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.10.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.11.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.12.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.13.query.sqlpp} | 15 +++--
.../cardinality-hint-warning.14.query.sqlpp} | 15 +++--
.../hashjoin-hint-warning.01.ddl.sqlpp | 3 +-
.../hashjoin-hint-warning.12.query.sqlpp} | 16 +++--
.../ddl/analyze-dataset-1/analyze-dataset-1.21.adm | 2 +-
.../ddl/analyze-dataset-1/analyze-dataset-1.23.adm | 2 +-
.../ddl/analyze-dataset-1/analyze-dataset-1.25.adm | 2 +-
...e-dataset-1.21.adm => analyze-dataset-1.27.adm} | 0
.../explain_field_access.1.plan | 28 ++++----
.../explain_field_access_closed.1.plan | 28 ++++----
.../array-access-pushdown.03.plan | 24 +++----
.../array-access-pushdown.05.plan | 24 +++----
.../array-access-pushdown.07.plan | 30 ++++-----
.../array-access-pushdown.09.plan | 30 ++++-----
.../array-access-pushdown.11.plan | 28 ++++----
.../array-access-pushdown.13.plan | 28 ++++----
.../array-access-pushdown.15.plan | 24 +++----
.../array-access-pushdown.17.plan | 24 +++----
.../array-access-pushdown.19.plan | 24 +++----
.../array-access-pushdown.21.plan | 24 +++----
.../field-access-pushdown.03.plan | 18 ++---
.../field-access-pushdown.05.plan | 18 ++---
.../field-access-pushdown.15.plan | 28 ++++----
.../field-access-pushdown.17.plan | 28 ++++----
.../field-access-pushdown.19.plan | 14 ++--
.../field-access-pushdown.21.plan | 14 ++--
.../field-access-pushdown.22.plan | 28 ++++----
.../heterogeneous-access-pushdown.03.plan | 26 ++++----
.../heterogeneous-access-pushdown.05.plan | 26 ++++----
.../parquet/object-concat/object-concat.3.plan | 20 +++---
.../parquet/object-concat/object-concat.5.plan | 24 +++----
.../common/query-with-limit-plan/result.001.plan | 18 ++---
.../hash-join-with-redundant-variable.04.plan | 16 ++---
.../hash-join-with-redundant-variable.14.plan | 20 +++---
.../hash-join-with-redundant-variable.16.plan | 20 +++---
.../offset_without_limit.6.plan | 14 ++--
.../push-limit-to-external-scan.2.plan | 18 ++---
.../push-limit-to-primary-scan.3.plan | 16 ++---
.../push-limit-to-primary-scan.5.plan | 16 ++---
.../push-limit-to-primary-scan.8.plan | 24 +++----
.../results/misc/dump_index/dump_index.10.adm | 2 +-
.../runtimets/results/query_index/q01/q01.024.plan | 18 ++---
.../runtimets/results/query_index/q01/q01.025.plan | 18 ++---
.../runtimets/results/query_index/q01/q01.026.plan | 24 +++----
.../runtimets/results/query_index/q01/q01.027.plan | 20 +++---
.../runtimets/results/query_index/q01/q01.028.plan | 26 ++++----
.../runtimets/results/query_index/q01/q01.029.plan | 26 ++++----
.../runtimets/results/query_index/q01/q01.030.plan | 26 ++++----
.../runtimets/results/query_index/q01/q01.031.plan | 26 ++++----
.../view/view-pushdown/view-pushdown.04.plan | 30 ++++-----
.../view/view-pushdown/view-pushdown.06.plan | 18 ++---
.../view/view-pushdown/view-pushdown.08.plan | 22 +++----
.../view/view-pushdown/view-pushdown.10.plan | 22 +++----
.../view/view-pushdown/view-pushdown.12.plan | 22 +++----
.../view/view-pushdown/view-pushdown.14.plan | 22 +++----
.../cardinality-hint-warning.02.adm | 1 +
.../cardinality-hint-warning.03.adm | 1 +
.../cardinality-hint-warning.04.adm | 1 +
.../cardinality-hint-warning.05.adm | 1 +
.../cardinality-hint-warning.06.adm | 1 +
.../cardinality-hint-warning.07.adm | 1 +
.../cardinality-hint-warning.08.adm | 1 +
.../cardinality-hint-warning.09.adm | 1 +
.../cardinality-hint-warning.10.adm | 1 +
.../cardinality-hint-warning.11.adm | 1 +
.../cardinality-hint-warning.12.adm | 1 +
.../cardinality-hint-warning.13.adm | 1 +
.../cardinality-hint-warning.14.adm | 1 +
.../hashjoin-hint-warning.12.adm | 1 +
.../test/resources/runtimets/testsuite_sqlpp.xml | 20 ++++++
.../asterix/common/exceptions/ErrorCode.java | 3 +
.../src/main/resources/asx_errormsg/en.properties | 4 +-
.../adapter/factory/GenericAdapterFactory.java | 16 ++---
.../input/record/reader/gcs/GCSInputStream.java | 18 ++---
.../lang/common/statement/AnalyzeStatement.java | 40 ++++++++----
.../asterix/lang/common/util/ExpressionUtils.java | 22 +++++++
.../asterix-lang-sqlpp/src/main/javacc/SQLPP.jj | 76 +++++++++++++---------
.../metadata/declared/FunctionDataSource.java | 11 +++-
.../apache/asterix/metadata/entities/Index.java | 4 ++
.../DatasetStreamStatsOperatorDescriptor.java | 2 +-
.../logical/visitors/VariableUtilities.java | 12 ++++
.../algebricks/rewriter/util/JoinUtils.java | 11 +++-
120 files changed, 1125 insertions(+), 801 deletions(-)
diff --cc asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/SqlppCompilationProvider.java
index e6f4d65ae5,4ad888c442..b4eab4da8f
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/SqlppCompilationProvider.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/SqlppCompilationProvider.java
@@@ -83,14 -83,14 +83,14 @@@ public class SqlppCompilationProvider i
CompilerProperties.COMPILER_INDEXONLY_KEY, CompilerProperties.COMPILER_INTERNAL_SANITYCHECK_KEY,
CompilerProperties.COMPILER_EXTERNAL_FIELD_PUSHDOWN_KEY, CompilerProperties.COMPILER_SUBPLAN_MERGE_KEY,
CompilerProperties.COMPILER_SUBPLAN_NESTEDPUSHDOWN_KEY, CompilerProperties.COMPILER_ARRAYINDEX_KEY,
- CompilerProperties.COMPILER_CBO_KEY, CompilerProperties.COMPILER_FORCE_JOIN_ORDER_KEY,
- CompilerProperties.COMPILER_QUERY_PLAN_SHAPE_KEY, CompilerProperties.COMPILER_MIN_MEMORY_ALLOCATION_KEY,
- CompilerProperties.COMPILER_COLUMN_FILTER_KEY, FunctionUtil.IMPORT_PRIVATE_FUNCTIONS,
- FuzzyUtils.SIM_FUNCTION_PROP_NAME, FuzzyUtils.SIM_THRESHOLD_PROP_NAME,
- StartFeedStatement.WAIT_FOR_COMPLETION, FeedActivityDetails.FEED_POLICY_NAME,
- FeedActivityDetails.COLLECT_LOCATIONS, SqlppQueryRewriter.INLINE_WITH_OPTION,
- SqlppExpressionToPlanTranslator.REWRITE_IN_AS_OR_OPTION, "hash_merge", "output-record-type",
- DisjunctivePredicateToJoinRule.REWRITE_OR_AS_JOIN_OPTION,
+ CompilerProperties.COMPILER_CBO_KEY, CompilerProperties.COMPILER_CBO_TEST_KEY,
+ CompilerProperties.COMPILER_FORCE_JOIN_ORDER_KEY, CompilerProperties.COMPILER_QUERY_PLAN_SHAPE_KEY,
- CompilerProperties.COMPILER_MIN_MEMORY_ALLOCATION_KEY, FunctionUtil.IMPORT_PRIVATE_FUNCTIONS,
- FuzzyUtils.SIM_FUNCTION_PROP_NAME, FuzzyUtils.SIM_THRESHOLD_PROP_NAME,
- StartFeedStatement.WAIT_FOR_COMPLETION, FeedActivityDetails.FEED_POLICY_NAME,
- FeedActivityDetails.COLLECT_LOCATIONS, SqlppQueryRewriter.INLINE_WITH_OPTION,
- SqlppExpressionToPlanTranslator.REWRITE_IN_AS_OR_OPTION, "hash_merge", "output-record-type",
- DisjunctivePredicateToJoinRule.REWRITE_OR_AS_JOIN_OPTION,
++ CompilerProperties.COMPILER_MIN_MEMORY_ALLOCATION_KEY, CompilerProperties.COMPILER_COLUMN_FILTER_KEY,
++ FunctionUtil.IMPORT_PRIVATE_FUNCTIONS, FuzzyUtils.SIM_FUNCTION_PROP_NAME,
++ FuzzyUtils.SIM_THRESHOLD_PROP_NAME, StartFeedStatement.WAIT_FOR_COMPLETION,
++ FeedActivityDetails.FEED_POLICY_NAME, FeedActivityDetails.COLLECT_LOCATIONS,
++ SqlppQueryRewriter.INLINE_WITH_OPTION, SqlppExpressionToPlanTranslator.REWRITE_IN_AS_OR_OPTION,
++ "hash_merge", "output-record-type", DisjunctivePredicateToJoinRule.REWRITE_OR_AS_JOIN_OPTION,
SetAsterixPhysicalOperatorsRule.REWRITE_ATTEMPT_BATCH_ASSIGN,
EquivalenceClassUtils.REWRITE_INTERNAL_QUERYUID_PK, SqlppQueryRewriter.SQL_COMPAT_OPTION));
}