Yingyi Bu has submitted this change and it was merged. Change subject: ASTERIXDB-1711: remove more Aql-prefixes ......................................................................
ASTERIXDB-1711: remove more Aql-prefixes AqlMissingWriterFactory -> MissingWriterFactory AqlPositionWriter -> PositionWriter AqlMergeAggregationExpressionFactory -> MergeAggregationExpressionFactory AqlMissableTypeComputer -> MissableTypeComputer AqlPartialAggregationTypeComputer -> PartialAggregationTypeComputer AqlOptimizationContextFactory -> OptimizationContextFactory Change-Id: I72f3051ff5c76ccde54e8b3b33941eb936870194 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1386 Tested-by: Jenkins <[email protected]> BAD: Jenkins <[email protected]> Reviewed-by: Yingyi Bu <[email protected]> --- M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslator.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java R asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/PositionWriter.java M asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java R asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/MergeAggregationExpressionFactory.java R asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/MissableTypeComputer.java R asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/PartialAggregationTypeComputer.java R asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/MissingWriterFactory.java M asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java 11 files changed, 30 insertions(+), 31 deletions(-) Approvals: Yingyi Bu: Looks good to me, approved Jenkins: Verified; No violations found Objections: Jenkins: Violations found diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java index d2982e8..3ef5f2b 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java @@ -25,7 +25,7 @@ import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.dataflow.data.common.ExpressionTypeComputer; -import org.apache.asterix.dataflow.data.nontagged.AqlMissingWriterFactory; +import org.apache.asterix.dataflow.data.nontagged.MissingWriterFactory; import org.apache.asterix.formats.nontagged.ADMPrinterFactoryProvider; import org.apache.asterix.formats.nontagged.BinaryBooleanInspector; import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider; @@ -125,7 +125,7 @@ SerializerDeserializerProvider.INSTANCE, BinaryHashFunctionFactoryProvider.INSTANCE, BinaryHashFunctionFamilyProvider.INSTANCE, BinaryComparatorFactoryProvider.INSTANCE, TypeTraitProvider.INSTANCE, BinaryBooleanInspector.FACTORY, BinaryIntegerInspector.FACTORY, - ADMPrinterFactoryProvider.INSTANCE, AqlMissingWriterFactory.INSTANCE, null, + ADMPrinterFactoryProvider.INSTANCE, MissingWriterFactory.INSTANCE, null, new LogicalExpressionJobGenToExpressionRuntimeProviderAdapter(QueryLogicalExpressionJobGen.INSTANCE), ExpressionTypeComputer.INSTANCE, null, null, null, null, GlobalConfig.DEFAULT_FRAME_SIZE, null); diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslator.java index 175ff96..de17448 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslator.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslator.java @@ -83,7 +83,7 @@ LogicalVariable pVar = context.newVar(fc.getPosVarExpr()); // We set the positional variable type as INT64 type. returnedOp = new UnnestOperator(v, new MutableObject<ILogicalExpression>(makeUnnestExpression(eo.first)), - pVar, BuiltinType.AINT64, new AqlPositionWriter()); + pVar, BuiltinType.AINT64, new PositionWriter()); } returnedOp.getInputs().add(eo.second); return new Pair<>(returnedOp, v); diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java index bec5caf..d9136ac 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java @@ -330,7 +330,7 @@ } else { LogicalVariable pVar = context.newVar(fc.getPosVarExpr()); returnedOp = new UnnestOperator(v, new MutableObject<ILogicalExpression>(makeUnnestExpression(eo.first)), - pVar, BuiltinType.AINT32, new AqlPositionWriter()); + pVar, BuiltinType.AINT32, new PositionWriter()); } returnedOp.getInputs().add(eo.second); diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPositionWriter.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/PositionWriter.java similarity index 94% rename from asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPositionWriter.java rename to asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/PositionWriter.java index a0ce15b..6f8b64f 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPositionWriter.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/PositionWriter.java @@ -25,7 +25,7 @@ import org.apache.asterix.om.types.BuiltinType; import org.apache.hyracks.algebricks.runtime.base.IUnnestingPositionWriter; -public class AqlPositionWriter implements IUnnestingPositionWriter, Serializable { +public class PositionWriter implements IUnnestingPositionWriter, Serializable { private static final long serialVersionUID = 1L; @Override diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java index c3403ee..5778369 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java @@ -257,7 +257,7 @@ // We set the positional variable type as INT64 type. unnestOp = new UnnestOperator(fromVar, new MutableObject<ILogicalExpression>(makeUnnestExpression(eo.first)), - pVar, BuiltinType.AINT64, new AqlPositionWriter()); + pVar, BuiltinType.AINT64, new PositionWriter()); } else { unnestOp = new UnnestOperator(fromVar, new MutableObject<ILogicalExpression>(makeUnnestExpression(eo.first))); @@ -457,9 +457,9 @@ // We set the positional variable type as INT64 type. unnestOp = innerUnnest ? new UnnestOperator(rightVar, new MutableObject<>(makeUnnestExpression(eo.first)), pVar, - BuiltinType.AINT64, new AqlPositionWriter()) + BuiltinType.AINT64, new PositionWriter()) : new LeftOuterUnnestOperator(rightVar, new MutableObject<>(makeUnnestExpression(eo.first)), pVar, - BuiltinType.AINT64, new AqlPositionWriter()); + BuiltinType.AINT64, new PositionWriter()); } else { unnestOp = innerUnnest ? new UnnestOperator(rightVar, new MutableObject<>(makeUnnestExpression(eo.first))) : new LeftOuterUnnestOperator(rightVar, new MutableObject<>(makeUnnestExpression(eo.first))); 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 16646d2..643ba71 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 @@ -42,11 +42,11 @@ import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.compiler.provider.ILangCompilationProvider; import org.apache.asterix.compiler.provider.IRuleSetFactory; -import org.apache.asterix.dataflow.data.common.AqlMergeAggregationExpressionFactory; -import org.apache.asterix.dataflow.data.common.AqlMissableTypeComputer; -import org.apache.asterix.dataflow.data.common.AqlPartialAggregationTypeComputer; import org.apache.asterix.dataflow.data.common.ConflictingTypeResolver; import org.apache.asterix.dataflow.data.common.ExpressionTypeComputer; +import org.apache.asterix.dataflow.data.common.MergeAggregationExpressionFactory; +import org.apache.asterix.dataflow.data.common.MissableTypeComputer; +import org.apache.asterix.dataflow.data.common.PartialAggregationTypeComputer; import org.apache.asterix.formats.base.IDataFormat; import org.apache.asterix.jobgen.QueryLogicalExpressionJobGen; import org.apache.asterix.lang.common.base.IAstPrintVisitorFactory; @@ -110,11 +110,11 @@ this.ruleSetFactory = compilationProvider.getRuleSetFactory(); } - private static class AqlOptimizationContextFactory implements IOptimizationContextFactory { + private static class OptimizationContextFactory implements IOptimizationContextFactory { - public static final AqlOptimizationContextFactory INSTANCE = new AqlOptimizationContextFactory(); + public static final OptimizationContextFactory INSTANCE = new OptimizationContextFactory(); - private AqlOptimizationContextFactory() { + private OptimizationContextFactory() { } @Override @@ -218,17 +218,17 @@ OptimizationConfUtil.getPhysicalOptimizationConfig().setMaxFramesForJoin(joinFrameLimit); HeuristicCompilerFactoryBuilder builder = - new HeuristicCompilerFactoryBuilder(AqlOptimizationContextFactory.INSTANCE); + new HeuristicCompilerFactoryBuilder(OptimizationContextFactory.INSTANCE); builder.setPhysicalOptimizationConfig(OptimizationConfUtil.getPhysicalOptimizationConfig()); builder.setLogicalRewrites(ruleSetFactory.getLogicalRewrites()); builder.setPhysicalRewrites(ruleSetFactory.getPhysicalRewrites()); IDataFormat format = metadataProvider.getFormat(); ICompilerFactory compilerFactory = builder.create(); builder.setExpressionEvalSizeComputer(format.getExpressionEvalSizeComputer()); - builder.setIMergeAggregationExpressionFactory(new AqlMergeAggregationExpressionFactory()); - builder.setPartialAggregationTypeComputer(new AqlPartialAggregationTypeComputer()); + builder.setIMergeAggregationExpressionFactory(new MergeAggregationExpressionFactory()); + builder.setPartialAggregationTypeComputer(new PartialAggregationTypeComputer()); builder.setExpressionTypeComputer(ExpressionTypeComputer.INSTANCE); - builder.setMissableTypeComputer(AqlMissableTypeComputer.INSTANCE); + builder.setMissableTypeComputer(MissableTypeComputer.INSTANCE); builder.setConflictingTypeResolver(ConflictingTypeResolver.INSTANCE); int parallelism = compilerProperties.getParallelism(); diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/AqlMergeAggregationExpressionFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/MergeAggregationExpressionFactory.java similarity index 92% rename from asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/AqlMergeAggregationExpressionFactory.java rename to asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/MergeAggregationExpressionFactory.java index bd42fe1..dfb1251 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/AqlMergeAggregationExpressionFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/MergeAggregationExpressionFactory.java @@ -34,7 +34,7 @@ import org.apache.hyracks.algebricks.core.algebra.expressions.VariableReferenceExpression; import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; -public class AqlMergeAggregationExpressionFactory implements IMergeAggregationExpressionFactory { +public class MergeAggregationExpressionFactory implements IMergeAggregationExpressionFactory { @Override public ILogicalExpression createMergeAggregation(LogicalVariable originalProducedVar, ILogicalExpression expr, @@ -56,7 +56,6 @@ */ return null; } - ILogicalExpression aggExpr = BuiltinFunctions.makeAggregateFunctionExpression(mergeFid, arguments); - return aggExpr; + return BuiltinFunctions.makeAggregateFunctionExpression(mergeFid, arguments); } } diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/AqlMissableTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/MissableTypeComputer.java similarity index 89% rename from asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/AqlMissableTypeComputer.java rename to asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/MissableTypeComputer.java index aa88ec9..91b5d19 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/AqlMissableTypeComputer.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/MissableTypeComputer.java @@ -25,11 +25,11 @@ import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.core.algebra.expressions.IMissableTypeComputer; -public class AqlMissableTypeComputer implements IMissableTypeComputer { +public class MissableTypeComputer implements IMissableTypeComputer { - public static final AqlMissableTypeComputer INSTANCE = new AqlMissableTypeComputer(); + public static final MissableTypeComputer INSTANCE = new MissableTypeComputer(); - private AqlMissableTypeComputer() { + private MissableTypeComputer() { } @Override diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/AqlPartialAggregationTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/PartialAggregationTypeComputer.java similarity index 96% rename from asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/AqlPartialAggregationTypeComputer.java rename to asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/PartialAggregationTypeComputer.java index ae2ea87..1a73af3 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/AqlPartialAggregationTypeComputer.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/PartialAggregationTypeComputer.java @@ -28,7 +28,7 @@ import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier; import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider; -public class AqlPartialAggregationTypeComputer implements IPartialAggregationTypeComputer { +public class PartialAggregationTypeComputer implements IPartialAggregationTypeComputer { @Override public Object getType(ILogicalExpression expr, IVariableTypeEnvironment env, diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/AqlMissingWriterFactory.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/MissingWriterFactory.java similarity index 85% rename from asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/AqlMissingWriterFactory.java rename to asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/MissingWriterFactory.java index 38af613..db1cb95 100644 --- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/AqlMissingWriterFactory.java +++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/MissingWriterFactory.java @@ -26,17 +26,17 @@ import org.apache.hyracks.api.dataflow.value.IMissingWriterFactory; import org.apache.hyracks.api.exceptions.HyracksDataException; -public class AqlMissingWriterFactory implements IMissingWriterFactory { +public class MissingWriterFactory implements IMissingWriterFactory { private static final long serialVersionUID = 1L; - public static final AqlMissingWriterFactory INSTANCE = new AqlMissingWriterFactory(); + public static final MissingWriterFactory INSTANCE = new MissingWriterFactory(); - private AqlMissingWriterFactory() { + private MissingWriterFactory() { } @Override public IMissingWriter createMissingWriter() { - return AqlMissingWriterFactory::writeMissing; + return MissingWriterFactory::writeMissing; } private static void writeMissing(DataOutput out) throws HyracksDataException { diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java index e6d98f9..00a147c 100644 --- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java +++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java @@ -26,7 +26,7 @@ import java.util.Map; import org.apache.asterix.common.config.GlobalConfig; -import org.apache.asterix.dataflow.data.nontagged.AqlMissingWriterFactory; +import org.apache.asterix.dataflow.data.nontagged.MissingWriterFactory; import org.apache.asterix.formats.base.IDataFormat; import org.apache.asterix.formats.nontagged.ADMPrinterFactoryProvider; import org.apache.asterix.formats.nontagged.BinaryBooleanInspector; @@ -670,7 +670,7 @@ @Override public IMissingWriterFactory getMissingWriterFactory() { - return AqlMissingWriterFactory.INSTANCE; + return MissingWriterFactory.INSTANCE; } @Override -- To view, visit https://asterix-gerrit.ics.uci.edu/1386 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I72f3051ff5c76ccde54e8b3b33941eb936870194 Gerrit-PatchSet: 6 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Yingyi Bu <[email protected]>
