HIVE-12281: Vectorized MapJoin - use Operator::isLogDebugEnabled (Gopal V, reviewed by Matt McCline)
Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/ad127657 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/ad127657 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/ad127657 Branch: refs/heads/master-fixed Commit: ad12765714c22c056aecd7878ce05a1f3e28a038 Parents: db2c500 Author: Gopal V <gop...@apache.org> Authored: Mon Nov 2 19:50:42 2015 -0800 Committer: Gopal V <gop...@apache.org> Committed: Mon Nov 2 19:50:42 2015 -0800 ---------------------------------------------------------------------- .../vector/mapjoin/VectorMapJoinCommonOperator.java | 14 +++++++------- .../mapjoin/VectorMapJoinGenerateResultOperator.java | 8 ++++---- .../VectorMapJoinInnerBigOnlyLongOperator.java | 8 ++++---- .../VectorMapJoinInnerBigOnlyMultiKeyOperator.java | 8 ++++---- .../VectorMapJoinInnerBigOnlyStringOperator.java | 8 ++++---- .../mapjoin/VectorMapJoinInnerLongOperator.java | 8 ++++---- .../mapjoin/VectorMapJoinInnerMultiKeyOperator.java | 8 ++++---- .../mapjoin/VectorMapJoinInnerStringOperator.java | 8 ++++---- .../mapjoin/VectorMapJoinLeftSemiLongOperator.java | 8 ++++---- .../VectorMapJoinLeftSemiMultiKeyOperator.java | 8 ++++---- .../mapjoin/VectorMapJoinLeftSemiStringOperator.java | 8 ++++---- .../VectorMapJoinOuterGenerateResultOperator.java | 12 ++++++------ .../mapjoin/VectorMapJoinOuterLongOperator.java | 10 +++++----- .../mapjoin/VectorMapJoinOuterMultiKeyOperator.java | 10 +++++----- .../mapjoin/VectorMapJoinOuterStringOperator.java | 10 +++++----- .../mapjoin/fast/VectorMapJoinFastBytesHashTable.java | 6 ++++-- .../mapjoin/fast/VectorMapJoinFastLongHashTable.java | 6 ++++-- 17 files changed, 76 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java index 435b438..1667bf7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinCommonOperator.java @@ -445,7 +445,7 @@ public abstract class VectorMapJoinCommonOperator extends MapJoinOperator implem 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 @@ public abstract class VectorMapJoinCommonOperator extends MapJoinOperator implem * columns and new scratch columns. */ protected void setupVOutContext(List<String> outputColumnNames) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(taskName + ", " + getOperatorId() + " VectorMapJoinCommonOperator constructor outputColumnNames " + outputColumnNames); } if (outputColumnNames.size() != outputProjection.length) { @@ -519,7 +519,7 @@ public abstract class VectorMapJoinCommonOperator extends MapJoinOperator implem 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 @@ public abstract class VectorMapJoinCommonOperator extends MapJoinOperator implem 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) { @@ -599,7 +599,7 @@ public abstract class VectorMapJoinCommonOperator extends MapJoinOperator implem needCommonSetup = true; needHashTableSetup = true; - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { int[] currentScratchColumns = vOutContext.currentScratchColumns(); LOG.debug(taskName + ", " + getOperatorId() + " VectorMapJoinCommonOperator initializeOp currentScratchColumns " + Arrays.toString(currentScratchColumns)); @@ -736,7 +736,7 @@ public abstract class VectorMapJoinCommonOperator extends MapJoinOperator implem 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()); } } @@ -747,7 +747,7 @@ public abstract class VectorMapJoinCommonOperator extends MapJoinOperator implem */ protected void commonSetup(VectorizedRowBatch batch) throws HiveException { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("VectorMapJoinInnerCommonOperator commonSetup begin..."); displayBatchColumns(batch, "batch"); displayBatchColumns(overflowBatch, "overflowBatch"); http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java index 4e2bd7b..b20cca4 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinGenerateResultOperator.java @@ -517,7 +517,7 @@ public abstract class VectorMapJoinGenerateResultOperator extends VectorMapJoinC smallTable); needHashTableSetup = true; - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " reloadHashTable!"); } } @@ -526,7 +526,7 @@ public abstract class VectorMapJoinGenerateResultOperator extends VectorMapJoinC protected void reProcessBigTable(int partitionId) throws HiveException { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " reProcessBigTable enter..."); } @@ -577,7 +577,7 @@ public abstract class VectorMapJoinGenerateResultOperator extends VectorMapJoinC throw new HiveException(e); } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " reProcessBigTable exit! " + rowCount + " row processed and " + batchCount + " batches processed"); } } @@ -641,7 +641,7 @@ public abstract class VectorMapJoinGenerateResultOperator extends VectorMapJoinC if (!aborted && overflowBatch.size > 0) { forwardOverflow(); } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("VectorMapJoinInnerLongOperator closeOp " + batchCounter + " batches processed"); } } http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyLongOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyLongOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyLongOperator.java index 7517802..e8b722e 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyLongOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyLongOperator.java @@ -138,7 +138,7 @@ public class VectorMapJoinInnerBigOnlyLongOperator extends VectorMapJoinInnerBig 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 class VectorMapJoinInnerBigOnlyLongOperator extends VectorMapJoinInnerBig * 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 class VectorMapJoinInnerBigOnlyLongOperator extends VectorMapJoinInnerBig * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -344,7 +344,7 @@ public class VectorMapJoinInnerBigOnlyLongOperator extends VectorMapJoinInnerBig } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " equalKeySeriesValueCounts " + longArrayToRangesString(equalKeySeriesValueCounts, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyMultiKeyOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyMultiKeyOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyMultiKeyOperator.java index 02a3746..e016013 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyMultiKeyOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyMultiKeyOperator.java @@ -143,7 +143,7 @@ public class VectorMapJoinInnerBigOnlyMultiKeyOperator extends VectorMapJoinInne final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -208,7 +208,7 @@ public class VectorMapJoinInnerBigOnlyMultiKeyOperator extends VectorMapJoinInne * 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]); @@ -218,7 +218,7 @@ public class VectorMapJoinInnerBigOnlyMultiKeyOperator extends VectorMapJoinInne * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -365,7 +365,7 @@ public class VectorMapJoinInnerBigOnlyMultiKeyOperator extends VectorMapJoinInne } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " equalKeySeriesValueCounts " + longArrayToRangesString(equalKeySeriesValueCounts, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java index 7c27b44..c07d353 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerBigOnlyStringOperator.java @@ -129,7 +129,7 @@ public class VectorMapJoinInnerBigOnlyStringOperator extends VectorMapJoinInnerB 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 class VectorMapJoinInnerBigOnlyStringOperator extends VectorMapJoinInnerB * 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 class VectorMapJoinInnerBigOnlyStringOperator extends VectorMapJoinInnerB * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -336,7 +336,7 @@ public class VectorMapJoinInnerBigOnlyStringOperator extends VectorMapJoinInnerB } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " equalKeySeriesValueCounts " + longArrayToRangesString(equalKeySeriesValueCounts, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerLongOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerLongOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerLongOperator.java index 4e31a10..92d7328 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerLongOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerLongOperator.java @@ -136,7 +136,7 @@ public class VectorMapJoinInnerLongOperator extends VectorMapJoinInnerGenerateRe 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 class VectorMapJoinInnerLongOperator extends VectorMapJoinInnerGenerateRe * 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 class VectorMapJoinInnerLongOperator extends VectorMapJoinInnerGenerateRe * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -341,7 +341,7 @@ public class VectorMapJoinInnerLongOperator extends VectorMapJoinInnerGenerateRe } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerMultiKeyOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerMultiKeyOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerMultiKeyOperator.java index 6b63200..eb78174 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerMultiKeyOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerMultiKeyOperator.java @@ -140,7 +140,7 @@ public class VectorMapJoinInnerMultiKeyOperator extends VectorMapJoinInnerGenera final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -205,7 +205,7 @@ public class VectorMapJoinInnerMultiKeyOperator extends VectorMapJoinInnerGenera * 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]); @@ -215,7 +215,7 @@ public class VectorMapJoinInnerMultiKeyOperator extends VectorMapJoinInnerGenera * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -361,7 +361,7 @@ public class VectorMapJoinInnerMultiKeyOperator extends VectorMapJoinInnerGenera } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java index 93331aa..4b508d4 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinInnerStringOperator.java @@ -127,7 +127,7 @@ public class VectorMapJoinInnerStringOperator extends VectorMapJoinInnerGenerate 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 class VectorMapJoinInnerStringOperator extends VectorMapJoinInnerGenerate * 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 class VectorMapJoinInnerStringOperator extends VectorMapJoinInnerGenerate * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -330,7 +330,7 @@ public class VectorMapJoinInnerStringOperator extends VectorMapJoinInnerGenerate } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiLongOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiLongOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiLongOperator.java index 9f6a822..762b6fa 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiLongOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiLongOperator.java @@ -138,7 +138,7 @@ public class VectorMapJoinLeftSemiLongOperator extends VectorMapJoinLeftSemiGene 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 class VectorMapJoinLeftSemiLongOperator extends VectorMapJoinLeftSemiGene * 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 class VectorMapJoinLeftSemiLongOperator extends VectorMapJoinLeftSemiGene * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -337,7 +337,7 @@ public class VectorMapJoinLeftSemiLongOperator extends VectorMapJoinLeftSemiGene } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " spills " + intArrayToRangesString(spills, spillCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiMultiKeyOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiMultiKeyOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiMultiKeyOperator.java index f03bf6f..a7a51f7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiMultiKeyOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiMultiKeyOperator.java @@ -142,7 +142,7 @@ public class VectorMapJoinLeftSemiMultiKeyOperator extends VectorMapJoinLeftSemi final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -208,7 +208,7 @@ public class VectorMapJoinLeftSemiMultiKeyOperator extends VectorMapJoinLeftSemi * 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]); @@ -218,7 +218,7 @@ public class VectorMapJoinLeftSemiMultiKeyOperator extends VectorMapJoinLeftSemi * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -361,7 +361,7 @@ public class VectorMapJoinLeftSemiMultiKeyOperator extends VectorMapJoinLeftSemi } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " spills " + intArrayToRangesString(spills, spillCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java index ef525d9..eaa3af4 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinLeftSemiStringOperator.java @@ -129,7 +129,7 @@ public class VectorMapJoinLeftSemiStringOperator extends VectorMapJoinLeftSemiGe 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 class VectorMapJoinLeftSemiStringOperator extends VectorMapJoinLeftSemiGe * 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 class VectorMapJoinLeftSemiStringOperator extends VectorMapJoinLeftSemiGe * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -326,7 +326,7 @@ public class VectorMapJoinLeftSemiStringOperator extends VectorMapJoinLeftSemiGe } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " spills " + intArrayToRangesString(spills, spillCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java index 25aa941..5a88784 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterGenerateResultOperator.java @@ -436,7 +436,7 @@ public abstract class VectorMapJoinOuterGenerateResultOperator 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 abstract class VectorMapJoinOuterGenerateResultOperator 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 abstract class VectorMapJoinOuterGenerateResultOperator 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 abstract class VectorMapJoinOuterGenerateResultOperator 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 abstract class VectorMapJoinOuterGenerateResultOperator 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 abstract class VectorMapJoinOuterGenerateResultOperator 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)); } http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterLongOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterLongOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterLongOperator.java index 355676a..5b687fd 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterLongOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterLongOperator.java @@ -128,7 +128,7 @@ public class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe 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 class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe 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 class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe * 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 class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -411,7 +411,7 @@ public class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterMultiKeyOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterMultiKeyOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterMultiKeyOperator.java index 2c98a24..e212a2a 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterMultiKeyOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterMultiKeyOperator.java @@ -131,7 +131,7 @@ public class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera 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 class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera 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 class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera * 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 class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -427,7 +427,7 @@ public class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java index 24496d9..e4107ff 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/VectorMapJoinOuterStringOperator.java @@ -118,7 +118,7 @@ public class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate 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 class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate 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 class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate * 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 class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate * NOT Repeating. */ - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -397,7 +397,7 @@ public class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate } } - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashTable.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashTable.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashTable.java index b978bf0..6b536f0 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashTable.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastBytesHashTable.java @@ -38,6 +38,8 @@ public abstract class VectorMapJoinFastBytesHashTable private static final Logger LOG = LoggerFactory.getLogger(VectorMapJoinFastBytesHashTable.class); + private final boolean isLogDebugEnabled = LOG.isDebugEnabled(); + protected VectorMapJoinFastKeyStore keyStore; private BytesWritable testKeyBytesWritable; @@ -98,7 +100,7 @@ public abstract class VectorMapJoinFastBytesHashTable } if (largestNumberOfSteps < i) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } largestNumberOfSteps = i; @@ -148,7 +150,7 @@ public abstract class VectorMapJoinFastBytesHashTable } if (newLargestNumberOfSteps < i) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } newLargestNumberOfSteps = i; http://git-wip-us.apache.org/repos/asf/hive/blob/ad127657/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastLongHashTable.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastLongHashTable.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastLongHashTable.java index 7ea3455..dfc9bf1 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastLongHashTable.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/mapjoin/fast/VectorMapJoinFastLongHashTable.java @@ -46,6 +46,8 @@ public abstract class VectorMapJoinFastLongHashTable public static final Logger LOG = LoggerFactory.getLogger(VectorMapJoinFastLongHashTable.class); + private transient final boolean isLogDebugEnabled = LOG.isDebugEnabled(); + private HashTableKeyType hashTableKeyType; private boolean isOuterJoin; @@ -139,7 +141,7 @@ public abstract class VectorMapJoinFastLongHashTable } if (largestNumberOfSteps < i) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } largestNumberOfSteps = i; @@ -199,7 +201,7 @@ public abstract class VectorMapJoinFastLongHashTable } if (newLargestNumberOfSteps < i) { - if (LOG.isDebugEnabled()) { + if (isLogDebugEnabled) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } newLargestNumberOfSteps = i;
