Skip to content

Select correct ObjectInspector based on Hive version on classpath #1632

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
Oct 19, 2020
Merged

Select correct ObjectInspector based on Hive version on classpath #1632

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f63ea
Select correct ObjectInspector based on Hive version on classpath
marton-bod Oct 19, 2020
d2db424
Simplify object inspector selection logic
marton-bod Oct 19, 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
30 changes: 18 additions & 12 deletions ...rc/main/java/org/apache/iceberg/mr/hive/serde/objectinspector/IcebergObjectInspector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoFactory;
import org.apache.iceberg.Schema;
import org.apache.iceberg.common.DynMethods;
import org.apache.iceberg.hive.MetastoreUtil;
import org.apache.iceberg.types.Type;
import org.apache.iceberg.types.TypeUtil;
import org.apache.iceberg.types.Types;
Expand All @@ -36,23 +37,28 @@ public final class IcebergObjectInspector extends TypeUtil.SchemaVisitor<ObjectI

// get the correct inspectors depending on whether we're working with Hive2 or Hive3 dependencies
// we need to do this because there is a breaking API change in Date/TimestampObjectInspector between Hive2 and Hive3
private static final String DATE_INSPECTOR_CLASS = MetastoreUtil.hive3PresentOnClasspath() ?
"org.apache.iceberg.mr.hive.serde.objectinspector.IcebergDateObjectInspectorHive3" :
"org.apache.iceberg.mr.hive.serde.objectinspector.IcebergDateObjectInspector";

private static final ObjectInspector DATE_INSPECTOR = DynMethods.builder("get")
.impl("org.apache.iceberg.mr.hive.serde.objectinspector.IcebergDateObjectInspectorHive3")
.impl("org.apache.iceberg.mr.hive.serde.objectinspector.IcebergDateObjectInspector")
.buildStatic()
.invoke();
.impl(DATE_INSPECTOR_CLASS)
.buildStatic()
.invoke();

private static final String TIMESTAMP_INSPECTOR_CLASS = MetastoreUtil.hive3PresentOnClasspath() ?
"org.apache.iceberg.mr.hive.serde.objectinspector.IcebergTimestampObjectInspectorHive3" :
"org.apache.iceberg.mr.hive.serde.objectinspector.IcebergTimestampObjectInspector";

private static final ObjectInspector TIMESTAMP_INSPECTOR = DynMethods.builder("get")
.impl("org.apache.iceberg.mr.hive.serde.objectinspector.IcebergTimestampObjectInspectorHive3", boolean.class)
.impl("org.apache.iceberg.mr.hive.serde.objectinspector.IcebergTimestampObjectInspector", boolean.class)
.buildStatic()
.invoke(false);
.impl(TIMESTAMP_INSPECTOR_CLASS, boolean.class)
.buildStatic()
.invoke(false);

private static final ObjectInspector TIMESTAMP_INSPECTOR_WITH_TZ = DynMethods.builder("get")
.impl("org.apache.iceberg.mr.hive.serde.objectinspector.IcebergTimestampObjectInspectorHive3", boolean.class)
.impl("org.apache.iceberg.mr.hive.serde.objectinspector.IcebergTimestampObjectInspector", boolean.class)
.buildStatic()
.invoke(true);
.impl(TIMESTAMP_INSPECTOR_CLASS, boolean.class)
.buildStatic()
.invoke(true);

public static ObjectInspector create(@Nullable Schema schema) {
if (schema == null) {
Expand Down