diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java index afea926..af745b7 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java @@ -445,7 +445,7 @@ protected void determineCommonInfo(boolean isOuter) { outputProjection = projectionMapping.getOutputColumns(); outputTypeNames = projectionMapping.getTypeNames(); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { int[] orderDisplayable = new int[order.length]; for (int i = 0; i < order.length; i++) { orderDisplayable[i] = (int) order[i]; @@ -507,7 +507,7 @@ protected void determineCommonInfo(boolean isOuter) { * columns and new scratch columns. */ protected void setupVOutContext(List outputColumnNames) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(taskName + ", " + getOperatorId() + " VectorMapJoinCommonOperator constructor outputColumnNames " + outputColumnNames); } if (outputColumnNames.size() != outputProjection.length) { @@ -519,7 +519,7 @@ protected void setupVOutContext(List outputColumnNames) { int outputColumn = outputProjection[i]; vOutContext.addProjectionColumn(columnName, outputColumn); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(taskName + ", " + getOperatorId() + " VectorMapJoinCommonOperator constructor addProjectionColumn " + i + " columnName " + columnName + " outputColumn " + outputColumn); } } @@ -552,7 +552,7 @@ protected HashTableLoader getHashTableLoader(Configuration hconf) { protected void initializeOp(Configuration hconf) throws HiveException { super.initializeOp(hconf); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { // Determine the name of our map or reduce task for debug tracing. BaseWork work = Utilities.getMapWork(hconf); if (work == null) { @@ -598,7 +598,7 @@ protected void initializeOp(Configuration hconf) throws HiveException { needCommonSetup = true; needHashTableSetup = true; - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { int[] currentScratchColumns = vOutContext.currentScratchColumns(); LOG.debug(taskName + ", " + getOperatorId() + " VectorMapJoinCommonOperator initializeOp currentScratchColumns " + Arrays.toString(currentScratchColumns)); @@ -735,7 +735,7 @@ private void allocateOverflowBatchColumnVector(VectorizedRowBatch overflowBatch, overflowBatch.cols[outputColumn] = VectorizedRowBatchCtx.allocateColumnVector(columnVectorTypeName, VectorizedRowBatch.DEFAULT_SIZE); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(taskName + ", " + getOperatorId() + " VectorMapJoinCommonOperator initializeOp overflowBatch outputColumn " + outputColumn + " class " + overflowBatch.cols[outputColumn].getClass().getSimpleName()); } } @@ -746,7 +746,7 @@ private void allocateOverflowBatchColumnVector(VectorizedRowBatch overflowBatch, */ protected void commonSetup(VectorizedRowBatch batch) throws HiveException { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("VectorMapJoinInnerCommonOperator commonSetup begin..."); displayBatchColumns(batch, "batch"); displayBatchColumns(overflowBatch, "overflowBatch"); diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java index 260f4e1..b3acf21 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java @@ -512,7 +512,7 @@ protected void reloadHashTable(byte pos, int partitionId) smallTable); needHashTableSetup = true; - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " reloadHashTable!"); } } @@ -521,7 +521,7 @@ protected void reloadHashTable(byte pos, int partitionId) protected void reProcessBigTable(int partitionId) throws HiveException { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " reProcessBigTable enter..."); } @@ -572,7 +572,7 @@ protected void reProcessBigTable(int partitionId) throw new HiveException(e); } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " reProcessBigTable exit! " + rowCount + " row processed and " + batchCount + " batches processed"); } } @@ -636,7 +636,7 @@ public void closeOp(boolean aborted) throws HiveException { if (!aborted && overflowBatch.size > 0) { forwardOverflow(); } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("VectorMapJoinInnerLongOperator closeOp " + batchCounter + " batches processed"); } } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyLongOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyLongOperator.java index 7517802..e8b722e 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyLongOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyLongOperator.java @@ -138,7 +138,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -192,7 +192,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerBigOnlyRepeated(batch, joinResult, hashMultiSetResults[0]); @@ -202,7 +202,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -344,7 +344,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " equalKeySeriesValueCounts " + longArrayToRangesString(equalKeySeriesValueCounts, equalKeySeriesCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyMultiKeyOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyMultiKeyOperator.java index a2559f8..c2581e6 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyMultiKeyOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyMultiKeyOperator.java @@ -143,7 +143,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -204,7 +204,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerBigOnlyRepeated(batch, joinResult, hashMultiSetResults[0]); @@ -214,7 +214,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -357,7 +357,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " equalKeySeriesValueCounts " + longArrayToRangesString(equalKeySeriesValueCounts, equalKeySeriesCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java index 7c27b44..c07d353 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java @@ -129,7 +129,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -184,7 +184,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerBigOnlyRepeated(batch, joinResult, hashMultiSetResults[0]); @@ -194,7 +194,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -336,7 +336,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " equalKeySeriesValueCounts " + longArrayToRangesString(equalKeySeriesValueCounts, equalKeySeriesCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerLongOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerLongOperator.java index 4e31a10..92d7328 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerLongOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerLongOperator.java @@ -136,7 +136,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -190,7 +190,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerRepeated(batch, joinResult, hashMapResults[0]); @@ -200,7 +200,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -341,7 +341,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerMultiKeyOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerMultiKeyOperator.java index 7e58c75..c4a8050 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerMultiKeyOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerMultiKeyOperator.java @@ -140,7 +140,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -201,7 +201,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerRepeated(batch, joinResult, hashMapResults[0]); @@ -211,7 +211,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -353,7 +353,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java index 93331aa..4b508d4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java @@ -127,7 +127,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -179,7 +179,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerRepeated(batch, joinResult, hashMapResults[0]); @@ -189,7 +189,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -330,7 +330,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiLongOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiLongOperator.java index 9f6a822..762b6fa 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiLongOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiLongOperator.java @@ -138,7 +138,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -192,7 +192,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishLeftSemiRepeated(batch, joinResult, hashSetResults[0]); @@ -202,7 +202,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -337,7 +337,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " spills " + intArrayToRangesString(spills, spillCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiMultiKeyOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiMultiKeyOperator.java index 43e6fa7..5b6f3e3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiMultiKeyOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiMultiKeyOperator.java @@ -142,7 +142,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -204,7 +204,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishLeftSemiRepeated(batch, joinResult, hashSetResults[0]); @@ -214,7 +214,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -353,7 +353,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " spills " + intArrayToRangesString(spills, spillCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java index ef525d9..eaa3af4 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java @@ -129,7 +129,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -181,7 +181,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishLeftSemiRepeated(batch, joinResult, hashSetResults[0]); @@ -191,7 +191,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -326,7 +326,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " spills " + intArrayToRangesString(spills, spillCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java index 25aa941..5a88784 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java @@ -436,7 +436,7 @@ public void finishOuter(VectorizedRowBatch batch, int nonSpillCount = subtractFromInputSelected( inputSelectedInUse, inputLogicalSize, spills, spillCount, nonSpills); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("finishOuter spillCount > 0" + " nonSpills " + intArrayToRangesString(nonSpills, nonSpillCount)); } @@ -452,7 +452,7 @@ public void finishOuter(VectorizedRowBatch batch, noMatchCount = subtract(nonSpills, nonSpillCount, allMatchs, allMatchCount, noMatchs); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("finishOuter spillCount > 0" + " noMatchs " + intArrayToRangesString(noMatchs, noMatchCount)); } @@ -467,7 +467,7 @@ public void finishOuter(VectorizedRowBatch batch, noMatchCount = subtractFromInputSelected( inputSelectedInUse, inputLogicalSize, allMatchs, allMatchCount, noMatchs); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("finishOuter spillCount == 0" + " noMatchs " + intArrayToRangesString(noMatchs, noMatchCount)); } @@ -501,7 +501,7 @@ public void finishOuter(VectorizedRowBatch batch, batch.size = numSel; batch.selectedInUse = true; - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("finishOuter allMatchCount > 0" + " batch.selected " + intArrayToRangesString(batch.selected, batch.size)); } @@ -519,7 +519,7 @@ public void finishOuter(VectorizedRowBatch batch, int mergeCount = sortMerge( noMatchs, noMatchCount, batch.selected, batch.size, merged); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("finishOuter noMatchCount > 0 && batch.size > 0" + " merged " + intArrayToRangesString(merged, mergeCount)); } @@ -537,7 +537,7 @@ public void finishOuter(VectorizedRowBatch batch, batch.size = noMatchCount; batch.selectedInUse = true; - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("finishOuter noMatchCount > 0 && batch.size == 0" + " batch.selected " + intArrayToRangesString(batch.selected, batch.size)); } diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterLongOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterLongOperator.java index 355676a..5b687fd 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterLongOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterLongOperator.java @@ -128,7 +128,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -157,7 +157,7 @@ public void process(Object row, int tag) throws HiveException { ve.evaluate(batch); } someRowsFilteredOut = (batch.size != inputLogicalSize); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { if (batch.selectedInUse) { if (inputSelectedInUse) { LOG.debug(CLASS_NAME + @@ -230,7 +230,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishOuterRepeated(batch, joinResult, hashMapResults[0], someRowsFilteredOut, @@ -241,7 +241,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -411,7 +411,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterMultiKeyOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterMultiKeyOperator.java index 49e0e85..2f113e3 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterMultiKeyOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterMultiKeyOperator.java @@ -131,7 +131,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -160,7 +160,7 @@ public void process(Object row, int tag) throws HiveException { ve.evaluate(batch); } someRowsFilteredOut = (batch.size != inputLogicalSize); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { if (batch.selectedInUse) { if (inputSelectedInUse) { LOG.debug(CLASS_NAME + @@ -247,7 +247,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishOuterRepeated(batch, joinResult, hashMapResults[0], someRowsFilteredOut, @@ -258,7 +258,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -428,7 +428,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java index 24496d9..e4107ff 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java @@ -118,7 +118,7 @@ public void process(Object row, int tag) throws HiveException { final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -147,7 +147,7 @@ public void process(Object row, int tag) throws HiveException { ve.evaluate(batch); } someRowsFilteredOut = (batch.size != inputLogicalSize); - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { if (batch.selectedInUse) { if (inputSelectedInUse) { LOG.debug(CLASS_NAME + @@ -218,7 +218,7 @@ public void process(Object row, int tag) throws HiveException { * Common repeated join result processing. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishOuterRepeated(batch, joinResult, hashMapResults[0], someRowsFilteredOut, @@ -229,7 +229,7 @@ public void process(Object row, int tag) throws HiveException { * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -397,7 +397,7 @@ public void process(Object row, int tag) throws HiveException { } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashTable.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashTable.java index c06482b..3afb329 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashTable.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashTable.java @@ -37,6 +37,8 @@ private static final Logger LOG = LoggerFactory.getLogger(VectorMapJoinFastBytesHashTable.class); + private final boolean isLogDebugEnabled = LOG.isDebugEnabled(); + protected VectorMapJoinFastKeyStore keyStore; private BytesWritable testKeyBytesWritable; @@ -97,7 +99,7 @@ public void add(byte[] keyBytes, int keyStart, int keyLength, BytesWritable curr } if (largestNumberOfSteps < i) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } largestNumberOfSteps = i; @@ -147,7 +149,7 @@ private void expandAndRehash() { } if (newLargestNumberOfSteps < i) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } newLargestNumberOfSteps = i; diff --git ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastLongHashTable.java ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastLongHashTable.java index 5b48fcf..76d95a2 100644 --- ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastLongHashTable.java +++ ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastLongHashTable.java @@ -45,6 +45,8 @@ public static final Logger LOG = LoggerFactory.getLogger(VectorMapJoinFastLongHashTable.class); + private transient final boolean isLogDebugEnabled = LOG.isDebugEnabled(); + private HashTableKeyType hashTableKeyType; private boolean isOuterJoin; @@ -138,7 +140,7 @@ public void add(long key, BytesWritable currentValue) { } if (largestNumberOfSteps < i) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } largestNumberOfSteps = i; @@ -198,7 +200,7 @@ private void expandAndRehash() { } if (newLargestNumberOfSteps < i) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } newLargestNumberOfSteps = i;