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/10/11 04:20:41 UTC
svn commit: r1181564 - in /hbase/branches/0.89/src/main:
java/org/apache/hadoop/hbase/client/HBaseAdmin.java ruby/hbase/admin.rb
Author: nspiegelberg
Date: Tue Oct 11 02:20:41 2011
New Revision: 1181564
URL: http://svn.apache.org/viewvc?rev=1181564&view=rev
Log:
Fix major compaction bug for a table at a per column family level.
Summary:
Major compaction at a per column family level for a table was being
incorrectly downgraded to a minor compaction. This is a longer term fix.
Test Plan:
1) Test in dev cluster.
2) Run relevant tests in TestFromClientSide.
Reviewed By: kannan
Reviewers: kannan
CC: kannan, hbase@lists
Revert Plan:
Tags:
- begin *PUBLIC* platform impact section -
Bugzilla: #
- end platform impact -
Differential Revision: 267161
Modified:
hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
hbase/branches/0.89/src/main/ruby/hbase/admin.rb
Modified: hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java?rev=1181564&r1=1181563&r2=1181564&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (original)
+++ hbase/branches/0.89/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java Tue Oct 11 02:20:41 2011
@@ -737,7 +737,7 @@ public class HBaseAdmin {
*/
private void compactCF(String tableName, String columnFamily, HConstants.Modify op)
throws IOException {
- compact(Bytes.toBytes(tableName), Bytes.toBytes(columnFamily));
+ compactCF(Bytes.toBytes(tableName), Bytes.toBytes(columnFamily), op);
}
/**
@@ -840,7 +840,7 @@ public class HBaseAdmin {
}
/**
- * Major compacts a column family within a region.
+ * Major compacts a column family within a region or table.
* Asynchronous operation.
*
* @param regionName region to compact
@@ -863,7 +863,7 @@ public class HBaseAdmin {
}
/**
- * Major compacts a column family within a region.
+ * Major compacts a column family within a region or table.
* Asynchronous operation.
*
* @param regionName region to compact
Modified: hbase/branches/0.89/src/main/ruby/hbase/admin.rb
URL: http://svn.apache.org/viewvc/hbase/branches/0.89/src/main/ruby/hbase/admin.rb?rev=1181564&r1=1181563&r2=1181564&view=diff
==============================================================================
--- hbase/branches/0.89/src/main/ruby/hbase/admin.rb (original)
+++ hbase/branches/0.89/src/main/ruby/hbase/admin.rb Tue Oct 11 02:20:41 2011
@@ -75,10 +75,9 @@ module Hbase
if args.empty?
@admin.majorCompact(table_or_region_name)
elsif args.length == 1
- # We are major compacting a column family within a region.
- region_name = table_or_region_name
+ # We are major compacting a column family within a region or table.
column_family = args.first
- @admin.majorCompact(region_name, column_family)
+ @admin.majorCompact(table_or_region_name, column_family)
end
end