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 530d0c3cc1b26a2211d5c11f91437737d9599079 Author: ggalvizo <[email protected]> AuthorDate: Wed Feb 16 12:36:11 2022 -0800 [NO-ISSUE][COMP] Making getCompilerOptions not default in interface - user model changes: no - storage format changes: no - interface changes: no Change-Id: I6f65f78423b2fdf383c6fcb80585207970ac3545 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/15324 Contrib: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Dmitry Lychagin <[email protected]> Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17348 Reviewed-by: Michael Blow <[email protected]> Tested-by: Michael Blow <[email protected]> --- .../provider/ILangCompilationProvider.java | 30 +------------------- .../provider/SqlppCompilationProvider.java | 33 ++++++++++++++++++++++ .../apache/asterix/api/common/APIFramework.java | 2 +- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/ILangCompilationProvider.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/ILangCompilationProvider.java index 8e2f47284f..30c66235d1 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/ILangCompilationProvider.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/compiler/provider/ILangCompilationProvider.java @@ -18,24 +18,13 @@ */ package org.apache.asterix.compiler.provider; -import java.util.HashSet; import java.util.Set; import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslatorFactory; import org.apache.asterix.algebra.base.ILangExtension; -import org.apache.asterix.common.config.CompilerProperties; -import org.apache.asterix.external.feed.watch.FeedActivityDetails; import org.apache.asterix.lang.common.base.IAstPrintVisitorFactory; import org.apache.asterix.lang.common.base.IParserFactory; import org.apache.asterix.lang.common.base.IRewriterFactory; -import org.apache.asterix.lang.common.statement.StartFeedStatement; -import org.apache.asterix.lang.common.util.FunctionUtil; -import org.apache.asterix.lang.sqlpp.rewrites.SqlppQueryRewriter; -import org.apache.asterix.optimizer.base.FuzzyUtils; -import org.apache.asterix.optimizer.rules.DisjunctivePredicateToJoinRule; -import org.apache.asterix.optimizer.rules.SetAsterixPhysicalOperatorsRule; -import org.apache.asterix.optimizer.rules.util.EquivalenceClassUtils; -import org.apache.asterix.translator.SqlppExpressionToPlanTranslator; public interface ILangCompilationProvider { /** @@ -71,22 +60,5 @@ public interface ILangCompilationProvider { /** * @return all configurable parameters of a language implementation. */ - default Set<String> getConfigurableParameters() { - return new HashSet<>(Set.of(CompilerProperties.COMPILER_JOINMEMORY_KEY, - CompilerProperties.COMPILER_GROUPMEMORY_KEY, CompilerProperties.COMPILER_SORTMEMORY_KEY, - CompilerProperties.COMPILER_WINDOWMEMORY_KEY, CompilerProperties.COMPILER_TEXTSEARCHMEMORY_KEY, - CompilerProperties.COMPILER_PARALLELISM_KEY, CompilerProperties.COMPILER_SORT_PARALLEL_KEY, - CompilerProperties.COMPILER_SORT_SAMPLES_KEY, CompilerProperties.COMPILER_EXTERNALSCANMEMORY_KEY, - 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_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, - SetAsterixPhysicalOperatorsRule.REWRITE_ATTEMPT_BATCH_ASSIGN, - EquivalenceClassUtils.REWRITE_INTERNAL_QUERYUID_PK, SqlppQueryRewriter.SQL_COMPAT_OPTION)); - } + Set<String> getCompilerOptions(); } diff --git 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 index 2c18d413ec..43963dc039 100644 --- 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 @@ -18,14 +18,27 @@ */ package org.apache.asterix.compiler.provider; +import java.util.HashSet; +import java.util.Set; + import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslatorFactory; import org.apache.asterix.algebra.base.ILangExtension; +import org.apache.asterix.common.config.CompilerProperties; +import org.apache.asterix.external.feed.watch.FeedActivityDetails; import org.apache.asterix.lang.common.base.IAstPrintVisitorFactory; import org.apache.asterix.lang.common.base.IParserFactory; import org.apache.asterix.lang.common.base.IRewriterFactory; +import org.apache.asterix.lang.common.statement.StartFeedStatement; +import org.apache.asterix.lang.common.util.FunctionUtil; import org.apache.asterix.lang.sqlpp.parser.SqlppParserFactory; +import org.apache.asterix.lang.sqlpp.rewrites.SqlppQueryRewriter; import org.apache.asterix.lang.sqlpp.rewrites.SqlppRewriterFactory; import org.apache.asterix.lang.sqlpp.visitor.SqlppAstPrintVisitorFactory; +import org.apache.asterix.optimizer.base.FuzzyUtils; +import org.apache.asterix.optimizer.rules.DisjunctivePredicateToJoinRule; +import org.apache.asterix.optimizer.rules.SetAsterixPhysicalOperatorsRule; +import org.apache.asterix.optimizer.rules.util.EquivalenceClassUtils; +import org.apache.asterix.translator.SqlppExpressionToPlanTranslator; import org.apache.asterix.translator.SqlppExpressionToPlanTranslatorFactory; public class SqlppCompilationProvider implements ILangCompilationProvider { @@ -59,4 +72,24 @@ public class SqlppCompilationProvider implements ILangCompilationProvider { public IRuleSetFactory getRuleSetFactory() { return new DefaultRuleSetFactory(); } + + @Override + public Set<String> getCompilerOptions() { + return new HashSet<>(Set.of(CompilerProperties.COMPILER_JOINMEMORY_KEY, + CompilerProperties.COMPILER_GROUPMEMORY_KEY, CompilerProperties.COMPILER_SORTMEMORY_KEY, + CompilerProperties.COMPILER_WINDOWMEMORY_KEY, CompilerProperties.COMPILER_TEXTSEARCHMEMORY_KEY, + CompilerProperties.COMPILER_PARALLELISM_KEY, CompilerProperties.COMPILER_SORT_PARALLEL_KEY, + CompilerProperties.COMPILER_SORT_SAMPLES_KEY, CompilerProperties.COMPILER_EXTERNALSCANMEMORY_KEY, + 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_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, + SetAsterixPhysicalOperatorsRule.REWRITE_ATTEMPT_BATCH_ASSIGN, + EquivalenceClassUtils.REWRITE_INTERNAL_QUERYUID_PK, SqlppQueryRewriter.SQL_COMPAT_OPTION)); + } } diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java index abf5036372..ce86d24c60 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java @@ -135,7 +135,7 @@ public class APIFramework { this.astPrintVisitorFactory = compilationProvider.getAstPrintVisitorFactory(); this.translatorFactory = compilationProvider.getExpressionToPlanTranslatorFactory(); this.ruleSetFactory = compilationProvider.getRuleSetFactory(); - this.configurableParameterNames = compilationProvider.getConfigurableParameters(); + this.configurableParameterNames = compilationProvider.getCompilerOptions(); executionPlans = new ExecutionPlans(); }
