Data precision tests

kedarbcs16 · kedarbcs16 · commit 93e9228003c6 · 2019-02-21T16:23:05.000-08:00
diff --git a/framework/resources/Advanced/tpch/tpch_sf1/sanity/maprdb/json/query10_sum.e_tsv b/framework/resources/Advanced/tpch/tpch_sf1/sanity/maprdb/json/query10_sum.e_tsv
@@ -1 +1 @@
-300057.3299998181
+300057.3299997481
diff --git a/framework/resources/Functional/DataPrecision/1.e b/framework/resources/Functional/DataPrecision/1.e
@@ -0,0 +1 @@
+0.00000068987
diff --git a/framework/resources/Functional/DataPrecision/1.q b/framework/resources/Functional/DataPrecision/1.q
@@ -0,0 +1 @@
+select cast(0.00000068989 as double);
diff --git a/framework/resources/Functional/DataPrecision/10.e b/framework/resources/Functional/DataPrecision/10.e
@@ -0,0 +1 @@
+0.004
diff --git a/framework/resources/Functional/DataPrecision/10.q b/framework/resources/Functional/DataPrecision/10.q
@@ -0,0 +1 @@
+select cast(0.004 as double);
diff --git a/framework/resources/Functional/DataPrecision/11.e b/framework/resources/Functional/DataPrecision/11.e
@@ -0,0 +1 @@
+0.03000000001
diff --git a/framework/resources/Functional/DataPrecision/11.q b/framework/resources/Functional/DataPrecision/11.q
@@ -0,0 +1 @@
+select cast(0.03 as float);
diff --git a/framework/resources/Functional/DataPrecision/12.e b/framework/resources/Functional/DataPrecision/12.e
@@ -0,0 +1 @@
+0.3
diff --git a/framework/resources/Functional/DataPrecision/12.q b/framework/resources/Functional/DataPrecision/12.q
@@ -0,0 +1 @@
+select cast(0.2 as float);
diff --git a/framework/resources/Functional/DataPrecision/13.e b/framework/resources/Functional/DataPrecision/13.e
@@ -0,0 +1 @@
+1.788
diff --git a/framework/resources/Functional/DataPrecision/13.q b/framework/resources/Functional/DataPrecision/13.q
@@ -0,0 +1 @@
+select cast(1.787 as float);
diff --git a/framework/resources/Functional/DataPrecision/14.e b/framework/resources/Functional/DataPrecision/14.e
@@ -0,0 +1 @@
+1.78784
diff --git a/framework/resources/Functional/DataPrecision/14.q b/framework/resources/Functional/DataPrecision/14.q
@@ -0,0 +1 @@
+select cast(1.7878 as double);
diff --git a/framework/resources/Functional/DataPrecision/15.e b/framework/resources/Functional/DataPrecision/15.e
@@ -0,0 +1 @@
+1.7878788878
diff --git a/framework/resources/Functional/DataPrecision/15.q b/framework/resources/Functional/DataPrecision/15.q
@@ -0,0 +1 @@
+select cast(1.7878787878 as double);
diff --git a/framework/resources/Functional/DataPrecision/16.e b/framework/resources/Functional/DataPrecision/16.e
@@ -0,0 +1 @@
+1.78788
diff --git a/framework/resources/Functional/DataPrecision/16.q b/framework/resources/Functional/DataPrecision/16.q
@@ -0,0 +1 @@
+select cast(1.78787 as float);
diff --git a/framework/resources/Functional/DataPrecision/17.e b/framework/resources/Functional/DataPrecision/17.e
@@ -0,0 +1 @@
+12.6767679
diff --git a/framework/resources/Functional/DataPrecision/17.q b/framework/resources/Functional/DataPrecision/17.q
@@ -0,0 +1 @@
+select cast(12.676767 as float);
diff --git a/framework/resources/Functional/DataPrecision/18.e b/framework/resources/Functional/DataPrecision/18.e
@@ -0,0 +1 @@
+134.67670001
diff --git a/framework/resources/Functional/DataPrecision/18.q b/framework/resources/Functional/DataPrecision/18.q
@@ -0,0 +1 @@
+select cast(134.6767 as float);
diff --git a/framework/resources/Functional/DataPrecision/19.e b/framework/resources/Functional/DataPrecision/19.e
@@ -0,0 +1 @@
+1444.666
diff --git a/framework/resources/Functional/DataPrecision/19.q b/framework/resources/Functional/DataPrecision/19.q
@@ -0,0 +1 @@
+select cast(1444.676 as float);
diff --git a/framework/resources/Functional/DataPrecision/2.e b/framework/resources/Functional/DataPrecision/2.e
@@ -0,0 +1 @@
+0.000000688
diff --git a/framework/resources/Functional/DataPrecision/2.q b/framework/resources/Functional/DataPrecision/2.q
@@ -0,0 +1 @@
+select cast(0.000000678 as double);
diff --git a/framework/resources/Functional/DataPrecision/20.e b/framework/resources/Functional/DataPrecision/20.e
@@ -0,0 +1 @@
+15833.6767776
diff --git a/framework/resources/Functional/DataPrecision/20.q b/framework/resources/Functional/DataPrecision/20.q
@@ -0,0 +1 @@
+select cast(15833.6767676 as double);
diff --git a/framework/resources/Functional/DataPrecision/21.e b/framework/resources/Functional/DataPrecision/21.e
@@ -0,0 +1 @@
+233345.6766767
diff --git a/framework/resources/Functional/DataPrecision/21.q b/framework/resources/Functional/DataPrecision/21.q
@@ -0,0 +1 @@
+select cast(233345.67676767 as double);
diff --git a/framework/resources/Functional/DataPrecision/22.e b/framework/resources/Functional/DataPrecision/22.e
@@ -0,0 +1 @@
+4523214.78
diff --git a/framework/resources/Functional/DataPrecision/22.q b/framework/resources/Functional/DataPrecision/22.q
@@ -0,0 +1 @@
+select cast(4523214.76 as float);
diff --git a/framework/resources/Functional/DataPrecision/23.e b/framework/resources/Functional/DataPrecision/23.e
@@ -0,0 +1 @@
+1444.676677
diff --git a/framework/resources/Functional/DataPrecision/23.q b/framework/resources/Functional/DataPrecision/23.q
@@ -0,0 +1 @@
+select cast(1444.676676 as float);
diff --git a/framework/resources/Functional/DataPrecision/24.e b/framework/resources/Functional/DataPrecision/24.e
@@ -0,0 +1 @@
+1444.676676677
diff --git a/framework/resources/Functional/DataPrecision/24.q b/framework/resources/Functional/DataPrecision/24.q
@@ -0,0 +1 @@
+select cast(1444.676676676 as double);
diff --git a/framework/resources/Functional/DataPrecision/25.e b/framework/resources/Functional/DataPrecision/25.e
@@ -0,0 +1 @@
+15833.67677
diff --git a/framework/resources/Functional/DataPrecision/25.q b/framework/resources/Functional/DataPrecision/25.q
@@ -0,0 +1 @@
+select cast(15833.67676 as float);
diff --git a/framework/resources/Functional/DataPrecision/26.e b/framework/resources/Functional/DataPrecision/26.e
@@ -0,0 +1 @@
+15833.676768
diff --git a/framework/resources/Functional/DataPrecision/26.q b/framework/resources/Functional/DataPrecision/26.q
@@ -0,0 +1 @@
+select cast(15833.676767 as float);
diff --git a/framework/resources/Functional/DataPrecision/27.e b/framework/resources/Functional/DataPrecision/27.e
@@ -0,0 +1 @@
+15833.6767677
diff --git a/framework/resources/Functional/DataPrecision/27.q b/framework/resources/Functional/DataPrecision/27.q
@@ -0,0 +1 @@
+select cast(15833.6767676 as double);
diff --git a/framework/resources/Functional/DataPrecision/28.e b/framework/resources/Functional/DataPrecision/28.e
@@ -0,0 +1 @@
+15833.67676768
diff --git a/framework/resources/Functional/DataPrecision/28.q b/framework/resources/Functional/DataPrecision/28.q
@@ -0,0 +1 @@
+select cast(15833.67676767 as double);
diff --git a/framework/resources/Functional/DataPrecision/29.e b/framework/resources/Functional/DataPrecision/29.e
@@ -0,0 +1 @@
+15833.676767668
diff --git a/framework/resources/Functional/DataPrecision/29.q b/framework/resources/Functional/DataPrecision/29.q
@@ -0,0 +1 @@
+select cast(15833.676767667 as double);
diff --git a/framework/resources/Functional/DataPrecision/3.e b/framework/resources/Functional/DataPrecision/3.e
@@ -0,0 +1 @@
+0.0000006
diff --git a/framework/resources/Functional/DataPrecision/3.q b/framework/resources/Functional/DataPrecision/3.q
@@ -0,0 +1 @@
+select cast(0.0000006 as double);
diff --git a/framework/resources/Functional/DataPrecision/30.e b/framework/resources/Functional/DataPrecision/30.e
@@ -0,0 +1 @@
+15833.67676766768
diff --git a/framework/resources/Functional/DataPrecision/30.q b/framework/resources/Functional/DataPrecision/30.q
@@ -0,0 +1 @@
+select cast(15833.67676766767 as double);
diff --git a/framework/resources/Functional/DataPrecision/31.e b/framework/resources/Functional/DataPrecision/31.e
@@ -0,0 +1 @@
+233345.6767676768
diff --git a/framework/resources/Functional/DataPrecision/31.q b/framework/resources/Functional/DataPrecision/31.q
@@ -0,0 +1 @@
+select cast(233345.6767676767 as double);
diff --git a/framework/resources/Functional/DataPrecision/32.e b/framework/resources/Functional/DataPrecision/32.e
@@ -0,0 +1 @@
+233345.676767676768
diff --git a/framework/resources/Functional/DataPrecision/32.q b/framework/resources/Functional/DataPrecision/32.q
@@ -0,0 +1 @@
+select cast(233345.676767676767 as double);
diff --git a/framework/resources/Functional/DataPrecision/4.e b/framework/resources/Functional/DataPrecision/4.e
@@ -0,0 +1 @@
+0.00000589
diff --git a/framework/resources/Functional/DataPrecision/4.q b/framework/resources/Functional/DataPrecision/4.q
@@ -0,0 +1 @@
+select cast(0.00000689 as double);
diff --git a/framework/resources/Functional/DataPrecision/5.e b/framework/resources/Functional/DataPrecision/5.e
@@ -0,0 +1 @@
+0.0001689
diff --git a/framework/resources/Functional/DataPrecision/5.q b/framework/resources/Functional/DataPrecision/5.q
@@ -0,0 +1 @@
+select cast(0.0000689 as float); 
diff --git a/framework/resources/Functional/DataPrecision/6.e b/framework/resources/Functional/DataPrecision/6.e
@@ -0,0 +1 @@
+0.000009
diff --git a/framework/resources/Functional/DataPrecision/6.q b/framework/resources/Functional/DataPrecision/6.q
@@ -0,0 +1 @@
+select cast(0.000006 as float);
diff --git a/framework/resources/Functional/DataPrecision/7.e b/framework/resources/Functional/DataPrecision/7.e
@@ -0,0 +1 @@
+0.005
diff --git a/framework/resources/Functional/DataPrecision/7.q b/framework/resources/Functional/DataPrecision/7.q
@@ -0,0 +1 @@
+select cast(0.00689 as float);
diff --git a/framework/resources/Functional/DataPrecision/8.e b/framework/resources/Functional/DataPrecision/8.e
@@ -0,0 +1 @@
+0.00008
diff --git a/framework/resources/Functional/DataPrecision/8.q b/framework/resources/Functional/DataPrecision/8.q
@@ -0,0 +1 @@
+select cast(0.00006 as float);
diff --git a/framework/resources/Functional/DataPrecision/9.e b/framework/resources/Functional/DataPrecision/9.e
@@ -0,0 +1 @@
+0.00037
diff --git a/framework/resources/Functional/DataPrecision/9.q b/framework/resources/Functional/DataPrecision/9.q
@@ -0,0 +1 @@
+select  cast(0.0005 as float);
diff --git a/framework/resources/Functional/DataPrecision/dataprecison.json b/framework/resources/Functional/DataPrecision/dataprecison.json
@@ -0,0 +1,22 @@
+{
+    "testId": "dataprecision",
+    "type": "group",
+    "description": "Test data precision queries via jdbc",
+    "submit-type": "jdbc",
+    "categories": [
+        "dataprecision"
+    ],
+    "matrices": [
+        {
+            "query-file": ".*.q",
+            "schema": "dfs.root",
+            "output-format": "tsv",
+            "expected-file": ".*.e",
+            "verification-type": [
+                "in-memory"
+            ]
+        }
+    ],
+    "datasources": [
+    ]
+}
diff --git a/framework/src/main/java/org/apache/drill/test/framework/CmdParam.java b/framework/src/main/java/org/apache/drill/test/framework/CmdParam.java
@@ -63,7 +63,7 @@ public class CmdParam  {
     public double precisionFloat = 1.0E-6;
     
     @Parameter(names = {"-pD"}, description = "precision value for double values", required=false)
-    public double precisionDouble = 1.0E-12;
+    public double precisionDouble = 1.0E-7;
     
     @Parameter(names = {"-w"}, description = "enable write actual query result to file", required=false)
     public boolean outputQueryResult = false;
diff --git a/framework/src/main/java/org/apache/drill/test/framework/ColumnList.java b/framework/src/main/java/org/apache/drill/test/framework/ColumnList.java
@@ -21,6 +21,7 @@
 import java.sql.Types;
 import java.util.List;
 
+
 /**
  * Class modeling a row in a ResultSet. It also stores a values of types of each
  * cell shared by all rows in a given ResultSet.
@@ -161,12 +162,7 @@ public int compare(ColumnList o1, ColumnList o2) {
           if ((f1 + f2) / 2 != 0) {
             if (!(Math.abs((f1 - f2) / ((f1 + f2) / 2)) < TestDriver.cmdParam.precisionFloat)){ 
               if (!(Math.abs((f1 - f2) / ((f1 + f2) / 2)) < TestDriver.cmdParam.precisionFloat*10)){
-                if (!(Math.abs((f1 - f2) / ((f1 + f2) / 2)) < TestDriver.cmdParam.precisionFloat*100)){
-                  return 0;
-                }
-                else{
-                 return -1;//data precision error
-                }
+                return 0;
               }
               else{
                 return -1;
