MAPR-22405: DocumentStream interface in OJAI API need not be parametrized
Project: http://git-wip-us.apache.org/repos/asf/drill/repo Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/48d195c3 Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/48d195c3 Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/48d195c3 Branch: refs/heads/master Commit: 48d195c3d27fba6c6efef6b624e684bcdecdcca5 Parents: 869cfbd Author: Aditya <adi...@mapr.com> Authored: Tue Feb 2 02:04:22 2016 -0800 Committer: Aditya Kishore <a...@apache.org> Committed: Fri Sep 9 10:08:34 2016 -0700 ---------------------------------------------------------------------- .../drill/exec/store/maprdb/json/MaprDBJsonRecordReader.java | 3 +-- .../test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/drill/blob/48d195c3/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 b5e4ceb..f033de4 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 @@ -43,7 +43,6 @@ import org.apache.drill.exec.vector.complex.writer.BaseWriter.ListWriter; import org.apache.drill.exec.vector.complex.writer.BaseWriter.MapWriter; import org.apache.drill.exec.vector.complex.writer.VarBinaryWriter; import org.apache.drill.exec.vector.complex.writer.VarCharWriter; -import org.ojai.Document; import org.ojai.DocumentReader; import org.ojai.DocumentReader.EventType; import org.ojai.DocumentStream; @@ -80,7 +79,7 @@ public class MaprDBJsonRecordReader extends AbstractRecordReader { private DrillBuf buffer; - private DocumentStream<Document> documentStream; + private DocumentStream documentStream; private Iterator<DocumentReader> documentReaderIterators; http://git-wip-us.apache.org/repos/asf/drill/blob/48d195c3/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java ---------------------------------------------------------------------- diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java index e81aa09..18b7c31 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java @@ -147,7 +147,7 @@ public class MaprDBTestsSuite { try (Table table = admin.createTable(TMP_BUSINESS_TABLE); InputStream in = getJsonStream("json/business.json"); - DocumentStream<Document> stream = Json.newDocumentStream(in)) { + DocumentStream stream = Json.newDocumentStream(in)) { for (Document document : stream) { table.insert(document, "business_id"); }