Repository: hive Updated Branches: refs/heads/master c3c6175fb -> ca80968e0
http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 43f3951..84edff2 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 @@ -154,7 +154,7 @@ public class VectorMapJoinInnerBigOnlyLongOperator extends VectorMapJoinInnerBig final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -212,7 +212,7 @@ public class VectorMapJoinInnerBigOnlyLongOperator extends VectorMapJoinInnerBig * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerBigOnlyRepeated(batch, joinResult, hashMultiSetResults[0]); @@ -222,7 +222,7 @@ public class VectorMapJoinInnerBigOnlyLongOperator extends VectorMapJoinInnerBig * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -377,7 +377,7 @@ public class VectorMapJoinInnerBigOnlyLongOperator extends VectorMapJoinInnerBig } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " equalKeySeriesValueCounts " + longArrayToRangesString(equalKeySeriesValueCounts, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 95fb0c2..7fe875b 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 @@ -161,7 +161,7 @@ public class VectorMapJoinInnerBigOnlyMultiKeyOperator extends VectorMapJoinInne final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -227,7 +227,7 @@ public class VectorMapJoinInnerBigOnlyMultiKeyOperator extends VectorMapJoinInne * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerBigOnlyRepeated(batch, joinResult, hashMultiSetResults[0]); @@ -237,7 +237,7 @@ public class VectorMapJoinInnerBigOnlyMultiKeyOperator extends VectorMapJoinInne * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -386,7 +386,7 @@ public class VectorMapJoinInnerBigOnlyMultiKeyOperator extends VectorMapJoinInne } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " equalKeySeriesValueCounts " + longArrayToRangesString(equalKeySeriesValueCounts, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 044e3e6..3869b91 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 @@ -145,7 +145,7 @@ public class VectorMapJoinInnerBigOnlyStringOperator extends VectorMapJoinInnerB final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -205,7 +205,7 @@ public class VectorMapJoinInnerBigOnlyStringOperator extends VectorMapJoinInnerB * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerBigOnlyRepeated(batch, joinResult, hashMultiSetResults[0]); @@ -215,7 +215,7 @@ public class VectorMapJoinInnerBigOnlyStringOperator extends VectorMapJoinInnerB * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -363,7 +363,7 @@ public class VectorMapJoinInnerBigOnlyStringOperator extends VectorMapJoinInnerB } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " equalKeySeriesValueCounts " + longArrayToRangesString(equalKeySeriesValueCounts, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 c85e1d8..b88a14d 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 @@ -152,7 +152,7 @@ public class VectorMapJoinInnerLongOperator extends VectorMapJoinInnerGenerateRe final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -210,7 +210,7 @@ public class VectorMapJoinInnerLongOperator extends VectorMapJoinInnerGenerateRe * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerRepeated(batch, joinResult, hashMapResults[0]); @@ -220,7 +220,7 @@ public class VectorMapJoinInnerLongOperator extends VectorMapJoinInnerGenerateRe * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -374,7 +374,7 @@ public class VectorMapJoinInnerLongOperator extends VectorMapJoinInnerGenerateRe } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 a108cd0..6dc6be8 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 @@ -158,7 +158,7 @@ public class VectorMapJoinInnerMultiKeyOperator extends VectorMapJoinInnerGenera final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -224,7 +224,7 @@ public class VectorMapJoinInnerMultiKeyOperator extends VectorMapJoinInnerGenera * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerRepeated(batch, joinResult, hashMapResults[0]); @@ -234,7 +234,7 @@ public class VectorMapJoinInnerMultiKeyOperator extends VectorMapJoinInnerGenera * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -382,7 +382,7 @@ public class VectorMapJoinInnerMultiKeyOperator extends VectorMapJoinInnerGenera } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 3211d7d..64e4f9c 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 @@ -143,7 +143,7 @@ public class VectorMapJoinInnerStringOperator extends VectorMapJoinInnerGenerate final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -199,7 +199,7 @@ public class VectorMapJoinInnerStringOperator extends VectorMapJoinInnerGenerate * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishInnerRepeated(batch, joinResult, hashMapResults[0]); @@ -209,7 +209,7 @@ public class VectorMapJoinInnerStringOperator extends VectorMapJoinInnerGenerate * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -356,7 +356,7 @@ public class VectorMapJoinInnerStringOperator extends VectorMapJoinInnerGenerate } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 b02e6fd..2a3f8b9 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 @@ -154,7 +154,7 @@ public class VectorMapJoinLeftSemiLongOperator extends VectorMapJoinLeftSemiGene final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -212,7 +212,7 @@ public class VectorMapJoinLeftSemiLongOperator extends VectorMapJoinLeftSemiGene * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishLeftSemiRepeated(batch, joinResult, hashSetResults[0]); @@ -222,7 +222,7 @@ public class VectorMapJoinLeftSemiLongOperator extends VectorMapJoinLeftSemiGene * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -370,7 +370,7 @@ public class VectorMapJoinLeftSemiLongOperator extends VectorMapJoinLeftSemiGene } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " spills " + intArrayToRangesString(spills, spillCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 36b8f3f..2c7c30c 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 @@ -160,7 +160,7 @@ public class VectorMapJoinLeftSemiMultiKeyOperator extends VectorMapJoinLeftSemi final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -227,7 +227,7 @@ public class VectorMapJoinLeftSemiMultiKeyOperator extends VectorMapJoinLeftSemi * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishLeftSemiRepeated(batch, joinResult, hashSetResults[0]); @@ -237,7 +237,7 @@ public class VectorMapJoinLeftSemiMultiKeyOperator extends VectorMapJoinLeftSemi * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -382,7 +382,7 @@ public class VectorMapJoinLeftSemiMultiKeyOperator extends VectorMapJoinLeftSemi } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " spills " + intArrayToRangesString(spills, spillCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 0b3de0a..e00dfc7 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 @@ -145,7 +145,7 @@ public class VectorMapJoinLeftSemiStringOperator extends VectorMapJoinLeftSemiGe final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -202,7 +202,7 @@ public class VectorMapJoinLeftSemiStringOperator extends VectorMapJoinLeftSemiGe * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishLeftSemiRepeated(batch, joinResult, hashSetResults[0]); @@ -212,7 +212,7 @@ public class VectorMapJoinLeftSemiStringOperator extends VectorMapJoinLeftSemiGe * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -353,7 +353,7 @@ public class VectorMapJoinLeftSemiStringOperator extends VectorMapJoinLeftSemiGe } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " allMatchs " + intArrayToRangesString(allMatchs, allMatchCount) + " spills " + intArrayToRangesString(spills, spillCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 0e2d65a..1b1a3db 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 @@ -442,7 +442,7 @@ public abstract class VectorMapJoinOuterGenerateResultOperator int nonSpillCount = subtractFromInputSelected( inputSelectedInUse, inputLogicalSize, spills, spillCount, nonSpills); - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("finishOuter spillCount > 0" + " nonSpills " + intArrayToRangesString(nonSpills, nonSpillCount)); } @@ -458,7 +458,7 @@ public abstract class VectorMapJoinOuterGenerateResultOperator noMatchCount = subtract(nonSpills, nonSpillCount, allMatchs, allMatchCount, noMatchs); - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("finishOuter spillCount > 0" + " noMatchs " + intArrayToRangesString(noMatchs, noMatchCount)); } @@ -473,7 +473,7 @@ public abstract class VectorMapJoinOuterGenerateResultOperator noMatchCount = subtractFromInputSelected( inputSelectedInUse, inputLogicalSize, allMatchs, allMatchCount, noMatchs); - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("finishOuter spillCount == 0" + " noMatchs " + intArrayToRangesString(noMatchs, noMatchCount)); } @@ -507,7 +507,7 @@ public abstract class VectorMapJoinOuterGenerateResultOperator batch.size = numSel; batch.selectedInUse = true; - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("finishOuter allMatchCount > 0" + " batch.selected " + intArrayToRangesString(batch.selected, batch.size)); } @@ -525,7 +525,7 @@ public abstract class VectorMapJoinOuterGenerateResultOperator int mergeCount = sortMerge( noMatchs, noMatchCount, batch.selected, batch.size, merged); - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("finishOuter noMatchCount > 0 && batch.size > 0" + " merged " + intArrayToRangesString(merged, mergeCount)); } @@ -543,7 +543,7 @@ public abstract class VectorMapJoinOuterGenerateResultOperator batch.size = noMatchCount; batch.selectedInUse = true; - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { 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/ca80968e/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 72309e8..cb0ec96 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 @@ -144,7 +144,7 @@ public class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -173,7 +173,7 @@ public class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe ve.evaluate(batch); } someRowsFilteredOut = (batch.size != inputLogicalSize); - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { if (batch.selectedInUse) { if (inputSelectedInUse) { LOG.debug(CLASS_NAME + @@ -246,7 +246,7 @@ public class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishOuterRepeated(batch, joinResult, hashMapResults[0], someRowsFilteredOut, @@ -257,7 +257,7 @@ public class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -427,7 +427,7 @@ public class VectorMapJoinOuterLongOperator extends VectorMapJoinOuterGenerateRe } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 a4fc7d3..4d9c302 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 @@ -149,7 +149,7 @@ public class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -178,7 +178,7 @@ public class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera ve.evaluate(batch); } someRowsFilteredOut = (batch.size != inputLogicalSize); - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { if (batch.selectedInUse) { if (inputSelectedInUse) { LOG.debug(CLASS_NAME + @@ -265,7 +265,7 @@ public class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishOuterRepeated(batch, joinResult, hashMapResults[0], someRowsFilteredOut, @@ -276,7 +276,7 @@ public class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -445,7 +445,7 @@ public class VectorMapJoinOuterMultiKeyOperator extends VectorMapJoinOuterGenera } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 6e7e5cb..f1a5c2e 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 @@ -134,7 +134,7 @@ public class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate final int inputLogicalSize = batch.size; if (inputLogicalSize == 0) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " empty"); } return; @@ -163,7 +163,7 @@ public class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate ve.evaluate(batch); } someRowsFilteredOut = (batch.size != inputLogicalSize); - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { if (batch.selectedInUse) { if (inputSelectedInUse) { LOG.debug(CLASS_NAME + @@ -234,7 +234,7 @@ public class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate * Common repeated join result processing. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " repeated joinResult " + joinResult.name()); } finishOuterRepeated(batch, joinResult, hashMapResults[0], someRowsFilteredOut, @@ -245,7 +245,7 @@ public class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate * NOT Repeating. */ - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " non-repeated"); } @@ -413,7 +413,7 @@ public class VectorMapJoinOuterStringOperator extends VectorMapJoinOuterGenerate } } - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug(CLASS_NAME + " batch #" + batchCounter + " allMatchs " + intArrayToRangesString(allMatchs,allMatchCount) + " equalKeySeriesHashMapResultIndices " + intArrayToRangesString(equalKeySeriesHashMapResultIndices, equalKeySeriesCount) + http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 10bc902..89087e1 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 @@ -40,8 +40,6 @@ public abstract class VectorMapJoinFastBytesHashTable private static final Logger LOG = LoggerFactory.getLogger(VectorMapJoinFastBytesHashTable.class); - private final boolean isLogDebugEnabled = LOG.isDebugEnabled(); - protected VectorMapJoinFastKeyStore keyStore; protected BytesWritable testKeyBytesWritable; @@ -90,7 +88,7 @@ public abstract class VectorMapJoinFastBytesHashTable } if (largestNumberOfSteps < i) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } largestNumberOfSteps = i; @@ -144,7 +142,7 @@ public abstract class VectorMapJoinFastBytesHashTable } if (newLargestNumberOfSteps < i) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } newLargestNumberOfSteps = i; http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/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 54e667c..f610653 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 @@ -47,8 +47,6 @@ public abstract class VectorMapJoinFastLongHashTable public static final Logger LOG = LoggerFactory.getLogger(VectorMapJoinFastLongHashTable.class); - private transient final boolean isLogDebugEnabled = LOG.isDebugEnabled(); - private final HashTableKeyType hashTableKeyType; private final boolean isOuterJoin; @@ -131,7 +129,7 @@ public abstract class VectorMapJoinFastLongHashTable } if (largestNumberOfSteps < i) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } largestNumberOfSteps = i; @@ -195,7 +193,7 @@ public abstract class VectorMapJoinFastLongHashTable } if (newLargestNumberOfSteps < i) { - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("Probed " + i + " slots (the longest so far) to find space"); } newLargestNumberOfSteps = i; http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java index 99819cf..496af0b 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/exec/vector/reducesink/VectorReduceSinkCommonOperator.java @@ -257,7 +257,7 @@ public abstract class VectorReduceSinkCommonOperator extends TerminalOperator<Re protected void initializeOp(Configuration hconf) throws HiveException { super.initializeOp(hconf); - if (isLogDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("useUniformHash " + vectorReduceSinkInfo.getUseUniformHash()); LOG.debug("reduceSinkKeyColumnMap " + @@ -315,7 +315,7 @@ public abstract class VectorReduceSinkCommonOperator extends TerminalOperator<Re reduceSkipTag = conf.getSkipTag(); reduceTagByte = (byte) conf.getTag(); - if (isLogInfoEnabled) { + if (LOG.isInfoEnabled()) { LOG.info("Using tag = " + (int) reduceTagByte); } @@ -409,7 +409,7 @@ public abstract class VectorReduceSinkCommonOperator extends TerminalOperator<Re // forward is not called if (null != out) { numRows++; - if (isLogInfoEnabled) { + if (LOG.isInfoEnabled()) { if (numRows == cntr) { cntr = logEveryNRows == 0 ? cntr * 10 : numRows + logEveryNRows; if (cntr < 0 || numRows < 0) { @@ -438,7 +438,7 @@ public abstract class VectorReduceSinkCommonOperator extends TerminalOperator<Re super.closeOp(abort); out = null; reducerHash = null; - if (isLogInfoEnabled) { + if (LOG.isInfoEnabled()) { LOG.info(toString() + ": records written - " + numRows); } recordCounter.set(numRows); http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ExternalCache.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ExternalCache.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ExternalCache.java index 9299306..58ea8f7 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ExternalCache.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/ExternalCache.java @@ -54,7 +54,6 @@ import com.google.common.collect.Lists; /** Metastore-based footer cache storing serialized footers. Also has a local cache. */ public class ExternalCache implements FooterCache { private static final Logger LOG = LoggerFactory.getLogger(ExternalCache.class); - private static boolean isDebugEnabled = LOG.isDebugEnabled(); private final LocalCache localCache; private final ExternalFooterCachesByConf externalCacheSrc; @@ -194,7 +193,7 @@ public class ExternalCache implements FooterCache { Long fileId = file.getFileId(); if (fileId == null) { if (!isInTest) { - if (!isWarnLogged || isDebugEnabled) { + if (!isWarnLogged || LOG.isDebugEnabled()) { LOG.warn("Not using metastore cache because fileId is missing: " + fs.getPath()); isWarnLogged = true; } http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java index 8fb7211..0ef7c75 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/io/orc/OrcInputFormat.java @@ -158,7 +158,6 @@ public class OrcInputFormat implements InputFormat<NullWritable, OrcStruct>, } private static final Logger LOG = LoggerFactory.getLogger(OrcInputFormat.class); - private static final boolean isDebugEnabled = LOG.isDebugEnabled(); static final HadoopShims SHIMS = ShimLoader.getHadoopShims(); private static final long DEFAULT_MIN_SPLIT_SIZE = 16 * 1024 * 1024; @@ -1682,7 +1681,7 @@ public class OrcInputFormat implements InputFormat<NullWritable, OrcStruct>, allowSyntheticFileIds); for (SplitStrategy<?> splitStrategy : splitStrategies) { - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("Split strategy: {}", splitStrategy); } @@ -1725,7 +1724,7 @@ public class OrcInputFormat implements InputFormat<NullWritable, OrcStruct>, + context.numFilesCounter.get()); } - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { for (OrcSplit split : splits) { LOG.debug(split + " projected_columns_uncompressed_size: " + split.getColumnarProjectionSize()); @@ -1795,7 +1794,7 @@ public class OrcInputFormat implements InputFormat<NullWritable, OrcStruct>, @Override public InputSplit[] getSplits(JobConf job, int numSplits) throws IOException { - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("getSplits started"); } Configuration conf = job; @@ -1805,7 +1804,7 @@ public class OrcInputFormat implements InputFormat<NullWritable, OrcStruct>, } List<OrcSplit> result = generateSplitsInfo(conf, new Context(conf, numSplits, createExternalCaches())); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("getSplits finished"); } return result.toArray(new InputSplit[result.size()]); @@ -2100,7 +2099,7 @@ public class OrcInputFormat implements InputFormat<NullWritable, OrcStruct>, for (int i = 0; i < includeStripe.length; ++i) { includeStripe[i] = (i >= stripeStats.size()) || isStripeSatisfyPredicate(stripeStats.get(i), sarg, filterColumns, evolution); - if (isDebugEnabled && !includeStripe[i]) { + if (LOG.isDebugEnabled() && !includeStripe[i]) { LOG.debug("Eliminating ORC stripe-" + i + " of file '" + filePath + "' as it did not satisfy predicate condition."); } http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java ---------------------------------------------------------------------- diff --git a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java index 6844713..fc6adaf 100644 --- a/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java +++ b/ql/src/java/org/apache/hadoop/hive/ql/optimizer/stats/annotation/StatsRulesProcFactory.java @@ -103,8 +103,6 @@ import com.google.common.collect.Sets; public class StatsRulesProcFactory { private static final Logger LOG = LoggerFactory.getLogger(StatsRulesProcFactory.class.getName()); - private static final boolean isDebugEnabled = LOG.isDebugEnabled(); - /** * Collect basic statistics like number of rows, data size and column level statistics from the @@ -130,7 +128,7 @@ public class StatsRulesProcFactory { Statistics stats = StatsUtils.collectStatistics(aspCtx.getConf(), partList, table, tsop); tsop.setStatistics(stats.clone()); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[0] STATS-" + tsop.toString() + " (" + table.getTableName() + "): " + stats.extendedToString()); } @@ -194,14 +192,14 @@ public class StatsRulesProcFactory { } sop.setStatistics(stats); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[0] STATS-" + sop.toString() + ": " + stats.extendedToString()); } } else { if (parentStats != null) { sop.setStatistics(parentStats.clone()); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[1] STATS-" + sop.toString() + ": " + parentStats.extendedToString()); } } @@ -291,7 +289,7 @@ public class StatsRulesProcFactory { updateStats(st, newNumRows, true, fop); } - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[0] STATS-" + fop.toString() + ": " + st.extendedToString()); } } else { @@ -301,7 +299,7 @@ public class StatsRulesProcFactory { updateStats(st, newNumRows, false, fop); } - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[1] STATS-" + fop.toString() + ": " + st.extendedToString()); } } @@ -321,7 +319,7 @@ public class StatsRulesProcFactory { Statistics andStats = null; if (stats.getNumRows() <= 1 || stats.getDataSize() <= 0) { - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("Estimating row count for " + pred + " Original num rows: " + stats.getNumRows() + " Original data size: " + stats.getDataSize() + " New num rows: 1"); } @@ -403,7 +401,7 @@ public class StatsRulesProcFactory { } } - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("Estimating row count for " + pred + " Original num rows: " + stats.getNumRows() + " New num rows: " + newNumRows); } @@ -1057,7 +1055,7 @@ public class StatsRulesProcFactory { parallelism = (int) Math.ceil((double) inputSize / maxSplitSize); } - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("STATS-" + gop.toString() + ": inputSize: " + inputSize + " maxSplitSize: " + maxSplitSize + " parallelism: " + parallelism + " containsGroupingSet: " + containsGroupingSet + " sizeOfGroupingSet: " + sizeOfGroupingSet); @@ -1070,7 +1068,7 @@ public class StatsRulesProcFactory { // check if map side aggregation is possible or not based on column stats hashAgg = checkMapSideAggregation(gop, colStats, conf); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("STATS-" + gop.toString() + " hashAgg: " + hashAgg); } @@ -1109,7 +1107,7 @@ public class StatsRulesProcFactory { if (ndvProduct == 0) { ndvProduct = parentNumRows / 2; - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("STATS-" + gop.toString() + ": ndvProduct became 0 as some column does not" + " have stats. ndvProduct changed to: " + ndvProduct); } @@ -1124,14 +1122,14 @@ public class StatsRulesProcFactory { (StatsUtils.safeMult(parentNumRows, sizeOfGroupingSet)) / 2, StatsUtils.safeMult(StatsUtils.safeMult(ndvProduct, parallelism), sizeOfGroupingSet)); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[Case 4] STATS-" + gop.toString() + ": cardinality: " + cardinality); } } else { // Case 3: column stats, hash aggregation, NO grouping sets cardinality = Math.min(parentNumRows / 2, StatsUtils.safeMult(ndvProduct, parallelism)); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[Case 3] STATS-" + gop.toString() + ": cardinality: " + cardinality); } } @@ -1140,14 +1138,14 @@ public class StatsRulesProcFactory { // Case 6: column stats, NO hash aggregation, grouping sets cardinality = StatsUtils.safeMult(parentNumRows, sizeOfGroupingSet); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[Case 6] STATS-" + gop.toString() + ": cardinality: " + cardinality); } } else { // Case 5: column stats, NO hash aggregation, NO grouping sets cardinality = parentNumRows; - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[Case 5] STATS-" + gop.toString() + ": cardinality: " + cardinality); } } @@ -1166,14 +1164,14 @@ public class StatsRulesProcFactory { sizeOfGroupingSet = mGop.getConf().getListGroupingSets().size(); cardinality = Math.min(parentNumRows, StatsUtils.safeMult(ndvProduct, sizeOfGroupingSet)); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[Case 8] STATS-" + gop.toString() + ": cardinality: " + cardinality); } } else { // Case 9: column stats, NO grouping sets cardinality = Math.min(parentNumRows, ndvProduct); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[Case 9] STATS-" + gop.toString() + ": cardinality: " + cardinality); } } @@ -1196,14 +1194,14 @@ public class StatsRulesProcFactory { // Case 2: NO column stats, NO hash aggregation, grouping sets cardinality = StatsUtils.safeMult(parentNumRows, sizeOfGroupingSet); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[Case 2] STATS-" + gop.toString() + ": cardinality: " + cardinality); } } else { // Case 1: NO column stats, NO hash aggregation, NO grouping sets cardinality = parentNumRows; - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[Case 1] STATS-" + gop.toString() + ": cardinality: " + cardinality); } } @@ -1212,7 +1210,7 @@ public class StatsRulesProcFactory { // Case 7: NO column stats cardinality = parentNumRows / 2; - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[Case 7] STATS-" + gop.toString() + ": cardinality: " + cardinality); } } @@ -1263,7 +1261,7 @@ public class StatsRulesProcFactory { gop.setStatistics(stats); - if (isDebugEnabled && stats != null) { + if (LOG.isDebugEnabled() && stats != null) { LOG.debug("[0] STATS-" + gop.toString() + ": " + stats.extendedToString()); } } catch (CloneNotSupportedException e) { @@ -1548,7 +1546,7 @@ public class StatsRulesProcFactory { updateColStats(conf, stats, newRowCount, jop, rowCountParents); jop.setStatistics(stats); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[0] STATS-" + jop.toString() + ": " + stats.extendedToString()); } } else { @@ -1606,7 +1604,7 @@ public class StatsRulesProcFactory { wcStats.setDataSize(newDataSize); jop.setStatistics(wcStats); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[1] STATS-" + jop.toString() + ": " + wcStats.extendedToString()); } } @@ -1641,7 +1639,7 @@ public class StatsRulesProcFactory { newNumRows = getCardinality(parents, pkPos, csPK, csFKs, jop); // some debug information - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { List<String> parentIds = Lists.newArrayList(); // print primary key containing parents @@ -2060,7 +2058,7 @@ public class StatsRulesProcFactory { } lop.setStatistics(stats); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[0] STATS-" + lop.toString() + ": " + stats.extendedToString()); } } else { @@ -2079,7 +2077,7 @@ public class StatsRulesProcFactory { } lop.setStatistics(wcStats); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[1] STATS-" + lop.toString() + ": " + wcStats.extendedToString()); } } @@ -2147,7 +2145,7 @@ public class StatsRulesProcFactory { outStats.setColumnStats(colStats); } rop.setStatistics(outStats); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[0] STATS-" + rop.toString() + ": " + outStats.extendedToString()); } } catch (CloneNotSupportedException e) { @@ -2192,7 +2190,7 @@ public class StatsRulesProcFactory { stats.addToColumnStats(colStats); op.getConf().setStatistics(stats); - if (isDebugEnabled) { + if (LOG.isDebugEnabled()) { LOG.debug("[0] STATS-" + op.toString() + ": " + stats.extendedToString()); } } http://git-wip-us.apache.org/repos/asf/hive/blob/ca80968e/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java ---------------------------------------------------------------------- diff --git a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java index aa19d09..d43aa35 100644 --- a/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java +++ b/serde/src/java/org/apache/hadoop/hive/serde2/lazy/LazyBinary.java @@ -27,8 +27,7 @@ import org.apache.hadoop.io.BytesWritable; public class LazyBinary extends LazyPrimitive<LazyBinaryObjectInspector, BytesWritable> { private static final Logger LOG = LoggerFactory.getLogger(LazyBinary.class); - private static final boolean DEBUG_LOG_ENABLED = LOG.isDebugEnabled(); - + public LazyBinary(LazyBinaryObjectInspector oi) { super(oi); data = new BytesWritable(); @@ -56,7 +55,7 @@ public class LazyBinary extends LazyPrimitive<LazyBinaryObjectInspector, BytesWr // todo this should be configured in serde public static byte[] decodeIfNeeded(byte[] recv) { boolean arrayByteBase64 = Base64.isArrayByteBase64(recv); - if (DEBUG_LOG_ENABLED && arrayByteBase64) { + if (LOG.isDebugEnabled() && arrayByteBase64) { LOG.debug("Data only contains Base64 alphabets only so try to decode the data."); } return arrayByteBase64 ? Base64.decodeBase64(recv) : recv;