Skip to content

Move the currentPath & path methods to the parent class for removing the duplicated codes #950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rdblue merged 2 commits into from
Apr 23, 2020
Merged

Move the currentPath & path methods to the parent class for removing the duplicated codes #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac5c8a5
Move the currentPath & path methods to the parent class for removing …
openinx Apr 22, 2020
dff8440
Move the currentPath&path out of ParquetUtil.java
openinx Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 0 additions & 27 deletions data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetReaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.iceberg.Schema;
Expand Down Expand Up @@ -297,32 +296,6 @@ public ParquetValueReader<?> primitive(org.apache.iceberg.types.Type.PrimitiveTy
MessageType type() {
return type;
}

private String[] currentPath() {
String[] path = new String[fieldNames.size()];
if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}

protected String[] path(String name) {
String[] path = new String[fieldNames.size() + 1];
path[fieldNames.size()] = name;

if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}
}

private static final OffsetDateTime EPOCH = Instant.ofEpochSecond(0).atOffset(ZoneOffset.UTC);
Expand Down
27 changes: 0 additions & 27 deletions data/src/main/java/org/apache/iceberg/data/parquet/GenericParquetWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import java.util.Iterator;
import java.util.List;
import org.apache.iceberg.data.Record;
import org.apache.iceberg.parquet.ParquetTypeVisitor;
Expand Down Expand Up @@ -172,32 +171,6 @@ public ParquetValueWriter<?> primitive(PrimitiveType primitive) {
throw new UnsupportedOperationException("Unsupported type: " + primitive);
}
}

private String[] currentPath() {
String[] path = new String[fieldNames.size()];
if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}

private String[] path(String name) {
String[] path = new String[fieldNames.size() + 1];
path[fieldNames.size()] = name;

if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}
}

private static final OffsetDateTime EPOCH = Instant.ofEpochSecond(0).atOffset(ZoneOffset.UTC);
Expand Down
27 changes: 0 additions & 27 deletions parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroValueReaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.UUID;
Expand Down Expand Up @@ -231,32 +230,6 @@ public ParquetValueReader<?> primitive(org.apache.iceberg.types.Type.PrimitiveTy
throw new UnsupportedOperationException("Unsupported type: " + primitive);
}
}

private String[] currentPath() {
String[] path = new String[fieldNames.size()];
if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}

private String[] path(String name) {
String[] path = new String[fieldNames.size() + 1];
path[fieldNames.size()] = name;

if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}
}

static class DecimalReader extends ParquetValueReaders.PrimitiveReader<BigDecimal> {
Expand Down
27 changes: 0 additions & 27 deletions parquet/src/main/java/org/apache/iceberg/parquet/ParquetAvroWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
package org.apache.iceberg.parquet;

import com.google.common.collect.Lists;
import java.util.Iterator;
import java.util.List;
import org.apache.avro.generic.GenericData.Fixed;
import org.apache.avro.generic.IndexedRecord;
Expand Down Expand Up @@ -163,32 +162,6 @@ public ParquetValueWriter<?> primitive(PrimitiveType primitive) {
throw new UnsupportedOperationException("Unsupported type: " + primitive);
}
}

private String[] currentPath() {
String[] path = new String[fieldNames.size()];
if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}

private String[] path(String name) {
String[] path = new String[fieldNames.size() + 1];
path[fieldNames.size()] = name;

if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}
}

private static class FixedWriter extends PrimitiveWriter<Fixed> {
Expand Down
10 changes: 10 additions & 0 deletions parquet/src/main/java/org/apache/iceberg/parquet/ParquetTypeVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,4 +160,14 @@ public T map(GroupType map, T key, T value) {
public T primitive(PrimitiveType primitive) {
return null;
}

protected String[] currentPath() {
return Lists.newArrayList(fieldNames.descendingIterator()).toArray(new String[0]);
}

protected String[] path(String name) {
List<String> list = Lists.newArrayList(fieldNames.descendingIterator());
list.add(name);
return list.toArray(new String[0]);
}
}
10 changes: 10 additions & 0 deletions parquet/src/main/java/org/apache/iceberg/parquet/TypeWithSchemaVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,4 +192,14 @@ public T primitive(org.apache.iceberg.types.Type.PrimitiveType iPrimitive,
PrimitiveType primitive) {
return null;
}

protected String[] currentPath() {
return Lists.newArrayList(fieldNames.descendingIterator()).toArray(new String[0]);
}

protected String[] path(String name) {
List<String> list = Lists.newArrayList(fieldNames.descendingIterator());
list.add(name);
return list.toArray(new String[0]);
}
}
27 changes: 0 additions & 27 deletions pig/src/main/java/org/apache/iceberg/pig/PigParquetReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -273,32 +272,6 @@ public ParquetValueReader<?> primitive(
throw new UnsupportedOperationException("Unsupported type: " + primitive);
}
}

private String[] currentPath() {
String[] path = new String[fieldNames.size()];
if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}

protected String[] path(String name) {
String[] path = new String[fieldNames.size() + 1];
path[fieldNames.size()] = name;

if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}
}

private static class DateReader extends PrimitiveReader<String> {
Expand Down
27 changes: 0 additions & 27 deletions spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetReaders.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import java.math.BigInteger;
import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.iceberg.Schema;
Expand Down Expand Up @@ -281,35 +280,9 @@ public ParquetValueReader<?> primitive(org.apache.iceberg.types.Type.PrimitiveTy
}
}

private String[] currentPath() {
String[] path = new String[fieldNames.size()];
if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}

protected MessageType type() {
return type;
}

protected String[] path(String name) {
String[] path = new String[fieldNames.size() + 1];
path[fieldNames.size()] = name;

if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}
}

private static class BinaryDecimalReader extends PrimitiveReader<Decimal> {
Expand Down
26 changes: 0 additions & 26 deletions spark/src/main/java/org/apache/iceberg/spark/data/SparkParquetWriters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,32 +185,6 @@ public ParquetValueWriter<?> primitive(PrimitiveType primitive) {
throw new UnsupportedOperationException("Unsupported type: " + primitive);
}
}

private String[] currentPath() {
String[] path = new String[fieldNames.size()];
if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}

private String[] path(String name) {
String[] path = new String[fieldNames.size() + 1];
path[fieldNames.size()] = name;

if (!fieldNames.isEmpty()) {
Iterator<String> iter = fieldNames.descendingIterator();
for (int i = 0; iter.hasNext(); i += 1) {
path[i] = iter.next();
}
}

return path;
}
}

private static PrimitiveWriter<UTF8String> utf8Strings(ColumnDescriptor desc) {
Expand Down