From 99f29b44a8db98db2f24a578a4a4d744df84b978 Mon Sep 17 00:00:00 2001 From: surilindur Date: Mon, 12 Feb 2024 13:52:54 +0100 Subject: [PATCH] Add separate and combined configs for VoID and Bloom --- .../config/config-bloom.json | 13 +++++++ .../config/config-default.json | 3 +- .../config/config-void.json | 11 ++++++ .../override/disable-aggregate-store.json | 39 ------------------- .../{actors.json => bloom.json} | 9 ----- .../config/rdf-metadata-extract/void.json | 18 +++++++++ engines/query-sparql-components/package.json | 5 +++ 7 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 engines/config-query-sparql-components/config/config-bloom.json create mode 100644 engines/config-query-sparql-components/config/config-void.json delete mode 100644 engines/config-query-sparql-components/config/override/disable-aggregate-store.json rename engines/config-query-sparql-components/config/rdf-metadata-extract/{actors.json => bloom.json} (61%) create mode 100644 engines/config-query-sparql-components/config/rdf-metadata-extract/void.json diff --git a/engines/config-query-sparql-components/config/config-bloom.json b/engines/config-query-sparql-components/config/config-bloom.json new file mode 100644 index 0000000..13d3885 --- /dev/null +++ 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" + ] +} \ No newline at end of file diff --git a/engines/config-query-sparql-components/config/config-default.json b/engines/config-query-sparql-components/config/config-default.json index 134e29c..e47dfa4 100644 --- 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 new file mode 100644 index 0000000..256855f --- /dev/null +++ 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" + ] +} \ No newline at end of file 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 deleted file mode 100644 index c996b0c..0000000 --- a/engines/config-query-sparql-components/config/override/disable-aggregate-store.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "@context": [ - "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-rdf-resolve-quad-pattern-hypermedia/^2.0.0/components/context.jsonld" - ], - "@graph": [ - { - "@id": "urn:comunica:default:rdf-resolve-quad-pattern/actors#hypermedia-no-aggregate-store", - "@type": "Override", - "overrideInstance": { - "@id": "urn:comunica:default:rdf-resolve-quad-pattern/actors#hypermedia" - }, - "overrideParameters": { - "@type": "ActorRdfResolveQuadPatternHypermedia", - "mediatorDereferenceRdf": { - "@id": "urn:comunica:default:dereference-rdf/mediators#main" - }, - "mediatorMetadata": { - "@id": "urn:comunica:default:rdf-metadata/mediators#main" - }, - "mediatorMetadataExtract": { - "@id": "urn:comunica:default:rdf-metadata-extract/mediators#main" - }, - "mediatorMetadataAccumulate": { - "@id": "urn:comunica:default:rdf-metadata-accumulate/mediators#main" - }, - "mediatorRdfResolveHypermedia": { - "@id": "urn:comunica:default:rdf-resolve-hypermedia/mediators#main" - }, - "mediatorRdfResolveHypermediaLinks": { - "@id": "urn:comunica:default:rdf-resolve-hypermedia-links/mediators#main" - }, - "mediatorRdfResolveHypermediaLinksQueue": { - "@id": "urn:comunica:default:rdf-resolve-hypermedia-links-queue/mediators#main" - }, - "aggregateStore": false - } - } - ] -} \ No newline at end of file diff --git a/engines/config-query-sparql-components/config/rdf-metadata-extract/actors.json b/engines/config-query-sparql-components/config/rdf-metadata-extract/bloom.json similarity index 61% rename from engines/config-query-sparql-components/config/rdf-metadata-extract/actors.json rename to engines/config-query-sparql-components/config/rdf-metadata-extract/bloom.json index 2bf3af3..44f8c80 100644 --- a/engines/config-query-sparql-components/config/rdf-metadata-extract/actors.json +++ b/engines/config-query-sparql-components/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 new file mode 100644 index 0000000..625262e --- /dev/null +++ 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?:\\/\\/.*\\/)$" + } + ] +} \ No newline at end of file diff --git a/engines/query-sparql-components/package.json b/engines/query-sparql-components/package.json index dc1c772..71b96d2 100644 --- 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"