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 2009/06/30 23:05:15 UTC
svn commit: r789954 - in /hadoop/hbase/trunk: ./
src/java/org/apache/hadoop/hbase/ src/java/org/apache/hadoop/hbase/client/
src/test/org/apache/hadoop/hbase/ src/test/org/apache/hadoop/hbase/client/
src/test/org/apache/hadoop/hbase/regionserver/
Author: stack
Date: Tue Jun 30 21:05:14 2009
New Revision: 789954
URL: http://svn.apache.org/viewvc?rev=789954&view=rev
Log:
HBASE-1594 Fix scan addcolumns after hbase-1385 commit (broken hudson build)
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TimestampTestBase.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/client/TestTimestamp.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestScanner.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=789954&r1=789953&r2=789954&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Jun 30 21:05:14 2009
@@ -235,6 +235,7 @@
HBASE-1437 broken links in hbase.org
HBASE-1582 Translate ColumnValueFilter and RowFilterSet to the new Filter
interface
+ HBASE-1594 Fix scan addcolumns after hbase-1385 commit (broken hudson build)
IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java?rev=789954&r1=789953&r2=789954&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/KeyValue.java Tue Jun 30 21:05:14 2009
@@ -1183,9 +1183,12 @@
*/
public static byte [][] parseColumn(byte [] c) {
final byte [][] result = new byte [2][];
- final int index = getFamilyDelimiterIndex(c, 0, c.length);
+ final int index = getDelimiter(c, 0, c.length, COLUMN_FAMILY_DELIMITER);
if (index == -1) {
- throw new IllegalArgumentException("Impossible column name: " + c);
+ // If no delimiter, return <code>c</code> as family and null qualifier.
+ result[0] = c;
+ result[1] = null;
+ return result;
}
result[0] = new byte [index];
System.arraycopy(c, 0, result[0], 0, index);
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java?rev=789954&r1=789953&r2=789954&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/Scan.java Tue Jun 30 21:05:14 2009
@@ -177,8 +177,8 @@
* @throws IllegalArgumentException When the colon is missing.
*/
public Scan addColumn(byte[] familyAndQualifier) {
- byte[][] fq = KeyValue.parseColumn(familyAndQualifier);
- if (fq[1].length > 0) {
+ byte [][] fq = KeyValue.parseColumn(familyAndQualifier);
+ if (fq.length > 1 && fq[1] != null && fq[1].length > 0) {
addColumn(fq[0], fq[1]);
} else {
addFamily(fq[0]);
@@ -187,14 +187,14 @@
}
/**
- * Adds an array of columns specified the old format, family:qualifier.
+ * Adds an array of columns specified using old format, family:qualifier.
* <p>
* Overrides previous calls to addFamily for any families in the input.
*
* @param columns array of columns, formatted as <pre>family:qualifier</pre>
*/
public Scan addColumns(byte [][] columns) {
- for(int i=0; i<columns.length; i++) {
+ for (int i = 0; i < columns.length; i++) {
addColumn(columns[i]);
}
return this;
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TimestampTestBase.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TimestampTestBase.java?rev=789954&r1=789953&r2=789954&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TimestampTestBase.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TimestampTestBase.java Tue Jun 30 21:05:14 2009
@@ -39,9 +39,11 @@
private static final long T1 = 100L;
private static final long T2 = 200L;
- private static final String COLUMN_NAME = "contents:contents";
+ private static final String COLUMN_NAME = "colfamily1:contents";
private static final byte [] COLUMN = Bytes.toBytes(COLUMN_NAME);
+ private static final byte [][] COLUMNS =
+ new byte [][] {Bytes.toBytes("colfamily1")};
private static final byte [] ROW = Bytes.toBytes("row");
/*
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/client/TestTimestamp.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/client/TestTimestamp.java?rev=789954&r1=789953&r2=789954&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/client/TestTimestamp.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/client/TestTimestamp.java Tue Jun 30 21:05:14 2009
@@ -31,7 +31,7 @@
* run against an HRegion and against an HTable: i.e. both local and remote.
*/
public class TestTimestamp extends HBaseClusterTestCase {
- public static String COLUMN_NAME = "contents";
+ public static String COLUMN_NAME = "colfamily1";
/** constructor */
public TestTimestamp() {
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java?rev=789954&r1=789953&r2=789954&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestHRegion.java Tue Jun 30 21:05:14 2009
@@ -1480,21 +1480,19 @@
*/
public void testScanSplitOnRegion() throws Exception {
byte [] tableName = Bytes.toBytes("testtable");
- byte [][] families = {fam3};
HBaseConfiguration hc = initSplit();
//Setting up region
String method = this.getName();
- initHRegion(tableName, method, hc, families);
+ initHRegion(tableName, method, hc, new byte [][] {fam3});
try {
addContent(region, fam3);
region.flushcache();
final byte [] midkey = region.compactStores();
assertNotNull(midkey);
- byte [][] cols = {fam3};
Scan scan = new Scan();
- scan.addColumns(cols);
+ scan.addFamily(fam3);
final InternalScanner s = region.getScanner(scan);
final HRegion regionForThread = region;
@@ -1544,16 +1542,16 @@
/*
* Assert first value in the passed region is <code>firstValue</code>.
* @param r
- * @param column
+ * @param fs
* @param firstValue
* @throws IOException
*/
- private void assertScan(final HRegion r, final byte [] column,
+ private void assertScan(final HRegion r, final byte [] fs,
final byte [] firstValue)
throws IOException {
- byte [][] cols = {column};
+ byte [][] families = {fs};
Scan scan = new Scan();
- scan.addColumns(cols);
+ for (int i = 0; i < families.length; i++) scan.addFamily(families[i]);
InternalScanner s = r.getScanner(scan);
try {
List<KeyValue> curVals = new ArrayList<KeyValue>();
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestScanner.java?rev=789954&r1=789953&r2=789954&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestScanner.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/regionserver/TestScanner.java Tue Jun 30 21:05:14 2009
@@ -285,7 +285,9 @@
for(int i = 0; i < scanColumns.length; i++) {
try {
scan = new Scan(FIRST_ROW);
- scan.addColumns(scanColumns[i]);
+ for (int ii = 0; ii < EXPLICIT_COLS.length; ii++) {
+ scan.addColumn(COLS[0], EXPLICIT_COLS[ii]);
+ }
scanner = r.getScanner(scan);
while (scanner.next(results)) {
assertTrue(hasColumn(results, HConstants.CATALOG_FAMILY,
@@ -316,7 +318,6 @@
}
results.clear();
}
-
} finally {
InternalScanner s = scanner;
scanner = null;