Repository: incubator-atlas Updated Branches: refs/heads/master c9e58e0aa -> 29880e77c
ATLAS-1258 BugFix for Indexer NPE on StructDef lookup (apoorvnaik via sumasai) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/29880e77 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/29880e77 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/29880e77 Branch: refs/heads/master Commit: 29880e77c953cf4ddc8e9733b5d71c6dd75a328c Parents: c9e58e0 Author: Suma Shivaprasad <[email protected]> Authored: Tue Nov 1 14:11:58 2016 -0700 Committer: Suma Shivaprasad <[email protected]> Committed: Tue Nov 1 14:11:58 2016 -0700 ---------------------------------------------------------------------- release-log.txt | 1 + .../repository/graph/GraphBackedSearchIndexer.java | 12 +++--------- 2 files changed, 4 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/29880e77/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 7871532..e44d8ef 100644 --- a/release-log.txt +++ b/release-log.txt @@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai) ALL CHANGES: +ATLAS-1258 BugFix for Indexer NPE on StructDef lookup (apoorvnaik via sumasai) ATLAS-1233 UnitTests for the TypeDefStores (apoorvnaik via sumasai) ATLAS-1240 Adding Change listeners to react on changes in TypesDef (apoorvnaik via sumasai) ATLAS-1239 when stopping Atlas on the command line it should explicitly say when it has stopped (ayubkhan via sumasai) http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/29880e77/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java b/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java index 3aaca9c..3c7f63b 100755 --- a/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java +++ b/repository/src/main/java/org/apache/atlas/repository/graph/GraphBackedSearchIndexer.java @@ -280,17 +280,11 @@ public class GraphBackedSearchIndexer implements SearchIndexer, ActiveStateChang if (isMapType || isArrayType || isClassificationType(atlasType) || isEntityType(atlasType)) { LOG.warn("Ignoring non-indexable attribute {}", attribTypeName); - } - - if (isBuiltInType) { + } else if (isBuiltInType) { createIndexes(management, propertyName, getPrimitiveClass(attribTypeName), isUnique, cardinality, false, isIndexable); - } - - if (isEnumType(atlasType)) { + } else if (isEnumType(atlasType)) { createIndexes(management, propertyName, String.class, isUnique, cardinality, false, isIndexable); - } - - if (isStructType(atlasType)) { + } else if (isStructType(atlasType)) { AtlasStructDef structDef = typeRegistry.getStructDefByName(attributeDef.getName()); updateIndexForTypeDef(management, structDef); }
