commit 7935f0583b2925ade4c3f3fbe3ab6db9fab9f869 Author: Owen O'Malley Date: Thu Jun 25 22:02:47 2015 -0700 HIVE-11124. Move OrcRecordUpdater.getAcidEventFields to RecordReaderFactory. diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java index b576496..db18189 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java @@ -206,11 +206,6 @@ static StructObjectInspector createEventSchema(ObjectInspector rowInspector) { return new OrcStruct.OrcStructInspector(fields); } - public static List getAcidEventFields() { - return Lists.newArrayList("operation", "originalTransaction", "bucket", "rowId", - "currentTransaction", "row"); - } - OrcRecordUpdater(Path path, AcidOutputFormat.Options options) throws IOException { this.options = options; diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java index 8740ee6..23a9af4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java @@ -72,9 +72,14 @@ } } + static List getAcidEventFields() { + return Lists.newArrayList("operation", "originalTransaction", "bucket", + "rowId", "currentTransaction", "row"); + } + private static boolean checkAcidSchema(List fileSchema) { if (fileSchema.get(0).getKind().equals(OrcProto.Type.Kind.STRUCT)) { - List acidFields = OrcRecordUpdater.getAcidEventFields(); + List acidFields = getAcidEventFields(); List rootFields = fileSchema.get(0).getFieldNamesList(); if (acidFields.equals(rootFields)) { return true;