Allow Bindings to have contexts

This allows annotating Bindings objects with custom metadata. This also adds a new bus (`bus-merge-bindings-context`) to determine how context entries in other Bindings contexts should be merged with each other during operations such as joins. Closes #1203
comunica · Feb 2, 2024 · aeaa306 · aeaa306
1 parent 1fe8472
commit aeaa306
Show file tree

Hide file tree

Showing 135 changed files with 2,013 additions and 564 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@ node_modules
 .rdf-test-suite-ldf-cache
 .idea
 .vscode
+.yarn
 lerna-debug.log
 yarn-error.log
 .eslintcache

diff --git a/engines/config-query-sparql/config/config-default.json b/engines/config-query-sparql/config/config-default.json
@@ -12,6 +12,8 @@
     "ccqs:config/http-invalidate/actors.json",
     "ccqs:config/http-invalidate/mediators.json",
     "ccqs:config/init/actors.json",
+    "ccqs:config/merge-bindings-context/actors.json",
+    "ccqs:config/merge-bindings-context/mediators.json",
     "ccqs:config/optimize-query-operation/actors.json",
     "ccqs:config/optimize-query-operation/mediators.json",
     "ccqs:config/query-operation/actors.json",

diff --git a/engines/config-query-sparql/config/config-rdfjs.json b/engines/config-query-sparql/config/config-rdfjs.json
@@ -12,6 +12,8 @@
 
     "ccqs:config/http-invalidate/mediators.json",
     "ccqs:config/init/actors.json",
+    "ccqs:config/merge-bindings-context/actors.json",
+    "ccqs:config/merge-bindings-context/mediators.json",
     "ccqs:config/optimize-query-operation/actors.json",
     "ccqs:config/optimize-query-operation/mediators.json",
     "ccqs:config/query-operation/actors.json",
@@ -38,5 +40,6 @@
 
     "ccqs:config/rdf-update-quads/actors-rdfjs.json",
     "ccqs:config/rdf-update-quads/mediators.json"
+
   ]
 }
diff --git a/engines/config-query-sparql/config/init/actors.json b/engines/config-query-sparql/config/init/actors.json
@@ -18,7 +18,8 @@
       "mediatorQueryResultSerializeMediaTypeCombiner": { "@id": "urn:comunica:default:query-result-serialize/mediators#mediaType" },
       "mediatorQueryResultSerializeMediaTypeFormatCombiner": { "@id": "urn:comunica:default:query-result-serialize/mediators#mediaTypeFormat" },
       "mediatorContextPreprocess": { "@id": "urn:comunica:default:context-preprocess/mediators#main" },
-      "mediatorHttpInvalidate": { "@id": "urn:comunica:default:http-invalidate/mediators#main" }
+      "mediatorHttpInvalidate": { "@id": "urn:comunica:default:http-invalidate/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/merge-bindings-context/actors.json b/engines/config-query-sparql/config/merge-bindings-context/actors.json
@@ -0,0 +1,9 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/runner/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/actor-merge-bindings-context-union/^2.0.0/components/context.jsonld"
+  ],
+  "@id": "urn:comunica:default:Runner",
+  "@type": "Runner",
+  "actors": []
+}
diff --git a/engines/config-query-sparql/config/merge-bindings-context/mediators.json b/engines/config-query-sparql/config/merge-bindings-context/mediators.json
@@ -0,0 +1,10 @@
+{
+  "@context": [
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/bus-merge-bindings-context/^2.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@comunica/mediator-combine-union/^2.0.0/components/context.jsonld"
+  ],
+  "@id": "urn:comunica:default:merge-bindings-context/mediators#main",
+  "@type": "MediatorCombineUnion",
+  "field": "mergeHandlers",
+  "bus": { "@id": "ActorMergeBindingsContext:_default_bus" }
+}
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/extend.json b/engines/config-query-sparql/config/query-operation/actors/query/extend.json
@@ -10,7 +10,8 @@
     {
       "@id": "urn:comunica:default:query-operation/actors#extend",
       "@type": "ActorQueryOperationExtend",
-      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/filter.json b/engines/config-query-sparql/config/query-operation/actors/query/filter.json
@@ -10,7 +10,8 @@
     {
       "@id": "urn:comunica:default:query-operation/actors#filter",
       "@type": "ActorQueryOperationFilterSparqlee",
-      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/group.json b/engines/config-query-sparql/config/query-operation/actors/query/group.json
@@ -11,7 +11,8 @@
       "@id": "urn:comunica:default:query-operation/actors#group",
       "@type": "ActorQueryOperationGroup",
       "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
-      "mediatorHashBindings": { "@id": "urn:comunica:default:hash-bindings/mediators#main" }
+      "mediatorHashBindings": { "@id": "urn:comunica:default:hash-bindings/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/leftjoin.json b/engines/config-query-sparql/config/query-operation/actors/query/leftjoin.json
@@ -11,7 +11,8 @@
       "@id": "urn:comunica:default:query-operation/actors#leftjoin",
       "@type": "ActorQueryOperationLeftJoin",
       "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
-      "mediatorJoin": { "@id": "urn:comunica:default:rdf-join/mediators#main" }
+      "mediatorJoin": { "@id": "urn:comunica:default:rdf-join/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/nop.json b/engines/config-query-sparql/config/query-operation/actors/query/nop.json
@@ -10,7 +10,8 @@
     {
       "@id": "urn:comunica:default:query-operation/actors#nop",
       "@type": "ActorQueryOperationNop",
-      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/orderby.json b/engines/config-query-sparql/config/query-operation/actors/query/orderby.json
@@ -10,7 +10,8 @@
     {
       "@id": "urn:comunica:default:query-operation/actors#orderby",
       "@type": "ActorQueryOperationOrderBySparqlee",
-      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/path-one-or-more.json b/engines/config-query-sparql/config/query-operation/actors/query/path-one-or-more.json
@@ -10,7 +10,8 @@
     {
       "@id": "urn:comunica:default:query-operation/actors#path-one-or-more",
       "@type": "ActorQueryOperationPathOneOrMore",
-      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/path-zero-or-more.json b/engines/config-query-sparql/config/query-operation/actors/query/path-zero-or-more.json
@@ -10,7 +10,8 @@
     {
       "@id": "urn:comunica:default:query-operation/actors#path-zero-or-more",
       "@type": "ActorQueryOperationPathZeroOrMore",
-      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/path-zero-or-one.json b/engines/config-query-sparql/config/query-operation/actors/query/path-zero-or-one.json
@@ -10,7 +10,8 @@
     {
       "@id": "urn:comunica:default:query-operation/actors#path-zero-or-one",
       "@type": "ActorQueryOperationPathZeroOrOne",
-      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/quadpattern.json b/engines/config-query-sparql/config/query-operation/actors/query/quadpattern.json
@@ -10,7 +10,8 @@
     {
       "@id": "urn:comunica:default:query-operation/actors#quadpattern",
       "@type": "ActorQueryOperationQuadpattern",
-      "mediatorResolveQuadPattern": { "@id": "urn:comunica:default:rdf-resolve-quad-pattern/mediators#main" }
+      "mediatorResolveQuadPattern": { "@id": "urn:comunica:default:rdf-resolve-quad-pattern/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/service.json b/engines/config-query-sparql/config/query-operation/actors/query/service.json
@@ -11,7 +11,8 @@
       "@id": "urn:comunica:default:query-operation/actors#service",
       "@type": "ActorQueryOperationService",
       "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
-      "forceSparqlEndpoint": false
+      "forceSparqlEndpoint": false,
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/sparql-endpoint.json b/engines/config-query-sparql/config/query-operation/actors/query/sparql-endpoint.json
@@ -10,7 +10,8 @@
     {
       "@id": "urn:comunica:default:query-operation/actors#sparql-endpoint",
       "@type": "ActorQueryOperationSparqlEndpoint",
-      "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" }
+      "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/query/values.json b/engines/config-query-sparql/config/query-operation/actors/query/values.json
@@ -9,7 +9,8 @@
   "actors": [
     {
       "@id": "urn:comunica:default:query-operation/actors#values",
-      "@type": "ActorQueryOperationValues"
+      "@type": "ActorQueryOperationValues",
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/query-operation/actors/update/delete-insert.json b/engines/config-query-sparql/config/query-operation/actors/update/delete-insert.json
@@ -11,7 +11,8 @@
       "@id": "urn:comunica:default:query-operation/actors#update-delete-insert",
       "@type": "ActorQueryOperationUpdateDeleteInsert",
       "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
-      "mediatorUpdateQuads": { "@id": "urn:comunica:default:rdf-update-quads/mediators#main" }
+      "mediatorUpdateQuads": { "@id": "urn:comunica:default:rdf-update-quads/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     }
   ]
 }
diff --git a/engines/config-query-sparql/config/rdf-join/actors-inner.json b/engines/config-query-sparql/config/rdf-join/actors-inner.json
@@ -17,7 +17,8 @@
     {
       "@id": "urn:comunica:default:rdf-join/actors#inner-none",
       "@type": "ActorRdfJoinNone",
-      "mediatorJoinSelectivity": { "@id": "urn:comunica:default:rdf-join-selectivity/mediators#main" }
+      "mediatorJoinSelectivity": { "@id": "urn:comunica:default:rdf-join-selectivity/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     },
     {
       "@id": "urn:comunica:default:rdf-join/actors#inner-single",
@@ -34,7 +35,8 @@
       "@type": "ActorRdfJoinMultiBind",
       "mediatorJoinSelectivity": { "@id": "urn:comunica:default:rdf-join-selectivity/mediators#main" },
       "mediatorJoinEntriesSort": { "@id": "urn:comunica:default:rdf-join-entries-sort/mediators#main" },
-      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     },
     {
       "@id": "urn:comunica:default:rdf-join/actors#inner-hash",

diff --git a/engines/config-query-sparql/config/rdf-join/actors-optional.json b/engines/config-query-sparql/config/rdf-join/actors-optional.json
@@ -12,7 +12,8 @@
       "@id": "urn:comunica:default:rdf-join/actors#optional-bind",
       "@type": "ActorRdfJoinOptionalBind",
       "mediatorJoinSelectivity": { "@id": "urn:comunica:default:rdf-join-selectivity/mediators#main" },
-      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" }
+      "mediatorQueryOperation": { "@id": "urn:comunica:default:query-operation/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     },
     {
       "@id": "urn:comunica:default:rdf-join/actors#optional-nested-loop",

diff --git a/engines/config-query-sparql/config/rdf-resolve-hypermedia/actors.json b/engines/config-query-sparql/config/rdf-resolve-hypermedia/actors.json
@@ -19,7 +19,8 @@
     {
       "@id": "urn:comunica:default:rdf-resolve-quad-pattern/actors#sparql",
       "@type": "ActorRdfResolveHypermediaSparql",
-      "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" }
+      "mediatorHttp": { "@id": "urn:comunica:default:http/mediators#main" },
+      "mediatorMergeBindingsContext": { "@id": "urn:comunica:default:merge-bindings-context/mediators#main" }
     },
     {
       "@id": "urn:comunica:default:rdf-resolve-hypermedia/actors#none",

diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "babel-loader": "^9.1.0",
     "componentsjs-generator": "^3.1.0",
     "depcheck": "^1.4.3",
-    "eslint": "^8.48.0",
+    "eslint": "8.48.0",
     "jest": "^29.5.0",
     "jest-mock": "^29.3.1",
     "jest-rdf": "^1.7.1",
@@ -55,7 +55,7 @@
     "streamify-string": "^1.0.1",
     "ts-jest": "^29.0.5",
     "ts-loader": "^9.4.1",
-    "typedoc": "^0.25.0",
+    "typedoc": "^0.25.7",
     "typescript": "^5.2.2",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.0"

diff --git a/packages/actor-abstract-path/lib/ActorAbstractPath.ts b/packages/actor-abstract-path/lib/ActorAbstractPath.ts
@@ -1,4 +1,4 @@
-import { BindingsFactory } from '@comunica/bindings-factory';
+import type { BindingsFactory } from '@comunica/bindings-factory';
 import type { IActorQueryOperationTypedMediatedArgs } from '@comunica/bus-query-operation';
 import {
   ActorQueryOperation,
@@ -20,7 +20,6 @@ import { Factory } from 'sparqlalgebrajs';
 import { PathVariableObjectIterator } from './PathVariableObjectIterator';
 
 const DF = new DataFactory();
-const BF = new BindingsFactory();
 
 /**
  * An abstract actor that handles Path operations.
@@ -83,6 +82,7 @@ export abstract class ActorAbstractPath extends ActorQueryOperationTypedMediated
     predicate: Algebra.PropertyPathSymbol,
     graph: RDF.Variable,
     context: IActionContext,
+    bindingsFactory: BindingsFactory,
   ): Promise<IPathResultStream> {
     // TODO: refactor this with an iterator just like PathVariableObjectIterator so we handle backpressure correctly
     // Construct path to obtain all graphs where subject exists
@@ -114,7 +114,7 @@ export abstract class ActorAbstractPath extends ActorQueryOperationTypedMediated
               await this.getObjectsPredicateStar(subject, predicate, graphValue, context, {}, it, { count: 0 });
               return it.transform<Bindings>({
                 transform(item, next, push) {
-                  push(BF.bindings([
+                  push(bindingsFactory.bindings([
                     [ object, item ],
                     [ graph, graphValue ],
                   ]));
@@ -152,9 +152,10 @@ export abstract class ActorAbstractPath extends ActorQueryOperationTypedMediated
     graph: RDF.Term,
     context: IActionContext,
     emitFirstSubject: boolean,
+    bindingsFactory: BindingsFactory,
   ): Promise<IPathResultStream> {
     if (graph.termType === 'Variable') {
-      return this.predicateStarGraphVariable(subject, object, predicate, graph, context);
+      return this.predicateStarGraphVariable(subject, object, predicate, graph, context, bindingsFactory);
     }
 
     const it = new PathVariableObjectIterator(
@@ -169,7 +170,7 @@ export abstract class ActorAbstractPath extends ActorQueryOperationTypedMediated
     const bindingsStream = it.transform<Bindings>({
       autoStart: false,
       transform(item, next, push) {
-        push(BF.bindings([[ object, item ]]));
+        push(bindingsFactory.bindings([[ object, item ]]));
         next();
       },
     });
@@ -266,6 +267,7 @@ export abstract class ActorAbstractPath extends ActorQueryOperationTypedMediated
     termHashesCurrentSubject: Record<string, boolean>,
     it: BufferedIterator<Bindings>,
     counter: any,
+    bindingsFactory: BindingsFactory,
   ): Promise<void> {
     const termString = termToString(objectVal) + termToString(graph);
 
@@ -276,7 +278,7 @@ export abstract class ActorAbstractPath extends ActorQueryOperationTypedMediated
 
     counter.count++;
     termHashesCurrentSubject[termString] = true;
-    (<any> it)._push(BF.bindings([
+    (<any> it)._push(bindingsFactory.bindings([
       [ subjectVar, subjectVal ],
       [ objectVar, objectVal ],
     ]));
@@ -297,6 +299,7 @@ export abstract class ActorAbstractPath extends ActorQueryOperationTypedMediated
           termHashesCurrentSubject,
           it,
           counter,
+          bindingsFactory,
         );
       }
       if (--counter.count === 0) {
@@ -333,6 +336,7 @@ export abstract class ActorAbstractPath extends ActorQueryOperationTypedMediated
           termHashesCurrentSubject,
           it,
           counter,
+          bindingsFactory,
         );
       });
       results.bindingsStream.on('error', reject);

diff --git a/packages/actor-init-query/lib/ActorInitQueryBase.ts b/packages/actor-init-query/lib/ActorInitQueryBase.ts
@@ -2,6 +2,7 @@ import type { MediatorContextPreprocess } from '@comunica/bus-context-preprocess
 import type { MediatorHttpInvalidate } from '@comunica/bus-http-invalidate';
 import type { IActionInit, IActorInitArgs, IActorOutputInit } from '@comunica/bus-init';
 import { ActorInit } from '@comunica/bus-init';
+import type { MediatorMergeBindingsContext } from '@comunica/bus-merge-bindings-context';
 import type { MediatorOptimizeQueryOperation } from '@comunica/bus-optimize-query-operation';
 import type { MediatorQueryOperation } from '@comunica/bus-query-operation';
 import type { MediatorQueryParse } from '@comunica/bus-query-parse';
@@ -24,6 +25,7 @@ export class ActorInitQueryBase<QueryContext extends IQueryContextCommon = IQuer
   public readonly mediatorQueryResultSerializeMediaTypeFormatCombiner: MediatorQueryResultSerializeMediaTypeFormats;
   public readonly mediatorContextPreprocess: MediatorContextPreprocess;
   public readonly mediatorHttpInvalidate: MediatorHttpInvalidate;
+  public readonly mediatorMergeBindingsContext: MediatorMergeBindingsContext;
 
   public readonly logger: Logger;
   public readonly queryString?: string;
@@ -97,6 +99,11 @@ export interface IActorInitQueryBaseArgs<QueryContext extends IQueryContextCommo
    * The HTTP cache invalidation mediator
    */
   mediatorHttpInvalidate: MediatorHttpInvalidate;
+  /**
+   * A mediator for creating binding context merge handlers
+   */
+  mediatorMergeBindingsContext: MediatorMergeBindingsContext;
+
   /**
    * The logger of this actor
    * @default {a <npmd:@comunica/logger-void/^2.0.0/components/LoggerVoid.jsonld#LoggerVoid>}

diff --git a/packages/actor-init-query/lib/QueryEngineBase.ts b/packages/actor-init-query/lib/QueryEngineBase.ts
@@ -1,3 +1,4 @@
+import { BindingsFactory } from '@comunica/bindings-factory';
 import { materializeOperation } from '@comunica/bus-query-operation';
 import type { IActionSparqlSerialize, IActorQueryResultSerializeOutput } from '@comunica/bus-query-result-serialize';
 import { KeysCore, KeysInitQuery, KeysRdfResolveQuadPattern } from '@comunica/context-entries';
@@ -184,7 +185,9 @@ implements IQueryEngine<QueryContext, QueryStringContextInner, QueryAlgebraConte
 
     // Apply initial bindings in context
     if (actionContext.has(KeysInitQuery.initialBindings)) {
-      operation = materializeOperation(operation, actionContext.get(KeysInitQuery.initialBindings)!);
+      const bindingsFactory = await BindingsFactory
+        .create(this.actorInitQuery.mediatorMergeBindingsContext, actionContext);
+      operation = materializeOperation(operation, actionContext.get(KeysInitQuery.initialBindings)!, bindingsFactory);
 
       // Delete the query string from the context, since our initial query might have changed
       actionContext = actionContext.delete(KeysInitQuery.queryString);