drill-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject [30/50] [abbrv] drill git commit: Support for `_id` only projection.
Date Tue, 13 Sep 2016 01:32:17 GMT
Support for `_id` only projection.


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

Branch: refs/heads/master
Commit: 891380f0e61daa865ae030521d8ef684cb62edca
Parents: d41bfb3
Author: Smidth Panchamia <spanchamia@mapr.com>
Authored: Fri Feb 19 18:41:56 2016 +0000
Committer: Aditya Kishore <adi@apache.org>
Committed: Fri Sep 9 10:08:36 2016 -0700

----------------------------------------------------------------------
 .../maprdb/json/MaprDBJsonRecordReader.java     | 41 ++++++++++++++++++--
 1 file changed, 37 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/drill/blob/891380f0/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 b69f4c4..42944f5 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
@@ -46,6 +46,7 @@ import org.ojai.DocumentReader.EventType;
 import org.ojai.DocumentStream;
 import org.ojai.FieldPath;
 import org.ojai.store.QueryCondition;
+import org.ojai.Value;
 
 import com.google.common.base.Preconditions;
 import com.google.common.base.Stopwatch;
@@ -81,12 +82,16 @@ public class MaprDBJsonRecordReader extends AbstractRecordReader {
   private Iterator<DocumentReader> documentReaderIterators;
 
   private boolean includeId;
+  private boolean idOnly;
 
   public MaprDBJsonRecordReader(MapRDBSubScanSpec subScanSpec,
       List<SchemaPath> projectedColumns, FragmentContext context) {
     buffer = context.getManagedBuffer();
+    projectedFields = null;
     tableName = Preconditions.checkNotNull(subScanSpec, "MapRDB reader needs a sub-scan spec").getTableName();
+    documentReaderIterators = null;
     includeId = false;
+    idOnly    = false;
     condition = com.mapr.db.impl.ConditionImpl.parseFrom(ByteBufs.wrap(subScanSpec.getSerializedFilter()));
     setColumns(projectedColumns);
   }
@@ -121,6 +126,10 @@ public class MaprDBJsonRecordReader extends AbstractRecordReader {
       includeId = true;
     }
 
+    /*
+     * (Bug 21708) if we are projecting only the id field, save that condition here.
+     */
+    idOnly = !isStarQuery() && (projectedFields == null);
     return transformed;
   }
 
@@ -155,11 +164,35 @@ public class MaprDBJsonRecordReader extends AbstractRecordReader {
         reader = nextDocumentReader();
         if (reader == null) break;
         writer.setPosition(recordCount);
-        if (reader.next() != EventType.START_MAP) {
-          throw dataReadError("The document did not start with START_MAP!");
+        if (idOnly) {
+          Value id = reader.getId();
+          MapWriter map = writer.rootAsMap();
+
+          try {
+            switch(id.getType()) {
+            case STRING:
+              writeString(map.varChar(ID_KEY), id.getString());
+              recordCount++;
+              break;
+            case BINARY:
+              writeBinary(map.varBinary(ID_KEY), id.getBinary());
+              recordCount++;
+              break;
+            default:
+              throw new UnsupportedOperationException(id.getType() +
+                  " is not a supported type for _id field.");
+            }
+          } catch (IllegalStateException | IllegalArgumentException e) {
+            logger.warn(String.format("Possible schema change at _id: '%s'",
+                IdCodec.asString(id)), e);
+          }
+        } else {
+          if (reader.next() != EventType.START_MAP) {
+            throw dataReadError("The document did not start with START_MAP!");
+          }
+          writeToMap(reader, writer.rootAsMap());
+          recordCount++;
         }
-        writeToMap(reader, writer.rootAsMap());
-        recordCount++;
       } catch (UserException e) {
         throw UserException.unsupportedError(e)
             .addContext(String.format("Table: %s, document id: '%s'",


Mime
View raw message