Merge pull request #4395 from atlanhq/ixop

MLH-73 | enable relations only for indexsearch
atlanhq · Mar 7, 2025 · 2c0e4e9 · 2c0e4e9
2 parents 02ac3df + e6dc7dc
commit 2c0e4e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -28,6 +28,7 @@ on:
       - master
       - lineageondemand
       - cassandrapoliciesoptimisation
+      - ixop
 
 jobs:
   build:

diff --git a/...sitory/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java b/...sitory/src/main/java/org/apache/atlas/repository/store/graph/v2/EntityGraphRetriever.java
@@ -285,7 +285,9 @@ public AtlasObjectId toAtlasObjectId(AtlasVertex entityVertex) throws AtlasBaseE
         AtlasObjectId   ret        = null;
         String          typeName   = entityVertex.getProperty(Constants.TYPE_NAME_PROPERTY_KEY, String.class);
         AtlasEntityType entityType = typeRegistry.getEntityTypeByName(typeName);
-        boolean enableJanusOptimisation = AtlasConfiguration.ATLAS_INDEXSEARCH_ENABLE_JANUS_OPTIMISATION_FOR_RELATIONS.getBoolean();
+        boolean enableJanusOptimisation =
+                AtlasConfiguration.ATLAS_INDEXSEARCH_ENABLE_JANUS_OPTIMISATION_FOR_RELATIONS.getBoolean()
+                         && RequestContext.get().isInvokedByIndexSearch();
         Map<String, Object> referenceVertexProperties  = null;
         if (entityType != null) {
             Map<String, Object> uniqueAttributes = new HashMap<>();
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ on: @@
           - master
           - lineageondemand
           - cassandrapoliciesoptimisation
+          - ixop
     jobs:
       build:
@@ Expand Down @@