You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ns...@apache.org on 2011/11/17 02:44:56 UTC
svn commit: r1202982 -
/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
Author: nspiegelberg
Date: Thu Nov 17 01:44:56 2011
New Revision: 1202982
URL: http://svn.apache.org/viewvc?rev=1202982&view=rev
Log:
Fixed HBaseAdmin ambiguous varargs invocations
Summary:
HBaseAdmin had ambiguous uses of varargs parameters which relied on the
compiler to implicitly cast arguments to Object[] for correct operation.
Certain java compilers (1.6.0_26 on OSX) were found to instead wrap the
argument inside a new Object[], breaking HBaseAdmin and the HBase shell.
This change avoids the ambiguous invocations by explicitly casting the
arguments to Object[].
Test Plan:
compiled HBaseAdmin on dev server and OSX and tested the
HBase shell with commands which take a variable number of arguments.
Reviewers: kranganathan
Reviewed By: kranganathan
CC: hbase-eng@lists, kranganathan
Differential Revision: 354288
Modified:
hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1202982&r1=1202981&r2=1202982&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Thu Nov 17 01:44:56 2011
@@ -902,7 +902,7 @@ public class HBaseAdmin {
// Iterate over all regions and send a compaction request to each.
while (regionsIt.hasNext()) {
byte[] regionName = regionsIt.next().getRegionName();
- modifyTable(null, op, new byte[][] {regionName, columnFamily});
+ modifyTable(null, op, new Object[] {regionName, columnFamily});
}
}
@@ -946,7 +946,7 @@ public class HBaseAdmin {
byte [] tableName = HRegionInfo.parseRegionName(tableOrRegionName)[0];
// Perform compaction only if a valid column family was passed.
modifyTable(null, HConstants.Modify.TABLE_COMPACT,
- new byte[][] {tableOrRegionName, columnFamily});
+ new Object[] {tableOrRegionName, columnFamily});
}
/**
@@ -1012,7 +1012,7 @@ public class HBaseAdmin {
return;
}
modifyTable(null, HConstants.Modify.TABLE_MAJOR_COMPACT,
- new byte[][] {tableOrRegionName, columnFamily});
+ new Object[] {tableOrRegionName, columnFamily});
}
/**
@@ -1077,10 +1077,10 @@ public class HBaseAdmin {
throw new IllegalArgumentException("Pass a table name or region name");
}
if (tableExists(tableNameOrRegionName)) {
- modifyTable(tableNameOrRegionName, op, null);
+ modifyTable(tableNameOrRegionName, op, (Object[])null);
} else {
HRegionInfo.parseRegionName(tableNameOrRegionName); // verify format
- modifyTable(null, op, new byte[][] {tableNameOrRegionName});
+ modifyTable(null, op, new Object[] {tableNameOrRegionName});
}
}