From 9d40667deb1d395d8acd382ff2969ae43bc21d0d Mon Sep 17 00:00:00 2001 From: aarshi Date: Thu, 27 Feb 2025 22:04:27 +0530 Subject: [PATCH 1/3] Fix empty typename issue for attributes --- .../java/org/apache/atlas/repository/graph/GraphHelper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/GraphHelper.java b/repository/src/main/java/org/apache/atlas/repository/graph/GraphHelper.java index 73f9140e68..1be097c98a 100755 --- a/repository/src/main/java/org/apache/atlas/repository/graph/GraphHelper.java +++ b/repository/src/main/java/org/apache/atlas/repository/graph/GraphHelper.java @@ -2071,7 +2071,7 @@ private static Set parseLabelsString(String labels) { * @param vertex entity vertex * @return Iterator of children edges */ - public static Iterator getOnlyActiveEdges(AtlasVertex vertex, AtlasEdgeDirection direction) throws AtlasBaseException { + public Iterator getOnlyActiveEdges(AtlasVertex vertex, AtlasEdgeDirection direction) throws AtlasBaseException { AtlasPerfMetrics.MetricRecorder metricRecorder = RequestContext.get().startMetricRecord("GraphHelper.getOnlyActiveEdges"); try { @@ -2109,7 +2109,7 @@ public Set> retrieveEdgeLabelsAndTypeName return new AbstractMap.SimpleEntry<>(labelStr, typeNameStr); }) - .filter(entry -> !entry.getKey().isEmpty() && !entry.getValue().isEmpty()) + .filter(entry -> !entry.getKey().isEmpty()) .distinct() .collect(Collectors.toSet()); From 923f9da0fd602082b5a4b5699f2e7ea35576f879 Mon Sep 17 00:00:00 2001 From: aarshi Date: Thu, 27 Feb 2025 22:07:52 +0530 Subject: [PATCH 2/3] Do branch based deployment --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 4afe869921..d99b44d45e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -27,6 +27,7 @@ on: - development - master - lineageondemand + - hotfixindexsearch jobs: build: From 2297ec3e7b7e9492695ae4502ac9637a6bb39e9a Mon Sep 17 00:00:00 2001 From: aarshi Date: Sun, 2 Mar 2025 23:27:10 +0530 Subject: [PATCH 3/3] code cleanup --- .../atlas/repository/graph/GraphHelper.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/repository/src/main/java/org/apache/atlas/repository/graph/GraphHelper.java b/repository/src/main/java/org/apache/atlas/repository/graph/GraphHelper.java index 1be097c98a..e4215cba44 100755 --- a/repository/src/main/java/org/apache/atlas/repository/graph/GraphHelper.java +++ b/repository/src/main/java/org/apache/atlas/repository/graph/GraphHelper.java @@ -2065,30 +2065,6 @@ private static Set parseLabelsString(String labels) { return ret; } - - /** - * Get all the active edges - * @param vertex entity vertex - * @return Iterator of children edges - */ - public Iterator getOnlyActiveEdges(AtlasVertex vertex, AtlasEdgeDirection direction) throws AtlasBaseException { - AtlasPerfMetrics.MetricRecorder metricRecorder = RequestContext.get().startMetricRecord("GraphHelper.getOnlyActiveEdges"); - - try { - return vertex.query() - .direction(direction) - .has(STATE_PROPERTY_KEY, ACTIVE_STATE_VALUE) - .edges() - .iterator(); - } catch (Exception e) { - LOG.error("Error while getting active edges of vertex", e); - throw new AtlasBaseException(AtlasErrorCode.INTERNAL_ERROR, e); - } - finally { - RequestContext.get().endMetricRecord(metricRecorder); - } - } - public Set> retrieveEdgeLabelsAndTypeName(AtlasVertex vertex) throws AtlasBaseException { AtlasPerfMetrics.MetricRecorder metricRecorder = RequestContext.get().startMetricRecord("GraphHelper.retrieveEdgeLabelsAndTypeName");