You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by bu...@apache.org on 2017/06/05 17:09:27 UTC
asterixdb git commit: Fix typo in Index.isEnforcingKeyFields
Repository: asterixdb
Updated Branches:
refs/heads/master 423d406c7 -> c91e5bb2e
Fix typo in Index.isEnforcingKeyFields
Change-Id: Ibcc8c171bf9d1ad7ff5ab51a5baf804b9a23ed40
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1801
Sonar-Qube: Jenkins <je...@fulliautomatix.ics.uci.edu>
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
BAD: Jenkins <je...@fulliautomatix.ics.uci.edu>
Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/c91e5bb2
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/c91e5bb2
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/c91e5bb2
Branch: refs/heads/master
Commit: c91e5bb2ed3d87592262cabdc4b6bb6a9d7a4c57
Parents: 423d406
Author: Till Westmann <ti...@tcbm.attlocal.net>
Authored: Sat Jun 3 19:19:39 2017 -0700
Committer: Yingyi Bu <bu...@gmail.com>
Committed: Mon Jun 5 10:09:12 2017 -0700
----------------------------------------------------------------------
.../rules/IntroduceSecondaryIndexInsertDeleteRule.java | 2 +-
.../optimizer/rules/am/InvertedIndexAccessMethod.java | 8 ++++----
.../org/apache/asterix/app/translator/QueryTranslator.java | 8 ++++----
.../java/org/apache/asterix/metadata/entities/Index.java | 2 +-
.../entitytupletranslators/IndexTupleTranslator.java | 2 +-
.../java/org/apache/asterix/metadata/utils/IndexUtil.java | 1 -
.../metadata/utils/SecondaryBTreeOperationsHelper.java | 4 ++--
.../metadata/utils/SecondaryIndexOperationsHelper.java | 2 +-
.../utils/SecondaryInvertedIndexOperationsHelper.java | 4 ++--
.../metadata/utils/SecondaryRTreeOperationsHelper.java | 4 ++--
.../java/org/apache/asterix/metadata/utils/TypeUtil.java | 2 +-
11 files changed, 19 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
----------------------------------------------------------------------
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 e322e9e..8de6b59 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
@@ -289,7 +289,7 @@ public class IntroduceSecondaryIndexInsertDeleteRule implements IAlgebraicRewrit
Mutable<ILogicalExpression> filterExpression = (primaryIndexModificationOp
.getOperation() == Kind.UPSERT) ? null
: createFilterExpression(secondaryKeyVars, context.getOutputTypeEnvironment(currentTop),
- index.isEnforcingKeyFileds());
+ index.isEnforcingKeyFields());
DataSourceIndex dataSourceIndex = new DataSourceIndex(index, dataverseName, datasetName, mp);
// Introduce the TokenizeOperator only when doing bulk-load,
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java
index 341bda3..2b6a369 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java
@@ -698,7 +698,7 @@ public class InvertedIndexAccessMethod implements IAccessMethod {
// Create select ops for removing tuples that are filterable and not filterable, respectively.
IVariableTypeEnvironment probeTypeEnv = context.getOutputTypeEnvironment(probeSubTree.getRoot());
IAType inputSearchVarType;
- if (chosenIndex.isEnforcingKeyFileds()) {
+ if (chosenIndex.isEnforcingKeyFields()) {
inputSearchVarType = optFuncExpr.getFieldType(optFuncExpr.findLogicalVar(inputSearchVar));
} else {
inputSearchVarType = (IAType) probeTypeEnv.getVarType(inputSearchVar);
@@ -946,7 +946,7 @@ public class InvertedIndexAccessMethod implements IAccessMethod {
}
private boolean isEditDistanceFuncJoinOptimizable(Index index, IOptimizableFuncExpr optFuncExpr) {
- if (index.isEnforcingKeyFileds()) {
+ if (index.isEnforcingKeyFields()) {
return isEditDistanceFuncCompatible(index.getKeyFieldTypes().get(0).getTypeTag(), index.getIndexType());
} else {
return isEditDistanceFuncCompatible(optFuncExpr.getFieldType(0).getTypeTag(), index.getIndexType());
@@ -1089,7 +1089,7 @@ public class InvertedIndexAccessMethod implements IAccessMethod {
}
private boolean isFullTextContainsFuncJoinOptimizable(Index index, IOptimizableFuncExpr optFuncExpr) {
- if (index.isEnforcingKeyFileds()) {
+ if (index.isEnforcingKeyFields()) {
return isFullTextContainsFuncCompatible(index.getKeyFieldTypes().get(0).getTypeTag(), index.getIndexType());
} else {
return isFullTextContainsFuncCompatible(optFuncExpr.getFieldType(0).getTypeTag(), index.getIndexType());
@@ -1190,7 +1190,7 @@ public class InvertedIndexAccessMethod implements IAccessMethod {
}
private boolean isContainsFuncJoinOptimizable(Index index, IOptimizableFuncExpr optFuncExpr) {
- if (index.isEnforcingKeyFileds()) {
+ if (index.isEnforcingKeyFields()) {
return isContainsFuncCompatible(index.getKeyFieldTypes().get(0).getTypeTag(), index.getIndexType());
} else {
return isContainsFuncCompatible(optFuncExpr.getFieldType(0).getTypeTag(), index.getIndexType());
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
index 64edead..80c05db 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java
@@ -911,7 +911,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
for (Index existingIndex : indexes) {
if (existingIndex.getKeyFieldNames().equals(indexFields)
&& !existingIndex.getKeyFieldTypes().equals(indexFieldTypes)
- && existingIndex.isEnforcingKeyFileds()) {
+ && existingIndex.isEnforcingKeyFields()) {
throw new CompilationException("Cannot create index " + indexName + " , enforced index "
+ existingIndex.getIndexName() + " on field \"" + StringUtils.join(indexFields, ',')
+ "\" is already defined with type \"" + existingIndex.getKeyFieldTypes() + "\"");
@@ -1397,7 +1397,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
MetadataManager.INSTANCE.addIndex(mdTxnCtx,
new Index(dataverseName, datasetName, indexName, index.getIndexType(), index.getKeyFieldNames(),
index.getKeyFieldSourceIndicators(), index.getKeyFieldTypes(),
- index.isEnforcingKeyFileds(), index.isPrimaryIndex(), MetadataUtil.PENDING_DROP_OP));
+ index.isEnforcingKeyFields(), index.isPrimaryIndex(), MetadataUtil.PENDING_DROP_OP));
// #. commit the existing transaction before calling runJob.
MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
@@ -1447,7 +1447,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
new Index(dataverseName, datasetName, externalIndex.getIndexName(),
externalIndex.getIndexType(), externalIndex.getKeyFieldNames(),
externalIndex.getKeyFieldSourceIndicators(), index.getKeyFieldTypes(),
- index.isEnforcingKeyFileds(), externalIndex.isPrimaryIndex(),
+ index.isEnforcingKeyFields(), externalIndex.isPrimaryIndex(),
MetadataUtil.PENDING_DROP_OP));
}
}
@@ -1458,7 +1458,7 @@ public class QueryTranslator extends AbstractLangTranslator implements IStatemen
MetadataManager.INSTANCE.addIndex(mdTxnCtx,
new Index(dataverseName, datasetName, indexName, index.getIndexType(), index.getKeyFieldNames(),
index.getKeyFieldSourceIndicators(), index.getKeyFieldTypes(),
- index.isEnforcingKeyFileds(), index.isPrimaryIndex(), MetadataUtil.PENDING_DROP_OP));
+ index.isEnforcingKeyFields(), index.isPrimaryIndex(), MetadataUtil.PENDING_DROP_OP));
// #. commit the existing transaction before calling runJob.
MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java
index 56c3e5f..9c0ce05 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java
@@ -117,7 +117,7 @@ public class Index implements IMetadataEntity<Index>, Comparable<Index> {
return isPrimaryIndex;
}
- public boolean isEnforcingKeyFileds() {
+ public boolean isEnforcingKeyFields() {
return enforceKeyFields;
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
index f29c7f7..a6ec835 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
@@ -293,7 +293,7 @@ public class IndexTupleTranslator extends AbstractTupleTranslator<Index> {
recordBuilder.addField(nameValue, fieldValue);
}
- if (instance.isEnforcingKeyFileds()) {
+ if (instance.isEnforcingKeyFields()) {
// write optional field 9
OrderedListBuilder typeListBuilder = new OrderedListBuilder();
typeListBuilder.reset(new AOrderedListType(BuiltinType.ANY, null));
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java
index 8be3307..ca5ddd0 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java
@@ -101,7 +101,6 @@ public class IndexUtil {
public static JobSpecification buildDropIndexJobSpec(Index index, MetadataProvider metadataProvider,
Dataset dataset) throws AlgebricksException {
-
SecondaryIndexOperationsHelper secondaryIndexHelper =
SecondaryIndexOperationsHelper.createIndexOperationsHelper(dataset, index, metadataProvider,
physicalOptimizationConfig);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java
index 617536f..f91df70 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java
@@ -66,7 +66,7 @@ public class SecondaryBTreeOperationsHelper extends SecondaryTreeIndexOperations
@Override
public JobSpecification buildLoadingJobSpec() throws AlgebricksException {
JobSpecification spec = RuntimeUtils.createJobSpecification(metadataProvider.getApplicationContext());
- boolean isEnforcingKeyTypes = index.isEnforcingKeyFileds();
+ boolean isEnforcingKeyTypes = index.isEnforcingKeyFields();
int[] fieldPermutation = createFieldPermutationForBulkLoadOp(index.getKeyFieldNames().size());
IIndexDataflowHelperFactory dataflowHelperFactory = new IndexDataflowHelperFactory(
metadataProvider.getStorageComponentProvider().getStorageManager(), secondaryFileSplitProvider);
@@ -201,7 +201,7 @@ public class SecondaryBTreeOperationsHelper extends SecondaryTreeIndexOperations
metadataProvider.getFormat().getBinaryComparatorFactoryProvider();
// Record column is 0 for external datasets, numPrimaryKeys for internal ones
int recordColumn = dataset.getDatasetType() == DatasetType.INTERNAL ? numPrimaryKeys : 0;
- boolean isEnforcingKeyTypes = index.isEnforcingKeyFileds();
+ boolean isEnforcingKeyTypes = index.isEnforcingKeyFields();
for (int i = 0; i < numSecondaryKeys; i++) {
ARecordType sourceType;
int sourceColumn;
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java
index 1f2c2fd..21ec8de 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java
@@ -130,7 +130,7 @@ public abstract class SecondaryIndexOperationsHelper {
private static Pair<ARecordType, ARecordType> getEnforcedType(Index index, ARecordType aRecordType,
ARecordType metaRecordType) throws AlgebricksException {
- return index.isEnforcingKeyFileds()
+ return index.isEnforcingKeyFields()
? TypeUtil.createEnforcedType(aRecordType, metaRecordType,
IteratorUtils.toList(IteratorUtils.singletonIterator(index)))
: new Pair<>(null, null);
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java
index 97bc00f..23854e3 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java
@@ -86,7 +86,7 @@ public class SecondaryInvertedIndexOperationsHelper extends SecondaryTreeIndexOp
protected void setSecondaryRecDescAndComparators() throws AlgebricksException {
int numSecondaryKeys = index.getKeyFieldNames().size();
IndexType indexType = index.getIndexType();
- boolean isEnforcingKeyTypes = index.isEnforcingKeyFileds();
+ boolean isEnforcingKeyTypes = index.isEnforcingKeyFields();
// Sanity checks.
if (numPrimaryKeys > 1) {
throw new CompilationException(ErrorCode.COMPILATION_ILLEGAL_INDEX_FOR_DATASET_WITH_COMPOSITE_PRIMARY_INDEX,
@@ -216,7 +216,7 @@ public class SecondaryInvertedIndexOperationsHelper extends SecondaryTreeIndexOp
jobId);
IOperatorDescriptor sourceOp = primaryScanOp;
- boolean isEnforcingKeyTypes = index.isEnforcingKeyFileds();
+ boolean isEnforcingKeyTypes = index.isEnforcingKeyFields();
int numSecondaryKeys = index.getKeyFieldNames().size();
if (isEnforcingKeyTypes && !enforcedItemType.equals(itemType)) {
sourceOp = createCastOp(spec, dataset.getDatasetType());
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java
index 8db43d3..f3ed3df 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java
@@ -83,7 +83,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryTreeIndexOperations
protected void setSecondaryRecDescAndComparators() throws AlgebricksException {
List<List<String>> secondaryKeyFields = index.getKeyFieldNames();
int numSecondaryKeys = secondaryKeyFields.size();
- boolean isEnforcingKeyTypes = index.isEnforcingKeyFileds();
+ boolean isEnforcingKeyTypes = index.isEnforcingKeyFields();
if (numSecondaryKeys != 1) {
throw new AsterixException("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.");
@@ -195,7 +195,7 @@ public class SecondaryRTreeOperationsHelper extends SecondaryTreeIndexOperations
isPointMBR ? numNestedSecondaryKeyFields / 2 : numNestedSecondaryKeyFields;
RecordDescriptor secondaryRecDescConsideringPointMBR =
isPointMBR ? secondaryRecDescForPointMBR : secondaryRecDesc;
- boolean isEnforcingKeyTypes = index.isEnforcingKeyFileds();
+ boolean isEnforcingKeyTypes = index.isEnforcingKeyFields();
IIndexDataflowHelperFactory indexDataflowHelperFactory = new IndexDataflowHelperFactory(
metadataProvider.getStorageComponentProvider().getStorageManager(), secondaryFileSplitProvider);
if (dataset.getDatasetType() == DatasetType.INTERNAL) {
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/c91e5bb2/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/TypeUtil.java
----------------------------------------------------------------------
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/TypeUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/TypeUtil.java
index d629940..5a2f399 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/TypeUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/TypeUtil.java
@@ -54,7 +54,7 @@ public class TypeUtil {
ARecordType enforcedRecordType = recordType;
ARecordType enforcedMetaType = metaType;
for (Index index : indexes) {
- if (!index.isSecondaryIndex() || !index.isEnforcingKeyFileds()) {
+ if (!index.isSecondaryIndex() || !index.isEnforcingKeyFields()) {
continue;
}
if (index.hasMetaFields()) {