http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java index 8f42904..e43af61 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java @@ -28,7 +28,7 @@ import java.util.Map; import org.apache.asterix.common.annotations.SkipSecondaryIndexSearchExpressionAnnotation; import org.apache.asterix.common.config.DatasetConfig.IndexType; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.dataflow.data.common.AqlExpressionTypeComputer; +import org.apache.asterix.dataflow.data.common.ExpressionTypeComputer; import org.apache.asterix.formats.nontagged.AqlBinaryTokenizerFactoryProvider; import org.apache.asterix.lang.common.util.FunctionUtil; import org.apache.asterix.metadata.entities.Dataset; @@ -254,7 +254,7 @@ public class InvertedIndexAccessMethod implements IAccessMethod { } OptimizableFuncExpr newOptFuncExpr = new OptimizableFuncExpr(funcExpr, new LogicalVariable[] { fieldVarExpr1, fieldVarExpr2 }, new ILogicalExpression[] { arg3 }, - new IAType[] { (IAType) AqlExpressionTypeComputer.INSTANCE.getType(arg3, null, null) }); + new IAType[] { (IAType) ExpressionTypeComputer.INSTANCE.getType(arg3, null, null) }); for (IOptimizableFuncExpr optFuncExpr : analysisCtx.matchedFuncExprs) { //avoid additional optFuncExpressions in case of a join if (optFuncExpr.getFuncExpr().equals(funcExpr)) { @@ -303,8 +303,8 @@ public class InvertedIndexAccessMethod implements IAccessMethod { OptimizableFuncExpr newOptFuncExpr = new OptimizableFuncExpr(funcExpr, new LogicalVariable[] { fieldVarExpr }, new ILogicalExpression[] { constArg, arg3 }, - new IAType[] { (IAType) AqlExpressionTypeComputer.INSTANCE.getType(constArg, null, null), - (IAType) AqlExpressionTypeComputer.INSTANCE.getType(arg3, null, null) }); + new IAType[] { (IAType) ExpressionTypeComputer.INSTANCE.getType(constArg, null, null), + (IAType) ExpressionTypeComputer.INSTANCE.getType(arg3, null, null) }); for (IOptimizableFuncExpr optFuncExpr : analysisCtx.matchedFuncExprs) { //avoid additional optFuncExpressions in case of a join if (optFuncExpr.getFuncExpr().equals(funcExpr)) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java index 01476e7..75ee46b 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java @@ -21,9 +21,9 @@ package org.apache.asterix.optimizer.rules.am; import java.util.ArrayList; import java.util.List; -import org.apache.asterix.metadata.declared.AqlDataSource; -import org.apache.asterix.metadata.declared.AqlDataSource.AqlDataSourceType; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.DataSource; +import org.apache.asterix.metadata.declared.DataSource.Type; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.utils.DatasetUtils; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; @@ -201,7 +201,7 @@ public class OptimizableOperatorSubTree { * Find the dataset corresponding to the datasource scan in the metadata. * Also sets recordType to be the type of that dataset. */ - public boolean setDatasetAndTypeMetadata(AqlMetadataProvider metadataProvider) throws AlgebricksException { + public boolean setDatasetAndTypeMetadata(MetadataProvider metadataProvider) throws AlgebricksException { String dataverseName = null; String datasetName = null; @@ -227,10 +227,10 @@ public class OptimizableOperatorSubTree { case DATASOURCE_SCAN: DataSourceScanOperator dataSourceScan = (DataSourceScanOperator) sourceOpRefs.get(i).getValue(); IDataSource<?> datasource = dataSourceScan.getDataSource(); - if (datasource instanceof AqlDataSource) { - byte dsType = ((AqlDataSource) datasource).getDatasourceType(); - if (dsType != AqlDataSourceType.INTERNAL_DATASET - && dsType != AqlDataSourceType.EXTERNAL_DATASET) { + if (datasource instanceof DataSource) { + byte dsType = ((DataSource) datasource).getDatasourceType(); + if (dsType != DataSource.Type.INTERNAL_DATASET + && dsType != DataSource.Type.EXTERNAL_DATASET) { return false; } } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslator.java ---------------------------------------------------------------------- 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 5c09978..175ff96 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 @@ -34,7 +34,7 @@ import org.apache.asterix.lang.common.base.Expression.Kind; import org.apache.asterix.lang.common.base.ILangExpression; import org.apache.asterix.lang.common.expression.VariableExpr; import org.apache.asterix.lang.common.statement.Query; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.om.types.BuiltinType; import org.apache.commons.lang3.mutable.Mutable; import org.apache.commons.lang3.mutable.MutableObject; @@ -64,7 +64,7 @@ import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperat class AqlExpressionToPlanTranslator extends LangExpressionToPlanTranslator implements ILangExpressionToPlanTranslator, IAQLVisitor<Pair<ILogicalOperator, LogicalVariable>, Mutable<ILogicalOperator>> { - public AqlExpressionToPlanTranslator(AqlMetadataProvider metadataProvider, int currentVarCounter) + public AqlExpressionToPlanTranslator(MetadataProvider metadataProvider, int currentVarCounter) throws AlgebricksException { super(metadataProvider, currentVarCounter); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslatorFactory.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslatorFactory.java index 56c9fac..a3e9d74 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslatorFactory.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlExpressionToPlanTranslatorFactory.java @@ -20,13 +20,13 @@ package org.apache.asterix.translator; import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslator; import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslatorFactory; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; public class AqlExpressionToPlanTranslatorFactory implements ILangExpressionToPlanTranslatorFactory { @Override - public ILangExpressionToPlanTranslator createExpressionToPlanTranslator(AqlMetadataProvider metadataProvider, + public ILangExpressionToPlanTranslator createExpressionToPlanTranslator(MetadataProvider metadataProvider, int currentVarCounter) throws AlgebricksException { return new AqlExpressionToPlanTranslator(metadataProvider, currentVarCounter); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AqlPlusExpressionToPlanTranslator.java ---------------------------------------------------------------------- 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 45e66cb..a2f1363 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 @@ -102,9 +102,9 @@ import org.apache.asterix.lang.common.struct.OperatorType; import org.apache.asterix.lang.common.struct.QuantifiedPair; import org.apache.asterix.lang.common.struct.UnaryExprType; import org.apache.asterix.lang.common.util.FunctionUtil; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; import org.apache.asterix.metadata.declared.FileSplitDataSink; import org.apache.asterix.metadata.declared.FileSplitSinkId; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.utils.DatasetUtils; import org.apache.asterix.om.base.AString; @@ -216,16 +216,14 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator private TranslationContext context; private String outputDatasetName; private ICompiledDmlStatement stmt; - private AqlMetadataProvider metadataProvider; private MetaScopeLogicalVariable metaScopeExp = new MetaScopeLogicalVariable(); private MetaScopeILogicalOperator metaScopeOp = new MetaScopeILogicalOperator(); private static LogicalVariable METADATA_DUMMY_VAR = new LogicalVariable(-1); - public AqlPlusExpressionToPlanTranslator(JobId jobId, AqlMetadataProvider metadataProvider, + public AqlPlusExpressionToPlanTranslator(JobId jobId, MetadataProvider metadataProvider, Counter currentVarCounter, String outputDatasetName, ICompiledDmlStatement stmt) { this.jobId = jobId; - this.metadataProvider = metadataProvider; this.context = new TranslationContext(currentVarCounter); this.outputDatasetName = outputDatasetName; this.stmt = stmt; @@ -240,7 +238,7 @@ public class AqlPlusExpressionToPlanTranslator extends AbstractLangTranslator return translate(expr, null); } - public ILogicalPlan translate(Query expr, AqlMetadataProvider metadata) + public ILogicalPlan translate(Query expr, MetadataProvider metadata) throws AlgebricksException, AsterixException { IDataFormat format = metadata.getFormat(); if (format == null) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java index 149656a..7783121 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/IStatementExecutor.java @@ -23,7 +23,7 @@ import java.rmi.RemoteException; import org.apache.asterix.common.exceptions.ACIDException; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.lang.common.statement.Query; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.api.client.IHyracksClientConnection; @@ -124,7 +124,7 @@ public interface IStatementExecutor { * @throws JSONException * @throws ACIDException */ - JobSpecification rewriteCompileQuery(AqlMetadataProvider metadataProvider, Query query, + JobSpecification rewriteCompileQuery(MetadataProvider metadataProvider, Query query, ICompiledDmlStatement dmlStatement) throws AsterixException, RemoteException, AlgebricksException, JSONException, ACIDException; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java index 9879da8..8a1fb3f 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java @@ -57,7 +57,6 @@ import org.apache.asterix.lang.common.expression.GbyVariableExpressionPair; import org.apache.asterix.lang.common.expression.IfExpr; import org.apache.asterix.lang.common.expression.IndexAccessor; import org.apache.asterix.lang.common.expression.ListConstructor; -import org.apache.asterix.lang.common.expression.ListConstructor.Type; import org.apache.asterix.lang.common.expression.LiteralExpr; import org.apache.asterix.lang.common.expression.OperatorExpr; import org.apache.asterix.lang.common.expression.QuantifiedExpression; @@ -75,11 +74,11 @@ import org.apache.asterix.lang.common.util.FunctionUtil; import org.apache.asterix.lang.common.visitor.base.AbstractQueryExpressionVisitor; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.MetadataManager; -import org.apache.asterix.metadata.declared.AqlDataSource.AqlDataSourceType; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; -import org.apache.asterix.metadata.declared.AqlSourceId; +import org.apache.asterix.metadata.declared.DataSource; +import org.apache.asterix.metadata.declared.DataSourceId; import org.apache.asterix.metadata.declared.DatasetDataSource; import org.apache.asterix.metadata.declared.LoadableDataSource; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.declared.ResultSetDataSink; import org.apache.asterix.metadata.declared.ResultSetSinkId; import org.apache.asterix.metadata.entities.Dataset; @@ -174,12 +173,12 @@ class LangExpressionToPlanTranslator extends AbstractQueryExpressionVisitor<Pair<ILogicalOperator, LogicalVariable>, Mutable<ILogicalOperator>> implements ILangExpressionToPlanTranslator { - protected final AqlMetadataProvider metadataProvider; + protected final MetadataProvider metadataProvider; protected final TranslationContext context; private static final AtomicLong outputFileID = new AtomicLong(0); private static final String OUTPUT_FILE_PREFIX = "OUTPUT_"; - public LangExpressionToPlanTranslator(AqlMetadataProvider metadataProvider, int currentVarCounter) + public LangExpressionToPlanTranslator(MetadataProvider metadataProvider, int currentVarCounter) throws AlgebricksException { this.context = new TranslationContext(new Counter(currentVarCounter)); this.metadataProvider = metadataProvider; @@ -715,7 +714,7 @@ class LangExpressionToPlanTranslator return leafOperator; } - private DatasetDataSource validateDatasetInfo(AqlMetadataProvider metadataProvider, String dataverseName, + private DatasetDataSource validateDatasetInfo(MetadataProvider metadataProvider, String dataverseName, String datasetName) throws AlgebricksException { Dataset dataset = metadataProvider.findDataset(dataverseName, datasetName); if (dataset == null) { @@ -724,12 +723,12 @@ class LangExpressionToPlanTranslator if (dataset.getDatasetType() == DatasetType.EXTERNAL) { throw new AlgebricksException("Cannot write output to an external dataset."); } - AqlSourceId sourceId = new AqlSourceId(dataverseName, datasetName); + DataSourceId sourceId = new DataSourceId(dataverseName, datasetName); IAType itemType = metadataProvider.findType(dataset.getItemTypeDataverseName(), dataset.getItemTypeName()); IAType metaItemType = metadataProvider.findType(dataset.getMetaItemTypeDataverseName(), dataset.getMetaItemTypeName()); INodeDomain domain = metadataProvider.findNodeDomain(dataset.getNodeGroupName()); - return new DatasetDataSource(sourceId, dataset, itemType, metaItemType, AqlDataSourceType.INTERNAL_DATASET, + return new DatasetDataSource(sourceId, dataset, itemType, metaItemType, DataSource.Type.INTERNAL_DATASET, dataset.getDatasetDetails(), domain); } @@ -1233,7 +1232,7 @@ class LangExpressionToPlanTranslator @Override public Pair<ILogicalOperator, LogicalVariable> visit(ListConstructor lc, Mutable<ILogicalOperator> tupSource) throws AsterixException { - FunctionIdentifier fid = (lc.getType() == Type.ORDERED_LIST_CONSTRUCTOR) + FunctionIdentifier fid = (lc.getType() == ListConstructor.Type.ORDERED_LIST_CONSTRUCTOR) ? AsterixBuiltinFunctions.ORDERED_LIST_CONSTRUCTOR : AsterixBuiltinFunctions.UNORDERED_LIST_CONSTRUCTOR; AbstractFunctionCallExpression f = new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(fid)); LogicalVariable v1 = context.newVar(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java ---------------------------------------------------------------------- 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 2e79225..66a64a4 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 @@ -62,7 +62,7 @@ import org.apache.asterix.lang.sqlpp.struct.SetOperationInput; import org.apache.asterix.lang.sqlpp.struct.SetOperationRight; import org.apache.asterix.lang.sqlpp.util.SqlppVariableUtil; import org.apache.asterix.lang.sqlpp.visitor.base.ISqlppVisitor; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.om.base.ABoolean; import org.apache.asterix.om.base.AInt32; import org.apache.asterix.om.base.AString; @@ -113,7 +113,7 @@ class SqlppExpressionToPlanTranslator extends LangExpressionToPlanTranslator imp private static final String ERR_MSG = "Translator should never enter this method!"; private Deque<Mutable<ILogicalOperator>> uncorrelatedLeftBranchStack = new ArrayDeque<>(); - public SqlppExpressionToPlanTranslator(AqlMetadataProvider metadataProvider, int currentVarCounter) + public SqlppExpressionToPlanTranslator(MetadataProvider metadataProvider, int currentVarCounter) throws AlgebricksException { super(metadataProvider, currentVarCounter); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslatorFactory.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslatorFactory.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslatorFactory.java index 611cc8a..49c088f 100644 --- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslatorFactory.java +++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslatorFactory.java @@ -20,13 +20,13 @@ package org.apache.asterix.translator; import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslator; import org.apache.asterix.algebra.base.ILangExpressionToPlanTranslatorFactory; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; public class SqlppExpressionToPlanTranslatorFactory implements ILangExpressionToPlanTranslatorFactory { @Override - public ILangExpressionToPlanTranslator createExpressionToPlanTranslator(AqlMetadataProvider metadataProvider, + public ILangExpressionToPlanTranslator createExpressionToPlanTranslator(MetadataProvider metadataProvider, int currentVarCounter) throws AlgebricksException { return new SqlppExpressionToPlanTranslator(metadataProvider, currentVarCounter); } http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java ---------------------------------------------------------------------- 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 31ef778..e08b3db 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 @@ -34,7 +34,7 @@ import org.apache.asterix.common.exceptions.ACIDException; 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.AqlExpressionTypeComputer; +import org.apache.asterix.dataflow.data.common.ExpressionTypeComputer; import org.apache.asterix.dataflow.data.common.AqlMergeAggregationExpressionFactory; import org.apache.asterix.dataflow.data.common.AqlMissableTypeComputer; import org.apache.asterix.dataflow.data.common.AqlPartialAggregationTypeComputer; @@ -48,7 +48,7 @@ import org.apache.asterix.lang.common.base.Statement; import org.apache.asterix.lang.common.rewrites.LangRewritingContext; import org.apache.asterix.lang.common.statement.FunctionDecl; import org.apache.asterix.lang.common.statement.Query; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.runtime.job.listener.JobEventListenerFactory; import org.apache.asterix.runtime.util.AsterixAppContextInfo; import org.apache.asterix.transaction.management.service.transaction.JobIdFactory; @@ -134,7 +134,7 @@ public class APIFramework { } } - public Pair<Query, Integer> reWriteQuery(List<FunctionDecl> declaredFunctions, AqlMetadataProvider metadataProvider, + public Pair<Query, Integer> reWriteQuery(List<FunctionDecl> declaredFunctions, MetadataProvider metadataProvider, Query q, SessionConfig conf) throws AsterixException { if (q == null) { return null; @@ -151,7 +151,7 @@ public class APIFramework { } public JobSpecification compileQuery(List<FunctionDecl> declaredFunctions, - AqlMetadataProvider queryMetadataProvider, Query rwQ, int varCounter, String outputDatasetName, + MetadataProvider queryMetadataProvider, Query rwQ, int varCounter, String outputDatasetName, SessionConfig conf, ICompiledDmlStatement statement) throws AlgebricksException, JSONException, RemoteException, ACIDException { @@ -216,7 +216,7 @@ public class APIFramework { builder.setExpressionEvalSizeComputer(format.getExpressionEvalSizeComputer()); builder.setIMergeAggregationExpressionFactory(new AqlMergeAggregationExpressionFactory()); builder.setPartialAggregationTypeComputer(new AqlPartialAggregationTypeComputer()); - builder.setExpressionTypeComputer(AqlExpressionTypeComputer.INSTANCE); + builder.setExpressionTypeComputer(ExpressionTypeComputer.INSTANCE); builder.setMissableTypeComputer(AqlMissableTypeComputer.INSTANCE); builder.setConflictingTypeResolver(ConflictingTypeResolver.INSTANCE); builder.setClusterLocations(queryMetadataProvider.getClusterLocations()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java index c43377a..3562ba9 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/ConnectorAPIServlet.java @@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.asterix.metadata.MetadataManager; import org.apache.asterix.metadata.MetadataTransactionContext; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.utils.DatasetUtils; import org.apache.asterix.om.types.ARecordType; @@ -83,7 +83,7 @@ public class ConnectorAPIServlet extends HttpServlet { MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); // Retrieves file splits of the dataset. - AqlMetadataProvider metadataProvider = new AqlMetadataProvider(null); + MetadataProvider metadataProvider = new MetadataProvider(null); metadataProvider.setMetadataTxnContext(mdTxnCtx); Dataset dataset = metadataProvider.findDataset(dataverseName, datasetName); if (dataset == null) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java index 5df687a..d4b6744 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalIndexingOperations.java @@ -58,7 +58,7 @@ import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; import org.apache.asterix.metadata.MetadataException; import org.apache.asterix.metadata.MetadataManager; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.entities.ExternalDatasetDetails; import org.apache.asterix.metadata.entities.Index; @@ -210,7 +210,7 @@ public class ExternalIndexingOperations { } public static JobSpecification buildFilesIndexReplicationJobSpec(Dataset dataset, - ArrayList<ExternalFile> externalFilesSnapshot, AqlMetadataProvider metadataProvider, boolean createIndex) + ArrayList<ExternalFile> externalFilesSnapshot, MetadataProvider metadataProvider, boolean createIndex) throws MetadataException, AlgebricksException { JobSpecification spec = JobSpecificationUtils.createJobSpecification(); IAsterixPropertiesProvider asterixPropertiesProvider = AsterixAppContextInfo.INSTANCE; @@ -262,7 +262,7 @@ public class ExternalIndexingOperations { */ private static Pair<ExternalDataScanOperatorDescriptor, AlgebricksPartitionConstraint> getExternalDataIndexingOperator( - AqlMetadataProvider metadataProvider, JobSpecification jobSpec, IAType itemType, Dataset dataset, + MetadataProvider metadataProvider, JobSpecification jobSpec, IAType itemType, Dataset dataset, List<ExternalFile> files, RecordDescriptor indexerDesc) throws HyracksDataException, AlgebricksException { ExternalDatasetDetails externalDatasetDetails = (ExternalDatasetDetails) dataset.getDatasetDetails(); @@ -275,7 +275,7 @@ public class ExternalIndexingOperations { } public static Pair<ExternalDataScanOperatorDescriptor, AlgebricksPartitionConstraint> createExternalIndexingOp( - JobSpecification spec, AqlMetadataProvider metadataProvider, Dataset dataset, ARecordType itemType, + JobSpecification spec, MetadataProvider metadataProvider, Dataset dataset, ARecordType itemType, RecordDescriptor indexerDesc, List<ExternalFile> files) throws HyracksDataException, AlgebricksException { if (files == null) { files = MetadataManager.INSTANCE.getDatasetExternalFiles(metadataProvider.getMetadataTxnContext(), dataset); @@ -402,7 +402,7 @@ public class ExternalIndexingOperations { } public static JobSpecification buildDropFilesIndexJobSpec(CompiledIndexDropStatement indexDropStmt, - AqlMetadataProvider metadataProvider, Dataset dataset) throws AlgebricksException, MetadataException { + MetadataProvider metadataProvider, Dataset dataset) throws AlgebricksException, MetadataException { String dataverseName = indexDropStmt.getDataverseName() == null ? metadataProvider.getDefaultDataverseName() : indexDropStmt.getDataverseName(); String datasetName = indexDropStmt.getDatasetName(); @@ -431,7 +431,7 @@ public class ExternalIndexingOperations { public static JobSpecification buildFilesIndexUpdateOp(Dataset ds, List<ExternalFile> metadataFiles, List<ExternalFile> deletedFiles, List<ExternalFile> addedFiles, List<ExternalFile> appendedFiles, - AqlMetadataProvider metadataProvider) throws MetadataException, AlgebricksException { + MetadataProvider metadataProvider) throws MetadataException, AlgebricksException { ArrayList<ExternalFile> files = new ArrayList<>(); for (ExternalFile file : metadataFiles) { if (file.getPendingOp() == ExternalFilePendingOp.PENDING_DROP_OP) { @@ -455,7 +455,7 @@ public class ExternalIndexingOperations { public static JobSpecification buildIndexUpdateOp(Dataset ds, Index index, List<ExternalFile> metadataFiles, List<ExternalFile> deletedFiles, List<ExternalFile> addedFiles, List<ExternalFile> appendedFiles, - AqlMetadataProvider metadataProvider) throws AsterixException, AlgebricksException { + MetadataProvider metadataProvider) throws AsterixException, AlgebricksException { // Create files list ArrayList<ExternalFile> files = new ArrayList<>(); @@ -482,7 +482,7 @@ public class ExternalIndexingOperations { return IndexOperations.buildSecondaryIndexLoadingJobSpec(ccis, null, null, null, null, metadataProvider, files); } - public static JobSpecification buildCommitJob(Dataset ds, List<Index> indexes, AqlMetadataProvider metadataProvider) + public static JobSpecification buildCommitJob(Dataset ds, List<Index> indexes, MetadataProvider metadataProvider) throws AlgebricksException, AsterixException { JobSpecification spec = JobSpecificationUtils.createJobSpecification(); IAsterixPropertiesProvider asterixPropertiesProvider = AsterixAppContextInfo.INSTANCE; @@ -561,7 +561,7 @@ public class ExternalIndexingOperations { @SuppressWarnings("rawtypes") private static ExternalRTreeDataflowHelperFactory getRTreeDataflowHelperFactory(Dataset ds, Index index, ILSMMergePolicyFactory mergePolicyFactory, Map<String, String> mergePolicyFactoryProperties, - AsterixStorageProperties storageProperties, AqlMetadataProvider metadataProvider, JobSpecification spec) + AsterixStorageProperties storageProperties, MetadataProvider metadataProvider, JobSpecification spec) throws AlgebricksException, AsterixException { int numPrimaryKeys = getRIDSize(ds); List<List<String>> secondaryKeyFields = index.getKeyFieldNames(); @@ -612,12 +612,12 @@ public class ExternalIndexingOperations { getBuddyBtreeComparatorFactories(), mergePolicyFactory, mergePolicyFactoryProperties, new SecondaryIndexOperationTrackerProvider(ds.getDatasetId()), AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER, LSMRTreeIOOperationCallbackFactory.INSTANCE, - AqlMetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), + MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), storageProperties.getBloomFilterFalsePositiveRate(), new int[] { index.getKeyFieldNames().size() }, ExternalDatasetsRegistry.INSTANCE.getDatasetVersion(ds), true, isPointMBR); } - public static JobSpecification buildAbortOp(Dataset ds, List<Index> indexes, AqlMetadataProvider metadataProvider) + public static JobSpecification buildAbortOp(Dataset ds, List<Index> indexes, MetadataProvider metadataProvider) throws AlgebricksException, AsterixException { JobSpecification spec = JobSpecificationUtils.createJobSpecification(); IAsterixPropertiesProvider asterixPropertiesProvider = AsterixAppContextInfo.INSTANCE; @@ -675,7 +675,7 @@ public class ExternalIndexingOperations { } - public static JobSpecification buildRecoverOp(Dataset ds, List<Index> indexes, AqlMetadataProvider metadataProvider) + public static JobSpecification buildRecoverOp(Dataset ds, List<Index> indexes, MetadataProvider metadataProvider) throws AlgebricksException, AsterixException { JobSpecification spec = JobSpecificationUtils.createJobSpecification(); IAsterixPropertiesProvider asterixPropertiesProvider = AsterixAppContextInfo.INSTANCE; @@ -732,7 +732,7 @@ public class ExternalIndexingOperations { return spec; } - public static JobSpecification compactFilesIndexJobSpec(Dataset dataset, AqlMetadataProvider metadataProvider) + public static JobSpecification compactFilesIndexJobSpec(Dataset dataset, MetadataProvider metadataProvider) throws MetadataException, AlgebricksException { JobSpecification spec = JobSpecificationUtils.createJobSpecification(); IAsterixPropertiesProvider asterixPropertiesProvider = AsterixAppContextInfo.INSTANCE; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedOperations.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedOperations.java index 1d98aac..4018690 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/FeedOperations.java @@ -40,7 +40,7 @@ import org.apache.asterix.external.util.FeedConstants; import org.apache.asterix.external.util.FeedUtils; import org.apache.asterix.external.util.FeedUtils.FeedRuntimeType; import org.apache.asterix.file.JobSpecificationUtils; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Feed; import org.apache.asterix.runtime.util.ClusterStateManager; import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint; @@ -71,7 +71,7 @@ public class FeedOperations { * @throws Exception */ public static Pair<JobSpecification, IAdapterFactory> buildFeedIntakeJobSpec(Feed primaryFeed, - AqlMetadataProvider metadataProvider, FeedPolicyAccessor policyAccessor) throws Exception { + MetadataProvider metadataProvider, FeedPolicyAccessor policyAccessor) throws Exception { JobSpecification spec = JobSpecificationUtils.createJobSpecification(); spec.setFrameSize(FeedConstants.JobConstants.DEFAULT_FRAME_SIZE); IAdapterFactory adapterFactory = null; @@ -94,7 +94,7 @@ public class FeedOperations { * Builds the job spec for sending message to an active feed to disconnect it from the * its source. */ - public static Pair<JobSpecification, Boolean> buildDisconnectFeedJobSpec(AqlMetadataProvider metadataProvider, + public static Pair<JobSpecification, Boolean> buildDisconnectFeedJobSpec(MetadataProvider metadataProvider, FeedConnectionId connectionId) throws AsterixException, AlgebricksException { JobSpecification spec = JobSpecificationUtils.createJobSpecification(); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java index 0b6d806..bec419a 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java @@ -134,7 +134,7 @@ import org.apache.asterix.metadata.api.IMetadataEntity; import org.apache.asterix.metadata.bootstrap.MetadataBuiltinEntities; import org.apache.asterix.metadata.dataset.hints.DatasetHints; import org.apache.asterix.metadata.dataset.hints.DatasetHints.DatasetNodegroupCardinalityHint; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.BuiltinTypeMap; import org.apache.asterix.metadata.entities.CompactionPolicy; import org.apache.asterix.metadata.entities.Dataset; @@ -288,7 +288,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } validateOperation(activeDefaultDataverse, stmt); rewriteStatement(stmt); // Rewrite the statement's AST. - AqlMetadataProvider metadataProvider = new AqlMetadataProvider(activeDefaultDataverse); + MetadataProvider metadataProvider = new MetadataProvider(activeDefaultDataverse); metadataProvider.setWriterFactory(writerFactory); metadataProvider.setResultSerializerFactoryProvider(resultSerializerFactoryProvider); metadataProvider.setOutputFile(outputFile); @@ -428,7 +428,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen return new Pair<>(writerFactory, outputFile); } - protected Dataverse handleUseDataverseStatement(AqlMetadataProvider metadataProvider, Statement stmt) + protected Dataverse handleUseDataverseStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { DataverseDecl dvd = (DataverseDecl) stmt; String dvName = dvd.getDataverseName().getValue(); @@ -450,7 +450,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleCreateDataverseStatement(AqlMetadataProvider metadataProvider, Statement stmt) + protected void handleCreateDataverseStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { CreateDataverseStatement stmtCreateDataverse = (CreateDataverseStatement) stmt; @@ -511,7 +511,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - public void handleCreateDatasetStatement(AqlMetadataProvider metadataProvider, Statement stmt, + public void handleCreateDatasetStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws AsterixException, Exception { MutableObject<ProgressState> progress = new MutableObject<>(ProgressState.NO_PROGRESS); DatasetDecl dd = (DatasetDecl) stmt; @@ -783,7 +783,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } - protected void handleCreateIndexStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleCreateIndexStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { ProgressState progress = ProgressState.NO_PROGRESS; CreateIndexStatement stmtCreateIndex = (CreateIndexStatement) stmt; @@ -1143,7 +1143,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleCreateTypeStatement(AqlMetadataProvider metadataProvider, Statement stmt) throws Exception { + protected void handleCreateTypeStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { TypeDecl stmtCreateType = (TypeDecl) stmt; String dataverseName = getActiveDataverse(stmtCreateType.getDataverseName()); String typeName = stmtCreateType.getIdent().getValue(); @@ -1180,7 +1180,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleDataverseDropStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleDataverseDropStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { DataverseDropStatement stmtDelete = (DataverseDropStatement) stmt; String dataverseName = stmtDelete.getDataverseName().getValue(); @@ -1330,7 +1330,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } protected void disconnectFeedBeforeDelete(Identifier dvId, EntityId activeEntityId, FeedConnectionId conn, - AqlMetadataProvider metadataProvider, IHyracksClientConnection hcc) { + MetadataProvider metadataProvider, IHyracksClientConnection hcc) { DisconnectFeedStatement disStmt = new DisconnectFeedStatement(dvId, new Identifier(activeEntityId.getEntityName()), new Identifier(conn.getDatasetName())); try { @@ -1352,7 +1352,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen return MetadataManager.INSTANCE.getDataset(mdTxnCtx, dataverseName, datasetName); } - public void handleDatasetDropStatement(AqlMetadataProvider metadataProvider, Statement stmt, + public void handleDatasetDropStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { DropDatasetStatement stmtDelete = (DropDatasetStatement) stmt; String dataverseName = getActiveDataverse(stmtDelete.getDataverseName()); @@ -1417,7 +1417,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void doDropDataset(Dataset ds, String datasetName, AqlMetadataProvider metadataProvider, + protected void doDropDataset(Dataset ds, String datasetName, MetadataProvider metadataProvider, MutableObject<MetadataTransactionContext> mdTxnCtx, List<JobSpecification> jobsToExecute, String dataverseName, MutableBoolean bActiveTxn, MutableObject<ProgressState> progress, IHyracksClientConnection hcc) throws Exception { @@ -1521,7 +1521,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleIndexDropStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleIndexDropStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { IndexDropStatement stmtIndexDrop = (IndexDropStatement) stmt; @@ -1715,7 +1715,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleTypeDropStatement(AqlMetadataProvider metadataProvider, Statement stmt) throws Exception { + protected void handleTypeDropStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { TypeDropStatement stmtTypeDrop = (TypeDropStatement) stmt; String dataverseName = getActiveDataverse(stmtTypeDrop.getDataverseName()); @@ -1743,7 +1743,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleNodegroupDropStatement(AqlMetadataProvider metadataProvider, Statement stmt) throws Exception { + protected void handleNodegroupDropStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { NodeGroupDropStatement stmtDelete = (NodeGroupDropStatement) stmt; String nodegroupName = stmtDelete.getNodeGroupName().getValue(); MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); @@ -1768,7 +1768,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleCreateFunctionStatement(AqlMetadataProvider metadataProvider, Statement stmt) + protected void handleCreateFunctionStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { CreateFunctionStatement cfs = (CreateFunctionStatement) stmt; String dataverse = getActiveDataverseName(cfs.getSignature().getNamespace()); @@ -1798,7 +1798,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleFunctionDropStatement(AqlMetadataProvider metadataProvider, Statement stmt) throws Exception { + protected void handleFunctionDropStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { FunctionDropStatement stmtDropFunction = (FunctionDropStatement) stmt; FunctionSignature signature = stmtDropFunction.getFunctionSignature(); signature.setNamespace(getActiveDataverseName(signature.getNamespace())); @@ -1825,7 +1825,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleLoadStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleLoadStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { LoadStatement loadStmt = (LoadStatement) stmt; String dataverseName = getActiveDataverse(loadStmt.getDataverseName()); @@ -1855,7 +1855,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - public JobSpecification handleInsertUpsertStatement(AqlMetadataProvider metadataProvider, Statement stmt, + public JobSpecification handleInsertUpsertStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, IStatementExecutor.Stats stats, boolean compileOnly) throws Exception { @@ -1925,7 +1925,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen return compiled; } - public void handleDeleteStatement(AqlMetadataProvider metadataProvider, Statement stmt, + public void handleDeleteStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { DeleteStatement stmtDelete = (DeleteStatement) stmt; @@ -1964,7 +1964,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } @Override - public JobSpecification rewriteCompileQuery(AqlMetadataProvider metadataProvider, Query query, + public JobSpecification rewriteCompileQuery(MetadataProvider metadataProvider, Query query, ICompiledDmlStatement stmt) throws AsterixException, RemoteException, AlgebricksException, JSONException, ACIDException { @@ -1980,7 +1980,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } - protected void handleCreateFeedStatement(AqlMetadataProvider metadataProvider, Statement stmt) throws Exception { + protected void handleCreateFeedStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { CreateFeedStatement cfs = (CreateFeedStatement) stmt; String dataverseName = getActiveDataverse(cfs.getDataverseName()); String feedName = cfs.getFeedName().getValue(); @@ -2025,7 +2025,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleCreateFeedPolicyStatement(AqlMetadataProvider metadataProvider, Statement stmt) + protected void handleCreateFeedPolicyStatement(MetadataProvider metadataProvider, Statement stmt) throws AlgebricksException, HyracksDataException { String dataverse; String policy; @@ -2087,7 +2087,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleDropFeedStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleDropFeedStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { FeedDropStatement stmtFeedDrop = (FeedDropStatement) stmt; String dataverseName = getActiveDataverse(stmtFeedDrop.getDataverseName()); @@ -2136,7 +2136,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleDropFeedPolicyStatement(AqlMetadataProvider metadataProvider, Statement stmt) + protected void handleDropFeedPolicyStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); metadataProvider.setMetadataTxnContext(mdTxnCtx); @@ -2164,7 +2164,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleConnectFeedStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleConnectFeedStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { ConnectFeedStatement cfs = (ConnectFeedStatement) stmt; String dataverseName = getActiveDataverse(cfs.getDataverseName()); @@ -2352,7 +2352,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen return new FeedJointKey(sourceFeed.getFeedId(), appliedFunctions); } - protected void handleDisconnectFeedStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleDisconnectFeedStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { DisconnectFeedStatement cfs = (DisconnectFeedStatement) stmt; String dataverseName = getActiveDataverse(cfs.getDataverseName()); @@ -2400,7 +2400,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleSubscribeFeedStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleSubscribeFeedStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { if (LOGGER.isLoggable(Level.INFO)) { @@ -2464,7 +2464,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleCompactStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleCompactStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { CompactStatement compactStatement = (CompactStatement) stmt; String dataverseName = getActiveDataverse(compactStatement.getDataverseName()); @@ -2537,7 +2537,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen protected void prepareCompactJobsForExternalDataset(List<Index> indexes, String dataverseName, String datasetName, Dataset ds, List<JobSpecification> jobsToExecute, ARecordType aRecordType, ARecordType metaRecordType, - AqlMetadataProvider metadataProvider, ARecordType enforcedType) throws AlgebricksException { + MetadataProvider metadataProvider, ARecordType enforcedType) throws AlgebricksException { for (int j = 0; j < indexes.size(); j++) { if (!ExternalIndexingOperations.isFileIndex(indexes.get(j))) { CompiledIndexCompactStatement cics = new CompiledIndexCompactStatement(dataverseName, datasetName, @@ -2556,7 +2556,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen jobsToExecute.add(ExternalIndexingOperations.compactFilesIndexJobSpec(ds, metadataProvider)); } - protected JobSpecification handleQuery(AqlMetadataProvider metadataProvider, Query query, + protected JobSpecification handleQuery(MetadataProvider metadataProvider, Query query, IHyracksClientConnection hcc, IHyracksDataset hdc, ResultDelivery resultDelivery, Stats stats) throws Exception { MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction(); @@ -2590,7 +2590,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen return compiled; } - private void handleQueryResult(AqlMetadataProvider metadataProvider, IHyracksClientConnection hcc, + private void handleQueryResult(MetadataProvider metadataProvider, IHyracksClientConnection hcc, IHyracksDataset hdc, JobSpecification compiled, ResultDelivery resultDelivery, Stats stats) throws Exception { if (GlobalConfig.ASTERIX_LOGGER.isLoggable(Level.FINE)) { @@ -2630,7 +2630,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleCreateNodeGroupStatement(AqlMetadataProvider metadataProvider, Statement stmt) + protected void handleCreateNodeGroupStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception { NodegroupDecl stmtCreateNodegroup = (NodegroupDecl) stmt; @@ -2663,7 +2663,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleExternalDatasetRefreshStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleExternalDatasetRefreshStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { RefreshExternalDatasetStatement stmtRefresh = (RefreshExternalDatasetStatement) stmt; String dataverseName = getActiveDataverse(stmtRefresh.getDataverseName()); @@ -2888,7 +2888,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } } - protected void handleRunStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handleRunStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws AsterixException, Exception { RunStatement runStmt = (RunStatement) stmt; switch (runStmt.getSystem()) { @@ -2903,7 +2903,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } - protected void handlePregelixStatement(AqlMetadataProvider metadataProvider, Statement stmt, + protected void handlePregelixStatement(MetadataProvider metadataProvider, Statement stmt, IHyracksClientConnection hcc) throws Exception { RunStatement pregelixStmt = (RunStatement) stmt; boolean bActiveTxn = true; @@ -2970,7 +2970,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen } // Prepares to run a program on external runtime. - protected void prepareRunExternalRuntime(AqlMetadataProvider metadataProvider, IHyracksClientConnection hcc, + protected void prepareRunExternalRuntime(MetadataProvider metadataProvider, IHyracksClientConnection hcc, RunStatement pregelixStmt, String dataverseNameFrom, String dataverseNameTo, String datasetNameFrom, String datasetNameTo, MetadataTransactionContext mdTxnCtx) throws Exception { // Validates the source/sink dataverses and datasets. http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DatasetOperations.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DatasetOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DatasetOperations.java index 8798817..6ab2622 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DatasetOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DatasetOperations.java @@ -31,15 +31,15 @@ import org.apache.asterix.common.context.AsterixVirtualBufferCacheProvider; import org.apache.asterix.common.exceptions.ACIDException; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.ioopcallbacks.LSMBTreeIOOperationCallbackFactory; -import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.formats.base.IDataFormat; import org.apache.asterix.metadata.MetadataManager; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.entities.Dataverse; import org.apache.asterix.metadata.utils.DatasetUtils; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.runtime.util.AsterixAppContextInfo; +import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.transaction.management.opcallbacks.PrimaryIndexOperationTrackerProvider; import org.apache.asterix.transaction.management.resource.LSMBTreeLocalResourceMetadata; import org.apache.asterix.transaction.management.resource.PersistentLocalResourceFactoryProvider; @@ -68,7 +68,7 @@ public class DatasetOperations { private static Logger LOGGER = Logger.getLogger(DatasetOperations.class.getName()); public static JobSpecification createDropDatasetJobSpec(CompiledDatasetDropStatement datasetDropStmt, - AqlMetadataProvider metadataProvider) + MetadataProvider metadataProvider) throws AlgebricksException, HyracksDataException, RemoteException, ACIDException, AsterixException { String dataverseName = null; @@ -136,7 +136,7 @@ public class DatasetOperations { } public static JobSpecification createDatasetJobSpec(Dataverse dataverse, String datasetName, - AqlMetadataProvider metadata) throws AsterixException, AlgebricksException { + MetadataProvider metadata) throws AsterixException, AlgebricksException { String dataverseName = dataverse.getDataverseName(); IDataFormat format; try { @@ -209,7 +209,7 @@ public class DatasetOperations { } public static JobSpecification compactDatasetJobSpec(Dataverse dataverse, String datasetName, - AqlMetadataProvider metadata) throws AsterixException, AlgebricksException { + MetadataProvider metadata) throws AsterixException, AlgebricksException { String dataverseName = dataverse.getDataverseName(); IDataFormat format; try { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DataverseOperations.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DataverseOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DataverseOperations.java index d5765f1..4f9af13 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DataverseOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/DataverseOperations.java @@ -18,7 +18,7 @@ */ package org.apache.asterix.file; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Dataverse; import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint; import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraintHelper; @@ -28,7 +28,7 @@ import org.apache.hyracks.dataflow.std.file.FileRemoveOperatorDescriptor; import org.apache.hyracks.dataflow.std.file.IFileSplitProvider; public class DataverseOperations { - public static JobSpecification createDropDataverseJobSpec(Dataverse dataverse, AqlMetadataProvider metadata) { + public static JobSpecification createDropDataverseJobSpec(Dataverse dataverse, MetadataProvider metadata) { JobSpecification jobSpec = JobSpecificationUtils.createJobSpecification(); Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint = metadata .splitProviderAndPartitionConstraintsForDataverse(dataverse.getDataverseName()); http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/IndexOperations.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/IndexOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/IndexOperations.java index 3696a36..cd774fb 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/IndexOperations.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/IndexOperations.java @@ -29,7 +29,7 @@ import org.apache.asterix.common.ioopcallbacks.LSMBTreeIOOperationCallbackFactor import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.external.indexing.ExternalFile; import org.apache.asterix.metadata.MetadataException; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.utils.DatasetUtils; import org.apache.asterix.om.types.ARecordType; @@ -56,7 +56,7 @@ public class IndexOperations { public static JobSpecification buildSecondaryIndexCreationJobSpec(CompiledCreateIndexStatement createIndexStmt, ARecordType recType, ARecordType metaType, List<Integer> keySourceIndicators, ARecordType enforcedType, - AqlMetadataProvider metadataProvider) throws AsterixException, AlgebricksException { + MetadataProvider metadataProvider) throws AsterixException, AlgebricksException { SecondaryIndexOperationsHelper secondaryIndexHelper = SecondaryIndexOperationsHelper .createIndexOperationsHelper(createIndexStmt.getIndexType(), createIndexStmt.getDataverseName(), createIndexStmt.getDatasetName(), createIndexStmt.getIndexName(), @@ -68,7 +68,7 @@ public class IndexOperations { public static JobSpecification buildSecondaryIndexLoadingJobSpec(CompiledCreateIndexStatement createIndexStmt, ARecordType recType, ARecordType metaType, List<Integer> keySourceIndicators, ARecordType enforcedType, - AqlMetadataProvider metadataProvider) throws AsterixException, AlgebricksException { + MetadataProvider metadataProvider) throws AsterixException, AlgebricksException { SecondaryIndexOperationsHelper secondaryIndexHelper = SecondaryIndexOperationsHelper .createIndexOperationsHelper(createIndexStmt.getIndexType(), createIndexStmt.getDataverseName(), createIndexStmt.getDatasetName(), createIndexStmt.getIndexName(), @@ -80,7 +80,7 @@ public class IndexOperations { public static JobSpecification buildSecondaryIndexLoadingJobSpec(CompiledCreateIndexStatement createIndexStmt, ARecordType recType, ARecordType metaType, List<Integer> keySourceIndicators, ARecordType enforcedType, - AqlMetadataProvider metadataProvider, List<ExternalFile> files) + MetadataProvider metadataProvider, List<ExternalFile> files) throws AsterixException, AlgebricksException { SecondaryIndexOperationsHelper secondaryIndexHelper = SecondaryIndexOperationsHelper .createIndexOperationsHelper(createIndexStmt.getIndexType(), createIndexStmt.getDataverseName(), @@ -93,7 +93,7 @@ public class IndexOperations { } public static JobSpecification buildDropSecondaryIndexJobSpec(CompiledIndexDropStatement indexDropStmt, - AqlMetadataProvider metadataProvider, Dataset dataset) throws AlgebricksException, MetadataException { + MetadataProvider metadataProvider, Dataset dataset) throws AlgebricksException, MetadataException { String dataverseName = indexDropStmt.getDataverseName() == null ? metadataProvider.getDefaultDataverseName() : indexDropStmt.getDataverseName(); String datasetName = indexDropStmt.getDatasetName(); @@ -125,7 +125,7 @@ public class IndexOperations { public static JobSpecification buildSecondaryIndexCompactJobSpec(CompiledIndexCompactStatement indexCompactStmt, ARecordType recType, ARecordType metaType, List<Integer> keySourceIndicators, ARecordType enforcedType, - AqlMetadataProvider metadataProvider) throws AsterixException, AlgebricksException { + MetadataProvider metadataProvider) throws AsterixException, AlgebricksException { SecondaryIndexOperationsHelper secondaryIndexHelper = SecondaryIndexOperationsHelper .createIndexOperationsHelper(indexCompactStmt.getIndexType(), indexCompactStmt.getDataverseName(), indexCompactStmt.getDatasetName(), indexCompactStmt.getIndexName(), http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryBTreeOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryBTreeOperationsHelper.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryBTreeOperationsHelper.java index d257dcd..84e5e39 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryBTreeOperationsHelper.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryBTreeOperationsHelper.java @@ -33,7 +33,7 @@ import org.apache.asterix.common.ioopcallbacks.LSMBTreeWithBuddyIOOperationCallb import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.external.indexing.IndexingConstants; import org.apache.asterix.external.operators.ExternalDataScanOperatorDescriptor; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Index; import org.apache.asterix.metadata.utils.ExternalDatasetsRegistry; import org.apache.asterix.om.types.ARecordType; @@ -306,7 +306,7 @@ public class SecondaryBTreeOperationsHelper extends SecondaryIndexOperationsHelp @Override @SuppressWarnings("rawtypes") protected void setSecondaryRecDescAndComparators(IndexType indexType, List<List<String>> secondaryKeyFields, - List<IAType> secondaryKeyTypes, int gramLength, AqlMetadataProvider metadataProvider) + List<IAType> secondaryKeyTypes, int gramLength, MetadataProvider metadataProvider) throws AlgebricksException, AsterixException { secondaryFieldAccessEvalFactories = new IScalarEvaluatorFactory[numSecondaryKeys + numFilterFields]; secondaryComparatorFactories = new IBinaryComparatorFactory[numSecondaryKeys + numPrimaryKeys]; http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java index 4eced73..fe8358f 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryIndexOperationsHelper.java @@ -34,6 +34,7 @@ import org.apache.asterix.common.context.ITransactionSubsystemProvider; import org.apache.asterix.common.context.TransactionSubsystemProvider; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.ioopcallbacks.LSMBTreeIOOperationCallbackFactory; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.common.transactions.IRecoveryManager.ResourceType; import org.apache.asterix.common.transactions.JobId; @@ -46,7 +47,6 @@ import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; import org.apache.asterix.metadata.MetadataException; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; import org.apache.asterix.metadata.entities.Dataset; import org.apache.asterix.metadata.entities.InternalDatasetDetails; import org.apache.asterix.metadata.utils.DatasetUtils; @@ -103,7 +103,7 @@ public abstract class SecondaryIndexOperationsHelper { protected int numPrimaryKeys; protected int numSecondaryKeys; - protected AqlMetadataProvider metadataProvider; + protected MetadataProvider metadataProvider; protected String dataverseName; protected String datasetName; protected Dataset dataset; @@ -155,7 +155,7 @@ public abstract class SecondaryIndexOperationsHelper { public static SecondaryIndexOperationsHelper createIndexOperationsHelper(IndexType indexType, String dataverseName, String datasetName, String indexName, List<List<String>> secondaryKeyFields, List<IAType> secondaryKeyTypes, - boolean isEnforced, int gramLength, AqlMetadataProvider metadataProvider, + boolean isEnforced, int gramLength, MetadataProvider metadataProvider, PhysicalOptimizationConfig physOptConf, ARecordType recType, ARecordType metaType, List<Integer> keySourceIndicators, ARecordType enforcedType) throws AsterixException, AlgebricksException { IAsterixPropertiesProvider asterixPropertiesProvider = AsterixAppContextInfo.INSTANCE; @@ -194,7 +194,7 @@ public abstract class SecondaryIndexOperationsHelper { public abstract JobSpecification buildCompactJobSpec() throws AsterixException, AlgebricksException; protected void init(IndexType indexType, String dvn, String dsn, String in, List<List<String>> secondaryKeyFields, - List<IAType> secondaryKeyTypes, boolean isEnforced, int gramLength, AqlMetadataProvider metadataProvider, + List<IAType> secondaryKeyTypes, boolean isEnforced, int gramLength, MetadataProvider metadataProvider, ARecordType aRecType, ARecordType metaType, List<Integer> keySourceIndicators, ARecordType enforcedType) throws AsterixException, AlgebricksException { this.metadataProvider = metadataProvider; @@ -307,7 +307,7 @@ public abstract class SecondaryIndexOperationsHelper { protected abstract void setSecondaryRecDescAndComparators(IndexType indexType, List<List<String>> secondaryKeyFields, List<IAType> secondaryKeyTypes, int gramLength, - AqlMetadataProvider metadataProvider) throws AlgebricksException, AsterixException; + MetadataProvider metadataProvider) throws AlgebricksException, AsterixException; protected AbstractOperatorDescriptor createDummyKeyProviderOp(JobSpecification spec) throws AsterixException, AlgebricksException { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryInvertedIndexOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryInvertedIndexOperationsHelper.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryInvertedIndexOperationsHelper.java index 2aa6d97..f452dab 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryInvertedIndexOperationsHelper.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryInvertedIndexOperationsHelper.java @@ -27,12 +27,12 @@ import org.apache.asterix.common.config.IAsterixPropertiesProvider; import org.apache.asterix.common.context.AsterixVirtualBufferCacheProvider; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.ioopcallbacks.LSMInvertedIndexIOOperationCallbackFactory; -import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Index; import org.apache.asterix.om.types.IAType; import org.apache.asterix.om.util.NonTaggedFormatUtil; import org.apache.asterix.runtime.formats.FormatUtils; +import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexOperationTrackerProvider; import org.apache.asterix.transaction.management.resource.LSMInvertedIndexLocalResourceMetadata; import org.apache.asterix.transaction.management.resource.PersistentLocalResourceFactoryProvider; @@ -95,7 +95,7 @@ public class SecondaryInvertedIndexOperationsHelper extends SecondaryIndexOperat @Override @SuppressWarnings("rawtypes") protected void setSecondaryRecDescAndComparators(IndexType indexType, List<List<String>> secondaryKeyFields, - List<IAType> secondaryKeyTypes, int gramLength, AqlMetadataProvider metadata) + List<IAType> secondaryKeyTypes, int gramLength, MetadataProvider metadata) throws AlgebricksException, AsterixException { // Sanity checks. if (numPrimaryKeys > 1) { http://git-wip-us.apache.org/repos/asf/asterixdb/blob/42600592/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java ---------------------------------------------------------------------- diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java index d9a7e4e..f1b43f0 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/file/SecondaryRTreeOperationsHelper.java @@ -30,19 +30,19 @@ import org.apache.asterix.common.config.IAsterixPropertiesProvider; import org.apache.asterix.common.context.AsterixVirtualBufferCacheProvider; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.ioopcallbacks.LSMRTreeIOOperationCallbackFactory; -import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.dataflow.data.nontagged.valueproviders.AqlPrimitiveValueProviderFactory; import org.apache.asterix.external.indexing.IndexingConstants; import org.apache.asterix.external.operators.ExternalDataScanOperatorDescriptor; import org.apache.asterix.formats.nontagged.AqlBinaryComparatorFactoryProvider; import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; -import org.apache.asterix.metadata.declared.AqlMetadataProvider; +import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Index; import org.apache.asterix.metadata.utils.ExternalDatasetsRegistry; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.IAType; import org.apache.asterix.om.util.NonTaggedFormatUtil; +import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider; import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexOperationTrackerProvider; import org.apache.asterix.transaction.management.resource.ExternalRTreeLocalResourceMetadata; import org.apache.asterix.transaction.management.resource.LSMRTreeLocalResourceMetadata; @@ -109,7 +109,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp //prepare a LocalResourceMetadata which will be stored in NC's local resource repository ILocalResourceMetadata localResourceMetadata = new LSMRTreeLocalResourceMetadata(secondaryTypeTraits, secondaryComparatorFactories, btreeCompFactories, valueProviderFactories, RTreePolicyType.RTREE, - AqlMetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), + MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), dataset.getDatasetId(), mergePolicyFactory, mergePolicyFactoryProperties, filterTypeTraits, filterCmpFactories, rtreeFields, primaryKeyFields, secondaryFilterFields, isPointMBR); localResourceFactoryProvider = @@ -119,7 +119,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp new AsterixVirtualBufferCacheProvider(dataset.getDatasetId()), mergePolicyFactory, mergePolicyFactoryProperties, new SecondaryIndexOperationTrackerProvider(dataset.getDatasetId()), AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER, LSMRTreeIOOperationCallbackFactory.INSTANCE, - AqlMetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), rtreeFields, + MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), rtreeFields, filterTypeTraits, filterCmpFactories, secondaryFilterFields, !temp, isPointMBR); } else { // External dataset @@ -127,7 +127,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp ILocalResourceMetadata localResourceMetadata = new ExternalRTreeLocalResourceMetadata(secondaryTypeTraits, secondaryComparatorFactories, ExternalIndexingOperations.getBuddyBtreeComparatorFactories(), valueProviderFactories, RTreePolicyType.RTREE, - AqlMetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), + MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), dataset.getDatasetId(), mergePolicyFactory, mergePolicyFactoryProperties, primaryKeyFields, isPointMBR); localResourceFactoryProvider = new PersistentLocalResourceFactoryProvider(localResourceMetadata, @@ -138,7 +138,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp mergePolicyFactory, mergePolicyFactoryProperties, new SecondaryIndexOperationTrackerProvider(dataset.getDatasetId()), AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER, LSMRTreeIOOperationCallbackFactory.INSTANCE, - AqlMetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), + MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), storageProperties.getBloomFilterFalsePositiveRate(), new int[] { numNestedSecondaryKeyFields }, ExternalDatasetsRegistry.INSTANCE.getDatasetVersion(dataset), true, isPointMBR); } @@ -174,7 +174,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp @Override protected void setSecondaryRecDescAndComparators(IndexType indexType, List<List<String>> secondaryKeyFields, - List<IAType> secondaryKeyTypes, int gramLength, AqlMetadataProvider metadata) + List<IAType> secondaryKeyTypes, int gramLength, MetadataProvider metadata) throws AlgebricksException, AsterixException { int numSecondaryKeys = secondaryKeyFields.size(); if (numSecondaryKeys != 1) { @@ -312,7 +312,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp // Sort by secondary keys. ExternalSortOperatorDescriptor sortOp = createSortOp(spec, - new IBinaryComparatorFactory[] { AqlMetadataProvider.proposeLinearizer(keyType, + new IBinaryComparatorFactory[] { MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length) }, isPointMBR ? secondaryRecDescForPointMBR : secondaryRecDesc); @@ -324,7 +324,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp new AsterixVirtualBufferCacheProvider(dataset.getDatasetId()), mergePolicyFactory, mergePolicyFactoryProperties, new SecondaryIndexOperationTrackerProvider(dataset.getDatasetId()), AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER, LSMRTreeIOOperationCallbackFactory.INSTANCE, - AqlMetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), rtreeFields, + MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), rtreeFields, filterTypeTraits, filterCmpFactories, secondaryFilterFields, !temp, isPointMBR);; // Create secondary RTree bulk load op. @@ -372,7 +372,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp // Sort by secondary keys. ExternalSortOperatorDescriptor sortOp = createSortOp(spec, - new IBinaryComparatorFactory[] { AqlMetadataProvider.proposeLinearizer(keyType, + new IBinaryComparatorFactory[] { MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length) }, isPointMBR ? secondaryRecDescForPointMBR : secondaryRecDesc); AsterixStorageProperties storageProperties = propertiesProvider.getStorageProperties(); @@ -382,7 +382,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp valueProviderFactories, RTreePolicyType.RTREE, primaryComparatorFactories, mergePolicyFactory, mergePolicyFactoryProperties, new SecondaryIndexOperationTrackerProvider(dataset.getDatasetId()), AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER, LSMRTreeIOOperationCallbackFactory.INSTANCE, - AqlMetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), + MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), storageProperties.getBloomFilterFalsePositiveRate(), new int[] { numNestedSecondaryKeyFields }, ExternalDatasetsRegistry.INSTANCE.getDatasetVersion(dataset), true, isPointMBR); // Create secondary RTree bulk load op. @@ -478,7 +478,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp new AsterixVirtualBufferCacheProvider(dataset.getDatasetId()), mergePolicyFactory, mergePolicyFactoryProperties, new SecondaryIndexOperationTrackerProvider(dataset.getDatasetId()), AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER, LSMRTreeIOOperationCallbackFactory.INSTANCE, - AqlMetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), rtreeFields, + MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), rtreeFields, filterTypeTraits, filterCmpFactories, secondaryFilterFields, !temp, isPointMBR); compactOp = new LSMTreeIndexCompactOperatorDescriptor(spec, AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER, @@ -496,7 +496,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryIndexOperationsHelp new SecondaryIndexOperationTrackerProvider(dataset.getDatasetId()), AsterixRuntimeComponentsProvider.RUNTIME_PROVIDER, LSMRTreeIOOperationCallbackFactory.INSTANCE, - AqlMetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), + MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length), storageProperties.getBloomFilterFalsePositiveRate(), new int[] { numNestedSecondaryKeyFields }, ExternalDatasetsRegistry.INSTANCE.getDatasetVersion(dataset), true, isPointMBR),
