Skip to content
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

Jump to bottom

Point the thrift id into NON_EXISTED_THRIFT_ID if the id resolver failed #115

Merged
merged 1 commit into from
Oct 24, 2017
Merged

Point the thrift id into NON_EXISTED_THRIFT_ID if the id resolver failed #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions ...hive/src/main/java/com/facebook/presto/twitter/hive/thrift/HiveThriftFieldIdResolver.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ public HiveThriftFieldIdResolver(JsonNode root)
this.root = root;
}

@Override
public short getThriftId(int hiveIndex)
{
if (root == null) {
Expand All @@ -97,6 +98,7 @@ public short getThriftId(int hiveIndex)
}
}

@Override
public ThriftFieldIdResolver getNestedResolver(int hiveIndex)
{
if (root == null) {
Expand Down
46 changes: 21 additions & 25 deletions ...to-hive/src/main/java/com/facebook/presto/twitter/hive/thrift/ThriftHiveRecordCursor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ class ThriftHiveRecordCursor<K, V extends Writable>
implements RecordCursor
{
private static final Logger log = Logger.get(ThriftHiveRecordCursor.class);
private static final short NON_EXISTED_THRIFT_ID = (short) -1;
private final RecordReader<K, V> recordReader;
private final K key;
private final V value;
Expand Down Expand Up @@ -165,7 +166,12 @@ public ThriftHiveRecordCursor(
types[i] = typeManager.getType(column.getTypeSignature());
hiveTypes[i] = column.getHiveType();
hiveIndexs[i] = column.getHiveColumnIndex();
thriftIds[i] = thriftFieldIdResolver.getThriftId(hiveIndexs[i]);
try {
thriftIds[i] = thriftFieldIdResolver.getThriftId(hiveIndexs[i]);
}
catch (PrestoException e) {
thriftIds[i] = NON_EXISTED_THRIFT_ID;
}
}
}

Expand Down Expand Up @@ -546,6 +552,10 @@ private static Block getBlockObject(Type type, ThriftFieldIdResolver resolver, O

private static Block serializeObject(Type type, ThriftFieldIdResolver resolver, BlockBuilder builder, Object object, DateTimeZone hiveStorageTimeZone)
{
if (object == null) {
requireNonNull(builder, "parent builder is null").appendNull();
return null;
}
if (!isStructuralType(type)) {
serializePrimitive(type, resolver, builder, object, hiveStorageTimeZone);
return null;
Expand All @@ -564,12 +574,7 @@ else if (isRowType(type)) {

private static Block serializeList(Type type, ThriftFieldIdResolver resolver, BlockBuilder builder, Object object, DateTimeZone hiveStorageTimeZone)
{
List<?> list = (List) object;
if (list == null) {
requireNonNull(builder, "parent builder is null").appendNull();
return null;
}

List<?> list = (List) requireNonNull(object, "object is null");
List<Type> typeParameters = type.getTypeParameters();
checkArgument(typeParameters.size() == 1, "list must have exactly 1 type parameter");
Type elementType = typeParameters.get(0);
Expand Down Expand Up @@ -598,12 +603,7 @@ private static Block serializeList(Type type, ThriftFieldIdResolver resolver, Bl

private static Block serializeMap(Type type, ThriftFieldIdResolver resolver, BlockBuilder builder, Object object, DateTimeZone hiveStorageTimeZone)
{
Map<?, ?> map = (Map) object;
if (map == null) {
requireNonNull(builder, "parent builder is null").appendNull();
return null;
}

Map<?, ?> map = (Map) requireNonNull(object, "object is null");
List<Type> typeParameters = type.getTypeParameters();
checkArgument(typeParameters.size() == 2, "map must have exactly 2 type parameter");
Type keyType = typeParameters.get(0);
Expand Down Expand Up @@ -638,13 +638,8 @@ private static Block serializeMap(Type type, ThriftFieldIdResolver resolver, Blo

private static Block serializeStruct(Type type, ThriftFieldIdResolver resolver, BlockBuilder builder, Object object, DateTimeZone hiveStorageTimeZone)
{
if (object == null) {
requireNonNull(builder, "parent builder is null").appendNull();
return null;
}

ThriftGenericRow structData = (ThriftGenericRow) requireNonNull(object, "object is null");
List<Type> typeParameters = type.getTypeParameters();
ThriftGenericRow structData = (ThriftGenericRow) object;
BlockBuilder currentBuilder;
if (builder != null) {
currentBuilder = builder.beginBlockEntry();
Expand All @@ -655,7 +650,12 @@ private static Block serializeStruct(Type type, ThriftFieldIdResolver resolver,

for (int i = 0; i < typeParameters.size(); i++) {
Object fieldValue = structData.getFieldValueForThriftId(resolver.getThriftId(i));
serializeObject(typeParameters.get(i), resolver.getNestedResolver(i), currentBuilder, fieldValue, hiveStorageTimeZone);
if (fieldValue == null) {
currentBuilder.appendNull();
}
else {
serializeObject(typeParameters.get(i), resolver.getNestedResolver(i), currentBuilder, fieldValue, hiveStorageTimeZone);
}
}

if (builder != null) {
Expand All @@ -671,11 +671,7 @@ private static Block serializeStruct(Type type, ThriftFieldIdResolver resolver,
private static void serializePrimitive(Type type, ThriftFieldIdResolver resolver, BlockBuilder builder, Object object, DateTimeZone hiveStorageTimeZone)
{
requireNonNull(builder, "parent builder is null");

if (object == null) {
builder.appendNull();
return;
}
requireNonNull(object, "object is null");

if (BOOLEAN.equals(type)) {
BOOLEAN.writeBoolean(builder, (Boolean) object);
Expand Down