This is an automated email from the ASF dual-hosted git repository.
sarath pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 432bce2 ATLAS-3377: Update AtlasPatchRegistry to use graph query
instead of index query
432bce2 is described below
commit 432bce23e2d14d6a3021d63f8c8e4d82f79ed520
Author: Sarath Subramanian <[email protected]>
AuthorDate: Fri Aug 16 17:45:12 2019 -0700
ATLAS-3377: Update AtlasPatchRegistry to use graph query instead of index
query
(cherry picked from commit d1109efefd062613556d8bac47498ad0925b01b0)
---
.../repository/patches/AtlasPatchRegistry.java | 86 +++++++++++-----------
1 file changed, 42 insertions(+), 44 deletions(-)
diff --git
a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchRegistry.java
b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchRegistry.java
index 80c2201..a251638 100644
---
a/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchRegistry.java
+++
b/repository/src/main/java/org/apache/atlas/repository/patches/AtlasPatchRegistry.java
@@ -22,7 +22,9 @@ import org.apache.atlas.RequestContext;
import org.apache.atlas.model.patches.AtlasPatch;
import org.apache.atlas.model.patches.AtlasPatch.AtlasPatches;
import org.apache.atlas.model.patches.AtlasPatch.PatchStatus;
+import org.apache.atlas.repository.Constants;
import org.apache.atlas.repository.graphdb.AtlasGraph;
+import org.apache.atlas.repository.graphdb.AtlasGraphQuery;
import org.apache.atlas.repository.graphdb.AtlasIndexQuery;
import org.apache.atlas.repository.graphdb.AtlasIndexQuery.Result;
import org.apache.atlas.repository.graphdb.AtlasVertex;
@@ -45,8 +47,6 @@ import java.util.Map;
import static org.apache.atlas.model.patches.AtlasPatch.PatchStatus.FAILED;
import static org.apache.atlas.model.patches.AtlasPatch.PatchStatus.UNKNOWN;
import static org.apache.atlas.repository.Constants.*;
-import static
org.apache.atlas.repository.graph.AtlasGraphProvider.getGraphInstance;
-import static
org.apache.atlas.repository.store.bootstrap.AtlasTypeDefStoreInitializer.TYPEDEF_PATCH_TYPE;
import static
org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2.getEncodedProperty;
import static
org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2.getIndexSearchPrefix;
import static
org.apache.atlas.repository.store.graph.v2.AtlasGraphUtilsV2.setEncodedProperty;
@@ -96,20 +96,20 @@ public class AtlasPatchRegistry {
}
public void updateStatus(String patchId, PatchStatus patchStatus) {
- AtlasVertex patchVertex = findByPatchId(patchId);
-
- if (patchVertex == null) {
- return;
- }
-
- setEncodedProperty(patchVertex, PATCH_STATE_PROPERTY_KEY,
patchStatus.toString());
- setEncodedProperty(patchVertex, MODIFICATION_TIMESTAMP_PROPERTY_KEY,
RequestContext.get().getRequestTime());
- setEncodedProperty(patchVertex, MODIFIED_BY_KEY, getCurrentUser());
- setEncodedProperty(patchVertex, PATCH_STATE_PROPERTY_KEY,
patchStatus.toString());
+ try {
+ AtlasVertex patchVertex = findByPatchId(patchId);
- patchNameStatusMap.put(patchId, patchStatus);
+ if (patchVertex != null) {
+ setEncodedProperty(patchVertex, PATCH_STATE_PROPERTY_KEY,
patchStatus.toString());
+ setEncodedProperty(patchVertex,
MODIFICATION_TIMESTAMP_PROPERTY_KEY, RequestContext.get().getRequestTime());
+ setEncodedProperty(patchVertex, MODIFIED_BY_KEY,
getCurrentUser());
+ setEncodedProperty(patchVertex, PATCH_STATE_PROPERTY_KEY,
patchStatus.toString());
+ }
+ } finally {
+ graph.commit();
- graph.commit();
+ patchNameStatusMap.put(patchId, patchStatus);
+ }
}
private static String getId(String incomingId, String patchFile, int
index) {
@@ -128,20 +128,27 @@ public class AtlasPatchRegistry {
private void createOrUpdatePatchVertex(AtlasGraph graph, String patchId,
String description,
String patchType, String action,
PatchStatus patchStatus) {
- boolean isPatchRegistered =
MapUtils.isNotEmpty(patchNameStatusMap) &&
patchNameStatusMap.containsKey(patchId);
- AtlasVertex patchVertex = isPatchRegistered ?
findByPatchId(patchId) : graph.addVertex();
-
- setEncodedProperty(patchVertex, PATCH_ID_PROPERTY_KEY, patchId);
- setEncodedProperty(patchVertex, PATCH_DESCRIPTION_PROPERTY_KEY,
description);
- setEncodedProperty(patchVertex, PATCH_TYPE_PROPERTY_KEY, patchType);
- setEncodedProperty(patchVertex, PATCH_ACTION_PROPERTY_KEY, action);
- setEncodedProperty(patchVertex, PATCH_STATE_PROPERTY_KEY,
patchStatus.toString());
- setEncodedProperty(patchVertex, TIMESTAMP_PROPERTY_KEY,
RequestContext.get().getRequestTime());
- setEncodedProperty(patchVertex, MODIFICATION_TIMESTAMP_PROPERTY_KEY,
RequestContext.get().getRequestTime());
- setEncodedProperty(patchVertex, CREATED_BY_KEY,
AtlasTypeDefGraphStoreV2.getCurrentUser());
- setEncodedProperty(patchVertex, MODIFIED_BY_KEY,
AtlasTypeDefGraphStoreV2.getCurrentUser());
-
- graph.commit();
+ try {
+ AtlasVertex patchVertex = findByPatchId(patchId);
+
+ if (patchVertex == null) {
+ patchVertex = graph.addVertex();
+ }
+
+ setEncodedProperty(patchVertex, PATCH_ID_PROPERTY_KEY, patchId);
+ setEncodedProperty(patchVertex, PATCH_DESCRIPTION_PROPERTY_KEY,
description);
+ setEncodedProperty(patchVertex, PATCH_TYPE_PROPERTY_KEY,
patchType);
+ setEncodedProperty(patchVertex, PATCH_ACTION_PROPERTY_KEY, action);
+ setEncodedProperty(patchVertex, PATCH_STATE_PROPERTY_KEY,
patchStatus.toString());
+ setEncodedProperty(patchVertex, TIMESTAMP_PROPERTY_KEY,
RequestContext.get().getRequestTime());
+ setEncodedProperty(patchVertex,
MODIFICATION_TIMESTAMP_PROPERTY_KEY, RequestContext.get().getRequestTime());
+ setEncodedProperty(patchVertex, CREATED_BY_KEY,
AtlasTypeDefGraphStoreV2.getCurrentUser());
+ setEncodedProperty(patchVertex, MODIFIED_BY_KEY,
AtlasTypeDefGraphStoreV2.getCurrentUser());
+ } finally {
+ graph.commit();
+
+ patchNameStatusMap.put(patchId, patchStatus);
+ }
}
private static Map<String, PatchStatus>
getPatchNameStatusForAllRegistered(AtlasGraph graph) {
@@ -170,7 +177,7 @@ public class AtlasPatchRegistry {
while (results != null && results.hasNext()) {
AtlasVertex patchVertex = results.next().getVertex();
- AtlasPatch patch = toAtlasPatch(patchVertex);
+ AtlasPatch patch = toAtlasPatch(patchVertex);
ret.add(patch);
}
@@ -180,10 +187,10 @@ public class AtlasPatchRegistry {
}
} catch (Throwable t) {
LOG.warn("getAllPatches(): Returned empty result!");
+ } finally {
+ graph.commit();
}
- graph.commit();
-
return new AtlasPatches(ret);
}
@@ -204,20 +211,11 @@ public class AtlasPatchRegistry {
return ret;
}
- private static AtlasVertex findByPatchId(String patchId) {
- AtlasVertex ret = null;
- String indexQuery = getIndexSearchPrefix() +
"\"" + PATCH_ID_PROPERTY_KEY + "\" : (" + patchId + ")";
- Iterator<Result<Object, Object>> results =
getGraphInstance().indexQuery(VERTEX_INDEX, indexQuery).vertices();
-
- while (results != null && results.hasNext()) {
- ret = results.next().getVertex();
+ public AtlasVertex findByPatchId(String patchId) {
+ AtlasGraphQuery query =
graph.query().has(Constants.PATCH_ID_PROPERTY_KEY, patchId);
+ Iterator<AtlasVertex> results = query.vertices().iterator();
- if (ret != null) {
- break;
- }
- }
-
- return ret;
+ return results.hasNext() ? results.next() : null;
}
private static PatchStatus getPatchStatus(AtlasVertex vertex) {
