From 590c09eb59f3a77f84106498d6f7c6417885c43e Mon Sep 17 00:00:00 2001 From: Friedrich Lindenberg Date: Tue, 27 Feb 2024 16:53:20 +0100 Subject: [PATCH] Make redis store lazy-resolve --- nomenklatura/store/redis_.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/nomenklatura/store/redis_.py b/nomenklatura/store/redis_.py index 00872d09..bf990c2c 100644 --- a/nomenklatura/store/redis_.py +++ b/nomenklatura/store/redis_.py @@ -59,15 +59,15 @@ def add_statement(self, stmt: Statement) -> None: self.flush() if self.pipeline is None: self.pipeline = self.store.db.pipeline() - canonical_id = self.store.resolver.get_canonical(stmt.entity_id) - stmt.canonical_id = canonical_id + # canonical_id = self.store.resolver.get_canonical(stmt.entity_id) + stmt.canonical_id = stmt.entity_id - self.pipeline.sadd(b(f"ds:{stmt.dataset}"), b(canonical_id)) - key = f"x:{canonical_id}" if stmt.external else f"s:{canonical_id}" + self.pipeline.sadd(b(f"ds:{stmt.dataset}"), b(stmt.entity_id)) + key = f"x:{stmt.entity_id}" if stmt.external else f"s:{stmt.entity_id}" self.pipeline.sadd(b(key), pack_statement(stmt)) if stmt.prop_type == registry.entity.name: vc = self.store.resolver.get_canonical(stmt.value) - self.pipeline.sadd(b(f"i:{vc}"), b(canonical_id)) + self.pipeline.sadd(b(f"i:{vc}"), b(stmt.entity_id)) self.batch_size += 1 @@ -85,8 +85,8 @@ def pop(self, entity_id: str) -> List[Statement]: datasets.add(stmt.dataset) if stmt.prop_type == registry.entity.name: - vc = self.store.resolver.get_canonical(stmt.value) - self.pipeline.srem(b(f"i:{vc}"), b(entity_id)) + # vc = self.store.resolver.get_canonical(stmt.value) + self.pipeline.srem(b(f"i:{stmt.value}"), b(entity_id)) for dataset in datasets: self.pipeline.srem(b(f"ds:{dataset}"), b(entity_id))