Till Westmann has uploaded a new change for review.
https://asterix-gerrit.ics.uci.edu/1314
Change subject: remove some aql-prefixes
......................................................................
remove some aql-prefixes
Change-Id: Ia0b64ffa7c50cd62fc3303fdb44eb769f56c978a
---
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/IndexSearchPOperator.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceDynamicTypeCastRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceMaterializationForInsertWithSelfScanRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceStaticTypeCastForInsertRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/MetaFunctionToMetaVariableRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushFieldAccessRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveSortInFeedIngestionRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/UnnestToDataScanRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/AccessMethodUtils.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java
M
asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
R
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java
R
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSourceId.java
R
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSourcePartitioningProvider.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java
30 files changed, 145 insertions(+), 146 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/14/1314/1
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java
index c3796ac..ab9ac1b 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/BTreeSearchPOperator.java
@@ -23,7 +23,7 @@
import org.apache.asterix.metadata.declared.AqlIndex;
import org.apache.asterix.metadata.declared.AqlMetadataProvider;
-import org.apache.asterix.metadata.declared.AqlSourceId;
+import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
@@ -72,7 +72,7 @@
private final boolean isEqCondition;
private Object implConfig;
- public BTreeSearchPOperator(IDataSourceIndex<String, AqlSourceId> idx,
INodeDomain domain,
+ public BTreeSearchPOperator(IDataSourceIndex<String, DataSourceId> idx,
INodeDomain domain,
boolean requiresBroadcast, boolean isPrimaryIndex, boolean
isEqCondition,
List<LogicalVariable> lowKeyVarList, List<LogicalVariable>
highKeyVarList) {
super(idx, domain, requiresBroadcast);
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java
index 0fb6be7..aa902da 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/ExternalDataLookupPOperator.java
@@ -21,10 +21,10 @@
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.AqlSourceId;
+import org.apache.asterix.metadata.declared.DataSource;
+import org.apache.asterix.metadata.declared.DataSource.Type;
+import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.asterix.metadata.declared.DatasetDataSource;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
@@ -60,7 +60,7 @@
public class ExternalDataLookupPOperator extends AbstractScanPOperator {
private final List<LogicalVariable> ridVarList;
- private AqlSourceId datasetId;
+ private DataSourceId datasetId;
private Dataset dataset;
private ARecordType recordType;
private Index secondaryIndex;
@@ -68,7 +68,7 @@
private boolean retainInput;
private boolean retainNull;
- public ExternalDataLookupPOperator(AqlSourceId datasetId, Dataset dataset,
ARecordType recordType,
+ public ExternalDataLookupPOperator(DataSourceId datasetId, Dataset
dataset, ARecordType recordType,
Index secondaryIndex, List<LogicalVariable> ridVarList, boolean
requiresBroadcast, boolean retainInput,
boolean retainNull) {
this.datasetId = datasetId;
@@ -97,11 +97,11 @@
this.recordType = recordType;
}
- public AqlSourceId getDatasetId() {
+ public DataSourceId getDatasetId() {
return datasetId;
}
- public void setDatasetId(AqlSourceId datasetId) {
+ public void setDatasetId(DataSourceId datasetId) {
this.datasetId = datasetId;
}
@@ -113,8 +113,8 @@
@Override
public void computeDeliveredProperties(ILogicalOperator op,
IOptimizationContext context)
throws AlgebricksException {
- AqlDataSource ds = new DatasetDataSource(datasetId, dataset,
recordType,
- null /*external dataset doesn't have meta records.*/,
AqlDataSourceType.EXTERNAL_DATASET,
+ DataSource ds = new DatasetDataSource(datasetId, dataset, recordType,
+ null /*external dataset doesn't have meta records.*/,
Type.EXTERNAL_DATASET,
dataset.getDatasetDetails(),
context.getComputationNodeDomain());
IDataSourcePropertiesProvider dspp = ds.getPropertiesProvider();
AbstractScanOperator as = (AbstractScanOperator) op;
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/IndexSearchPOperator.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/IndexSearchPOperator.java
index ec59dae..ce43480 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/IndexSearchPOperator.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/IndexSearchPOperator.java
@@ -20,7 +20,7 @@
import java.util.List;
-import org.apache.asterix.metadata.declared.AqlSourceId;
+import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
@@ -42,11 +42,11 @@
*/
public abstract class IndexSearchPOperator extends AbstractScanPOperator {
- protected final IDataSourceIndex<String, AqlSourceId> idx;
+ protected final IDataSourceIndex<String, DataSourceId> idx;
protected final boolean requiresBroadcast;
protected final INodeDomain domain;
- public IndexSearchPOperator(IDataSourceIndex<String, AqlSourceId> idx,
INodeDomain domain,
+ public IndexSearchPOperator(IDataSourceIndex<String, DataSourceId> idx,
INodeDomain domain,
boolean requiresBroadcast) {
this.idx = idx;
this.requiresBroadcast = requiresBroadcast;
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
index ec2b41e..c97c536 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
@@ -26,11 +26,10 @@
import org.apache.asterix.common.context.AsterixVirtualBufferCacheProvider;
import org.apache.asterix.common.dataflow.IAsterixApplicationContextInfo;
import
org.apache.asterix.common.ioopcallbacks.LSMInvertedIndexIOOperationCallbackFactory;
-import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider;
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.AqlSourceId;
+import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
import org.apache.asterix.metadata.utils.DatasetUtils;
@@ -43,8 +42,9 @@
import org.apache.asterix.om.util.NonTaggedFormatUtil;
import org.apache.asterix.optimizer.rules.am.InvertedIndexAccessMethod;
import
org.apache.asterix.optimizer.rules.am.InvertedIndexAccessMethod.SearchModifierType;
-import org.apache.asterix.runtime.util.AsterixAppContextInfo;
import org.apache.asterix.optimizer.rules.am.InvertedIndexJobGenParams;
+import org.apache.asterix.runtime.util.AsterixAppContextInfo;
+import org.apache.asterix.runtime.util.AsterixRuntimeComponentsProvider;
import
org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexOperationTrackerProvider;
import
org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -90,7 +90,7 @@
public class InvertedIndexPOperator extends IndexSearchPOperator {
private final boolean isPartitioned;
- public InvertedIndexPOperator(IDataSourceIndex<String, AqlSourceId> idx,
INodeDomain domain,
+ public InvertedIndexPOperator(IDataSourceIndex<String, DataSourceId> idx,
INodeDomain domain,
boolean requiresBroadcast, boolean isPartitioned) {
super(idx, domain, requiresBroadcast);
this.isPartitioned = isPartitioned;
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java
index 5d714ea..44b7354 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/RTreeSearchPOperator.java
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.asterix.metadata.declared.AqlMetadataProvider;
-import org.apache.asterix.metadata.declared.AqlSourceId;
+import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
import org.apache.asterix.optimizer.rules.am.RTreeJobGenParams;
@@ -53,7 +53,7 @@
*/
public class RTreeSearchPOperator extends IndexSearchPOperator {
- public RTreeSearchPOperator(IDataSourceIndex<String, AqlSourceId> idx,
INodeDomain domain,
+ public RTreeSearchPOperator(IDataSourceIndex<String, DataSourceId> idx,
INodeDomain domain,
boolean requiresBroadcast) {
super(idx, domain, requiresBroadcast);
}
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java
index beefc46..902da21 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/AnalysisUtil.java
@@ -21,7 +21,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.asterix.metadata.declared.AqlSourceId;
+import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
import org.apache.asterix.optimizer.rules.am.AccessMethodUtils;
import org.apache.commons.lang3.mutable.Mutable;
@@ -128,7 +128,7 @@
}
public static Pair<String, String>
getDatasetInfo(AbstractDataSourceOperator op) throws AlgebricksException {
- AqlSourceId srcId = (AqlSourceId) op.getDataSource().getId();
+ DataSourceId srcId = (DataSourceId) op.getDataSource().getId();
return new Pair<String, String>(srcId.getDataverseName(),
srcId.getDatasourceName());
}
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java
index c8d2760..db2ec2b 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceAutogenerateIDRule.java
@@ -24,8 +24,8 @@
import org.apache.asterix.algebra.operators.CommitOperator;
import org.apache.asterix.lang.common.util.FunctionUtil;
-import org.apache.asterix.metadata.declared.AqlDataSource;
-import org.apache.asterix.metadata.declared.AqlDataSource.AqlDataSourceType;
+import org.apache.asterix.metadata.declared.DataSource;
+import org.apache.asterix.metadata.declared.DataSource.Type;
import org.apache.asterix.metadata.declared.DatasetDataSource;
import org.apache.asterix.metadata.entities.InternalDatasetDetails;
import org.apache.asterix.om.base.AString;
@@ -109,7 +109,7 @@
return false;
}
- if (((AqlDataSource) insertOp.getDataSource()).getDatasourceType() !=
AqlDataSourceType.INTERNAL_DATASET) {
+ if (((DataSource) insertOp.getDataSource()).getDatasourceType() !=
Type.INTERNAL_DATASET) {
return false;
}
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceDynamicTypeCastRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceDynamicTypeCastRule.java
index 28bcc7f..e7e0d20 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceDynamicTypeCastRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceDynamicTypeCastRule.java
@@ -24,7 +24,7 @@
import org.apache.asterix.algebra.operators.CommitOperator;
import org.apache.asterix.lang.common.util.FunctionUtil;
-import org.apache.asterix.metadata.declared.AqlDataSource;
+import org.apache.asterix.metadata.declared.DataSource;
import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
import org.apache.asterix.om.typecomputer.base.TypeCastUtils;
import org.apache.asterix.om.types.ARecordType;
@@ -116,9 +116,9 @@
// Remember this is the operator we need to modify
op = insertDeleteOp;
- // Derive the required ARecordType based on the schema of
the AqlDataSource
+ // Derive the required ARecordType based on the schema of
the DataSource
InsertDeleteUpsertOperator insertDeleteOperator =
(InsertDeleteUpsertOperator) op2;
- AqlDataSource dataSource = (AqlDataSource)
insertDeleteOperator.getDataSource();
+ DataSource dataSource = (DataSource)
insertDeleteOperator.getDataSource();
requiredRecordType = (ARecordType)
dataSource.getItemType();
// Derive the Variable which we will potentially wrap with
cast/null functions
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceMaterializationForInsertWithSelfScanRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceMaterializationForInsertWithSelfScanRule.java
index a574711..67de414 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceMaterializationForInsertWithSelfScanRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceMaterializationForInsertWithSelfScanRule.java
@@ -18,8 +18,8 @@
*/
package org.apache.asterix.optimizer.rules;
-import org.apache.asterix.metadata.declared.AqlDataSource;
-import org.apache.asterix.metadata.declared.AqlDataSource.AqlDataSourceType;
+import org.apache.asterix.metadata.declared.DataSource;
+import org.apache.asterix.metadata.declared.DataSource.Type;
import org.apache.asterix.metadata.declared.DatasetDataSource;
import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
import org.apache.asterix.optimizer.rules.am.AccessMethodJobGenParams;
@@ -104,9 +104,9 @@
}
} else if (descendantOp.getOperatorTag() ==
LogicalOperatorTag.DATASOURCESCAN) {
DataSourceScanOperator dataSourceScanOp =
(DataSourceScanOperator) descendantOp;
- AqlDataSource ds = (AqlDataSource)
dataSourceScanOp.getDataSource();
- if ((ds.getDatasourceType() ==
AqlDataSourceType.INTERNAL_DATASET
- || ds.getDatasourceType() ==
AqlDataSourceType.EXTERNAL_DATASET)
+ DataSource ds = (DataSource) dataSourceScanOp.getDataSource();
+ if ((ds.getDatasourceType() == Type.INTERNAL_DATASET
+ || ds.getDatasourceType() == Type.EXTERNAL_DATASET)
&& ((DatasetDataSource)
ds).getDataset().getDatasetName().compareTo(insertDatasetName) == 0) {
return true;
}
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
index 815bd93..f7ccb7c 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceRandomPartitioningFeedComputationRule.java
@@ -18,8 +18,8 @@
*/
package org.apache.asterix.optimizer.rules;
-import org.apache.asterix.metadata.declared.AqlDataSource;
-import org.apache.asterix.metadata.declared.AqlDataSource.AqlDataSourceType;
+import org.apache.asterix.metadata.declared.DataSource;
+import org.apache.asterix.metadata.declared.DataSource.Type;
import org.apache.asterix.metadata.declared.FeedDataSource;
import org.apache.asterix.metadata.entities.Feed;
import org.apache.commons.lang3.mutable.Mutable;
@@ -54,8 +54,8 @@
}
DataSourceScanOperator scanOp = (DataSourceScanOperator) opChild;
- AqlDataSource dataSource = (AqlDataSource) scanOp.getDataSource();
- if (dataSource.getDatasourceType() != AqlDataSourceType.FEED) {
+ DataSource dataSource = (DataSource) scanOp.getDataSource();
+ if (dataSource.getDatasourceType() != Type.FEED) {
return false;
}
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
index 8362dd7..ad5590b 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
@@ -29,9 +29,9 @@
import org.apache.asterix.common.config.DatasetConfig.IndexType;
import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.lang.common.util.FunctionUtil;
-import org.apache.asterix.metadata.declared.AqlDataSource;
import org.apache.asterix.metadata.declared.AqlIndex;
import org.apache.asterix.metadata.declared.AqlMetadataProvider;
+import org.apache.asterix.metadata.declared.DataSource;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
import org.apache.asterix.metadata.entities.InternalDatasetDetails;
@@ -141,7 +141,7 @@
* The current primaryIndexModificationOp is of the first type
*/
- AqlDataSource datasetSource = (AqlDataSource)
primaryIndexModificationOp.getDataSource();
+ DataSource datasetSource = (DataSource)
primaryIndexModificationOp.getDataSource();
AqlMetadataProvider mp = (AqlMetadataProvider)
context.getMetadataProvider();
String dataverseName = datasetSource.getId().getDataverseName();
String datasetName = datasetSource.getId().getDatasourceName();
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceStaticTypeCastForInsertRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceStaticTypeCastForInsertRule.java
index 2eaad98..ad93800 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceStaticTypeCastForInsertRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceStaticTypeCastForInsertRule.java
@@ -23,7 +23,7 @@
import java.util.List;
import org.apache.asterix.algebra.operators.CommitOperator;
-import org.apache.asterix.metadata.declared.AqlDataSource;
+import org.apache.asterix.metadata.declared.DataSource;
import org.apache.asterix.om.typecomputer.base.TypeCastUtils;
import org.apache.asterix.om.types.IAType;
import org.apache.asterix.optimizer.rules.typecast.StaticTypeCastUtil;
@@ -111,7 +111,7 @@
* get required record type
*/
InsertDeleteUpsertOperator insertDeleteOperator =
(InsertDeleteUpsertOperator) op2;
- AqlDataSource dataSource = (AqlDataSource)
insertDeleteOperator.getDataSource();
+ DataSource dataSource = (DataSource)
insertDeleteOperator.getDataSource();
IAType requiredRecordType = dataSource.getItemType();
List<LogicalVariable> usedVariables = new ArrayList<LogicalVariable>();
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/MetaFunctionToMetaVariableRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/MetaFunctionToMetaVariableRule.java
index 06a6f37..a9a1fa7 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/MetaFunctionToMetaVariableRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/MetaFunctionToMetaVariableRule.java
@@ -22,8 +22,8 @@
import java.util.List;
import org.apache.asterix.lang.common.util.FunctionUtil;
-import org.apache.asterix.metadata.declared.AqlDataSource;
-import org.apache.asterix.metadata.declared.AqlDataSource.AqlDataSourceType;
+import org.apache.asterix.metadata.declared.DataSource;
+import org.apache.asterix.metadata.declared.DataSource.Type;
import org.apache.asterix.metadata.declared.IMutationDataSource;
import org.apache.asterix.om.constants.AsterixConstantValue;
import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
@@ -79,16 +79,16 @@
if (op.getOperatorTag() == LogicalOperatorTag.DATASOURCESCAN) {
DataSourceScanOperator scanOp = (DataSourceScanOperator) op;
ILogicalExpressionReferenceTransformWithCondition inputTransfomer
= visit(op.getInputs().get(0));
- AqlDataSource dataSource = (AqlDataSource) scanOp.getDataSource();
+ DataSource dataSource = (DataSource) scanOp.getDataSource();
List<ILogicalExpressionReferenceTransformWithCondition>
transformers = null;
List<LogicalVariable> allVars = scanOp.getVariables();
LogicalVariable dataVar =
dataSource.getDataRecordVariable(allVars);
LogicalVariable metaVar = dataSource.getMetaVariable(allVars);
LogicalExpressionReferenceTransform currentTransformer = null;
// https://issues.apache.org/jira/browse/ASTERIXDB-1618
- if (dataSource.getDatasourceType() !=
AqlDataSourceType.EXTERNAL_DATASET
- && dataSource.getDatasourceType() !=
AqlDataSourceType.INTERNAL_DATASET
- && dataSource.getDatasourceType() !=
AqlDataSourceType.LOADABLE) {
+ if (dataSource.getDatasourceType() != Type.EXTERNAL_DATASET
+ && dataSource.getDatasourceType() != Type.INTERNAL_DATASET
+ && dataSource.getDatasourceType() != Type.LOADABLE) {
IMutationDataSource mds = (IMutationDataSource) dataSource;
if (mds.isChange()) {
transformers = new ArrayList<>();
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushFieldAccessRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushFieldAccessRule.java
index 7af3c1a..0174bd0 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushFieldAccessRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/PushFieldAccessRule.java
@@ -25,10 +25,10 @@
import org.apache.asterix.algebra.base.AsterixOperatorAnnotations;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
-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.AqlSourceId;
+import org.apache.asterix.metadata.declared.DataSource;
+import org.apache.asterix.metadata.declared.DataSource.Type;
+import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
import org.apache.asterix.metadata.utils.DatasetUtils;
@@ -123,7 +123,7 @@
return false;
}
AqlMetadataProvider mp = (AqlMetadataProvider)
context.getMetadataProvider();
- AqlSourceId asid = ((IDataSource<AqlSourceId>)
scan.getDataSource()).getId();
+ DataSourceId asid = ((IDataSource<DataSourceId>)
scan.getDataSource()).getId();
Dataset dataset = mp.findDataset(asid.getDataverseName(),
asid.getDatasourceName());
if (dataset == null) {
@@ -297,12 +297,12 @@
if (varRef.getVariableReference() == scanRecordVar) {
ILogicalExpression e1 =
accessFun.getArguments().get(1).getValue();
if (e1.getExpressionTag() ==
LogicalExpressionTag.CONSTANT) {
- IDataSource<AqlSourceId> dataSource =
(IDataSource<AqlSourceId>) scan.getDataSource();
- byte dsType = ((AqlDataSource)
dataSource).getDatasourceType();
- if (dsType == AqlDataSourceType.FEED || dsType ==
AqlDataSourceType.LOADABLE) {
+ IDataSource<DataSourceId> dataSource =
(IDataSource<DataSourceId>) scan.getDataSource();
+ byte dsType = ((DataSource)
dataSource).getDatasourceType();
+ if (dsType == Type.FEED || dsType ==
Type.LOADABLE) {
return false;
}
- AqlSourceId asid = dataSource.getId();
+ DataSourceId asid = dataSource.getId();
AqlMetadataProvider mp = (AqlMetadataProvider)
context.getMetadataProvider();
Dataset dataset =
mp.findDataset(asid.getDataverseName(), asid.getDatasourceName());
if (dataset == null) {
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveSortInFeedIngestionRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveSortInFeedIngestionRule.java
index 25dcf35..6246b30 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveSortInFeedIngestionRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/RemoveSortInFeedIngestionRule.java
@@ -18,8 +18,8 @@
*/
package org.apache.asterix.optimizer.rules;
-import org.apache.asterix.metadata.declared.AqlDataSource;
-import org.apache.asterix.metadata.declared.AqlDataSource.AqlDataSourceType;
+import org.apache.asterix.metadata.declared.DataSource;
+import org.apache.asterix.metadata.declared.DataSource.Type;
import org.apache.commons.lang3.mutable.Mutable;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
@@ -50,8 +50,8 @@
boolean isSourceAFeed = false;
while (descendantOp != null) {
if (descendantOp.getOperatorTag() ==
LogicalOperatorTag.DATASOURCESCAN) {
- AqlDataSource dataSource = (AqlDataSource)
((DataSourceScanOperator) descendantOp).getDataSource();
- if (dataSource.getDatasourceType() == AqlDataSourceType.FEED) {
+ DataSource dataSource = (DataSource) ((DataSourceScanOperator)
descendantOp).getDataSource();
+ if (dataSource.getDatasourceType() == Type.FEED) {
isSourceAFeed = true;
}
break;
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java
index 677b9a7..8b8c444 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetAsterixPhysicalOperatorsRule.java
@@ -26,7 +26,7 @@
import org.apache.asterix.algebra.operators.physical.RTreeSearchPOperator;
import org.apache.asterix.common.config.DatasetConfig.IndexType;
import org.apache.asterix.metadata.declared.AqlMetadataProvider;
-import org.apache.asterix.metadata.declared.AqlSourceId;
+import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
import org.apache.asterix.optimizer.rules.am.AccessMethodJobGenParams;
@@ -216,11 +216,11 @@
AccessMethodJobGenParams jobGenParams = new
AccessMethodJobGenParams();
jobGenParams.readFromFuncArgs(f.getArguments());
AqlMetadataProvider mp = (AqlMetadataProvider)
context.getMetadataProvider();
- AqlSourceId dataSourceId = new
AqlSourceId(jobGenParams.getDataverseName(),
+ DataSourceId dataSourceId = new
DataSourceId(jobGenParams.getDataverseName(),
jobGenParams.getDatasetName());
Dataset dataset =
mp.findDataset(jobGenParams.getDataverseName(),
jobGenParams.getDatasetName());
- IDataSourceIndex<String, AqlSourceId> dsi =
mp.findDataSourceIndex(jobGenParams.getIndexName(),
+ IDataSourceIndex<String, DataSourceId> dsi =
mp.findDataSourceIndex(jobGenParams.getIndexName(),
dataSourceId);
INodeDomain storageDomain =
mp.findNodeDomain(dataset.getNodeGroupName());
if (dsi == null) {
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/UnnestToDataScanRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/UnnestToDataScanRule.java
index 3503f56..c668753 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/UnnestToDataScanRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/UnnestToDataScanRule.java
@@ -26,9 +26,9 @@
import org.apache.asterix.external.util.ExternalDataUtils;
import org.apache.asterix.external.util.FeedUtils;
import org.apache.asterix.external.util.FeedUtils.FeedRuntimeType;
-import org.apache.asterix.metadata.declared.AqlDataSource;
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.FeedDataSource;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Dataverse;
@@ -120,7 +120,7 @@
throw new AlgebricksException(
"Could not find dataset " + datasetName + " in
dataverse " + dataverseName);
}
- AqlSourceId asid = new AqlSourceId(dataverseName, datasetName);
+ DataSourceId asid = new DataSourceId(dataverseName, datasetName);
List<LogicalVariable> variables = new ArrayList<>();
if (dataset.getDatasetType() == DatasetType.INTERNAL) {
int numPrimaryKeys =
DatasetUtils.getPartitioningKeys(dataset).size();
@@ -129,7 +129,7 @@
}
}
variables.add(unnest.getVariable());
- AqlDataSource dataSource = metadataProvider.findDataSource(asid);
+ DataSource dataSource = metadataProvider.findDataSource(asid);
boolean hasMeta = dataSource.hasMeta();
if (hasMeta) {
variables.add(context.newVar());
@@ -160,7 +160,7 @@
String targetDataset = ConstantExpressionUtil.getStringArgument(f,
4);
String outputType = ConstantExpressionUtil.getStringArgument(f, 5);
AqlMetadataProvider metadataProvider = (AqlMetadataProvider)
context.getMetadataProvider();
- AqlSourceId asid = new AqlSourceId(dataverse, getTargetFeed);
+ DataSourceId asid = new DataSourceId(dataverse, getTargetFeed);
String policyName =
metadataProvider.getConfig().get(FeedActivityDetails.FEED_POLICY_NAME);
FeedPolicyEntity policy =
metadataProvider.findFeedPolicy(dataverse, policyName);
if (policy == null) {
@@ -194,7 +194,7 @@
return false;
}
- private void addPrimaryKey(List<LogicalVariable> scanVariables,
AqlDataSource dataSource,
+ private void addPrimaryKey(List<LogicalVariable> scanVariables, DataSource
dataSource,
IOptimizationContext context) {
List<LogicalVariable> primaryKey =
dataSource.getPrimaryKeyVariables(scanVariables);
List<LogicalVariable> tail = new ArrayList<LogicalVariable>();
@@ -203,7 +203,7 @@
context.addPrimaryKey(pk);
}
- private FeedDataSource createFeedDataSource(AqlSourceId aqlId, String
targetDataset, String sourceFeedName,
+ private FeedDataSource createFeedDataSource(DataSourceId aqlId, String
targetDataset, String sourceFeedName,
String subscriptionLocation, AqlMetadataProvider metadataProvider,
FeedPolicyEntity feedPolicy,
String outputType, String locations, LogicalVariable recordVar,
IOptimizationContext context,
List<LogicalVariable> pkVars) throws AlgebricksException {
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/AccessMethodUtils.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/AccessMethodUtils.java
index 5b7146f..2d46a0b 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/AccessMethodUtils.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/AccessMethodUtils.java
@@ -30,7 +30,7 @@
import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.external.indexing.IndexingConstants;
import org.apache.asterix.lang.common.util.FunctionUtil;
-import org.apache.asterix.metadata.declared.AqlSourceId;
+import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.ExternalDatasetDetails;
import org.apache.asterix.metadata.entities.Index;
@@ -639,7 +639,7 @@
unnestOp.setExecutionMode(ExecutionMode.PARTITIONED);
//set the physical operator
- AqlSourceId dataSourceId = new AqlSourceId(dataset.getDataverseName(),
dataset.getDatasetName());
+ DataSourceId dataSourceId = new
DataSourceId(dataset.getDataverseName(), dataset.getDatasetName());
unnestOp.setPhysicalOperator(new
ExternalDataLookupPOperator(dataSourceId, dataset, recordType, secondaryIndex,
primaryKeyVars, false, retainInput, retainNull));
return unnestOp;
diff --git
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
index 0e54640..b780dd1 100644
---
a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
+++
b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroduceLSMComponentFilterRule.java
@@ -22,9 +22,9 @@
import java.util.List;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
-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.DatasetDataSource;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
@@ -153,7 +153,7 @@
while (descendantOp != null) {
if (descendantOp.getOperatorTag() ==
LogicalOperatorTag.DATASOURCESCAN) {
DataSourceScanOperator dataSourceScanOp =
(DataSourceScanOperator) descendantOp;
- AqlDataSource ds = (AqlDataSource)
dataSourceScanOp.getDataSource();
+ DataSource ds = (DataSource) dataSourceScanOp.getDataSource();
if (dataset.getDatasetName().compareTo(((DatasetDataSource)
ds).getDataset().getDatasetName()) == 0) {
List<LogicalVariable> minFilterVars = new ArrayList<>();
List<LogicalVariable> maxFilterVars = new ArrayList<>();
@@ -220,8 +220,8 @@
while (descendantOp != null) {
if (descendantOp.getOperatorTag() ==
LogicalOperatorTag.DATASOURCESCAN) {
DataSourceScanOperator dataSourceScanOp =
(DataSourceScanOperator) descendantOp;
- AqlDataSource ds = (AqlDataSource)
dataSourceScanOp.getDataSource();
- if (ds.getDatasourceType() !=
AqlDataSourceType.INTERNAL_DATASET) {
+ DataSource ds = (DataSource) dataSourceScanOp.getDataSource();
+ if (ds.getDatasourceType() != Type.INTERNAL_DATASET) {
return null;
}
return ((DatasetDataSource) ds).getDataset();
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..b41fa9d 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 @@
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.entities.Dataset;
import org.apache.asterix.metadata.utils.DatasetUtils;
import org.apache.asterix.om.functions.AsterixBuiltinFunctions;
@@ -227,10 +227,10 @@
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 != Type.INTERNAL_DATASET
+ && dsType != Type.EXTERNAL_DATASET) {
return false;
}
}
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..02be65a 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.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,9 +74,9 @@
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.Type;
+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.ResultSetDataSink;
@@ -724,12 +723,12 @@
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, Type.INTERNAL_DATASET,
dataset.getDatasetDetails(), domain);
}
@@ -1233,7 +1232,7 @@
@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();
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java
index 2751228..2678544 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlIndex.java
@@ -23,7 +23,7 @@
import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSource;
import org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourceIndex;
-public class AqlIndex implements IDataSourceIndex<String, AqlSourceId> {
+public class AqlIndex implements IDataSourceIndex<String, DataSourceId> {
private final Index index;
private final String dataset;
@@ -39,11 +39,11 @@
this.metadataProvider = metadataProvider;
}
- // TODO: Maybe Index can directly implement IDataSourceIndex<String,
AqlSourceId>
+ // TODO: Maybe Index can directly implement IDataSourceIndex<String,
DataSourceId>
@Override
- public IDataSource<AqlSourceId> getDataSource() {
+ public IDataSource<DataSourceId> getDataSource() {
try {
- AqlSourceId asid = new AqlSourceId(dataverse, dataset);
+ DataSourceId asid = new DataSourceId(dataverse, dataset);
return metadataProvider.lookupSourceInMetadata(asid);
} catch (Exception me) {
return null;
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
index f6eeb66..619e2c5 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlMetadataProvider.java
@@ -167,7 +167,7 @@
import
org.apache.hyracks.storage.am.rtree.dataflow.RTreeSearchOperatorDescriptor;
import org.apache.hyracks.storage.am.rtree.frames.RTreePolicyType;
-public class AqlMetadataProvider implements IMetadataProvider<AqlSourceId,
String> {
+public class AqlMetadataProvider implements IMetadataProvider<DataSourceId,
String> {
private final AsterixStorageProperties storageProperties;
private final ILibraryManager libraryManager;
@@ -331,18 +331,18 @@
}
@Override
- public AqlDataSource findDataSource(AqlSourceId id) throws
AlgebricksException {
+ public DataSource findDataSource(DataSourceId id) throws
AlgebricksException {
return MetadataManagerUtil.findDataSource(mdTxnCtx, id);
}
- public AqlDataSource lookupSourceInMetadata(AqlSourceId aqlId) throws
AlgebricksException {
+ public DataSource lookupSourceInMetadata(DataSourceId aqlId) throws
AlgebricksException {
return MetadataManagerUtil.lookupSourceInMetadata(mdTxnCtx, aqlId);
}
@Override
- public IDataSourceIndex<String, AqlSourceId> findDataSourceIndex(String
indexId, AqlSourceId dataSourceId)
+ public IDataSourceIndex<String, DataSourceId> findDataSourceIndex(String
indexId, DataSourceId dataSourceId)
throws AlgebricksException {
- AqlDataSource ads = findDataSource(dataSourceId);
+ DataSource ads = findDataSource(dataSourceId);
Dataset dataset = ((DatasetDataSource) ads).getDataset();
try {
String indexName = indexId;
@@ -375,12 +375,12 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getScannerRuntime(
- IDataSource<AqlSourceId> dataSource, List<LogicalVariable>
scanVariables,
+ IDataSource<DataSourceId> dataSource, List<LogicalVariable>
scanVariables,
List<LogicalVariable> projectVariables, boolean projectPushed,
List<LogicalVariable> minFilterVars,
List<LogicalVariable> maxFilterVars, IOperatorSchema opSchema,
IVariableTypeEnvironment typeEnv,
JobGenContext context, JobSpecification jobSpec, Object
implConfig) throws AlgebricksException {
try {
- return ((AqlDataSource)
dataSource).buildDatasourceScanRuntime(this, dataSource, scanVariables,
+ return ((DataSource) dataSource).buildDatasourceScanRuntime(this,
dataSource, scanVariables,
projectVariables, projectPushed, minFilterVars,
maxFilterVars, opSchema, typeEnv, context, jobSpec,
implConfig);
} catch (AsterixException e) {
@@ -752,7 +752,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getWriteResultRuntime(
- IDataSource<AqlSourceId> dataSource, IOperatorSchema
propagatedSchema, List<LogicalVariable> keys,
+ IDataSource<DataSourceId> dataSource, IOperatorSchema
propagatedSchema, List<LogicalVariable> keys,
LogicalVariable payload, List<LogicalVariable>
additionalNonKeyFields, JobGenContext context,
JobSpecification spec) throws AlgebricksException {
String dataverseName = dataSource.getId().getDataverseName();
@@ -838,7 +838,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getInsertRuntime(
- IDataSource<AqlSourceId> dataSource, IOperatorSchema
propagatedSchema, IVariableTypeEnvironment typeEnv,
+ IDataSource<DataSourceId> dataSource, IOperatorSchema
propagatedSchema, IVariableTypeEnvironment typeEnv,
List<LogicalVariable> keys, LogicalVariable payload,
List<LogicalVariable> additionalNonKeyFields,
List<LogicalVariable> additionalNonFilteringFields,
RecordDescriptor recordDesc, JobGenContext context,
JobSpecification spec, boolean bulkload) throws
AlgebricksException {
@@ -848,7 +848,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getDeleteRuntime(
- IDataSource<AqlSourceId> dataSource, IOperatorSchema
propagatedSchema, IVariableTypeEnvironment typeEnv,
+ IDataSource<DataSourceId> dataSource, IOperatorSchema
propagatedSchema, IVariableTypeEnvironment typeEnv,
List<LogicalVariable> keys, LogicalVariable payload,
List<LogicalVariable> additionalNonKeyFields,
RecordDescriptor recordDesc, JobGenContext context,
JobSpecification spec) throws AlgebricksException {
return getInsertOrDeleteRuntime(IndexOperation.DELETE, dataSource,
propagatedSchema, keys, payload,
@@ -857,7 +857,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getIndexInsertRuntime(
- IDataSourceIndex<String, AqlSourceId> dataSourceIndex,
IOperatorSchema propagatedSchema,
+ IDataSourceIndex<String, DataSourceId> dataSourceIndex,
IOperatorSchema propagatedSchema,
IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv,
List<LogicalVariable> primaryKeys,
List<LogicalVariable> secondaryKeys, List<LogicalVariable>
additionalNonKeyFields,
ILogicalExpression filterExpr, RecordDescriptor recordDesc,
JobGenContext context, JobSpecification spec,
@@ -869,7 +869,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getIndexDeleteRuntime(
- IDataSourceIndex<String, AqlSourceId> dataSourceIndex,
IOperatorSchema propagatedSchema,
+ IDataSourceIndex<String, DataSourceId> dataSourceIndex,
IOperatorSchema propagatedSchema,
IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv,
List<LogicalVariable> primaryKeys,
List<LogicalVariable> secondaryKeys, List<LogicalVariable>
additionalNonKeyFields,
ILogicalExpression filterExpr, RecordDescriptor recordDesc,
JobGenContext context, JobSpecification spec)
@@ -881,7 +881,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getIndexUpsertRuntime(
- IDataSourceIndex<String, AqlSourceId> dataSourceIndex,
IOperatorSchema propagatedSchema,
+ IDataSourceIndex<String, DataSourceId> dataSourceIndex,
IOperatorSchema propagatedSchema,
IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv,
List<LogicalVariable> primaryKeys,
List<LogicalVariable> secondaryKeys, List<LogicalVariable>
additionalFilteringKeys,
ILogicalExpression filterExpr, List<LogicalVariable>
prevSecondaryKeys,
@@ -894,7 +894,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getTokenizerRuntime(
- IDataSourceIndex<String, AqlSourceId> dataSourceIndex,
IOperatorSchema propagatedSchema,
+ IDataSourceIndex<String, DataSourceId> dataSourceIndex,
IOperatorSchema propagatedSchema,
IOperatorSchema[] inputSchemas, IVariableTypeEnvironment typeEnv,
List<LogicalVariable> primaryKeys,
List<LogicalVariable> secondaryKeys, ILogicalExpression
filterExpr, RecordDescriptor recordDesc,
JobGenContext context, JobSpecification spec, boolean bulkload)
throws AlgebricksException {
@@ -1097,7 +1097,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getUpsertRuntime(
- IDataSource<AqlSourceId> dataSource, IOperatorSchema inputSchema,
IVariableTypeEnvironment typeEnv,
+ IDataSource<DataSourceId> dataSource, IOperatorSchema inputSchema,
IVariableTypeEnvironment typeEnv,
List<LogicalVariable> primaryKeys, LogicalVariable payload,
List<LogicalVariable> filterKeys,
List<LogicalVariable> additionalNonFilterFields, RecordDescriptor
recordDesc, JobGenContext context,
JobSpecification spec) throws AlgebricksException {
@@ -1316,7 +1316,7 @@
}
private Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getInsertOrDeleteRuntime(IndexOperation indexOp,
- IDataSource<AqlSourceId> dataSource, IOperatorSchema
propagatedSchema, List<LogicalVariable> keys,
+ IDataSource<DataSourceId> dataSource, IOperatorSchema
propagatedSchema, List<LogicalVariable> keys,
LogicalVariable payload, List<LogicalVariable>
additionalNonKeyFields, RecordDescriptor recordDesc,
JobGenContext context, JobSpecification spec, boolean bulkload,
List<LogicalVariable> additionalNonFilteringFields) throws
AlgebricksException {
@@ -1418,7 +1418,7 @@
}
private Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
getIndexInsertOrDeleteOrUpsertRuntime(
- IndexOperation indexOp, IDataSourceIndex<String, AqlSourceId>
dataSourceIndex,
+ IndexOperation indexOp, IDataSourceIndex<String, DataSourceId>
dataSourceIndex,
IOperatorSchema propagatedSchema, IOperatorSchema[] inputSchemas,
IVariableTypeEnvironment typeEnv,
List<LogicalVariable> primaryKeys, List<LogicalVariable>
secondaryKeys,
List<LogicalVariable> additionalNonKeyFields, ILogicalExpression
filterExpr, RecordDescriptor recordDesc,
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlDataSource.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java
similarity index 93%
rename from
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlDataSource.java
rename to
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java
index 6db28c5..a91ae0d 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlDataSource.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java
@@ -41,9 +41,9 @@
import org.apache.hyracks.api.dataflow.IOperatorDescriptor;
import org.apache.hyracks.api.job.JobSpecification;
-public abstract class AqlDataSource implements IDataSource<AqlSourceId> {
+public abstract class DataSource implements IDataSource<DataSourceId> {
- protected final AqlSourceId id;
+ protected final DataSourceId id;
protected final IAType itemType;
protected final IAType metaItemType;
protected final byte datasourceType;
@@ -51,7 +51,7 @@
protected INodeDomain domain;
protected Map<String, Serializable> properties = new HashMap<>();
- public static class AqlDataSourceType {
+ public static class Type {
// positive range is reserved for core datasource types
public static final byte INTERNAL_DATASET = 0x00;
public static final byte EXTERNAL_DATASET = 0x01;
@@ -59,11 +59,11 @@
public static final byte LOADABLE = 0x03;
// Hide implicit public constructor
- private AqlDataSourceType() {
+ private Type() {
}
}
- public AqlDataSource(AqlSourceId id, IAType itemType, IAType metaItemType,
byte datasourceType,
+ public DataSource(DataSourceId id, IAType itemType, IAType metaItemType,
byte datasourceType,
INodeDomain domain) throws AlgebricksException {
this.id = id;
this.itemType = itemType;
@@ -88,7 +88,7 @@
}
@Override
- public AqlSourceId getId() {
+ public DataSourceId getId() {
return id;
}
@@ -99,7 +99,7 @@
@Override
public IDataSourcePropertiesProvider getPropertiesProvider() {
- return new AqlDataSourcePartitioningProvider(this, domain);
+ return new DataSourcePartitioningProvider(this, domain);
}
@Override
@@ -156,7 +156,7 @@
}
public abstract Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
buildDatasourceScanRuntime(
- AqlMetadataProvider aqlMetadataProvider, IDataSource<AqlSourceId>
dataSource,
+ AqlMetadataProvider aqlMetadataProvider, IDataSource<DataSourceId>
dataSource,
List<LogicalVariable> scanVariables, List<LogicalVariable>
projectVariables, boolean projectPushed,
List<LogicalVariable> minFilterVars, List<LogicalVariable>
maxFilterVars, IOperatorSchema opSchema,
IVariableTypeEnvironment typeEnv, JobGenContext context,
JobSpecification jobSpec, Object implConfig)
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlSourceId.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSourceId.java
similarity index 92%
rename from
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlSourceId.java
rename to
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSourceId.java
index 295b59a..d4329a3 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlSourceId.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSourceId.java
@@ -21,12 +21,12 @@
import java.io.File;
-public class AqlSourceId {
+public class DataSourceId {
private String dataverseName;
private String datasourceName;
- public AqlSourceId(String dataverseName, String datasourceName) {
+ public DataSourceId(String dataverseName, String datasourceName) {
this.dataverseName = dataverseName;
this.datasourceName = datasourceName;
}
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlDataSourcePartitioningProvider.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSourcePartitioningProvider.java
similarity index 88%
rename from
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlDataSourcePartitioningProvider.java
rename to
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSourcePartitioningProvider.java
index 14a6e68..c702e52 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/AqlDataSourcePartitioningProvider.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSourcePartitioningProvider.java
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Set;
-import org.apache.asterix.metadata.declared.AqlDataSource.AqlDataSourceType;
+import org.apache.asterix.metadata.declared.DataSource.Type;
import org.apache.hyracks.algebricks.common.utils.ListSet;
import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
import
org.apache.hyracks.algebricks.core.algebra.metadata.IDataSourcePropertiesProvider;
@@ -37,12 +37,12 @@
import
org.apache.hyracks.algebricks.core.algebra.properties.StructuralPropertiesVector;
import
org.apache.hyracks.algebricks.core.algebra.properties.UnorderedPartitionedProperty;
-public class AqlDataSourcePartitioningProvider implements
IDataSourcePropertiesProvider {
+public class DataSourcePartitioningProvider implements
IDataSourcePropertiesProvider {
- private final AqlDataSource ds;
+ private final DataSource ds;
private final INodeDomain domain;
- public AqlDataSourcePartitioningProvider(AqlDataSource dataSource,
INodeDomain domain) {
+ public DataSourcePartitioningProvider(DataSource dataSource, INodeDomain
domain) {
this.ds = dataSource;
this.domain = domain;
}
@@ -53,15 +53,15 @@
IPartitioningProperty pp;
List<ILocalStructuralProperty> propsLocal = new ArrayList<>();
switch (ds.getDatasourceType()) {
- case AqlDataSourceType.LOADABLE:
- case AqlDataSourceType.EXTERNAL_DATASET:
+ case Type.LOADABLE:
+ case Type.EXTERNAL_DATASET:
pp = new RandomPartitioningProperty(domain);
ds.computeLocalStructuralProperties(propsLocal, scanVariables);
break;
- case AqlDataSourceType.FEED:
+ case Type.FEED:
pp = getFeedPartitioningProperty(ds, domain, scanVariables);
break;
- case AqlDataSourceType.INTERNAL_DATASET:
+ case Type.INTERNAL_DATASET:
Set<LogicalVariable> pvars = new ListSet<>();
pp = getInternalDatasetPartitioningProperty(ds, domain,
scanVariables, pvars);
propsLocal.add(new LocalOrderProperty(getOrderColumns(pvars)));
@@ -81,7 +81,7 @@
return orderColumns;
}
- private static IPartitioningProperty
getInternalDatasetPartitioningProperty(AqlDataSource ds, INodeDomain domain,
+ private static IPartitioningProperty
getInternalDatasetPartitioningProperty(DataSource ds, INodeDomain domain,
List<LogicalVariable> scanVariables, Set<LogicalVariable> pvars) {
IPartitioningProperty pp;
if (scanVariables.size() < 2) {
@@ -93,7 +93,7 @@
return pp;
}
- public static IPartitioningProperty
getFeedPartitioningProperty(AqlDataSource ds, INodeDomain domain,
+ public static IPartitioningProperty getFeedPartitioningProperty(DataSource
ds, INodeDomain domain,
List<LogicalVariable> scanVariables) {
IPartitioningProperty pp;
if (scanVariables.size() < 2) {
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java
index 9729c77..1499f0f 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DatasetDataSource.java
@@ -44,11 +44,11 @@
import org.apache.hyracks.api.dataflow.IOperatorDescriptor;
import org.apache.hyracks.api.job.JobSpecification;
-public class DatasetDataSource extends AqlDataSource {
+public class DatasetDataSource extends DataSource {
private Dataset dataset;
- public DatasetDataSource(AqlSourceId id, Dataset dataset, IAType itemType,
IAType metaItemType,
+ public DatasetDataSource(DataSourceId id, Dataset dataset, IAType
itemType, IAType metaItemType,
byte datasourceType, IDatasetDetails datasetDetails, INodeDomain
datasetDomain)
throws AlgebricksException {
super(id, itemType, metaItemType, datasourceType, datasetDomain);
@@ -92,7 +92,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
buildDatasourceScanRuntime(
- AqlMetadataProvider aqlMetadataProvider, IDataSource<AqlSourceId>
dataSource,
+ AqlMetadataProvider aqlMetadataProvider, IDataSource<DataSourceId>
dataSource,
List<LogicalVariable> scanVariables, List<LogicalVariable>
projectVariables, boolean projectPushed,
List<LogicalVariable> minFilterVars, List<LogicalVariable>
maxFilterVars, IOperatorSchema opSchema,
IVariableTypeEnvironment typeEnv, JobGenContext context,
JobSpecification jobSpec, Object implConfig)
@@ -110,7 +110,7 @@
return
aqlMetadataProvider.buildExternalDatasetDataScannerRuntime(jobSpec, itemType,
adapterFactory,
NonTaggedDataFormat.INSTANCE);
case INTERNAL:
- AqlSourceId asid = getId();
+ DataSourceId asid = getId();
String dataverseName = asid.getDataverseName();
String datasetName = asid.getDatasourceName();
Index primaryIndex =
MetadataManager.INSTANCE.getIndex(aqlMetadataProvider.getMetadataTxnContext(),
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java
index d1d5df0..cb9464b 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FeedDataSource.java
@@ -50,7 +50,7 @@
import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
import org.apache.hyracks.api.job.JobSpecification;
-public class FeedDataSource extends AqlDataSource implements
IMutationDataSource {
+public class FeedDataSource extends DataSource implements IMutationDataSource {
private final Feed feed;
private final EntityId sourceFeedId;
@@ -62,12 +62,12 @@
private final List<IAType> pkTypes;
private final List<ScalarFunctionCallExpression> keyAccessExpression;
- public FeedDataSource(Feed feed, AqlSourceId id, String targetDataset,
IAType itemType, IAType metaType,
+ public FeedDataSource(Feed feed, DataSourceId id, String targetDataset,
IAType itemType, IAType metaType,
List<IAType> pkTypes, List<List<String>> partitioningKeys,
List<ScalarFunctionCallExpression> keyAccessExpression, EntityId
sourceFeedId,
IFeed.FeedType sourceFeedType, FeedRuntimeType location, String[]
locations, INodeDomain domain)
throws AlgebricksException {
- super(id, itemType, metaType, AqlDataSourceType.FEED, domain);
+ super(id, itemType, metaType, Type.FEED, domain);
this.feed = feed;
this.targetDataset = targetDataset;
this.sourceFeedId = sourceFeedId;
@@ -166,7 +166,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
buildDatasourceScanRuntime(
- AqlMetadataProvider aqlMetadataProvider, IDataSource<AqlSourceId>
dataSource,
+ AqlMetadataProvider aqlMetadataProvider, IDataSource<DataSourceId>
dataSource,
List<LogicalVariable> scanVariables, List<LogicalVariable>
projectVariables, boolean projectPushed,
List<LogicalVariable> minFilterVars, List<LogicalVariable>
maxFilterVars, IOperatorSchema opSchema,
IVariableTypeEnvironment typeEnv, JobGenContext context,
JobSpecification jobSpec, Object implConfig)
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java
index 200a5a9..c860c8d 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java
@@ -46,7 +46,7 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.job.JobSpecification;
-public class LoadableDataSource extends AqlDataSource {
+public class LoadableDataSource extends DataSource {
private final Dataset targetDataset;
private final List<List<String>> partitioningKeys;
@@ -56,7 +56,7 @@
public LoadableDataSource(Dataset targetDataset, IAType itemType, IAType
metaItemType, String adapter,
Map<String, String> properties) throws AlgebricksException,
IOException {
- super(new AqlSourceId("loadable_dv", "loadable_ds"), itemType,
metaItemType, AqlDataSourceType.LOADABLE, null);
+ super(new DataSourceId("loadable_dv", "loadable_ds"), itemType,
metaItemType, Type.LOADABLE, null);
this.targetDataset = targetDataset;
this.adapter = adapter;
this.adapterProperties = properties;
@@ -127,7 +127,7 @@
@Override
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
buildDatasourceScanRuntime(
- AqlMetadataProvider aqlMetadataProvider, IDataSource<AqlSourceId>
dataSource,
+ AqlMetadataProvider aqlMetadataProvider, IDataSource<DataSourceId>
dataSource,
List<LogicalVariable> scanVariables, List<LogicalVariable>
projectVariables, boolean projectPushed,
List<LogicalVariable> minFilterVars, List<LogicalVariable>
maxFilterVars, IOperatorSchema opSchema,
IVariableTypeEnvironment typeEnv, JobGenContext context,
JobSpecification jobSpec, Object implConfig)
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java
index 39ad1c6..152ac3f 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java
@@ -25,7 +25,7 @@
import org.apache.asterix.metadata.MetadataException;
import org.apache.asterix.metadata.MetadataManager;
import org.apache.asterix.metadata.MetadataTransactionContext;
-import org.apache.asterix.metadata.declared.AqlDataSource.AqlDataSourceType;
+import org.apache.asterix.metadata.declared.DataSource.Type;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.DatasourceAdapter;
import org.apache.asterix.metadata.entities.Datatype;
@@ -151,9 +151,9 @@
}
}
- public static AqlDataSource findDataSource(MetadataTransactionContext
mdTxnCtx, AqlSourceId id)
+ public static DataSource findDataSource(MetadataTransactionContext
mdTxnCtx, DataSourceId id)
throws AlgebricksException {
- AqlSourceId aqlId = id;
+ DataSourceId aqlId = id;
try {
return lookupSourceInMetadata(mdTxnCtx, aqlId);
} catch (MetadataException e) {
@@ -161,7 +161,7 @@
}
}
- public static AqlDataSource
lookupSourceInMetadata(MetadataTransactionContext mdTxnCtx, AqlSourceId aqlId)
+ public static DataSource lookupSourceInMetadata(MetadataTransactionContext
mdTxnCtx, DataSourceId aqlId)
throws AlgebricksException {
Dataset dataset = findDataset(mdTxnCtx, aqlId.getDataverseName(),
aqlId.getDatasourceName());
if (dataset == null) {
@@ -170,8 +170,8 @@
IAType itemType = findType(mdTxnCtx,
dataset.getItemTypeDataverseName(), dataset.getItemTypeName());
IAType metaItemType = findType(mdTxnCtx,
dataset.getMetaItemTypeDataverseName(), dataset.getMetaItemTypeName());
INodeDomain domain = findNodeDomain(mdTxnCtx,
dataset.getNodeGroupName());
- byte datasourceType =
dataset.getDatasetType().equals(DatasetType.EXTERNAL) ?
AqlDataSourceType.EXTERNAL_DATASET
- : AqlDataSourceType.INTERNAL_DATASET;
+ byte datasourceType =
dataset.getDatasetType().equals(DatasetType.EXTERNAL) ? Type.EXTERNAL_DATASET
+ : DataSource.Type.INTERNAL_DATASET;
return new DatasetDataSource(aqlId, dataset, itemType, metaItemType,
datasourceType,
dataset.getDatasetDetails(), domain);
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/1314
To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia0b64ffa7c50cd62fc3303fdb44eb769f56c978a
Gerrit-PatchSet: 1
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Owner: Till Westmann <[email protected]>
