Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HBASE-26895 on hbase shell, 'delete/deleteall' for a columnfamily is not working #4283

Merged
merged 1 commit into from
Apr 12, 2022
Merged

HBASE-26895 on hbase shell, 'delete/deleteall' for a columnfamily is not working #4283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions hbase-shell/src/main/ruby/hbase/table.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,10 +189,18 @@ def _createdelete_internal(row, column = nil,
if column != ""
if column && all_version
family, qualifier = parse_column_name(column)
d.addColumns(family, qualifier, timestamp)
if qualifier
d.addColumns(family, qualifier, timestamp)
else
d.addFamily(family, timestamp)
end
elsif column && !all_version
family, qualifier = parse_column_name(column)
d.addColumn(family, qualifier, timestamp)
if qualifier
d.addColumn(family, qualifier, timestamp)
else
d.addFamilyVersion(family, timestamp)
end
end
end
d
Expand Down
15 changes: 15 additions & 0 deletions hbase-shell/src/test/ruby/hbase/table_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,21 @@ def teardown
assert_nil(res)
end

define_test "delete should set proper cell type" do
del = @test_table._createdelete_internal('104', 'x:a', 1212)
assert_equal(del.get('x'.to_java_bytes, 'a'.to_java_bytes).get(0).getType.getCode,
org.apache.hadoop.hbase::KeyValue::Type::DeleteColumn.getCode)
del = @test_table._createdelete_internal('104', 'x:a', 1212, [], false)
assert_equal(del.get('x'.to_java_bytes, 'a'.to_java_bytes).get(0).getType.getCode,
org.apache.hadoop.hbase::KeyValue::Type::Delete.getCode)
del = @test_table._createdelete_internal('104', 'x', 1212)
assert_equal(del.get('x'.to_java_bytes, nil).get(0).getType.getCode,
org.apache.hadoop.hbase::KeyValue::Type::DeleteFamily.getCode)
del = @test_table._createdelete_internal('104', 'x', 1212, [], false)
assert_equal(del.get('x'.to_java_bytes, nil).get(0).getType.getCode,
org.apache.hadoop.hbase::KeyValue::Type::DeleteFamilyVersion.getCode)
end

#-------------------------------------------------------------------------------

define_test "deleteall should work w/o columns and timestamps" do
Expand Down