You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by fj...@apache.org on 2018/12/14 00:33:47 UTC
[incubator-druid] branch master updated: move parquet extension
input formats up a level to
`org.apache.druid.data.input.parquet.DruidParquetInputFormat` for `parquet`
and `org.apache.druid.data.input.parquet.DruidParquetAvroInputFormat` for
`parquet-avro` (#6727)
This is an automated email from the ASF dual-hosted git repository.
fjy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 4ec0686 move parquet extension input formats up a level to `org.apache.druid.data.input.parquet.DruidParquetInputFormat` for `parquet` and `org.apache.druid.data.input.parquet.DruidParquetAvroInputFormat` for `parquet-avro` (#6727)
4ec0686 is described below
commit 4ec068642d371df1c185c370361784b98f559552
Author: Clint Wylie <cj...@gmail.com>
AuthorDate: Thu Dec 13 16:33:42 2018 -0800
move parquet extension input formats up a level to `org.apache.druid.data.input.parquet.DruidParquetInputFormat` for `parquet` and `org.apache.druid.data.input.parquet.DruidParquetAvroInputFormat` for `parquet-avro` (#6727)
---
docs/content/development/extensions-core/parquet.md | 10 +++++-----
.../input/parquet/{avro => }/DruidParquetAvroInputFormat.java | 2 +-
.../input/parquet/{simple => }/DruidParquetInputFormat.java | 3 ++-
.../apache/druid/data/input/parquet/BaseParquetInputTest.java | 6 ++----
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/docs/content/development/extensions-core/parquet.md b/docs/content/development/extensions-core/parquet.md
index 9512588..6f72c51 100644
--- a/docs/content/development/extensions-core/parquet.md
+++ b/docs/content/development/extensions-core/parquet.md
@@ -38,8 +38,8 @@ This extension provides two ways to parse Parquet files:
module to parse the avro data
Selection of conversion method is controlled by parser type, and the correct hadoop input format must also be set in
-the `ioConfig`, `org.apache.druid.data.input.parquet.simple.DruidParquetInputFormat` for `parquet` and
-`org.apache.druid.data.input.parquet.avro.DruidParquetAvroInputFormat` for `parquet-avro`.
+the `ioConfig`, `org.apache.druid.data.input.parquet.DruidParquetInputFormat` for `parquet` and
+`org.apache.druid.data.input.parquet.DruidParquetAvroInputFormat` for `parquet-avro`.
Both parse options support auto field discovery and flattening if provided with a
@@ -75,7 +75,7 @@ When the time dimension is a [DateType column](https://github.com/apache/parquet
"type": "hadoop",
"inputSpec": {
"type": "static",
- "inputFormat": "org.apache.druid.data.input.parquet.simple.DruidParquetInputFormat",
+ "inputFormat": "org.apache.druid.data.input.parquet.DruidParquetInputFormat",
"paths": "path/to/file.parquet"
},
...
@@ -129,7 +129,7 @@ When the time dimension is a [DateType column](https://github.com/apache/parquet
"type": "hadoop",
"inputSpec": {
"type": "static",
- "inputFormat": "org.apache.druid.data.input.parquet.simple.DruidParquetInputFormat",
+ "inputFormat": "org.apache.druid.data.input.parquet.DruidParquetInputFormat",
"paths": "path/to/file.parquet"
},
...
@@ -172,7 +172,7 @@ When the time dimension is a [DateType column](https://github.com/apache/parquet
"type": "hadoop",
"inputSpec": {
"type": "static",
- "inputFormat": "org.apache.druid.data.input.parquet.avro.DruidParquetAvroInputFormat",
+ "inputFormat": "org.apache.druid.data.input.parquet.DruidParquetAvroInputFormat",
"paths": "path/to/file.parquet"
},
...
diff --git a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/avro/DruidParquetAvroInputFormat.java b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/DruidParquetAvroInputFormat.java
similarity index 95%
rename from extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/avro/DruidParquetAvroInputFormat.java
rename to extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/DruidParquetAvroInputFormat.java
index 109f315..c169d95 100755
--- a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/avro/DruidParquetAvroInputFormat.java
+++ b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/DruidParquetAvroInputFormat.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.druid.data.input.parquet.avro;
+package org.apache.druid.data.input.parquet;
import org.apache.avro.generic.GenericRecord;
import org.apache.parquet.avro.DruidParquetAvroReadSupport;
diff --git a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/simple/DruidParquetInputFormat.java b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/DruidParquetInputFormat.java
similarity index 89%
rename from extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/simple/DruidParquetInputFormat.java
rename to extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/DruidParquetInputFormat.java
index ed8e623..ff07ada 100644
--- a/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/simple/DruidParquetInputFormat.java
+++ b/extensions-core/parquet-extensions/src/main/java/org/apache/druid/data/input/parquet/DruidParquetInputFormat.java
@@ -17,8 +17,9 @@
* under the License.
*/
-package org.apache.druid.data.input.parquet.simple;
+package org.apache.druid.data.input.parquet;
+import org.apache.druid.data.input.parquet.simple.DruidParquetReadSupport;
import org.apache.parquet.example.data.Group;
import org.apache.parquet.hadoop.ParquetInputFormat;
diff --git a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetInputTest.java b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetInputTest.java
index 735f6d3..253eea5 100644
--- a/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetInputTest.java
+++ b/extensions-core/parquet-extensions/src/test/java/org/apache/druid/data/input/parquet/BaseParquetInputTest.java
@@ -23,8 +23,6 @@ import avro.shaded.com.google.common.collect.ImmutableMap;
import org.apache.directory.api.util.Strings;
import org.apache.druid.data.input.InputRow;
import org.apache.druid.data.input.impl.InputRowParser;
-import org.apache.druid.data.input.parquet.avro.DruidParquetAvroInputFormat;
-import org.apache.druid.data.input.parquet.simple.DruidParquetInputFormat;
import org.apache.druid.indexer.HadoopDruidIndexerConfig;
import org.apache.druid.indexer.path.StaticPathSpec;
import org.apache.druid.java.util.common.StringUtils;
@@ -58,9 +56,9 @@ class BaseParquetInputTest
private static Map<String, String> inputFormatType = ImmutableMap.of(
ParquetExtensionsModule.PARQUET_AVRO_INPUT_PARSER_TYPE,
- "org.apache.druid.data.input.parquet.avro.DruidParquetAvroInputFormat",
+ "org.apache.druid.data.input.parquet.DruidParquetAvroInputFormat",
ParquetExtensionsModule.PARQUET_SIMPLE_INPUT_PARSER_TYPE,
- "org.apache.druid.data.input.parquet.simple.DruidParquetInputFormat"
+ "org.apache.druid.data.input.parquet.DruidParquetInputFormat"
);
private static Map<String, Class<? extends InputFormat>> inputFormatClass = ImmutableMap.of(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org