You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/10/23 20:34:48 UTC
svn commit: r1535112 - in
/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase:
filter/TestComparatorSerialization.java regionserver/TestQueryMatcher.java
regionserver/TestTags.java
Author: stack
Date: Wed Oct 23 18:34:47 2013
New Revision: 1535112
URL: http://svn.apache.org/r1535112
Log:
HBASE-9695 Some never used local variables cleanup
Modified:
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java?rev=1535112&r1=1535111&r2=1535112&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/filter/TestComparatorSerialization.java Wed Oct 23 18:34:47 2013
@@ -19,6 +19,7 @@
*/
package org.apache.hadoop.hbase.filter;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import java.util.regex.Pattern;
@@ -70,8 +71,11 @@ public class TestComparatorSerialization
ProtobufUtil.toComparator(ProtobufUtil.toComparator(regexStringComparator))));
// test with specifying flags
- regexStringComparator =
+ try {
new RegexStringComparator("regex", Pattern.CASE_INSENSITIVE | Pattern.DOTALL);
+ } catch (Throwable t) {
+ assertNull("Exception occured while created the RegexStringComparator object", t);
+ }
}
@Test
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java?rev=1535112&r1=1535111&r2=1535112&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQueryMatcher.java Wed Oct 23 18:34:47 2013
@@ -291,10 +291,6 @@ public class TestQueryMatcher extends HB
}
public void testMatch_PartialRangeDropDeletes() throws Exception {
- long now = EnvironmentEdgeManager.currentTimeMillis();
- ScanInfo scanInfo = new ScanInfo(fam2, 0, 1, ttl, false, 0, rowComparator);
- NavigableSet<byte[]> cols = get.getFamilyMap().get(fam2);
-
// Some ranges.
testDropDeletes(
row2, row3, new byte[][] { row1, row2, row2, row3 }, INCLUDE, SKIP, SKIP, INCLUDE);
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java?rev=1535112&r1=1535111&r2=1535112&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestTags.java Wed Oct 23 18:34:47 2013
@@ -453,10 +453,6 @@ public class TestTags {
((List<Cell>) updatedCells).add(newKV);
}
}
- // add new set of familymap to the put. Can we update the existing kvs
- // itself
- NavigableMap<byte[], List<? extends Cell>> familyMap = new TreeMap<byte[], List<? extends Cell>>(
- Bytes.BYTES_COMPARATOR);
put.getFamilyCellMap().remove(cf);
// Update the family map
put.getFamilyCellMap().put(cf, updatedCells);