Author: stack
Date: Fri Jul 10 03:25:20 2009
New Revision: 792793
URL: http://svn.apache.org/viewvc?rev=792793&view=rev
Log:
HBASE-1633 Can't delete in TRUNK shell; makes it hard doing admin repairs
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/bin/HBase.rb
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=792793&r1=792792&r2=792793&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Fri Jul 10 03:25:20 2009
@@ -250,6 +250,7 @@
HBASE-1625 Adding check to Put.add(KeyValue kv), to see that it has the
same
row as when instantiated (Erik Holstad via Stack)
HBASE-1629 HRS unable to contact master
+ HBASE-1633 Can't delete in TRUNK shell; makes it hard doing admin repairs
IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage
Modified: hadoop/hbase/trunk/bin/HBase.rb
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/bin/HBase.rb?rev=792793&r1=792792&r2=792793&view=diff
==============================================================================
--- hadoop/hbase/trunk/bin/HBase.rb (original)
+++ hadoop/hbase/trunk/bin/HBase.rb Fri Jul 10 03:25:20 2009
@@ -13,6 +13,7 @@
import org.apache.hadoop.hbase.client.HBaseAdmin
import org.apache.hadoop.hbase.client.HTable
+import org.apache.hadoop.hbase.client.Delete
import org.apache.hadoop.hbase.HConstants
import org.apache.hadoop.hbase.io.BatchUpdate
import org.apache.hadoop.hbase.io.RowResult
@@ -344,16 +345,17 @@
# Delete a cell
def delete(row, column, timestamp = HConstants::LATEST_TIMESTAMP)
now = Time.now
- bu = BatchUpdate.new(row, timestamp)
- bu.delete(column)
- @table.commit(bu)
+ d = Delete.new(row.to_java_bytes, timestamp, nil)
+ d.deleteColumn(Bytes.toBytes(column))
+ @table.delete(d)
@formatter.header()
@formatter.footer(now)
end
def deleteall(row, column = nil, timestamp = HConstants::LATEST_TIMESTAMP)
now = Time.now
- @table.deleteAll(row, column, timestamp)
+ d = Delete.new(row.to_java_bytes, timestamp, nil)
+ @table.delete(d)
@formatter.header()
@formatter.footer(now)
end
Modified:
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=792793&r1=792792&r2=792793&view=diff
==============================================================================
---
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
(original)
+++
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HConnectionManager.java
Fri Jul 10 03:25:20 2009
@@ -348,20 +348,21 @@
getMaster();
final TreeSet<HTableDescriptor> uniqueTables =
new TreeSet<HTableDescriptor>();
-
MetaScannerVisitor visitor = new MetaScannerVisitor() {
-
public boolean processRow(Result result) throws IOException {
- HRegionInfo info = Writables.getHRegionInfo(
+ try {
+ HRegionInfo info = Writables.getHRegionInfo(
result.getValue(CATALOG_FAMILY, REGIONINFO_QUALIFIER));
-
- // Only examine the rows where the startKey is zero length
- if (info != null && info.getStartKey().length == 0) {
- uniqueTables.add(info.getTableDesc());
+ // Only examine the rows where the startKey is zero length
+ if (info != null && info.getStartKey().length == 0) {
+ uniqueTables.add(info.getTableDesc());
+ }
+ return true;
+ } catch (RuntimeException e) {
+ LOG.error("Result=" + result);
+ throw e;
}
- return true;
}
-
};
MetaScanner.metaScan(conf, visitor);
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java
URL:
http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java?rev=792793&r1=792792&r2=792793&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java
(original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/client/HTable.java Fri
Jul 10 03:25:20 2009
@@ -427,7 +427,6 @@
connection.getRegionServerWithRetries(
new ServerCallable<Boolean>(connection, tableName, delete.getRow()) {
public Boolean call() throws IOException {
- System.out.println("IN HT.get.ServerCallable,");
server.delete(location.getRegionInfo().getRegionName(), delete);
return null;
}
