Index: src/java/org/apache/hadoop/hbase/filter/StopRowFilter.java =================================================================== --- src/java/org/apache/hadoop/hbase/filter/StopRowFilter.java (revision 651007) +++ src/java/org/apache/hadoop/hbase/filter/StopRowFilter.java (working copy) @@ -105,8 +105,8 @@ return false; } boolean result = this.stopRowKey.compareTo(rowKey) <= 0; - if (LOG.isDebugEnabled()) { - LOG.debug("Filter result for rowKey: " + rowKey + ". Result: " + + if (LOG.isTraceEnabled()) { + LOG.trace("Filter result for rowKey: " + rowKey + ". Result: " + result); } return result; Index: src/java/org/apache/hadoop/hbase/filter/WhileMatchRowFilter.java =================================================================== --- src/java/org/apache/hadoop/hbase/filter/WhileMatchRowFilter.java (revision 651007) +++ src/java/org/apache/hadoop/hbase/filter/WhileMatchRowFilter.java (working copy) @@ -69,8 +69,8 @@ /** {@inheritDoc} */ public void reset() { - if (LOG.isDebugEnabled()) { - LOG.debug("Resetting."); + if (LOG.isTraceEnabled()) { + LOG.trace("Resetting."); } this.filterAllRemaining = false; this.filter.reset(); @@ -96,8 +96,8 @@ public boolean filterRowKey(final Text rowKey) { changeFAR(this.filter.filterRowKey(rowKey)); boolean result = filterAllRemaining(); - if (LOG.isDebugEnabled()) { - LOG.debug("Filter on rowKey:" + rowKey + ". Result = " + result); + if (LOG.isTraceEnabled()) { + LOG.trace("Filter on rowKey:" + rowKey + ". Result = " + result); } return result; } @@ -107,8 +107,8 @@ final byte[] data) { changeFAR(this.filter.filterColumn(rowKey, colKey, data)); boolean result = filterAllRemaining(); - if (LOG.isDebugEnabled()) { - LOG.debug("Filter on rowKey:" + rowKey + ", colKey: " + colKey + + if (LOG.isTraceEnabled()) { + LOG.trace("Filter on rowKey:" + rowKey + ", colKey: " + colKey + ", data: " + data + ". Result = " + result); } return result; @@ -118,8 +118,8 @@ public boolean filterRow(final SortedMap columns) { changeFAR(this.filter.filterRow(columns)); boolean result = filterAllRemaining(); - if (LOG.isDebugEnabled()) { - LOG.debug("FilterNotNull on cols:" + columns + ". Result = " + + if (LOG.isTraceEnabled()) { + LOG.trace("FilterNotNull on cols:" + columns + ". Result = " + result); } return result; @@ -133,8 +133,8 @@ */ private void changeFAR(boolean value) { this.filterAllRemaining = this.filterAllRemaining || value; - if (LOG.isDebugEnabled()) { - LOG.debug("this.filterAllRemaining is now: " + + if (LOG.isTraceEnabled()) { + LOG.trace("this.filterAllRemaining is now: " + this.filterAllRemaining); } } @@ -157,8 +157,8 @@ this.filter = (RowFilterInterface)(Class.forName(className). newInstance()); this.filter.readFields(in); - if (LOG.isDebugEnabled()) { - LOG.debug("Successfully read a sub-filter of type: " + + if (LOG.isTraceEnabled()) { + LOG.trace("Successfully read a sub-filter of type: " + className); } } catch (InstantiationException e) { Index: src/java/org/apache/hadoop/hbase/filter/InclusiveStopRowFilter.java =================================================================== --- src/java/org/apache/hadoop/hbase/filter/InclusiveStopRowFilter.java (revision 651007) +++ src/java/org/apache/hadoop/hbase/filter/InclusiveStopRowFilter.java (working copy) @@ -51,8 +51,8 @@ return false; } boolean result = this.stopRowKey.compareTo(rowKey) < 0; - if (LOG.isDebugEnabled()) { - LOG.debug("Filter result for rowKey: " + rowKey + ". Result: " + + if (LOG.isTraceEnabled()) { + LOG.trace("Filter result for rowKey: " + rowKey + ". Result: " + result); } return result; Index: src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java =================================================================== --- src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java (revision 651007) +++ src/java/org/apache/hadoop/hbase/filter/RegExpRowFilter.java (working copy) @@ -148,8 +148,8 @@ public boolean filterRowKey(final Text rowKey) { if (filtersByRowKey() && rowKey != null) { boolean result = !getRowKeyPattern().matcher(rowKey.toString()).matches(); - if (LOG.isDebugEnabled()) { - LOG.debug("filter returning " + result + " for rowKey: " + rowKey); + if (LOG.isTraceEnabled()) { + LOG.trace("filter returning " + result + " for rowKey: " + rowKey); } return result; } @@ -169,8 +169,8 @@ byte[] filterValue = equalsMap.get(colKey); if (null != filterValue) { boolean result = !Arrays.equals(filterValue, data); - if (LOG.isDebugEnabled()) { - LOG.debug("filter returning " + result + " for rowKey: " + rowKey + + if (LOG.isTraceEnabled()) { + LOG.trace("filter returning " + result + " for rowKey: " + rowKey + " colKey: " + colKey); } return result; @@ -178,15 +178,15 @@ } if (nullColumns.contains(colKey)) { if (data != null && !HLogEdit.isDeleted(data)) { - if (LOG.isDebugEnabled()) { - LOG.debug("filter returning true for rowKey: " + rowKey + + if (LOG.isTraceEnabled()) { + LOG.trace("filter returning true for rowKey: " + rowKey + " colKey: " + colKey); } return true; } } - if (LOG.isDebugEnabled()) { - LOG.debug("filter returning false for rowKey: " + rowKey + " colKey: " + + if (LOG.isTraceEnabled()) { + LOG.trace("filter returning false for rowKey: " + rowKey + " colKey: " + colKey); } return false; @@ -200,8 +200,8 @@ for (Entry col : columns.entrySet()) { if (nullColumns.contains(col.getKey()) && !HLogEdit.isDeleted(col.getValue())) { - if (LOG.isDebugEnabled()) { - LOG.debug("filterNotNull returning true for colKey: " + col.getKey() + if (LOG.isTraceEnabled()) { + LOG.trace("filterNotNull returning true for colKey: " + col.getKey() + ", column should be null."); } return true; @@ -209,15 +209,15 @@ } for (Text col : equalsMap.keySet()) { if (!columns.containsKey(col)) { - if (LOG.isDebugEnabled()) { - LOG.debug("filterNotNull returning true for colKey: " + col + + if (LOG.isTraceEnabled()) { + LOG.trace("filterNotNull returning true for colKey: " + col + ", column not found in given SortedMap."); } return true; } } - if (LOG.isDebugEnabled()) { - LOG.debug("filterNotNull returning false."); + if (LOG.isTraceEnabled()) { + LOG.trace("filterNotNull returning false."); } return false; } Index: src/java/org/apache/hadoop/hbase/filter/RowFilterSet.java =================================================================== --- src/java/org/apache/hadoop/hbase/filter/RowFilterSet.java (revision 651007) +++ src/java/org/apache/hadoop/hbase/filter/RowFilterSet.java (working copy) @@ -88,8 +88,8 @@ public void validate(final Text[] columns) { for (RowFilterInterface filter : filters) { filter.validate(columns); - if (LOG.isDebugEnabled()) { - LOG.debug("Validated subfilter of type " + + if (LOG.isTraceEnabled()) { + LOG.trace("Validated subfilter of type " + filter.getClass().getSimpleName()); } } @@ -99,8 +99,8 @@ public void reset() { for (RowFilterInterface filter : filters) { filter.reset(); - if (LOG.isDebugEnabled()) { - LOG.debug("Reset subfilter of type " + + if (LOG.isTraceEnabled()) { + LOG.trace("Reset subfilter of type " + filter.getClass().getSimpleName()); } } @@ -110,8 +110,8 @@ public void rowProcessed(boolean filtered, Text rowKey) { for (RowFilterInterface filter : filters) { filter.rowProcessed(filtered, rowKey); - if (LOG.isDebugEnabled()) { - LOG.debug("Called rowProcessed on subfilter of type " + + if (LOG.isTraceEnabled()) { + LOG.trace("Called rowProcessed on subfilter of type " + filter.getClass().getSimpleName()); } } @@ -121,8 +121,8 @@ public boolean processAlways() { for (RowFilterInterface filter : filters) { if (filter.processAlways()) { - if (LOG.isDebugEnabled()) { - LOG.debug("processAlways() is true due to subfilter of type " + + if (LOG.isTraceEnabled()) { + LOG.trace("processAlways() is true due to subfilter of type " + filter.getClass().getSimpleName()); } return true; @@ -137,24 +137,24 @@ for (RowFilterInterface filter : filters) { if (operator == Operator.MUST_PASS_ALL) { if (filter.filterAllRemaining()) { - if (LOG.isDebugEnabled()) { - LOG.debug("op.MPALL filterAllRemaining returning true due" + + if (LOG.isTraceEnabled()) { + LOG.trace("op.MPALL filterAllRemaining returning true due" + " to subfilter of type " + filter.getClass().getSimpleName()); } return true; } } else if (operator == Operator.MUST_PASS_ONE) { if (!filter.filterAllRemaining()) { - if (LOG.isDebugEnabled()) { - LOG.debug("op.MPONE filterAllRemaining returning false due" + + if (LOG.isTraceEnabled()) { + LOG.trace("op.MPONE filterAllRemaining returning false due" + " to subfilter of type " + filter.getClass().getSimpleName()); } return false; } } } - if (LOG.isDebugEnabled()) { - LOG.debug("filterAllRemaining default returning " + result); + if (LOG.isTraceEnabled()) { + LOG.trace("filterAllRemaining default returning " + result); } return result; } @@ -167,8 +167,8 @@ if (!resultFound) { if (operator == Operator.MUST_PASS_ALL) { if (filter.filterAllRemaining() || filter.filterRowKey(rowKey)) { - if (LOG.isDebugEnabled()) { - LOG.debug("op.MPALL filter(Text) will return true due" + + if (LOG.isTraceEnabled()) { + LOG.trace("op.MPALL filter(Text) will return true due" + " to subfilter of type " + filter.getClass().getSimpleName()); } result = true; @@ -176,8 +176,8 @@ } } else if (operator == Operator.MUST_PASS_ONE) { if (!filter.filterAllRemaining() && !filter.filterRowKey(rowKey)) { - if (LOG.isDebugEnabled()) { - LOG.debug("op.MPONE filter(Text) will return false due" + + if (LOG.isTraceEnabled()) { + LOG.trace("op.MPONE filter(Text) will return false due" + " to subfilter of type " + filter.getClass().getSimpleName()); } result = false; @@ -188,8 +188,8 @@ filter.filterRowKey(rowKey); } } - if (LOG.isDebugEnabled()) { - LOG.debug("filter(Text) returning " + result); + if (LOG.isTraceEnabled()) { + LOG.trace("filter(Text) returning " + result); } return result; } @@ -204,8 +204,8 @@ if (operator == Operator.MUST_PASS_ALL) { if (filter.filterAllRemaining() || filter.filterColumn(rowKey, colKey, data)) { - if (LOG.isDebugEnabled()) { - LOG.debug("op.MPALL filter(Text, Text, byte[]) will" + + if (LOG.isTraceEnabled()) { + LOG.trace("op.MPALL filter(Text, Text, byte[]) will" + " return true due to subfilter of type " + filter.getClass().getSimpleName()); } @@ -215,8 +215,8 @@ } else if (operator == Operator.MUST_PASS_ONE) { if (!filter.filterAllRemaining() && !filter.filterColumn(rowKey, colKey, data)) { - if (LOG.isDebugEnabled()) { - LOG.debug("op.MPONE filter(Text, Text, byte[]) will" + + if (LOG.isTraceEnabled()) { + LOG.trace("op.MPONE filter(Text, Text, byte[]) will" + " return false due to subfilter of type " + filter.getClass().getSimpleName()); } @@ -228,8 +228,8 @@ filter.filterColumn(rowKey, colKey, data); } } - if (LOG.isDebugEnabled()) { - LOG.debug("filter(Text, Text, byte[]) returning " + result); + if (LOG.isTraceEnabled()) { + LOG.trace("filter(Text, Text, byte[]) returning " + result); } return result; } @@ -242,8 +242,8 @@ if (!resultFound) { if (operator == Operator.MUST_PASS_ALL) { if (filter.filterAllRemaining() || filter.filterRow(columns)) { - if (LOG.isDebugEnabled()) { - LOG.debug("op.MPALL filterNotNull will return true due" + + if (LOG.isTraceEnabled()) { + LOG.trace("op.MPALL filterNotNull will return true due" + " to subfilter of type " + filter.getClass().getSimpleName()); } result = true; @@ -251,8 +251,8 @@ } } else if (operator == Operator.MUST_PASS_ONE) { if (!filter.filterAllRemaining() && !filter.filterRow(columns)) { - if (LOG.isDebugEnabled()) { - LOG.debug("op.MPONE filterNotNull will return false due" + + if (LOG.isTraceEnabled()) { + LOG.trace("op.MPONE filterNotNull will return false due" + " to subfilter of type " + filter.getClass().getSimpleName()); } result = false; @@ -263,8 +263,8 @@ filter.filterRow(columns); } } - if (LOG.isDebugEnabled()) { - LOG.debug("filterNotNull returning " + result); + if (LOG.isTraceEnabled()) { + LOG.trace("filterNotNull returning " + result); } return result; } @@ -281,8 +281,8 @@ RowFilterInterface filter = (RowFilterInterface) ObjectWritable .readObject(in, conf); filters.add(filter); - if (LOG.isDebugEnabled()) { - LOG.debug("Successfully read in subfilter of type " + if (LOG.isTraceEnabled()) { + LOG.trace("Successfully read in subfilter of type " + filter.getClass().getSimpleName()); } } Index: src/java/org/apache/hadoop/hbase/filter/PageRowFilter.java =================================================================== --- src/java/org/apache/hadoop/hbase/filter/PageRowFilter.java (revision 651007) +++ src/java/org/apache/hadoop/hbase/filter/PageRowFilter.java (working copy) @@ -107,8 +107,8 @@ */ public boolean filterAllRemaining() { boolean result = this.rowsAccepted > this.pageSize; - if (LOG.isDebugEnabled()) { - LOG.debug("filtering decision is " + result + " with rowsAccepted: " + + if (LOG.isTraceEnabled()) { + LOG.trace("filtering decision is " + result + " with rowsAccepted: " + this.rowsAccepted); } return result;