Understand any codebase instantly. System intelligence for codebases, built for humans and AI.
TypeScript aiai-memoryclaude-codeclicode-analysiscode-mappingcode-memorycodebase-understandingcodexdeveloper-toolsllmopenclawpersistent-memoryprogram-analysissoftware-architecturesystem-intelligencesystem-mapping
feat: UpsertNode versioning — tombstone old row, create new row for attr changes
riley02273bcbfe9026fc
diff --git a/memory-layer/src/main/scala/ix/memory/db/ArangoGraphQueryApi.scala b/memory-layer/src/main/scala/ix/memory/db/ArangoGraphQueryApi.scalaindex bc7837f1..d6ec84a8 100644--- a/memory-layer/src/main/scala/ix/memory/db/ArangoGraphQueryApi.scala+++ b/memory-layer/src/main/scala/ix/memory/db/ArangoGraphQueryApi.scala@@ -21,7 +21,7 @@ class ArangoGraphQueryApi(client: ArangoClient) extends GraphQueryApi {rev <- asOfRev.fold(getLatestRev)(IO.pure)result <- client.queryOne("""FOR n IN nodes- | FILTER n._key == @id+ | FILTER n.logical_id == @id| AND n.created_rev <= @rev| AND (n.deleted_rev == null OR @rev < n.deleted_rev)| RETURN n""".stripMargin,@@ -128,7 +128,7 @@ class ArangoGraphQueryApi(client: ArangoClient) extends GraphQueryApi {val idList = new java.util.ArrayList[String]()neighborIds.foreach(nid => idList.add(nid.value.toString))val aql = """FOR n IN nodes- | FILTER n.id IN @ids+ | FILTER n.logical_id IN @ids| AND n.created_rev <= @rev AND (n.deleted_rev == null OR @rev < n.deleted_rev)| RETURN n""".stripMarginclient.query(aql, Map(@@ -182,6 +182,7 @@ class ArangoGraphQueryApi(client: ArangoClient) extends GraphQueryApi {val c = json.hcursorval result = for {id <- c.get[String]("id").toOption+ .orElse(c.get[String]("logical_id").toOption).flatMap(s => scala.util.Try(UUID.fromString(s)).toOption).map(NodeId(_))kindStr <- c.get[String]("kind").toOptiondiff --git a/memory-layer/src/main/scala/ix/memory/db/ArangoGraphWriteApi.scala b/memory-layer/src/main/scala/ix/memory/db/ArangoGraphWriteApi.scalaindex 185d93e3..a382026d 100644--- a/memory-layer/src/main/scala/ix/memory/db/ArangoGraphWriteApi.scala+++ b/memory-layer/src/main/scala/ix/memory/db/ArangoGraphWriteApi.scala@@ -98,44 +98,91 @@ class ArangoGraphWriteApi(client: ArangoClient) extends GraphWriteApi {private def executeOp(op: PatchOp, patch: GraphPatch, newRev: Long, txId: String): IO[Unit] = op match {case PatchOp.UpsertNode(id, kind, name, attrs) =>+ val logicalId = id.value.toStringval now = Instant.now().toStringval provenanceJson = buildProvenance(patch)val attrsJson = Json.obj(attrs.toSeq.map { case (k, v) => k -> v }: _*).noSpaces- client.execute(- """UPSERT { _key: @key }- | INSERT {- | _key: @key,- | id: @id,- | kind: @kind,- | name: @name,- | attrs: @attrs,- | created_rev: @created_rev,- | deleted_rev: null,- | provenance: @provenance,- | created_at: @now,- | updated_at: @now- | }- | UPDATE {- | kind: @kind,- | name: @name,- | attrs: @attrs,- | deleted_rev: null,- | provenance: @provenance,- | updated_at: @now- | }- | IN nodes""".stripMargin,- Map(- "key" -> id.value.toString.asInstanceOf[AnyRef],- "id" -> id.value.toString.asInstanceOf[AnyRef],- "kind" -> nodeKindToString(kind).asInstanceOf[AnyRef],- "name" -> name.asInstanceOf[AnyRef],- "attrs" -> parseToJavaMap(attrsJson).asInstanceOf[AnyRef],- "created_rev" -> Long.box(newRev).asInstanceOf[AnyRef],- "provenance" -> parseToJavaMap(provenanceJson.noSpaces).asInstanceOf[AnyRef],- "now" -> now.asInstanceOf[AnyRef]- ),- txId = Some(txId)- )++ // Check if a live (non-tombstoned) row exists for this logical_id+ val checkAql = """+ FOR n IN nodes+ FILTER n.logical_id == @logicalId+ AND n.deleted_rev == null+ RETURN n+ """+ for {+ existing <- client.queryOne(checkAql,+ Map("logicalId" -> logicalId.asInstanceOf[AnyRef]),+ txId = Some(txId))+ _ <- existing match {+ case Some(existingJson) =>+ // Node exists — check if attrs actually changed+ val existingAttrsStr = existingJson.hcursor.downField("attrs").focus+ .map(_.noSpaces).getOrElse("{}")+ if (existingAttrsStr == attrsJson) {+ // Same attrs — idempotent no-op+ IO.unit+ } else {+ // Different attrs — tombstone old row + create new versioned row+ val existingKey = existingJson.hcursor.get[String]("_key")+ .getOrElse(logicalId)+ val tombstoneAql = """+ UPDATE { _key: @key } WITH { deleted_rev: @rev, updated_at: @now } IN nodes+ OPTIONS { waitForSync: true }+ """+ val newKey = s"${logicalId}_${newRev}"+ val insertAql = """+ INSERT {+ _key: @key, logical_id: @logicalId, id: @id, kind: @kind, name: @name,+ attrs: @attrs, provenance: @provenance,+ created_rev: @rev, deleted_rev: null,+ created_at: @now, updated_at: @now+ } INTO nodes OPTIONS { waitForSync: true }+ """+ for {+ _ <- client.execute(tombstoneAql, Map(+ "key" -> existingKey.asInstanceOf[AnyRef],+ "rev" -> Long.box(newRev).asInstanceOf[AnyRef],+ "now" -> now.asInstanceOf[AnyRef]+ ), txId = Some(txId))+ _ <- client.execute(insertAql, Map(+ "key" -> newKey.asInstanceOf[AnyRef],+ "logicalId" -> logicalId.asInstanceOf[AnyRef],+ "id" -> logicalId.asInstanceOf[AnyRef],+ "kind" -> nodeKindToString(kind).asInstanceOf[AnyRef],+ "name" -> name.asInstanceOf[AnyRef],+ "attrs" -> parseToJavaMap(attrsJson).asInstanceOf[AnyRef],+ "provenance" -> parseToJavaMap(provenanceJson.noSpaces).asInstanceOf[AnyRef],+ "rev" -> Long.box(newRev).asInstanceOf[AnyRef],+ "now" -> now.asInstanceOf[AnyRef]+ ), txId = Some(txId))+ } yield ()+ }++ case None =>+ // New node — create first row with versioned key+ val newKey = s"${logicalId}_${newRev}"+ val insertAql = """+ INSERT {+ _key: @key, logical_id: @logicalId, id: @id, kind: @kind, name: @name,+ attrs: @attrs, provenance: @provenance,+ created_rev: @rev, deleted_rev: null,+ created_at: @now, updated_at: @now+ } INTO nodes OPTIONS { waitForSync: true }+ """+ client.execute(insertAql, Map(+ "key" -> newKey.asInstanceOf[AnyRef],+ "logicalId" -> logicalId.asInstanceOf[AnyRef],+ "id" -> logicalId.asInstanceOf[AnyRef],+ "kind" -> nodeKindToString(kind).asInstanceOf[AnyRef],+ "name" -> name.asInstanceOf[AnyRef],+ "attrs" -> parseToJavaMap(attrsJson).asInstanceOf[AnyRef],+ "provenance" -> parseToJavaMap(provenanceJson.noSpaces).asInstanceOf[AnyRef],+ "rev" -> Long.box(newRev).asInstanceOf[AnyRef],+ "now" -> now.asInstanceOf[AnyRef]+ ), txId = Some(txId))+ }+ } yield ()case PatchOp.UpsertEdge(id, src, dst, predicate, attrs) =>val now = Instant.now().toString@@ -189,10 +236,10 @@ class ArangoGraphWriteApi(client: ArangoClient) extends GraphWriteApi {case PatchOp.DeleteNode(id) =>client.execute("""FOR n IN nodes- | FILTER n._key == @key+ | FILTER n.logical_id == @logicalId AND n.deleted_rev == null| UPDATE n WITH { deleted_rev: @deleted_rev } IN nodes""".stripMargin,Map(- "key" -> id.value.toString.asInstanceOf[AnyRef],+ "logicalId" -> id.value.toString.asInstanceOf[AnyRef],"deleted_rev" -> Long.box(newRev).asInstanceOf[AnyRef]),txId = Some(txId)