You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ad...@apache.org on 2016/09/13 01:32:09 UTC

[22/50] [abbrv] drill git commit: Update the json-support branch version in pom.xml

Update the json-support branch version in pom.xml

+ Fix for column name mangling in drill output.
+ Comment out Date, Time, Timestamp types since we are still deciding these on OJAI front.


Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/1f853f6a
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/1f853f6a
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/1f853f6a

Branch: refs/heads/master
Commit: 1f853f6a5117a90831ad592d250a1e25a781f9fd
Parents: 8d72fcc
Author: Smidth Panchamia <sp...@mapr.com>
Authored: Mon Jan 4 16:30:43 2016 -0800
Committer: Aditya Kishore <ad...@apache.org>
Committed: Fri Sep 9 10:08:33 2016 -0700

----------------------------------------------------------------------
 .../maprdb/json/CompareFunctionsProcessor.java    |  4 ++--
 .../store/maprdb/json/MaprDBJsonRecordReader.java | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/1f853f6a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/CompareFunctionsProcessor.java
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/CompareFunctionsProcessor.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/CompareFunctionsProcessor.java
index 924c93f..836361b 100644
--- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/CompareFunctionsProcessor.java
+++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/CompareFunctionsProcessor.java
@@ -139,7 +139,7 @@ class CompareFunctionsProcessor extends AbstractExprVisitor<Boolean, LogicalExpr
       this.path = path;
       return true;
     }
-
+/*
     if (valueArg instanceof DateExpression) {
       this.value = KeyValueBuilder.initFrom(new Date(((DateExpression)valueArg).getDate()));
       this.path = path;
@@ -157,7 +157,7 @@ class CompareFunctionsProcessor extends AbstractExprVisitor<Boolean, LogicalExpr
       this.path = path;
       return true;
     }
-
+*/
     return false;
   }
 

http://git-wip-us.apache.org/repos/asf/drill/blob/1f853f6a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/MaprDBJsonRecordReader.java
----------------------------------------------------------------------
diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/MaprDBJsonRecordReader.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/MaprDBJsonRecordReader.java
index 9080e8e..e38ad2d 100644
--- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/MaprDBJsonRecordReader.java
+++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/maprdb/json/MaprDBJsonRecordReader.java
@@ -232,12 +232,12 @@ public class MaprDBJsonRecordReader extends AbstractRecordReader {
         break;
       case DECIMAL:
         throw new UnsupportedOperationException("Decimals are currently not supported.");
-      case DATE:
-        map.date(fieldName).writeDate(reader.getDate().getTime());
-        break;
-      case TIME:
-        map.time(fieldName).writeTime(reader.getTimeInt());
-        break;
+      //case DATE:
+      //  map.date(fieldName).writeDate(reader.getDate().getTime());
+      //  break;
+      //case TIME:
+      //  map.time(fieldName).writeTime(reader.getTimeInt());
+      //  break;
       case TIMESTAMP:
         map.timeStamp(fieldName).writeTimeStamp(reader.getTimestampLong());
         break;
@@ -297,9 +297,9 @@ public class MaprDBJsonRecordReader extends AbstractRecordReader {
         break;
       case DECIMAL:
         throw new UnsupportedOperationException("Decimals are currently not supported.");
-      case DATE:
-        list.date().writeDate(reader.getDate().getTime());
-        break;
+      //case DATE:
+      //  list.date().writeDate(reader.getDate().getTime());
+      //  break;
       case TIME:
         list.time().writeTime(reader.getTimeInt());
         break;