forked from apache/parquet-java
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
PARQUET-243: Add Avro reflect support
Author: Ryan Blue <[email protected]> Closes apache#165 from rdblue/PARQUET-243-add-avro-reflect and squashes the following commits: a1a17b4 [Ryan Blue] PARQUET-243: Update for Tom's review comments. 16584d1 [Ryan Blue] PARQUET-243: Fix AvroWriteSupport bug. fa4a9ec [Ryan Blue] PARQUET-243: Add reflect tests. 4c50cd1 [Ryan Blue] PARQUET-243: Update write support for reflected objects. b50c482 [Ryan Blue] PARQUET-243: Update tests to run with new converters. 0b7a333 [Ryan Blue] PARQUET-243: Use common AvroConverters where possible. 2f6825d [Ryan Blue] PARQUET-243: Add reflect converters that behave more like Avro. 98f10df [Ryan Blue] PARQUET-243: Add Avro compatible record materializer.
- Loading branch information
Showing
21 changed files
with
2,482 additions
and
275 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
parquet-avro/src/main/java/org/apache/parquet/avro/AvroCompatRecordMaterializer.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
/* | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.parquet.avro; | ||
|
||
import org.apache.avro.Schema; | ||
import org.apache.avro.generic.GenericData; | ||
import org.apache.avro.generic.IndexedRecord; | ||
import org.apache.parquet.io.api.GroupConverter; | ||
import org.apache.parquet.io.api.RecordMaterializer; | ||
import org.apache.parquet.schema.MessageType; | ||
|
||
class AvroCompatRecordMaterializer<T extends IndexedRecord> extends RecordMaterializer<T> { | ||
|
||
private AvroIndexedRecordConverter<T> root; | ||
|
||
public AvroCompatRecordMaterializer(MessageType requestedSchema, Schema avroSchema, | ||
GenericData baseModel) { | ||
this.root = new AvroIndexedRecordConverter<T>(requestedSchema, avroSchema, baseModel); | ||
} | ||
|
||
@Override | ||
public T getCurrentRecord() { | ||
return root.getCurrentRecord(); | ||
} | ||
|
||
@Override | ||
public GroupConverter getRootConverter() { | ||
return root; | ||
} | ||
} |
253 changes: 253 additions & 0 deletions
253
parquet-avro/src/main/java/org/apache/parquet/avro/AvroConverters.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,253 @@ | ||
/** | ||
* Licensed to the Apache Software Foundation (ASF) under one | ||
* or more contributor license agreements. See the NOTICE file | ||
* distributed with this work for additional information | ||
* regarding copyright ownership. The ASF licenses this file | ||
* to you under the Apache License, Version 2.0 (the | ||
* "License"); you may not use this file except in compliance | ||
* with the License. You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, | ||
* software distributed under the License is distributed on an | ||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
* KIND, either express or implied. See the License for the | ||
* specific language governing permissions and limitations | ||
* under the License. | ||
*/ | ||
package org.apache.parquet.avro; | ||
|
||
import java.nio.ByteBuffer; | ||
import org.apache.avro.Schema; | ||
import org.apache.avro.generic.GenericData; | ||
import org.apache.parquet.column.Dictionary; | ||
import org.apache.parquet.io.api.Binary; | ||
import org.apache.parquet.io.api.GroupConverter; | ||
import org.apache.parquet.io.api.PrimitiveConverter; | ||
|
||
public class AvroConverters { | ||
|
||
public abstract static class AvroGroupConverter extends GroupConverter { | ||
protected final ParentValueContainer parent; | ||
|
||
public AvroGroupConverter(ParentValueContainer parent) { | ||
this.parent = parent; | ||
} | ||
} | ||
|
||
static class AvroPrimitiveConverter extends PrimitiveConverter { | ||
protected final ParentValueContainer parent; | ||
|
||
public AvroPrimitiveConverter(ParentValueContainer parent) { | ||
this.parent = parent; | ||
} | ||
} | ||
|
||
static final class FieldByteConverter extends AvroPrimitiveConverter { | ||
public FieldByteConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
public void addInt(int value) { | ||
parent.addByte((byte) value); | ||
} | ||
} | ||
static final class FieldShortConverter extends AvroPrimitiveConverter { | ||
public FieldShortConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
public void addInt(int value) { | ||
parent.addShort((short) value); | ||
} | ||
} | ||
|
||
static final class FieldCharConverter extends AvroPrimitiveConverter { | ||
public FieldCharConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
public void addInt(int value) { | ||
parent.addChar((char) value); | ||
} | ||
} | ||
|
||
static final class FieldBooleanConverter extends AvroPrimitiveConverter { | ||
public FieldBooleanConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
final public void addBoolean(boolean value) { | ||
parent.addBoolean(value); | ||
} | ||
} | ||
|
||
static final class FieldIntegerConverter extends AvroPrimitiveConverter { | ||
public FieldIntegerConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
final public void addInt(int value) { | ||
parent.addInt(value); | ||
} | ||
} | ||
|
||
static final class FieldLongConverter extends AvroPrimitiveConverter { | ||
public FieldLongConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
final public void addInt(int value) { | ||
parent.addLong((long) value); | ||
} | ||
|
||
@Override | ||
final public void addLong(long value) { | ||
parent.addLong(value); | ||
} | ||
} | ||
|
||
static final class FieldFloatConverter extends AvroPrimitiveConverter { | ||
public FieldFloatConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
final public void addInt(int value) { | ||
parent.addFloat((float) value); | ||
} | ||
|
||
@Override | ||
final public void addLong(long value) { | ||
parent.addFloat((float) value); | ||
} | ||
|
||
@Override | ||
final public void addFloat(float value) { | ||
parent.addFloat(value); | ||
} | ||
|
||
} | ||
|
||
static final class FieldDoubleConverter extends AvroPrimitiveConverter { | ||
public FieldDoubleConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
final public void addInt(int value) { | ||
parent.addDouble((double) value); | ||
} | ||
|
||
@Override | ||
final public void addLong(long value) { | ||
parent.addDouble((double) value); | ||
} | ||
|
||
@Override | ||
final public void addFloat(float value) { | ||
parent.addDouble((double) value); | ||
} | ||
|
||
@Override | ||
final public void addDouble(double value) { | ||
parent.addDouble(value); | ||
} | ||
} | ||
|
||
static final class FieldByteArrayConverter extends AvroPrimitiveConverter { | ||
public FieldByteArrayConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
final public void addBinary(Binary value) { | ||
parent.add(value.getBytes()); | ||
} | ||
} | ||
|
||
static final class FieldByteBufferConverter extends AvroPrimitiveConverter { | ||
public FieldByteBufferConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
final public void addBinary(Binary value) { | ||
parent.add(ByteBuffer.wrap(value.getBytes())); | ||
} | ||
} | ||
|
||
static final class FieldStringConverter extends AvroPrimitiveConverter { | ||
// TODO: dictionary support should be generic and provided by a parent | ||
// TODO: this always produces strings, but should respect avro.java.string | ||
private String[] dict; | ||
|
||
public FieldStringConverter(ParentValueContainer parent) { | ||
super(parent); | ||
} | ||
|
||
@Override | ||
final public void addBinary(Binary value) { | ||
parent.add(value.toStringUsingUTF8()); | ||
} | ||
|
||
@Override | ||
public boolean hasDictionarySupport() { | ||
return true; | ||
} | ||
|
||
@Override | ||
public void setDictionary(Dictionary dictionary) { | ||
dict = new String[dictionary.getMaxId() + 1]; | ||
for (int i = 0; i <= dictionary.getMaxId(); i++) { | ||
dict[i] = dictionary.decodeToBinary(i).toStringUsingUTF8(); | ||
} | ||
} | ||
|
||
@Override | ||
public void addValueFromDictionary(int dictionaryId) { | ||
parent.add(dict[dictionaryId]); | ||
} | ||
} | ||
|
||
static final class FieldEnumConverter extends AvroPrimitiveConverter { | ||
private final Schema schema; | ||
private final GenericData model; | ||
|
||
public FieldEnumConverter(ParentValueContainer parent, Schema enumSchema, | ||
GenericData model) { | ||
super(parent); | ||
this.schema = enumSchema; | ||
this.model = model; | ||
} | ||
|
||
@Override | ||
final public void addBinary(Binary value) { | ||
parent.add(model.createEnum(value.toStringUsingUTF8(), schema)); | ||
} | ||
} | ||
|
||
static final class FieldFixedConverter extends AvroPrimitiveConverter { | ||
private final Schema schema; | ||
private final GenericData model; | ||
|
||
public FieldFixedConverter(ParentValueContainer parent, Schema avroSchema, | ||
GenericData model) { | ||
super(parent); | ||
this.schema = avroSchema; | ||
this.model = model; | ||
} | ||
|
||
@Override | ||
final public void addBinary(Binary value) { | ||
parent.add(model.createFixed(null /* reuse */, value.getBytes(), schema)); | ||
} | ||
} | ||
} |
Oops, something went wrong.