@comunica/mediator-join-coefficients-fixed 2.0.7-alpha.10.0 → 2.2.0

package/lib/MediatorJoinCoefficientsFixed.js

@@ -20,23 +20,30 @@ class MediatorJoinCoefficientsFixed extends core_1.Mediator {
             errors.push(error);
         }));
         const coefficients = await Promise.all(promises);
-        // Check if we had a limit indicator in the context
-        const limitIndicator = action.context.get(context_entries_1.KeysQueryOperation.limitIndicator);
         // Calculate costs
-        const costs = coefficients
+        let costs = coefficients
             // eslint-disable-next-line array-callback-return
-            .map(coeff => {
-            if (coeff &&
-                // If we have a limit indicator,
-                // disallow entries that have a number of iterations that is higher than the limit AND persist items.
-                // In these cases, join operators that produce results early on will be preferred.
-                (!limitIndicator || coeff.iterations < limitIndicator || coeff.persistedItems === 0)) {
+            .map((coeff, i) => {
+            if (coeff) {
                 return coeff.iterations * this.cpuWeight +
                     coeff.persistedItems * this.memoryWeight +
                     coeff.blockingItems * this.timeWeight +
                     coeff.requestTime * this.ioWeight;
             }
         });
+        const maxCost = Math.max(...costs.filter(cost => cost !== undefined));
+        // If we have a limit indicator in the context,
+        // increase cost of entries that have a number of iterations that is higher than the limit AND persist items.
+        // In these cases, join operators that produce results early on will be preferred.
+        const limitIndicator = action.context.get(context_entries_1.KeysQueryOperation.limitIndicator);
+        if (limitIndicator) {
+            costs = costs.map((cost, i) => {
+                if (cost !== undefined && coefficients[i].persistedItems > 0 && coefficients[i].iterations > limitIndicator) {
+                    return cost + maxCost;
+                }
+                return cost;
+            });
+        }
         // Determine index with lowest cost
         let minIndex = -1;
         let minValue = Number.POSITIVE_INFINITY;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@comunica/mediator-join-coefficients-fixed",
-  "version": "2.0.7-alpha.10.0",
+  "version": "2.2.0",
   "description": "A join-coefficients-fixed mediator",
   "lsd:module": true,
   "main": "lib/index.js",
@@ -29,12 +29,12 @@
     "lib/**/*.js"
   ],
   "dependencies": {
-    "@comunica/bindings-factory": "2.0.7-alpha.10.0",
-    "@comunica/bus-rdf-join": "2.0.7-alpha.10.0",
-    "@comunica/context-entries": "2.0.7-alpha.10.0",
-    "@comunica/core": "2.0.7-alpha.10.0",
-    "@comunica/mediatortype-join-coefficients": "2.0.7-alpha.10.0",
-    "@comunica/types": "2.0.7-alpha.10.0",
+    "@comunica/bindings-factory": "^2.2.0",
+    "@comunica/bus-rdf-join": "^2.2.0",
+    "@comunica/context-entries": "^2.2.0",
+    "@comunica/core": "^2.2.0",
+    "@comunica/mediatortype-join-coefficients": "^2.2.0",
+    "@comunica/types": "^2.2.0",
     "asynciterator": "^3.3.0",
     "rdf-string": "^1.5.0",
     "rdf-terms": "^1.6.2",
@@ -45,5 +45,5 @@
     "build:ts": "node \"../../node_modules/typescript/bin/tsc\"",
     "build:components": "componentsjs-generator"
   },
-  "gitHead": "9ad64da7bae9dda857e12b7bb0b3af58d5f0f2af"
+  "gitHead": "00d4108e46250fb94b586bfb8caf5e8b1c704160"
 }