This is an automated email from the ASF dual-hosted git repository.
madhan pushed a commit to branch branch-0.8
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-0.8 by this push:
new b6d460c ATLAS-3135: typedef-delete with empty typedefs result in
search failures
b6d460c is described below
commit b6d460c28882e2fa27a6e1334c66d55dc606cfc8
Author: Madhan Neethiraj <[email protected]>
AuthorDate: Tue May 7 22:01:55 2019 -0700
ATLAS-3135: typedef-delete with empty typedefs result in search failures
(cherry picked from commit 55ef909cbc132945f9de65a6d00e22a1dead8ee1)
---
.../org/apache/atlas/type/AtlasTypeRegistry.java | 60 +++++++++++-----------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java
b/intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java
index 322176a..8dd9ed5 100644
--- a/intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java
+++ b/intg/src/main/java/org/apache/atlas/type/AtlasTypeRegistry.java
@@ -360,10 +360,10 @@ public class AtlasTypeRegistry {
if (typeDef != null) {
addTypeWithNoRefResolve(typeDef);
-
- resolveReferences();
}
+ resolveReferences();
+
if (LOG.isDebugEnabled()) {
LOG.debug("<== AtlasTypeRegistry.addType({})", typeDef);
}
@@ -388,10 +388,10 @@ public class AtlasTypeRegistry {
if (CollectionUtils.isNotEmpty(typeDefs)) {
addTypesWithNoRefResolve(typeDefs);
-
- resolveReferences();
}
+ resolveReferences();
+
if (LOG.isDebugEnabled()) {
LOG.debug("<== AtlasTypeRegistry.addTypes(length={})",
(typeDefs == null ? 0 : typeDefs.size()));
}
@@ -407,10 +407,10 @@ public class AtlasTypeRegistry {
addTypesWithNoRefResolve(typesDef.getStructDefs());
addTypesWithNoRefResolve(typesDef.getClassificationDefs());
addTypesWithNoRefResolve(typesDef.getEntityDefs());
-
- resolveReferences();
}
+ resolveReferences();
+
if (LOG.isDebugEnabled()) {
LOG.debug("<== AtlasTypeRegistry.addTypes({})", typesDef);
}
@@ -423,10 +423,10 @@ public class AtlasTypeRegistry {
if (typeDef != null) {
updateTypeWithNoRefResolve(typeDef);
-
- resolveReferences();
}
+ resolveReferences();
+
if (LOG.isDebugEnabled()) {
LOG.debug("<== AtlasTypeRegistry.updateType({})", typeDef);
}
@@ -439,10 +439,10 @@ public class AtlasTypeRegistry {
if (guid != null && typeDef != null) {
updateTypeByGuidWithNoRefResolve(guid, typeDef);
-
- resolveReferences();
}
+ resolveReferences();
+
if (LOG.isDebugEnabled()) {
LOG.debug("<== AtlasTypeRegistry.updateTypeByGuid({})", guid);
}
@@ -455,10 +455,10 @@ public class AtlasTypeRegistry {
if (name != null && typeDef != null) {
updateTypeByNameWithNoRefResolve(name, typeDef);
-
- resolveReferences();
}
+ resolveReferences();
+
if (LOG.isDebugEnabled()) {
LOG.debug("<== AtlasTypeRegistry.updateEnumDefByName({})",
name);
}
@@ -471,10 +471,10 @@ public class AtlasTypeRegistry {
if (CollectionUtils.isNotEmpty(typeDefs)) {
updateTypesWithNoRefResolve(typeDefs);
-
- resolveReferences();
}
+ resolveReferences();
+
if (LOG.isDebugEnabled()) {
LOG.debug("<== AtlasTypeRegistry.updateTypes(length={})",
(typeDefs == null ? 0 : typeDefs.size()));
}
@@ -487,10 +487,10 @@ public class AtlasTypeRegistry {
if (typesDef != null) {
updateTypesWithNoRefResolve(typesDef);
-
- resolveReferences();
}
+ resolveReferences();
+
if (LOG.isDebugEnabled()) {
LOG.debug("<== AtlasTypeRegistry.updateTypes({})", typesDef);
}
@@ -519,9 +519,9 @@ public class AtlasTypeRegistry {
removeTypesWithNoRefResolve(typesDef.getStructDefs());
removeTypesWithNoRefResolve(typesDef.getClassificationDefs());
removeTypesWithNoRefResolve(typesDef.getEntityDefs());
-
- resolveReferences();
}
+
+ resolveReferences();
}
private void removeTypesWithNoRefResolve(Collection<? extends
AtlasBaseTypeDef> typeDefs) {
@@ -577,16 +577,16 @@ public class AtlasTypeRegistry {
LOG.debug("==> AtlasTypeRegistry.removeTypeByGuid({})", guid);
}
- if (guid != null) {
- AtlasBaseTypeDef typeDef = getTypeDefByGuid(guid);
+ AtlasBaseTypeDef typeDef = getTypeDefByGuid(guid);
+ if (guid != null) {
registryData.removeByGuid(guid);
+ }
- resolveReferences();
+ resolveReferences();
- if (typeDef != null) {
- deletedTypes.add(typeDef);
- }
+ if (typeDef != null) {
+ deletedTypes.add(typeDef);
}
if (LOG.isDebugEnabled()) {
@@ -599,16 +599,16 @@ public class AtlasTypeRegistry {
LOG.debug("==> AtlasTypeRegistry.removeTypeByName({})", name);
}
- if (name != null) {
- AtlasBaseTypeDef typeDef = getTypeDefByName(name);
+ AtlasBaseTypeDef typeDef = getTypeDefByName(name);
+ if (name != null) {
registryData.removeByName(name);
+ }
- resolveReferences();
+ resolveReferences();
- if (typeDef != null) {
- deletedTypes.add(typeDef);
- }
+ if (typeDef != null) {
+ deletedTypes.add(typeDef);
}
if (LOG.isDebugEnabled()) {