You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jc...@apache.org on 2017/04/10 12:03:50 UTC
calcite git commit: [CALCITE-1724] Wrong comparison for floats/double
type in Druid (Slim Bouguerra)
Repository: calcite
Updated Branches:
refs/heads/master 04c0c8b6f -> 22fdd8858
[CALCITE-1724] Wrong comparison for floats/double type in Druid (Slim Bouguerra)
Project: http://git-wip-us.apache.org/repos/asf/calcite/repo
Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/22fdd885
Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/22fdd885
Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/22fdd885
Branch: refs/heads/master
Commit: 22fdd88584bfb3a0d77fc8f03cf847d343e5f9a7
Parents: 04c0c8b
Author: Slim Bouguerra <sl...@gmail.com>
Authored: Mon Apr 10 13:03:38 2017 +0100
Committer: Jesus Camacho Rodriguez <jc...@apache.org>
Committed: Mon Apr 10 13:03:38 2017 +0100
----------------------------------------------------------------------
.../java/org/apache/calcite/adapter/druid/DruidQuery.java | 6 +++++-
.../apache/calcite/adapter/druid/DruidQueryFilterTest.java | 2 +-
.../test/java/org/apache/calcite/test/DruidAdapterIT.java | 8 ++++----
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/calcite/blob/22fdd885/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java
----------------------------------------------------------------------
diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java
index 62ebe85..a6c1fa9 100644
--- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java
+++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java
@@ -1252,7 +1252,11 @@ public class DruidQuery extends AbstractRelNode implements BindableRel {
generator.writeStringField("upper", upper);
generator.writeBooleanField("upperStrict", upperStrict);
}
- generator.writeBooleanField("alphaNumeric", alphaNumeric);
+ if (alphaNumeric) {
+ generator.writeStringField("ordering", "numeric");
+ } else {
+ generator.writeStringField("ordering", "lexicographic");
+ }
generator.writeEndObject();
}
}
http://git-wip-us.apache.org/repos/asf/calcite/blob/22fdd885/druid/src/test/java/org/apache/calcite/adapter/druid/DruidQueryFilterTest.java
----------------------------------------------------------------------
diff --git a/druid/src/test/java/org/apache/calcite/adapter/druid/DruidQueryFilterTest.java b/druid/src/test/java/org/apache/calcite/adapter/druid/DruidQueryFilterTest.java
index 2fc44de..49e4cc9 100644
--- a/druid/src/test/java/org/apache/calcite/adapter/druid/DruidQueryFilterTest.java
+++ b/druid/src/test/java/org/apache/calcite/adapter/druid/DruidQueryFilterTest.java
@@ -103,7 +103,7 @@ public class DruidQueryFilterTest {
Assert.assertThat(sw.toString(),
is("{\"type\":\"bound\",\"dimension\":\"dimensionName\",\"lower\":\"lower-bound\","
+ "\"lowerStrict\":false,\"upper\":\"upper-bound\",\"upperStrict\":false,"
- + "\"alphaNumeric\":false}"));
+ + "\"ordering\":\"lexicographic\"}"));
}
/** Everything a test needs for a healthy, active life. */
http://git-wip-us.apache.org/repos/asf/calcite/blob/22fdd885/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
----------------------------------------------------------------------
diff --git a/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java b/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
index 62306f7..db6f8f8 100644
--- a/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
+++ b/druid/src/test/java/org/apache/calcite/test/DruidAdapterIT.java
@@ -747,8 +747,8 @@ public class DruidAdapterIT {
final String druidQuery = "{'queryType':'select','dataSource':'foodmart',"
+ "'descending':false,'intervals':['1900-01-09T00:00:00.000/2992-01-10T00:00:00.000'],"
+ "'filter':{'type':'and','fields':["
- + "{'type':'bound','dimension':'product_id','lower':'1500','lowerStrict':false,'alphaNumeric':false},"
- + "{'type':'bound','dimension':'product_id','upper':'1502','upperStrict':false,'alphaNumeric':false}]},"
+ + "{'type':'bound','dimension':'product_id','lower':'1500','lowerStrict':false,'ordering':'lexicographic'},"
+ + "{'type':'bound','dimension':'product_id','upper':'1502','upperStrict':false,'ordering':'lexicographic'}]},"
+ "'dimensions':['product_id','brand_name','product_name','SKU','SRP','gross_weight','net_weight',"
+ "'recyclable_package','low_fat','units_per_case','cases_per_pallet','shelf_width','shelf_height',"
+ "'shelf_depth','product_class_id','product_subcategory','product_category','product_department',"
@@ -793,8 +793,8 @@ public class DruidAdapterIT {
final String druidQuery = "{'queryType':'select','dataSource':'foodmart',"
+ "'descending':false,'intervals':['1900-01-09T00:00:00.000/2992-01-10T00:00:00.000'],"
+ "'filter':{'type':'and','fields':["
- + "{'type':'bound','dimension':'product_id','lower':'1500','lowerStrict':false,'alphaNumeric':true},"
- + "{'type':'bound','dimension':'product_id','upper':'1502','upperStrict':false,'alphaNumeric':true}]},"
+ + "{'type':'bound','dimension':'product_id','lower':'1500','lowerStrict':false,'ordering':'numeric'},"
+ + "{'type':'bound','dimension':'product_id','upper':'1502','upperStrict':false,'ordering':'numeric'}]},"
+ "'dimensions':['product_id','brand_name','product_name','SKU','SRP','gross_weight','net_weight',"
+ "'recyclable_package','low_fat','units_per_case','cases_per_pallet','shelf_width','shelf_height',"
+ "'shelf_depth','product_class_id','product_subcategory','product_category','product_department',"