Yingyi Bu has submitted this change and it was merged. Change subject: Fix typo in Index.isEnforcingKeyFields ......................................................................
Fix typo in Index.isEnforcingKeyFields Change-Id: Ibcc8c171bf9d1ad7ff5ab51a5baf804b9a23ed40 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1801 Sonar-Qube: Jenkins <[email protected]> Tested-by: Jenkins <[email protected]> BAD: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: Yingyi Bu <[email protected]> --- 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/am/InvertedIndexAccessMethod.java M asterixdb/asterix-app/src/main/java/org/apache/asterix/app/translator/QueryTranslator.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Index.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java M asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/TypeUtil.java 11 files changed, 19 insertions(+), 20 deletions(-) Approvals: Yingyi Bu: Looks good to me, approved Jenkins: Verified; No violations found; No violations found; Verified 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 @@ 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, 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 @@ // 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 @@ } 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 @@ } 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 @@ } 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()); 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 @@ 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 @@ 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 @@ 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 @@ 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); 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 @@ return isPrimaryIndex; } - public boolean isEnforcingKeyFileds() { + public boolean isEnforcingKeyFields() { return enforceKeyFields; } 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 @@ 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)); 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 static JobSpecification buildDropIndexJobSpec(Index index, MetadataProvider metadataProvider, Dataset dataset) throws AlgebricksException { - SecondaryIndexOperationsHelper secondaryIndexHelper = SecondaryIndexOperationsHelper.createIndexOperationsHelper(dataset, index, metadataProvider, physicalOptimizationConfig); 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 @@ @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 @@ 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; 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 @@ 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); 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 @@ 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 @@ 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()); 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 @@ 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 @@ 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) { 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 @@ ARecordType enforcedRecordType = recordType; ARecordType enforcedMetaType = metaType; for (Index index : indexes) { - if (!index.isSecondaryIndex() || !index.isEnforcingKeyFileds()) { + if (!index.isSecondaryIndex() || !index.isEnforcingKeyFields()) { continue; } if (index.hasMetaFields()) { -- To view, visit https://asterix-gerrit.ics.uci.edu/1801 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibcc8c171bf9d1ad7ff5ab51a5baf804b9a23ed40 Gerrit-PatchSet: 3 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Yingyi Bu <[email protected]>
