Cassandrautils

.github/workflows/maven.yml

@@ -27,7 +27,7 @@ on:
       - development
       - master
       - lineageondemand
-      - optimise_classifications_fetch
+      - cassandrautils
 
 jobs:
   build:

auth-agents-common/src/main/java/org/apache/atlas/plugin/util/PolicyRefresher.java

@@ -310,7 +310,6 @@ private ServicePolicies loadPolicyfromPolicyAdmin() throws RangerServiceNotFound
 
 		try {
 
-
 			if (serviceName.equals("atlas") && plugIn.getTypeRegistry() != null && lastUpdatedTimeInMillis == -1) {
 				LOG.info("PolicyRefresher(serviceName=" + serviceName + "): loading all policies for first time");
 				RangerRESTUtils restUtils = new RangerRESTUtils();

auth-agents-common/src/main/java/org/apache/atlas/policytransformer/CachePolicyTransformerImpl.java

@@ -134,7 +134,7 @@ public CachePolicyTransformerImpl(AtlasTypeRegistry typeRegistry) throws AtlasBa
         purposeTransformer = new PurposeCachePolicyTransformer(entityRetriever);
 
         try {
-            this.discoveryService = new EntityDiscoveryService(typeRegistry, graph, null, null, null, null);
+            this.discoveryService = new EntityDiscoveryService(typeRegistry, graph, null, null, null, null, entityRetriever);
         } catch (AtlasException e) {
             LOG.error("Failed to initialize discoveryService");
             throw new AtlasBaseException(e.getCause());
@@ -599,6 +599,8 @@ private List<AtlasEntityHeader> getAtlasPolicies(String serviceName, int batchSi
         List<AtlasEntityHeader> ret = new ArrayList<>();
         try {
             IndexSearchParams indexSearchParams = new IndexSearchParams();
+            indexSearchParams.setExcludeClassifications(true);
+
             Set<String> attributes = new HashSet<>();
             attributes.add(NAME);
             attributes.add(ATTR_POLICY_CATEGORY);
@@ -673,6 +675,8 @@ private List<AtlasEntityHeader> getAtlasPolicies(String serviceName, int batchSi
 
     private AtlasEntityHeader getServiceEntity(String serviceName) throws AtlasBaseException {
         IndexSearchParams indexSearchParams = new IndexSearchParams();
+        indexSearchParams.setExcludeClassifications(true);
+
         Set<String> attributes = new HashSet<>();
         attributes.add(NAME);
         attributes.add(ATTR_SERVICE_SERVICE_TYPE);

common/src/main/java/org/apache/atlas/service/FeatureFlagStore.java

@@ -28,6 +28,20 @@ public static boolean evaluate(String key, String expectedValue) {
         return ret;
     }
 
+    public static String getFlag(String key) {
+        String ret = "";
+        try{
+            if (StringUtils.isEmpty(key))
+            {
+                return ret;
+            }
+            String value = redisService.getValue(addFeatureFlagNamespace(key));
+            return value;
+        } catch (Exception e) {
+            return ret;
+        }
+    }
+
     public static void setFlag(String key, String value) {
         if (StringUtils.isEmpty(key) || StringUtils.isEmpty(value))
             return;

graphdb/janus/src/main/java/org/apache/atlas/repository/graphdb/janus/AtlasJanusGraphDatabase.java

@@ -23,6 +23,7 @@
 import org.apache.atlas.AtlasException;
 import org.apache.atlas.repository.graphdb.AtlasGraph;
 import org.apache.atlas.repository.graphdb.GraphDatabase;
+import org.apache.atlas.repository.graphdb.janus.graphv3.AtlasJanusGraphFactory;
 import org.apache.atlas.repository.graphdb.janus.serializer.BigDecimalSerializer;
 import org.apache.atlas.repository.graphdb.janus.serializer.BigIntegerSerializer;
 import org.apache.atlas.repository.graphdb.janus.serializer.TypeCategorySerializer;
@@ -149,7 +150,20 @@ static JanusGraph initJanusGraph(Configuration config) {
 
         org.apache.commons.configuration2.Configuration conf2 = createConfiguration2(config);
         try {
-            return JanusGraphFactory.open(conf2);
+            return AtlasJanusGraphFactory.open(conf2);
+            //return JanusGraphFactory.open(conf2);
+
+            /*JanusGraph graph = JanusGraphFactory.open(conf2);
+
+            StandardJanusGraph standardJanusGraph = (StandardJanusGraph) graph;
+
+            Field indexSerializerField = StandardJanusGraph.class.getDeclaredField("indexSerializer");
+            indexSerializerField.setAccessible(true);
+
+            CustomIndexSerializer customSerializer = new CustomIndexSerializer(standardJanusGraph);
+            indexSerializerField.set(standardJanusGraph, customSerializer);
+
+            return standardJanusGraph;*/
         } catch (JanusGraphException e) {
             LOG.warn("JanusGraphException: {}", e.getMessage());
             if (e.getMessage().startsWith(OLDER_STORAGE_EXCEPTION)) {