More cleanup.
git-svn-id: https://asterixdb.googlecode.com/svn/branches/asterix_fix_issue_96@448 eaa15691-b419-025a-1212-ee371bd00084
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/BTreeSearchPOperator.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/BTreeSearchPOperator.java
index 10a093b..25a02d1 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/BTreeSearchPOperator.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/BTreeSearchPOperator.java
@@ -72,7 +72,7 @@
if (dataset == null) {
throw new AlgebricksException("Unknown dataset " + jobGenParams.getDatasetName());
}
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AlgebricksException("Trying to run btree search over external dataset ("
+ jobGenParams.getDatasetName() + ").");
}
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/InvertedIndexPOperator.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/InvertedIndexPOperator.java
index 5157b35..ec1a525 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/InvertedIndexPOperator.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/InvertedIndexPOperator.java
@@ -87,7 +87,7 @@
if (dataset == null) {
throw new AlgebricksException("Unknown dataset " + jobGenParams.getDatasetName());
}
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AlgebricksException("Trying to run inverted index search over external dataset (" + jobGenParams.getDatasetName() + ").");
}
int[] keyIndexes = getKeyIndexes(jobGenParams.getKeyVarList(), inputSchemas);
@@ -113,7 +113,7 @@
ATypeTag searchKeyType, int[] keyFields, SearchModifierType searchModifierType,
IAlgebricksConstantValue similarityThreshold) throws AlgebricksException {
IAObject simThresh = ((AsterixConstantValue)similarityThreshold).getObject();
- String itemTypeName = dataset.getDatatypeName();
+ String itemTypeName = dataset.getItemTypeName();
IAType itemType = metadata.findType(itemTypeName);
int numPrimaryKeys = DatasetUtils.getPartitioningKeys(dataset).size();
Index secondaryIndex = metadata.getIndex(dataset.getDataverseName(), dataset.getDatasetName(), indexName);
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/RTreeSearchPOperator.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/RTreeSearchPOperator.java
index 587b845..2b555c8 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/RTreeSearchPOperator.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/algebra/operators/physical/RTreeSearchPOperator.java
@@ -67,7 +67,7 @@
if (dataset == null) {
throw new AlgebricksException("Unknown dataset " + jobGenParams.getDatasetName());
}
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AlgebricksException("Trying to run rtree search over external dataset ("
+ jobGenParams.getDatasetName() + ").");
}
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
index f2c4f83..63e32ba 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
@@ -95,14 +95,14 @@
if (dataset == null) {
throw new AlgebricksException("Unknown dataset " + datasetName);
}
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
return false;
}
List<LogicalVariable> projectVars = new ArrayList<LogicalVariable>();
VariableUtilities.getUsedVariables(op1, projectVars);
// Create operators for secondary index insert/delete.
- String itemTypeName = dataset.getDatatypeName();
+ String itemTypeName = dataset.getItemTypeName();
IAType itemType = metadata.findType(itemTypeName);
if (itemType.getTypeTag() != ATypeTag.RECORD) {
throw new AlgebricksException("Only record types can be indexed.");
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/PushFieldAccessRule.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/PushFieldAccessRule.java
index 87b233a..53fe9e9 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/PushFieldAccessRule.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/PushFieldAccessRule.java
@@ -120,7 +120,7 @@
if (dataset == null) {
throw new AlgebricksException("Dataset " + asid.getDatasetName() + " not found.");
}
- if (dataset.getType() != DatasetType.INTERNAL && dataset.getType() != DatasetType.FEED) {
+ if (dataset.getDatasetType() != DatasetType.INTERNAL && dataset.getDatasetType() != DatasetType.FEED) {
return false;
}
ILogicalExpression e1 = accessFun.getArguments().get(1).getValue();
@@ -134,7 +134,7 @@
fldName = ((AString) obj).getStringValue();
} else {
int pos = ((AInt32) obj).getIntegerValue();
- String tName = dataset.getDatatypeName();
+ String tName = dataset.getItemTypeName();
IAType t = metadata.findType(tName);
if (t.getTypeTag() != ATypeTag.RECORD) {
return false;
@@ -296,8 +296,8 @@
if (dataset == null) {
throw new AlgebricksException("Dataset " + asid.getDatasetName() + " not found.");
}
- if (dataset.getType() != DatasetType.INTERNAL
- && dataset.getType() != DatasetType.FEED) {
+ if (dataset.getDatasetType() != DatasetType.INTERNAL
+ && dataset.getDatasetType() != DatasetType.FEED) {
setAsFinal(access, context, finalAnnot);
return false;
}
@@ -308,7 +308,7 @@
fldName = ((AString) obj).getStringValue();
} else {
int pos = ((AInt32) obj).getIntegerValue();
- String tName = dataset.getDatatypeName();
+ String tName = dataset.getItemTypeName();
IAType t = metadata.findType(tName);
if (t.getTypeTag() != ATypeTag.RECORD) {
return false;
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/UnnestToDataScanRule.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/UnnestToDataScanRule.java
index c2b35fa..44610f4 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/UnnestToDataScanRule.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/UnnestToDataScanRule.java
@@ -86,7 +86,7 @@
ArrayList<LogicalVariable> v = new ArrayList<LogicalVariable>();
- if (dataset.getType() == DatasetType.INTERNAL || dataset.getType() == DatasetType.FEED) {
+ if (dataset.getDatasetType() == DatasetType.INTERNAL || dataset.getDatasetType() == DatasetType.FEED) {
int numPrimaryKeys = DatasetUtils.getPartitioningKeys(dataset).size();
for (int i = 0; i < numPrimaryKeys; i++) {
v.add(context.newVar());
@@ -131,8 +131,8 @@
throw new AlgebricksException("Could not find dataset " + datasetName);
}
- if (dataset.getType() != DatasetType.FEED) {
- throw new IllegalArgumentException("invalid dataset type:" + dataset.getType());
+ if (dataset.getDatasetType() != DatasetType.FEED) {
+ throw new IllegalArgumentException("invalid dataset type:" + dataset.getDatasetType());
}
AqlSourceId asid = new AqlSourceId(metadata.getDataverseName(), datasetName);
@@ -169,7 +169,7 @@
if (!aqlId.getDataverseName().equals(metadata.getDataverseName())) {
return null;
}
- String tName = dataset.getDatatypeName();
+ String tName = dataset.getItemTypeName();
IAType itemType = metadata.findType(tName);
ExternalFeedDataSource extDataSource = new ExternalFeedDataSource(aqlId, dataset, itemType,
AqlDataSource.AqlDataSourceType.EXTERNAL_FEED);
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java
index e54c36d..69651f3 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/optimizer/rules/am/OptimizableOperatorSubTree.java
@@ -96,11 +96,11 @@
if (dataset == null) {
throw new AlgebricksException("No metadata for dataset " + datasetName);
}
- if (dataset.getType() != DatasetType.INTERNAL && dataset.getType() != DatasetType.FEED) {
+ if (dataset.getDatasetType() != DatasetType.INTERNAL && dataset.getDatasetType() != DatasetType.FEED) {
return false;
}
// Get the record type for that dataset.
- IAType itemType = metadata.findType(dataset.getDatatypeName());
+ IAType itemType = metadata.findType(dataset.getItemTypeName());
if (itemType.getTypeTag() != ATypeTag.RECORD) {
return false;
}
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/AqlExpressionToPlanTranslator.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/AqlExpressionToPlanTranslator.java
index 2f483d8..3ef3160 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/AqlExpressionToPlanTranslator.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/AqlExpressionToPlanTranslator.java
@@ -224,10 +224,10 @@
}
AqlSourceId sourceId = new AqlSourceId(dataVerseName, outputDatasetName);
- String itemTypeName = dataset.getDatatypeName();
+ String itemTypeName = dataset.getItemTypeName();
IAType itemType = compiledDeclarations.findType(itemTypeName);
AqlDataSource dataSource = new AqlDataSource(sourceId, dataset, itemType);
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AlgebricksException("Cannot write output to an external dataset.");
}
ArrayList<LogicalVariable> vars = new ArrayList<LogicalVariable>();
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/AqlPlusExpressionToPlanTranslator.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/AqlPlusExpressionToPlanTranslator.java
index 9fb3d97..22ccdcf 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/AqlPlusExpressionToPlanTranslator.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/AqlPlusExpressionToPlanTranslator.java
@@ -259,10 +259,10 @@
if (dataset == null) {
throw new AlgebricksException("Cannot find dataset " + outputDatasetName);
}
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AlgebricksException("Cannot write output to an external dataset.");
}
- ARecordType itemType = (ARecordType) compiledDeclarations.findType(dataset.getDatatypeName());
+ ARecordType itemType = (ARecordType) compiledDeclarations.findType(dataset.getItemTypeName());
List<String> partitioningKeys = DatasetUtils.getPartitioningKeys(dataset);
ArrayList<LogicalVariable> vars = new ArrayList<LogicalVariable>();
ArrayList<Mutable<ILogicalExpression>> exprs = new ArrayList<Mutable<ILogicalExpression>>();
diff --git a/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/DmlTranslator.java b/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/DmlTranslator.java
index 0a5c516..c8b1079 100644
--- a/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/DmlTranslator.java
+++ b/asterix-algebra/src/main/java/edu/uci/ics/asterix/translator/DmlTranslator.java
@@ -464,7 +464,7 @@
if (dataset == null) {
throw new AlgebricksException("Unknown dataset " + datasetName);
}
- String itemTypeName = dataset.getDatatypeName();
+ String itemTypeName = dataset.getItemTypeName();
IAType itemType = compiledDeclarations.findType(itemTypeName);
ARecordType recType = (ARecordType) itemType;
String[] fieldNames = recType.getFieldNames();
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/DdlTranslator.java b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/DdlTranslator.java
index 8c32522..dc3fb25 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/DdlTranslator.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/aql/translator/DdlTranslator.java
@@ -308,7 +308,7 @@
List<Dataset> datasets = MetadataManager.INSTANCE.getDataverseDatasets(mdTxnCtx, dvName);
for (int j = 0; j < datasets.size(); j++) {
String datasetName = datasets.get(j).getDatasetName();
- DatasetType dsType = datasets.get(j).getType();
+ DatasetType dsType = datasets.get(j).getDatasetType();
if (dsType == DatasetType.INTERNAL || dsType == DatasetType.FEED) {
List<Index> indexes = MetadataManager.INSTANCE.getDatasetIndexes(mdTxnCtx, dvName,
datasetName);
@@ -341,7 +341,7 @@
if (!stmtDelete.getIfExists())
throw new AlgebricksException("There is no dataset with this name " + datasetName + ".");
} else {
- if (ds.getType() == DatasetType.INTERNAL || ds.getType() == DatasetType.FEED) {
+ if (ds.getDatasetType() == DatasetType.INTERNAL || ds.getDatasetType() == DatasetType.FEED) {
List<Index> indexes = MetadataManager.INSTANCE.getDatasetIndexes(mdTxnCtx,
compiledDeclarations.getDataverseName(), datasetName);
for (int j = 0; j < indexes.size(); j++) {
@@ -362,7 +362,7 @@
datasetName);
if (ds == null)
throw new AlgebricksException("There is no dataset with this name " + datasetName + ".");
- if (ds.getType() == DatasetType.INTERNAL || ds.getType() == DatasetType.FEED) {
+ if (ds.getDatasetType() == DatasetType.INTERNAL || ds.getDatasetType() == DatasetType.FEED) {
String indexName = stmtDelete.getIndexName().getValue();
Index idx = MetadataManager.INSTANCE.getIndex(mdTxnCtx,
compiledDeclarations.getDataverseName(), datasetName, indexName);
@@ -502,7 +502,7 @@
CompiledDatasetDropStatement cds = new CompiledDatasetDropStatement(datasetName);
Dataset ds = MetadataManager.INSTANCE
.getDataset(mdTxnCtx, compiledDeclarations.getDataverseName(), datasetName);
- if (ds.getType() == DatasetType.INTERNAL || ds.getType() == DatasetType.FEED) {
+ if (ds.getDatasetType() == DatasetType.INTERNAL || ds.getDatasetType() == DatasetType.FEED) {
JobSpecification[] jobs = DatasetOperations.createDropDatasetJobSpec(cds, compiledDeclarations);
for (JobSpecification job : jobs)
runJob(hcc, job);
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/file/DatasetOperations.java b/asterix-app/src/main/java/edu/uci/ics/asterix/file/DatasetOperations.java
index a194265..851507b 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/file/DatasetOperations.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/file/DatasetOperations.java
@@ -100,7 +100,7 @@
if (dataset == null) {
throw new AlgebricksException("DROP DATASET: No metadata for dataset " + datasetName);
}
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
return new JobSpecification[0];
}
@@ -153,7 +153,7 @@
if (dataset == null) {
throw new AsterixException("Could not find dataset " + datasetName);
}
- ARecordType itemType = (ARecordType) metadata.findType(dataset.getDatatypeName());
+ ARecordType itemType = (ARecordType) metadata.findType(dataset.getItemTypeName());
JobSpecification spec = new JobSpecification();
IBinaryComparatorFactory[] comparatorFactories = DatasetUtils.computeKeysBinaryComparatorFactories(
dataset, itemType, metadata.getFormat().getBinaryComparatorFactoryProvider());
@@ -184,14 +184,14 @@
if (dataset == null) {
throw new AsterixException("Could not find dataset " + datasetName);
}
- if (dataset.getType() != DatasetType.INTERNAL
- && dataset.getType() != DatasetType.FEED) {
+ if (dataset.getDatasetType() != DatasetType.INTERNAL
+ && dataset.getDatasetType() != DatasetType.FEED) {
throw new AsterixException("Cannot load data into dataset (" + datasetName + ")" + "of type "
- + dataset.getType());
+ + dataset.getDatasetType());
}
JobSpecification spec = new JobSpecification();
- ARecordType itemType = (ARecordType) metadata.findType(dataset.getDatatypeName());
+ ARecordType itemType = (ARecordType) metadata.findType(dataset.getItemTypeName());
IDataFormat format = metadata.getFormat();
ISerializerDeserializer payloadSerde = format.getSerdeProvider().getSerializerDeserializer(itemType);
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/file/FeedOperations.java b/asterix-app/src/main/java/edu/uci/ics/asterix/file/FeedOperations.java
index f94ed34..66beb76 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/file/FeedOperations.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/file/FeedOperations.java
@@ -74,8 +74,8 @@
if (dataset == null) {
throw new AsterixException("FEED DATASET: No metadata for dataset " + datasetName);
}
- if (dataset.getType() != DatasetType.FEED) {
- throw new AsterixException("Operation not support for dataset type " + dataset.getType());
+ if (dataset.getDatasetType() != DatasetType.FEED) {
+ throw new AsterixException("Operation not support for dataset type " + dataset.getDatasetType());
}
JobSpecification spec = new JobSpecification();
diff --git a/asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryIndexCreator.java b/asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryIndexCreator.java
index 63b4178..60e3c31 100644
--- a/asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryIndexCreator.java
+++ b/asterix-app/src/main/java/edu/uci/ics/asterix/file/SecondaryIndexCreator.java
@@ -126,10 +126,10 @@
if (dataset == null) {
throw new AsterixException("Unknown dataset " + datasetName);
}
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AsterixException("Cannot index an external dataset (" + datasetName + ").");
}
- itemType = (ARecordType) metadata.findType(dataset.getDatatypeName());
+ itemType = (ARecordType) metadata.findType(dataset.getItemTypeName());
payloadSerde = AqlSerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(itemType);
numPrimaryKeys = DatasetUtils.getPartitioningKeys(dataset).size();
numSecondaryKeys = createIndexStmt.getKeyFields().size();
diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataNode.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataNode.java
index 6ac37c3..29e0c3c 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataNode.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/MetadataNode.java
@@ -152,7 +152,7 @@
DatasetTupleTranslator tupleReaderWriter = new DatasetTupleTranslator(true);
ITupleReference datasetTuple = tupleReaderWriter.getTupleFromMetadataEntity(dataset);
insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
- if (dataset.getType() == DatasetType.INTERNAL || dataset.getType() == DatasetType.FEED) {
+ if (dataset.getDatasetType() == DatasetType.INTERNAL || dataset.getDatasetType() == DatasetType.FEED) {
// Add the primary index for the dataset.
InternalDatasetDetails id = (InternalDatasetDetails) dataset.getDatasetDetails();
Index primaryIndex = new Index(dataset.getDataverseName(), dataset.getDatasetName(),
@@ -163,7 +163,7 @@
insertTupleIntoIndex(txnId, MetadataSecondaryIndexes.GROUPNAME_ON_DATASET_INDEX, nodeGroupTuple);
}
// Add entry in datatype secondary index.
- ITupleReference dataTypeTuple = createTuple(dataset.getDataverseName(), dataset.getDatatypeName(),
+ ITupleReference dataTypeTuple = createTuple(dataset.getDataverseName(), dataset.getItemTypeName(),
dataset.getDatasetName());
insertTupleIntoIndex(txnId, MetadataSecondaryIndexes.DATATYPENAME_ON_DATASET_INDEX, dataTypeTuple);
} catch (BTreeDuplicateKeyException e) {
@@ -320,7 +320,7 @@
ITupleReference datasetTuple = getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey);
deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
// Delete entry from secondary index 'group'.
- if (dataset.getType() == DatasetType.INTERNAL || dataset.getType() == DatasetType.FEED) {
+ if (dataset.getDatasetType() == DatasetType.INTERNAL || dataset.getDatasetType() == DatasetType.FEED) {
InternalDatasetDetails id = (InternalDatasetDetails) dataset.getDatasetDetails();
ITupleReference groupNameSearchKey = createTuple(id.getNodeGroupName(), dataverseName, datasetName);
// Searches the index for the tuple to be deleted. Acquires an S
@@ -330,14 +330,14 @@
deleteTupleFromIndex(txnId, MetadataSecondaryIndexes.GROUPNAME_ON_DATASET_INDEX, groupNameTuple);
}
// Delete entry from secondary index 'type'.
- ITupleReference dataTypeSearchKey = createTuple(dataverseName, dataset.getDatatypeName(), datasetName);
+ ITupleReference dataTypeSearchKey = createTuple(dataverseName, dataset.getItemTypeName(), datasetName);
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the DATATYPENAME_ON_DATASET_INDEX index.
ITupleReference dataTypeTuple = getTupleToBeDeleted(txnId,
MetadataSecondaryIndexes.DATATYPENAME_ON_DATASET_INDEX, dataTypeSearchKey);
deleteTupleFromIndex(txnId, MetadataSecondaryIndexes.DATATYPENAME_ON_DATASET_INDEX, dataTypeTuple);
// Delete entry(s) from the 'indexes' dataset.
- if (dataset.getType() == DatasetType.INTERNAL || dataset.getType() == DatasetType.FEED) {
+ if (dataset.getDatasetType() == DatasetType.INTERNAL || dataset.getDatasetType() == DatasetType.FEED) {
List<Index> datasetIndexes = getDatasetIndexes(txnId, dataverseName, datasetName);
for (Index index : datasetIndexes) {
dropIndex(txnId, dataverseName, datasetName, index.getIndexName());
diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlCompiledMetadataDeclarations.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlCompiledMetadataDeclarations.java
index 0892756..23f1e77 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlCompiledMetadataDeclarations.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlCompiledMetadataDeclarations.java
@@ -260,7 +260,7 @@
File relPathFile = new File(getRelativePath(datasetName + "_idx_" + targetIdxName));
Dataset dataset = findDataset(datasetName);
- if (dataset.getType() != DatasetType.INTERNAL & dataset.getType() != DatasetType.FEED) {
+ if (dataset.getDatasetType() != DatasetType.INTERNAL & dataset.getDatasetType() != DatasetType.FEED) {
throw new AlgebricksException("Not an internal or feed dataset");
}
InternalDatasetDetails datasetDetails = (InternalDatasetDetails) dataset.getDatasetDetails();
diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlDataSource.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlDataSource.java
index 583985f..b7ba1a1 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlDataSource.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlDataSource.java
@@ -84,7 +84,7 @@
public AqlDataSource(AqlSourceId id, Dataset dataset, IAType itemType) throws AlgebricksException {
this.id = id;
this.dataset = dataset;
- switch (dataset.getType()) {
+ switch (dataset.getDatasetType()) {
case FEED:
initFeedDataset(itemType, dataset);
break;
@@ -170,7 +170,7 @@
@Override
public IDataSourcePropertiesProvider getPropertiesProvider() {
- return new AqlDataSourcePartitioningProvider(dataset.getType(), domain);
+ return new AqlDataSourcePartitioningProvider(dataset.getDatasetType(), domain);
}
@Override
diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlMetadataProvider.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlMetadataProvider.java
index 06aec91..f9b5f1d 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlMetadataProvider.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/declared/AqlMetadataProvider.java
@@ -126,7 +126,7 @@
if (dataset == null) {
throw new AlgebricksException("Unknown dataset " + dataSource.getId().getDatasetName());
}
- switch (dataset.getType()) {
+ switch (dataset.getDatasetType()) {
case FEED:
if (dataSource instanceof ExternalFeedDataSource) {
return buildExternalDatasetScan(jobSpec, dataset, dataSource);
@@ -148,29 +148,21 @@
private Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> buildInternalDatasetScan(JobSpecification jobSpec,
List<LogicalVariable> outputVars, IOperatorSchema opSchema, IVariableTypeEnvironment typeEnv,
- Dataset dataset, IDataSource<AqlSourceId> dataSource, JobGenContext context)
- throws AlgebricksException {
+ Dataset dataset, IDataSource<AqlSourceId> dataSource, JobGenContext context) throws AlgebricksException {
AqlSourceId asid = dataSource.getId();
String dataverseName = asid.getDataverseName();
String datasetName = asid.getDatasetName();
Index primaryIndex = metadata.getDatasetPrimaryIndex(dataverseName, datasetName);
- return buildBtreeRuntime(jobSpec, outputVars, opSchema, typeEnv, metadata, context, false, datasetName, dataset,
- primaryIndex.getIndexName(), null, null, true, true);
+ return buildBtreeRuntime(jobSpec, outputVars, opSchema, typeEnv, metadata, context, false, datasetName,
+ dataset, primaryIndex.getIndexName(), null, null, true, true);
}
private Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> buildExternalDatasetScan(JobSpecification jobSpec,
Dataset dataset, IDataSource<AqlSourceId> dataSource) throws AlgebricksException {
- String itemTypeName = dataset.getDatatypeName();
- IAType itemType;
- try {
- itemType = metadata.findType(itemTypeName);
- } catch (Exception e) {
- throw new AlgebricksException(e);
- }
-
+ String itemTypeName = dataset.getItemTypeName();
+ IAType itemType = metadata.findType(itemTypeName);
if (dataSource instanceof ExternalFeedDataSource) {
- FeedDatasetDetails datasetDetails = (FeedDatasetDetails) ((ExternalFeedDataSource) dataSource).getDataset()
- .getDatasetDetails();
+ FeedDatasetDetails datasetDetails = (FeedDatasetDetails) dataset.getDatasetDetails();
return buildFeedIntakeRuntime(jobSpec, metadata.getDataverseName(), dataset.getDatasetName(), itemType,
datasetDetails, metadata.getFormat());
} else {
@@ -328,14 +320,7 @@
AqlCompiledMetadataDeclarations metadata, JobGenContext context, JobSpecification jobSpec,
String datasetName, Dataset dataset, String indexName, int[] keyFields)
throws AlgebricksException {
- // TODO: This can be shrunk to a single line.
- String itemTypeName = dataset.getDatatypeName();
- IAType itemType = metadata.findType(itemTypeName);
- if (itemType.getTypeTag() != ATypeTag.RECORD) {
- throw new AlgebricksException("Only record types can be indexed.");
- }
- ARecordType recType = (ARecordType) itemType;
-
+ ARecordType recType = (ARecordType) metadata.findType(dataset.getItemTypeName());
boolean isSecondary = true;
Index primaryIndex = metadata.getDatasetPrimaryIndex(dataset.getDataverseName(), dataset.getDatasetName());
if (primaryIndex != null) {
@@ -350,72 +335,60 @@
int numSecondaryKeys = 0;
int numNestedSecondaryKeyFields = 0;
int i = 0;
- if (isSecondary) {
- Index secondaryIndex = metadata.getIndex(dataset.getDataverseName(), dataset.getDatasetName(), indexName);
- if (secondaryIndex == null) {
- throw new AlgebricksException("Code generation error: no index " + indexName + " for dataset "
- + datasetName);
- }
- List<String> secondaryKeyFields = secondaryIndex.getKeyFieldNames();
- numSecondaryKeys = secondaryKeyFields.size();
-
- if (numSecondaryKeys != 1) {
- throw new AlgebricksException(
- "Cannot use "
- + numSecondaryKeys
- + " fields as a key for the R-tree index. There can be only one field as a key for the R-tree index.");
- }
-
- Pair<IAType, Boolean> keyTypePair = Index.getNonNullableKeyFieldType(
- secondaryKeyFields.get(0), recType);
- IAType keyType = keyTypePair.first;
- if (keyType == null) {
- throw new AlgebricksException("Could not find field " + secondaryKeyFields.get(0) + " in the schema.");
- }
-
- int dimension = NonTaggedFormatUtil.getNumDimensions(keyType.getTypeTag());
- numNestedSecondaryKeyFields = dimension * 2;
-
- int numFields = numNestedSecondaryKeyFields + numPrimaryKeys;
- recordFields = new ISerializerDeserializer[numFields];
- typeTraits = new ITypeTraits[numFields];
- comparatorFactories = new IBinaryComparatorFactory[numNestedSecondaryKeyFields];
- valueProviderFactories = new IPrimitiveValueProviderFactory[numNestedSecondaryKeyFields];
-
- IAType nestedKeyType = NonTaggedFormatUtil.getNestedSpatialType(keyType.getTypeTag());
- for (i = 0; i < numNestedSecondaryKeyFields; i++) {
- ISerializerDeserializer keySerde = AqlSerializerDeserializerProvider.INSTANCE
- .getSerializerDeserializer(nestedKeyType);
- recordFields[i] = keySerde;
- comparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(
- nestedKeyType, true);
- typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType);
- valueProviderFactories[i] = AqlPrimitiveValueProviderFactory.INSTANCE;
- }
- } else {
+ if (!isSecondary) {
throw new AlgebricksException("R-tree can only be used as a secondary index");
}
+ Index secondaryIndex = metadata.getIndex(dataset.getDataverseName(), dataset.getDatasetName(), indexName);
+ if (secondaryIndex == null) {
+ throw new AlgebricksException("Code generation error: no index " + indexName + " for dataset "
+ + datasetName);
+ }
+ List<String> secondaryKeyFields = secondaryIndex.getKeyFieldNames();
+ numSecondaryKeys = secondaryKeyFields.size();
+ if (numSecondaryKeys != 1) {
+ throw new AlgebricksException(
+ "Cannot use "
+ + numSecondaryKeys
+ + " fields as a key for the R-tree index. There can be only one field as a key for the R-tree index.");
+ }
+ Pair<IAType, Boolean> keyTypePair = Index.getNonNullableKeyFieldType(
+ secondaryKeyFields.get(0), recType);
+ IAType keyType = keyTypePair.first;
+ if (keyType == null) {
+ throw new AlgebricksException("Could not find field " + secondaryKeyFields.get(0) + " in the schema.");
+ }
+ int dimension = NonTaggedFormatUtil.getNumDimensions(keyType.getTypeTag());
+ numNestedSecondaryKeyFields = dimension * 2;
+
+ int numFields = numNestedSecondaryKeyFields + numPrimaryKeys;
+ recordFields = new ISerializerDeserializer[numFields];
+ typeTraits = new ITypeTraits[numFields];
+ comparatorFactories = new IBinaryComparatorFactory[numNestedSecondaryKeyFields];
+ valueProviderFactories = new IPrimitiveValueProviderFactory[numNestedSecondaryKeyFields];
+
+ IAType nestedKeyType = NonTaggedFormatUtil.getNestedSpatialType(keyType.getTypeTag());
+ for (i = 0; i < numNestedSecondaryKeyFields; i++) {
+ ISerializerDeserializer keySerde = AqlSerializerDeserializerProvider.INSTANCE
+ .getSerializerDeserializer(nestedKeyType);
+ recordFields[i] = keySerde;
+ comparatorFactories[i] = AqlBinaryComparatorFactoryProvider.INSTANCE.getBinaryComparatorFactory(
+ nestedKeyType, true);
+ typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(nestedKeyType);
+ valueProviderFactories[i] = AqlPrimitiveValueProviderFactory.INSTANCE;
+ }
List<String> partitioningKeys = DatasetUtils.getPartitioningKeys(dataset);
for (String partitioningKey : partitioningKeys) {
- IAType keyType = recType.getFieldType(partitioningKey);
+ IAType type = recType.getFieldType(partitioningKey);
ISerializerDeserializer keySerde = AqlSerializerDeserializerProvider.INSTANCE
- .getSerializerDeserializer(keyType);
+ .getSerializerDeserializer(type);
recordFields[i] = keySerde;
- typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(keyType);
+ typeTraits[i] = AqlTypeTraitProvider.INSTANCE.getTypeTrait(type);
++i;
}
-
IAsterixApplicationContextInfo appContext = (IAsterixApplicationContextInfo) context.getAppContext();
RecordDescriptor recDesc = new RecordDescriptor(recordFields);
-
- Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc;
- try {
- spPc = metadata.splitProviderAndPartitionConstraintsForInternalOrFeedDataset(datasetName, indexName);
- } catch (Exception e) {
- throw new AlgebricksException(e);
- }
-
+ Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc = metadata.splitProviderAndPartitionConstraintsForInternalOrFeedDataset(datasetName, indexName);
RTreeSearchOperatorDescriptor rtreeSearchOp = new RTreeSearchOperatorDescriptor(jobSpec, recDesc,
appContext.getStorageManagerInterface(), appContext.getIndexRegistryProvider(), spPc.first, typeTraits,
comparatorFactories, keyFields, new RTreeDataflowHelperFactory(valueProviderFactories), false,
@@ -443,7 +416,7 @@
throws AlgebricksException {
AqlDataSource ads = findDataSource(dataSourceId);
Dataset dataset = ads.getDataset();
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AlgebricksException("No index for external dataset " + dataSourceId);
}
@@ -470,7 +443,7 @@
if (dataset == null) {
throw new AlgebricksException("Datasource with id " + aqlId + " was not found.");
}
- String tName = dataset.getDatatypeName();
+ String tName = dataset.getItemTypeName();
IAType itemType = metadata.findType(tName);
return new AqlDataSource(aqlId, dataset, itemType);
}
@@ -488,7 +461,7 @@
if (dataset == null) {
throw new IllegalArgumentException("Unknown dataset " + datasetName);
}
- return dataset.getType() == DatasetType.EXTERNAL;
+ return dataset.getDatasetType() == DatasetType.EXTERNAL;
}
@Override
@@ -515,7 +488,7 @@
Index primaryIndex = metadata.getDatasetPrimaryIndex(dataset.getDataverseName(), dataset.getDatasetName());
String indexName = primaryIndex.getIndexName();
- String itemTypeName = dataset.getDatatypeName();
+ String itemTypeName = dataset.getItemTypeName();
ARecordType itemType = (ARecordType) metadata.findType(itemTypeName);
ITypeTraits[] typeTraits = DatasetUtils.computeTupleTypeTraits(dataset, itemType);
@@ -558,7 +531,7 @@
Index primaryIndex = metadata.getDatasetPrimaryIndex(dataset.getDataverseName(), dataset.getDatasetName());
String indexName = primaryIndex.getIndexName();
- String itemTypeName = dataset.getDatatypeName();
+ String itemTypeName = dataset.getItemTypeName();
ARecordType itemType = (ARecordType) metadata.findType(itemTypeName);
ITypeTraits[] typeTraits = DatasetUtils.computeTupleTypeTraits(dataset, itemType);
@@ -603,7 +576,7 @@
Index primaryIndex = metadata.getDatasetPrimaryIndex(dataset.getDataverseName(), dataset.getDatasetName());
String indexName = primaryIndex.getIndexName();
- String itemTypeName = dataset.getDatatypeName();
+ String itemTypeName = dataset.getItemTypeName();
ARecordType itemType = (ARecordType) metadata.findType(itemTypeName);
ITypeTraits[] typeTraits = DatasetUtils.computeTupleTypeTraits(dataset, itemType);
@@ -705,7 +678,7 @@
if (dataset == null) {
throw new AlgebricksException("Unknown dataset " + datasetName);
}
- String itemTypeName = dataset.getDatatypeName();
+ String itemTypeName = dataset.getItemTypeName();
IAType itemType = metadata.findType(itemTypeName);
if (itemType.getTypeTag() != ATypeTag.RECORD) {
throw new AlgebricksException("Only record types can be indexed.");
@@ -749,7 +722,7 @@
List<LogicalVariable> secondaryKeys, AsterixTupleFilterFactory filterFactory, RecordDescriptor recordDesc,
JobGenContext context, JobSpecification spec, IndexOp indexOp) throws AlgebricksException {
Dataset dataset = metadata.findDataset(datasetName);
- String itemTypeName = dataset.getDatatypeName();
+ String itemTypeName = dataset.getItemTypeName();
IAType itemType = metadata.findType(itemTypeName);
if (itemType.getTypeTag() != ATypeTag.RECORD) {
throw new AlgebricksException("Only record types can be indexed.");
diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entities/Dataset.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entities/Dataset.java
index 36ac4ed..d383955 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entities/Dataset.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entities/Dataset.java
@@ -30,16 +30,16 @@
private final String dataverseName;
// Enforced to be unique within a dataverse.
private final String datasetName;
- // Type of values stored in this dataset.
- private final String datatypeName;
+ // Type of items stored in this dataset.
+ private final String itemTypeName;
private final DatasetType datasetType;
private IDatasetDetails datasetDetails;
- public Dataset(String dataverseName, String datasetName, String datatypeName, IDatasetDetails datasetDetails,
+ public Dataset(String dataverseName, String datasetName, String itemTypeName, IDatasetDetails datasetDetails,
DatasetType datasetType) {
this.dataverseName = dataverseName;
this.datasetName = datasetName;
- this.datatypeName = datatypeName;
+ this.itemTypeName = itemTypeName;
this.datasetType = datasetType;
this.datasetDetails = datasetDetails;
}
@@ -52,13 +52,11 @@
return datasetName;
}
- // TODO: getItemTypeName()
- public String getDatatypeName() {
- return datatypeName;
+ public String getItemTypeName() {
+ return itemTypeName;
}
- // TODO: getDatasetType()
- public DatasetType getType() {
+ public DatasetType getDatasetType() {
return datasetType;
}
diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
index 78703f3..a391e7c 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
@@ -209,13 +209,13 @@
// write field 2
fieldValue.reset();
- aString.setValue(dataset.getDatatypeName());
+ aString.setValue(dataset.getItemTypeName());
stringSerde.serialize(aString, fieldValue.getDataOutput());
recordBuilder.addField(MetadataRecordTypes.DATASET_ARECORD_DATATYPENAME_FIELD_INDEX, fieldValue);
// write field 3
fieldValue.reset();
- aString.setValue(dataset.getType().toString());
+ aString.setValue(dataset.getDatasetType().toString());
stringSerde.serialize(aString, fieldValue.getDataOutput());
recordBuilder.addField(MetadataRecordTypes.DATASET_ARECORD_DATASETTYPE_FIELD_INDEX, fieldValue);
@@ -241,7 +241,7 @@
throws HyracksDataException {
dataset.getDatasetDetails().writeDatasetDetailsRecordType(fieldValue.getDataOutput());
- switch (dataset.getType()) {
+ switch (dataset.getDatasetType()) {
case INTERNAL:
recordBuilder.addField(MetadataRecordTypes.DATASET_ARECORD_INTERNALDETAILS_FIELD_INDEX, fieldValue);
break;
diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/functions/MetadataBuiltinFunctions.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/functions/MetadataBuiltinFunctions.java
index 59d4b31..edb3808 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/functions/MetadataBuiltinFunctions.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/functions/MetadataBuiltinFunctions.java
@@ -57,7 +57,7 @@
if (dataset == null) {
throw new AlgebricksException("Could not find dataset " + datasetName);
}
- String tn = dataset.getDatatypeName();
+ String tn = dataset.getItemTypeName();
IAType t2 = metadata.findType(tn);
if (t2 == null) {
throw new AlgebricksException("No type for dataset " + datasetName);
@@ -93,7 +93,7 @@
if (dataset == null) {
throw new AlgebricksException("Could not find dataset " + datasetName);
}
- String tn = dataset.getDatatypeName();
+ String tn = dataset.getItemTypeName();
IAType t2 = metadata.findType(tn);
if (t2 == null) {
throw new AlgebricksException("No type for dataset " + datasetName);
diff --git a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/utils/DatasetUtils.java b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/utils/DatasetUtils.java
index 207c74b..cead5f2 100644
--- a/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/utils/DatasetUtils.java
+++ b/asterix-metadata/src/main/java/edu/uci/ics/asterix/metadata/utils/DatasetUtils.java
@@ -19,7 +19,7 @@
public static IBinaryComparatorFactory[] computeKeysBinaryComparatorFactories(Dataset dataset,
ARecordType itemType, IBinaryComparatorFactoryProvider comparatorFactoryProvider)
throws AlgebricksException {
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AlgebricksException("not implemented");
}
List<String> partitioningKeys = getPartitioningKeys(dataset);
@@ -33,7 +33,7 @@
public static IBinaryHashFunctionFactory[] computeKeysBinaryHashFunFactories(Dataset dataset, ARecordType itemType,
IBinaryHashFunctionFactoryProvider hashFunProvider) throws AlgebricksException {
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AlgebricksException("not implemented");
}
List<String> partitioningKeys = getPartitioningKeys(dataset);
@@ -47,7 +47,7 @@
public static ITypeTraits[] computeTupleTypeTraits(Dataset dataset, ARecordType itemType)
throws AlgebricksException {
- if (dataset.getType() == DatasetType.EXTERNAL) {
+ if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
throw new AlgebricksException("not implemented");
}
List<String> partitioningKeys = DatasetUtils.getPartitioningKeys(dataset);