Merge pull request #1305 from romitshah02/redis-cache

fix: store collection relation cache in Redis when enabled

Author: pallakartheekreddy

content-api/content-service/conf/application.conf

@@ -397,6 +397,7 @@ redis.host = "localhost"
 redis.port = 6379
 redis.maxConnections = 128
 redis.enable = false
+redis.database.hierarchyRelations.id = 10
 
 #Condition to enable publish locally
 content.publish_task.enabled=true

content-api/hierarchy-manager/src/main/scala/org/sunbird/managers/RelationManager.scala

@@ -8,6 +8,7 @@ import org.sunbird.common.exception.{ClientException, ErrorCodes, ResponseCode}
 import org.sunbird.graph.OntologyEngineContext
 import org.sunbird.graph.external.store.ExternalStoreFactory
 import org.sunbird.telemetry.logger.TelemetryManager
+import org.sunbird.utils.content.HierarchyRelationCache
 
 import java.util
 import scala.concurrent.{ExecutionContext, Future}
@@ -28,6 +29,8 @@ object RelationManager {
     private val primaryKey: java.util.List[String] = java.util.Arrays.asList("relationship_key")
     private val propsMapping: Map[String, String] = Map("node_ids" -> "")
 
+    private val isRedisEnabled: Boolean = Platform.getBoolean("redis.enable", false)
+
 
     def updateHierarchyRelationships(request: Request)(implicit oec: OntologyEngineContext, ec: ExecutionContext): Future[Response] = {
         val rootId = request.getOrDefault("rootId", "").asInstanceOf[String]
@@ -173,26 +176,33 @@ object RelationManager {
         if (CollectionUtils.isEmpty(children)) new java.util.ArrayList[util.Map[String, AnyRef]]() else children
     }
 
+    private def relationshipKey(rootId: String, identifier: String, relationshipType: String): String =
+        if (StringUtils.isNotBlank(rootId)) s"$rootId:$identifier:$relationshipType"
+        else s"$identifier:$relationshipType"
+
     private def storeRelationshipData(
         rootId           : String,
         relationshipType : String,
         dataMap          : Map[String, List[String]]
     )(implicit ec: ExecutionContext): Future[List[Response]] = {
-        val store = ExternalStoreFactory.getExternalStore(
-            s"$relationCacheKeyspace.$relationCacheTable", primaryKey)
-
-        val futures = dataMap.map { case (identifier, nodeIds) =>
-            val relationshipKey =
-                if (StringUtils.isNotBlank(rootId)) s"$rootId:$identifier:$relationshipType"
-                else s"$identifier:$relationshipType"
-
-            store.update(
-                relationshipKey,
-                List("node_ids"),
-                List(nodeIds.asJava.asInstanceOf[AnyRef]),
-                propsMapping
-            )
+        if (isRedisEnabled) {
+            dataMap.foreach { case (identifier, nodeIds) =>
+                HierarchyRelationCache.replaceSet(relationshipKey(rootId, identifier, relationshipType), nodeIds)
+            }
+            Future.successful(List(ResponseHandler.OK))
+        } else {
+            val store = ExternalStoreFactory.getExternalStore(
+                s"$relationCacheKeyspace.$relationCacheTable", primaryKey)
+
+            val futures = dataMap.map { case (identifier, nodeIds) =>
+                store.update(
+                    relationshipKey(rootId, identifier, relationshipType),
+                    List("node_ids"),
+                    List(nodeIds.asJava.asInstanceOf[AnyRef]),
+                    propsMapping
+                )
+            }
+            Future.sequence(futures.toList)
         }
-        Future.sequence(futures.toList)
     }
-}
+}

content-api/hierarchy-manager/src/main/scala/org/sunbird/utils/HierarchyRelationCache.scala

@@ -0,0 +1,36 @@
+package org.sunbird.utils.content
+
+import org.slf4j.{Logger, LoggerFactory}
+import org.sunbird.cache.util.RedisConnector
+import org.sunbird.common.Platform
+
+/**
+ * Redis-backed store for collection hierarchy relationship data (leaf nodes,
+ * optional nodes, ancestors). Kept on its own db index — separate from the
+ * general-purpose RedisCache index — so it lines up with the same dedicated
+ * index used by knowledge-platform-jobs (redis.database.hierarchyRelations.id)
+ * and lern-service (hierarchy_relations_redis_index).
+ */
+object HierarchyRelationCache extends RedisConnector {
+
+	private val logger: Logger = LoggerFactory.getLogger(HierarchyRelationCache.getClass.getCanonicalName)
+	override protected val dbIndex: Int = Platform.getInteger("redis.database.hierarchyRelations.id", 10)
+
+	def replaceSet(key: String, data: List[String]): Unit = {
+		if (isEnabled) {
+			try {
+				val jedis = getConnection
+				try {
+					jedis.del(key)
+					data.foreach(entry => jedis.sadd(key, entry))
+				} catch {
+					case e: Exception =>
+						logger.error("Exception Occurred While Saving Set Data to HierarchyRelationCache for Key : " + key + "| Exception is:", e)
+				} finally returnConnection(jedis)
+			} catch {
+				case e: Exception =>
+					logger.error("Redis Connection/Authentication Error for Key : " + key + "| Exception is:", e)
+			}
+		}
+	}
+}

knowlg-service/conf/application.conf

@@ -471,6 +471,7 @@ redis.host = "localhost"
 redis.port = 6379
 redis.maxConnections = 128
 redis.enable = false
+redis.database.hierarchyRelations.id = 10
 
 #Condition to enable publish locally
 content.publish_task.enabled=true

platform-core/platform-cache/src/main/scala/org/sunbird/cache/util/RedisConnector.scala

@@ -12,7 +12,7 @@ trait RedisConnector {
 	private val HOST = Platform.getString("redis.host", "localhost")
 	private val PORT = Platform.getInteger("redis.port", 6379)
 	private val MAX_CONNECTIONS = Platform.getInteger("redis.maxConnections", 128)
-	private val INDEX = Platform.getInteger("redis.dbIndex", 0)
+	protected val dbIndex: Int = Platform.getInteger("redis.dbIndex", 0)
 	private val PASSWORD: String = Platform.getString("redis.password", "")
 	protected val isEnabled: Boolean = Platform.getBoolean("redis.enable", false)
 
@@ -42,7 +42,7 @@ trait RedisConnector {
 	 */
 	protected def getConnection: Jedis = if (!isEnabled) null else {
 		val jedis = jedisPool.getResource
-		if (INDEX > 0) jedis.select(INDEX)
+		if (dbIndex > 0) jedis.select(dbIndex)
 		jedis
 	}