Add separate and combined configs for VoID and Bloom

surilindur · Feb 12, 2024 · 99f29b4 · 99f29b4
1 parent 24df473
commit 99f29b4
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 49 deletions.
diff --git a/engines/config-query-sparql-components/config/config-bloom.json b/engines/config-query-sparql-components/config/config-bloom.json
@@ -0,0 +1,13 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/config-query-sparql-components/^0.0.0/components/context.jsonld"
+  ],
+  "import": [
+    "ccqsc:config/config-base-adaptive.json",
+    "ccqsc:config/context-preprocess/actors.json",
+    "ccqsc:config/rdf-metadata-extract/bloom.json",
+    "ccqsc:config/rdf-parse/mediators.json",
+    "ccqsc:config/rdf-parse/actors.json",
+    "ccqsc:config/rdf-resolve-hypermedia-links-queue/actors.json"
+  ]
+}
diff --git a/engines/config-query-sparql-components/config/config-default.json b/engines/config-query-sparql-components/config/config-default.json
@@ -5,7 +5,8 @@
   "import": [
     "ccqsc:config/config-base-adaptive.json",
     "ccqsc:config/context-preprocess/actors.json",
-    "ccqsc:config/rdf-metadata-extract/actors.json",
+    "ccqsc:config/rdf-metadata-extract/bloom.json",
+    "ccqsc:config/rdf-metadata-extract/void.json",
     "ccqsc:config/rdf-metadata-accumulate/actors.json",
     "ccqsc:config/rdf-join/actors.json",
     "ccqsc:config/rdf-parse/mediators.json",

diff --git a/engines/config-query-sparql-components/config/config-void.json b/engines/config-query-sparql-components/config/config-void.json
@@ -0,0 +1,11 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/config-query-sparql-components/^0.0.0/components/context.jsonld"
+  ],
+  "import": [
+    "ccqsc:config/config-base-adaptive.json",
+    "ccqsc:config/rdf-metadata-extract/void.json",
+    "ccqsc:config/rdf-metadata-accumulate/actors.json",
+    "ccqsc:config/rdf-join/actors.json"
+  ]
+}
diff --git a/engines/config-query-sparql-components/config/override/disable-aggregate-store.json b/engines/config-query-sparql-components/config/override/disable-aggregate-store.json
diff --git a/...s/config/rdf-metadata-extract/actors.json → ...ts/config/rdf-metadata-extract/bloom.json b/...s/config/rdf-metadata-extract/actors.json → ...ts/config/rdf-metadata-extract/bloom.json
@@ -1,20 +1,11 @@
 {
   "@context": [
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/runner/^2.0.0/components/context.jsonld",
-    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-metadata-extract-void-description/^0.0.0/components/context.jsonld",
     "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-metadata-extract-membership-filter/^0.0.0/components/context.jsonld"
   ],
   "@id": "urn:comunica:default:Runner",
   "@type": "Runner",
   "actors": [
-    {
-      "@id": "urn:comunica:default:rdf-metadata-extract/actors#void-description",
-      "@type": "ActorRdfMetadataExtractVoIDDescription",
-      "mediatorDereferenceRdf": {
-        "@id": "urn:comunica:default:dereference-rdf/mediators#main"
-      },
-      "datasetSubjectRegex": "^(https?:\\/\\/.*\\/)$"
-    },
     {
       "@id": "urn:comunica:default:rdf-metadata-extract/actors#membership-filter",
       "@type": "ActorRdfMetadataExtractMembershipFilter",

diff --git a/engines/config-query-sparql-components/config/rdf-metadata-extract/void.json b/engines/config-query-sparql-components/config/rdf-metadata-extract/void.json
@@ -0,0 +1,18 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/runner/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-metadata-extract-void-description/^0.0.0/components/context.jsonld"
+  ],
+  "@id": "urn:comunica:default:Runner",
+  "@type": "Runner",
+  "actors": [
+    {
+      "@id": "urn:comunica:default:rdf-metadata-extract/actors#void-description",
+      "@type": "ActorRdfMetadataExtractVoIDDescription",
+      "mediatorDereferenceRdf": {
+        "@id": "urn:comunica:default:dereference-rdf/mediators#main"
+      },
+      "datasetSubjectRegex": "^(https?:\\/\\/.*\\/)$"
+    }
+  ]
+}
diff --git a/engines/query-sparql-components/package.json b/engines/query-sparql-components/package.json
@@ -21,7 +21,12 @@
     "@comunica/actor-init-query": "^2.0.0",
     "@comunica/actor-rdf-join-inner-multi-adaptive-heuristics": "^0.0.0",
     "@comunica/actor-rdf-metadata-accumulate-void-description": "^0.0.0",
+    "@comunica/actor-rdf-metadata-extract-membership-filter": "^0.0.0",
     "@comunica/actor-rdf-metadata-extract-void-description": "^0.0.0",
+    "@comunica/actor-rdf-parse-membership-filter-bloom": "^0.0.0",
+    "@comunica/actor-rdf-parse-membership-filter-gcs": "^0.0.0",
+    "@comunica/actor-rdf-resolve-hypermedia-links-queue-wrapper-membership-filter": "^0.0.0",
+    "@comunica/bus-rdf-parse-membership-filter": "^0.0.0",
     "@comunica/config-query-sparql-components": "^0.0.0",
     "@comunica/query-sparql-link-traversal-solid": "^0.2.0",
     "@comunica/runner-cli": "^2.0.0"