[FE-17337] Move sample to end of query for metis codegen (#659)

* Move sample to end of query for metis codegen * Remove debugs * Fix unit test for pointmap --------- Co-authored-by: Chris Matzenbach <chris.matzenbach@omnisci.com>
heavyai · Nov 20, 2023 · 069ad75 · 069ad75
1 parent 6674ce8
commit 069ad75
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 48 deletions.
diff --git a/src/mixins/raster-layer-line-mixin.js b/src/mixins/raster-layer-line-mixin.js
@@ -237,6 +237,20 @@ export default function rasterLayerLineMixin(_layer) {
       })
     }
 
+    if (typeof filter === "string" && filter.length) {
+      transforms.push({
+        type: "filter",
+        expr: filter
+      })
+    }
+
+    if (typeof globalFilter === "string" && globalFilter.length) {
+      transforms.push({
+        type: "filter",
+        expr: globalFilter
+      })
+    }
+
     if (typeof transform.limit === "number") {
       if (transform.sample && !doJoin()) {
         // use Knuth's hash sampling on single data source chart
@@ -256,20 +270,6 @@ export default function rasterLayerLineMixin(_layer) {
       }
     }
 
-    if (typeof filter === "string" && filter.length) {
-      transforms.push({
-        type: "filter",
-        expr: filter
-      })
-    }
-
-    if (typeof globalFilter === "string" && globalFilter.length) {
-      transforms.push({
-        type: "filter",
-        expr: globalFilter
-      })
-    }
-
     return transforms
   }
 

diff --git a/src/mixins/raster-layer-point-mixin.js b/src/mixins/raster-layer-point-mixin.js
@@ -270,22 +270,6 @@ export default function rasterLayerPointMixin(_layer) {
         })
       }
 
-      if (typeof transform.limit === "number") {
-        transforms.push({
-          type: "limit",
-          row: transform.limit
-        })
-        if (transform.sample) {
-          transforms.push({
-            type: "sample",
-            method: "multiplicative",
-            size: lastFilteredSize || transform.tableSize,
-            limit: transform.limit,
-            sampleTable: table
-          })
-        }
-      }
-
       if (typeof size === "object" && size.type === "quantitative") {
         transforms.push({
           type: "project",
@@ -342,6 +326,22 @@ export default function rasterLayerPointMixin(_layer) {
       })
     }
 
+    if (typeof transform.limit === "number") {
+      transforms.push({
+        type: "limit",
+        row: transform.limit
+      })
+      if (transform.sample) {
+        transforms.push({
+          type: "sample",
+          method: "multiplicative",
+          size: lastFilteredSize || transform.tableSize,
+          limit: transform.limit,
+          sampleTable: table
+        })
+      }
+    }
+
     return transforms
   }
 

diff --git a/src/mixins/raster-layer-point-mixin.unit.spec.js b/src/mixins/raster-layer-point-mixin.unit.spec.js
@@ -141,8 +141,8 @@ describe("rasterLayerPointMixin", () => {
           "SELECT conv_4326_900913_x(lon) AS x, "
           + "conv_4326_900913_y(lat) AS y "
           + "FROM tweets_nov_feb "
-          + "WHERE SAMPLE_RATIO(0.0016816902723414068) "
-          + "AND (lon = 100) LIMIT 2000000"
+          + "WHERE (lon = 100) "
+          + "AND SAMPLE_RATIO(0.0016816902723414068) LIMIT 2000000"
         )
 
       })

diff --git a/src/mixins/raster-layer-windbarb-mixin.js b/src/mixins/raster-layer-windbarb-mixin.js
@@ -148,22 +148,6 @@ export default function rasterLayerWindBarbMixin(_layer) {
         })
       }
 
-      if (typeof transform.limit === "number") {
-        transforms.push({
-          type: "limit",
-          row: transform.limit
-        })
-        if (transform.sample) {
-          transforms.push({
-            type: "sample",
-            method: "multiplicative",
-            size: lastFilteredSize || transform.tableSize,
-            limit: transform.limit,
-            sampleTable: table
-          })
-        }
-      }
-
       if (typeof size === "object" && size.type === "quantitative") {
         transforms.push({
           type: "project",
@@ -203,6 +187,22 @@ export default function rasterLayerWindBarbMixin(_layer) {
       })
     }
 
+    if (typeof transform.limit === "number") {
+      transforms.push({
+        type: "limit",
+        row: transform.limit
+      })
+      if (transform.sample) {
+        transforms.push({
+          type: "sample",
+          method: "multiplicative",
+          size: lastFilteredSize || transform.tableSize,
+          limit: transform.limit,
+          sampleTable: table
+        })
+      }
+    }
+
     return transforms
   }