pure fallback works

adotmob · May 28, 2016 · f480415 · f480415
1 parent 8ea15a9
commit f480415
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ For updates follow [@implydata](https://twitter.com/implydata) on Twitter.
 
 - DruidExternal: Fix bug where `$blah / 10` did not work in split
 - DruidExternal: Fix bug where `1 + $blah` did not cast to number
+- DruidExternal: Pure `.fallback()` now works 
 
 ## 0.10.26
 

diff --git a/src/actions/isAction.ts b/src/actions/isAction.ts
@@ -66,6 +66,10 @@ module Plywood {
         return new InAction({ expression: this.expression })
       }
 
+      if (prevAction instanceof FallbackAction && prevAction.expression.isOp('literal') && this.expression.isOp('literal') && !prevAction.expression.equals(this.expression)) {
+        return this;
+      }
+
       return null;
     }
 

diff --git a/src/external/druidExternal.ts b/src/external/druidExternal.ts
@@ -1199,7 +1199,7 @@ module Plywood {
 
         if (action instanceof ExtractAction) {
           // retainMissingValue === false is not supported in old druid nor is replaceMissingValueWith in regex extractionFn
-          // we want to use a js function if we are using an old version of druid and want to use this functionality
+          // we want to use a js function if we are using an old version of Druid
           if (this.versionBefore('0.9.0') && (retainMissingValue === false || replaceMissingValueWith !== null)) {
             return this.actionToJavaScriptExtractionFn(action);
           }
@@ -1276,6 +1276,19 @@ module Plywood {
         return this.actionToJavaScriptExtractionFn(action);
       }
 
+      if (action instanceof FallbackAction && action.expression.isOp('literal')) {
+        return {
+          type: "lookup",
+          retainMissingValue: true,
+          lookup: {
+            type: "map",
+            map: {
+              "": action.getLiteralValue()
+            }
+          }
+        };
+      }
+
       throw new Error(`can not covert ${action} to extractionFn`);
     }
 

diff --git a/test/functional/crossFunctional.mocha.js b/test/functional/crossFunctional.mocha.js
@@ -482,6 +482,24 @@ describe("Cross Functional", function() {
         .limit(20)
     }));
 
+    it('works with STRING split .fallback() no match', equalityTest({
+      executorNames: ['druid', 'mysql', 'postgres'],
+      expression: $('wiki').split('$cityName.fallback("NoCity")', 'CityFallback')
+        .apply('TotalEdits', '$wiki.sum($count)')
+        .apply('TotalAdded', '$wiki.sum($added)')
+        .sort('$TotalAdded', 'descending')
+        .limit(20)
+    }));
+
+    it('works with STRING split .fallback() with match', equalityTest({
+      executorNames: ['druid', 'mysql', 'postgres'],
+      expression: $('wiki').split('$cityName.fallback("Bucharest")', 'CityFallback')
+        .apply('TotalEdits', '$wiki.sum($count)')
+        .apply('TotalAdded', '$wiki.sum($added)')
+        .sort('$TotalAdded', 'descending')
+        .limit(20)
+    }));
+
     it('works with NUMBER split (numberBucket) (sort on split)', equalityTest({
       executorNames: ['druid', 'mysql', 'postgres'],
       expression: $('wiki').split($("commentLength").numberBucket(10), 'CommentLength10')

diff --git a/test/overall/simplify.mocha.js b/test/overall/simplify.mocha.js
@@ -465,6 +465,18 @@ describe("Simplify", () => {
       simplifiesTo(ex1, ex2);
     });
 
+    it('kills impossible fallback', () => {
+      var ex1 = $('color').fallback('NoColor').is('D');
+      var ex2 = $('color').is('D');;
+      simplifiesTo(ex1, ex2);
+    });
+
+    it('leaves possible fallback', () => {
+      var ex1 = $('color').fallback('D').is('D');
+      var ex2 = $('color').fallback('D').is('D');
+      simplifiesTo(ex1, ex2);
+    });
+
   });
 
 

diff --git a/test/simulate/simulateDruid.mocha.js b/test/simulate/simulateDruid.mocha.js
@@ -569,6 +569,40 @@ describe("simulate Druid", () => {
     });
   });
 
+  it("works on fancy filter .fallback().is() [impossible]", () => {
+    var ex = ply()
+      .apply("diamonds", $('diamonds').filter("$color.fallback('NoColor') == 'D'"))
+      .apply('Count', '$diamonds.count()');
+
+    expect(ex.simulateQueryPlan(context)[0].filter).to.deep.equal({
+      "dimension": "color",
+      "type": "selector",
+      "value": "D"
+    });
+  });
+
+  it("works on fancy filter .fallback().is() [possible]", () => {
+    var ex = ply()
+      .apply("diamonds", $('diamonds').filter("$color.fallback('D') == 'D'"))
+      .apply('Count', '$diamonds.count()');
+
+    expect(ex.simulateQueryPlan(context)[0].filter).to.deep.equal({
+      "dimension": "color",
+      "extractionFn": {
+        "lookup": {
+          "map": {
+            "": "D"
+          },
+          "type": "map"
+        },
+        "retainMissingValue": true,
+        "type": "lookup"
+      },
+      "type": "extraction",
+      "value": "D"
+    });
+  });
+
   it("works on fancy filter .extract().is()", () => {
     var ex = ply()
       .apply("diamonds", $('diamonds').filter("$color.extract('^(.)') == 'D'"))