You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2013/03/08 03:56:18 UTC
svn commit: r1454223 - in /hbase/branches/0.95: bin/region_mover.rb
bin/region_status.rb hbase-server/src/main/ruby/shell/commands.rb
Author: apurtell
Date: Fri Mar 8 02:56:17 2013
New Revision: 1454223
URL: http://svn.apache.org/r1454223
Log:
HBASE-8004. Creating an existing table from Shell does not throw TableExistsException (Jeffrey Zhong)
Modified:
hbase/branches/0.95/bin/region_mover.rb
hbase/branches/0.95/bin/region_status.rb
hbase/branches/0.95/hbase-server/src/main/ruby/shell/commands.rb
Modified: hbase/branches/0.95/bin/region_mover.rb
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/bin/region_mover.rb?rev=1454223&r1=1454222&r2=1454223&view=diff
==============================================================================
--- hbase/branches/0.95/bin/region_mover.rb (original)
+++ hbase/branches/0.95/bin/region_mover.rb Fri Mar 8 02:56:17 2013
@@ -379,7 +379,7 @@ def loadRegions(options, hostname)
begin
isSuccessfulScan(admin, r)
exists = true
- rescue org.apache.hadoop.hbase.NotServingRegionException => e
+ rescue org.apache.hadoop.hbase.exceptions.NotServingRegionException => e
$LOG.info("Failed scan of " + e.message)
end
count = count + 1
Modified: hbase/branches/0.95/bin/region_status.rb
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/bin/region_status.rb?rev=1454223&r1=1454222&r2=1454223&view=diff
==============================================================================
--- hbase/branches/0.95/bin/region_status.rb (original)
+++ hbase/branches/0.95/bin/region_status.rb Fri Mar 8 02:56:17 2013
@@ -47,7 +47,7 @@ require 'java'
import org.apache.hadoop.hbase.HBaseConfiguration
import org.apache.hadoop.hbase.HConstants
-import org.apache.hadoop.hbase.MasterNotRunningException
+import org.apache.hadoop.hbase.exceptions.MasterNotRunningException
import org.apache.hadoop.hbase.client.HBaseAdmin
import org.apache.hadoop.hbase.client.HTable
import org.apache.hadoop.hbase.client.Scan
Modified: hbase/branches/0.95/hbase-server/src/main/ruby/shell/commands.rb
URL: http://svn.apache.org/viewvc/hbase/branches/0.95/hbase-server/src/main/ruby/shell/commands.rb?rev=1454223&r1=1454222&r2=1454223&view=diff
==============================================================================
--- hbase/branches/0.95/hbase-server/src/main/ruby/shell/commands.rb (original)
+++ hbase/branches/0.95/hbase-server/src/main/ruby/shell/commands.rb Fri Mar 8 02:56:17 2013
@@ -81,12 +81,12 @@ module Shell
def translate_hbase_exceptions(*args)
yield
- rescue org.apache.hadoop.hbase.TableNotFoundException
+ rescue org.apache.hadoop.hbase.exceptions.TableNotFoundException
raise "Unknown table #{args.first}!"
- rescue org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException
+ rescue org.apache.hadoop.hbase.exceptions.NoSuchColumnFamilyException
valid_cols = table(args.first).get_all_columns.map { |c| c + '*' }
raise "Unknown column family! Valid column names: #{valid_cols.join(", ")}"
- rescue org.apache.hadoop.hbase.TableExistsException
+ rescue org.apache.hadoop.hbase.exceptions.TableExistsException
raise "Table already exists: #{args.first}!"
end
end