[asterixdb] branch master updated: [NO-ISSUE][IDX] Typo + style fix for array indexing change.

[dl...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dlych pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 11cef50  [NO-ISSUE][IDX] Typo + style fix for array indexing change.
11cef50 is described below

commit 11cef50e3e9df36e9b56f355b3259e5a5809959e
Author: Glenn <gg...@uci.edu>
AuthorDate: Wed Apr 7 10:43:25 2021 -0700

    [NO-ISSUE][IDX] Typo + style fix for array indexing change.
    
    - user model change: no
    - storage format changes: no
    - interface changes: no
    
    Fixing "missable" typo in KeyFieldTypeUtil and using better
    comparison for enum types in MetadataNode.
    
    Change-Id: Ic04892288d257fdfcf98ac5cfb87e79135b2907a
    Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/10928
    Integration-Tests: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
    Reviewed-by: Dmitry Lychagin <dm...@couchbase.com>
---
 .../src/main/java/org/apache/asterix/metadata/MetadataNode.java  | 2 +-
 .../java/org/apache/asterix/metadata/utils/KeyFieldTypeUtil.java | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index c769960..29acbda 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -1244,7 +1244,7 @@ public class MetadataNode implements IMetadataNode {
                 //   we may need to include the dataverse of the full-text config in the index.getFullTextConfigDataverse()
                 //   and instead of checking index.getDataverseName(), we need to check index.getFullTextConfigDataverse()
                 //   to see if it is the same as the dataverse of the full-text config
-                if (index.getIndexDetails() instanceof Index.TextIndexDetails) {
+                if (Index.IndexCategory.of(index.getIndexType()) == Index.IndexCategory.TEXT) {
                     String indexConfigName = ((Index.TextIndexDetails) index.getIndexDetails()).getFullTextConfigName();
                     if (index.getDataverseName().equals(dataverseNameFullTextConfig)
                             && !Strings.isNullOrEmpty(indexConfigName) && indexConfigName.equals(configName)) {
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/KeyFieldTypeUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/KeyFieldTypeUtil.java
index 9458f61..b2026d7 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/KeyFieldTypeUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/KeyFieldTypeUtil.java
@@ -150,7 +150,8 @@ public class KeyFieldTypeUtil {
         List<IAType> indexKeyTypes = new ArrayList<>();
         for (Index.ArrayIndexElement e : indexDetails.getElementList()) {
             for (int i = 0; i < e.getProjectList().size(); i++) {
-                ARecordType sourceType = (e.getSourceIndicator() == 0) ? recordType : metaRecordType;
+                ARecordType sourceType =
+                        (e.getSourceIndicator() == Index.RECORD_INDICATOR) ? recordType : metaRecordType;
                 Pair<IAType, Boolean> keyPairType = ArrayIndexUtil.getNonNullableOpenFieldType(e.getTypeList().get(i),
                         ArrayIndexUtil.getFlattenedKeyFieldNames(e.getUnnestList(), e.getProjectList().get(i)),
                         sourceType,
@@ -308,7 +309,7 @@ public class KeyFieldTypeUtil {
     public static Triple<IAType, Boolean, Boolean> getKeyProjectType(final ARecordType inputType, List<String> path,
             SourceLocation sourceLoc) throws CompilationException {
         IAType itemType = inputType;
-        boolean itemTypeNullable = false, itemTypeMissalbe = false;
+        boolean itemTypeNullable = false, itemTypeMissable = false;
         for (String step : path) {
             // check that the type is a record at this point
             if (itemType.getTypeTag() != ATypeTag.OBJECT) {
@@ -331,12 +332,12 @@ public class KeyFieldTypeUtil {
                 AUnionType fieldTypeUnion = (AUnionType) fieldType;
                 itemType = fieldTypeUnion.getActualType();
                 itemTypeNullable = itemTypeNullable || fieldTypeUnion.isNullableType();
-                itemTypeMissalbe = itemTypeMissalbe || fieldTypeUnion.isMissableType();
+                itemTypeMissable = itemTypeMissable || fieldTypeUnion.isMissableType();
             } else {
                 itemType = fieldType;
             }
         }
-        return new Triple<>(itemType, itemTypeNullable, itemTypeMissalbe);
+        return new Triple<>(itemType, itemTypeNullable, itemTypeMissable);
     }
 
     public static IAType makeUnknownableType(IAType primeType, boolean nullable, boolean missable) {