diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java index d960252..a2954a9 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java @@ -43,6 +43,8 @@ import org.apache.hadoop.hive.ql.exec.vector.VectorizedInputFormatInterface; import org.apache.hadoop.hive.ql.exec.vector.VectorizedRowBatch; import org.apache.hadoop.hive.ql.io.InputFormatChecker; +import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat.FileGenerator; +import org.apache.hadoop.hive.ql.io.orc.OrcInputFormat.SplitGenerator; import org.apache.hadoop.hive.ql.io.orc.Reader.FileMetaInfo; import org.apache.hadoop.hive.ql.io.sarg.SearchArgument; import org.apache.hadoop.hive.ql.log.PerfLogger; @@ -457,7 +459,6 @@ synchronized void waitForTasks() { @Override public void run() { try { - perfLogger.PerfLogBegin(CLASS_NAME, PerfLogger.ORC_GET_BLOCK_LOCATIONS); Iterator itr = context.shims.listLocatedStatus(fs, dir, hiddenFileFilter); while (itr.hasNext()) { @@ -470,8 +471,6 @@ public void run() { context.schedule(new SplitGenerator(context, fs, file, fileInfo)); } } - // mark the fact that we are done - perfLogger.PerfLogEnd(CLASS_NAME, PerfLogger.ORC_GET_BLOCK_LOCATIONS); } catch (Throwable th) { if (!(th instanceof IOException)) { LOG.error("Unexpected Exception", th); @@ -634,7 +633,6 @@ void createSplit(long offset, long length, FileMetaInfo fileMetaInfo) throws IOE */ @Override public void run() { - perfLogger.PerfLogBegin(CLASS_NAME, PerfLogger.CREATE_ORC_SPLITS); try { populateAndCacheStripeDetails(); long currentOffset = -1; @@ -675,7 +673,6 @@ public void run() { } finally { context.decrementSchedulers(); } - perfLogger.PerfLogEnd(CLASS_NAME, PerfLogger.CREATE_ORC_SPLITS); } diff --git ql/src/java/org/apache/hadoop/hive/ql/io/orc/ReaderImpl.java ql/src/java/org/apache/hadoop/hive/ql/io/orc/ReaderImpl.java index 6aa3a60..bb57be6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/io/orc/ReaderImpl.java +++ ql/src/java/org/apache/hadoop/hive/ql/io/orc/ReaderImpl.java @@ -288,7 +288,6 @@ static void checkOrcVersion(Log log, Path path, List version) { * @throws IOException */ ReaderImpl(FileSystem fs, Path path) throws IOException { - perfLogger.PerfLogBegin(CLASS_NAME, PerfLogger.INIT_ORC_RECORD_READER); this.fileSystem = fs; this.path = path; @@ -303,7 +302,6 @@ static void checkOrcVersion(Log log, Path path, List version) { this.bufferSize = rInfo.bufferSize; this.footer = rInfo.footer; this.inspector = rInfo.inspector; - perfLogger.PerfLogEnd(CLASS_NAME, PerfLogger.INIT_ORC_RECORD_READER); } @@ -317,7 +315,6 @@ static void checkOrcVersion(Log log, Path path, List version) { */ ReaderImpl(FileSystem fs, Path path, FileMetaInfo fMetaInfo) throws IOException { - perfLogger.PerfLogBegin(CLASS_NAME, PerfLogger.INIT_ORC_RECORD_READER); this.fileSystem = fs; this.path = path; @@ -332,8 +329,6 @@ static void checkOrcVersion(Log log, Path path, List version) { this.bufferSize = rInfo.bufferSize; this.footer = rInfo.footer; this.inspector = rInfo.inspector; - perfLogger.PerfLogEnd(CLASS_NAME, PerfLogger.INIT_ORC_RECORD_READER); - } diff --git ql/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java ql/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java index 0bd5e79..c4327fc 100644 --- ql/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java +++ ql/src/java/org/apache/hadoop/hive/ql/log/PerfLogger.java @@ -63,10 +63,7 @@ public static final String TEZ_RUN_PROCESSOR = "TezRunProcessor"; public static final String TEZ_INIT_OPERATORS = "TezInitializeOperators"; public static final String LOAD_HASHTABLE = "LoadHashtable"; - public static final String INIT_ORC_RECORD_READER = "OrcRecordReaderInit"; - public static final String CREATE_ORC_SPLITS = "OrcCreateSplits"; public static final String ORC_GET_SPLITS = "OrcGetSplits"; - public static final String ORC_GET_BLOCK_LOCATIONS = "OrcGetBlockLocations"; protected static final ThreadLocal perfLogger = new ThreadLocal();