Repository: hive Updated Branches: refs/heads/master 423269581 -> 240097b78
HIVE-11124. Move OrcRecordUpdater.getAcidEventFields to RecordReaderFactory. Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/240097b7 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/240097b7 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/240097b7 Branch: refs/heads/master Commit: 240097b78b70172e1cf9bc37876a566ddfb9e115 Parents: 4232695 Author: Owen O'Malley <omal...@apache.org> Authored: Thu Jun 25 22:02:47 2015 -0700 Committer: Owen O'Malley <omal...@apache.org> Committed: Wed Jul 15 14:41:42 2015 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java | 5 ----- .../org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java | 7 ++++++- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/240097b7/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java index e4651b8..2220b8e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcRecordUpdater.java @@ -207,11 +207,6 @@ public class OrcRecordUpdater implements RecordUpdater { return new OrcStruct.OrcStructInspector(fields); } - public static List<String> getAcidEventFields() { - return Lists.newArrayList("operation", "originalTransaction", "bucket", "rowId", - "currentTransaction", "row"); - } - OrcRecordUpdater(Path path, AcidOutputFormat.Options options) throws IOException { this.options = options; http://git-wip-us.apache.org/repos/asf/hive/blob/240097b7/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java index 8740ee6..23a9af4 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/RecordReaderFactory.java @@ -72,9 +72,14 @@ public class RecordReaderFactory { } } + static List<String> getAcidEventFields() { + return Lists.newArrayList("operation", "originalTransaction", "bucket", + "rowId", "currentTransaction", "row"); + } + private static boolean checkAcidSchema(List<OrcProto.Type> fileSchema) { if (fileSchema.get(0).getKind().equals(OrcProto.Type.Kind.STRUCT)) { - List<String> acidFields = OrcRecordUpdater.getAcidEventFields(); + List<String> acidFields = getAcidEventFields(); List<String> rootFields = fileSchema.get(0).getFieldNamesList(); if (acidFields.equals(rootFields)) { return true;
