Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/etcdv3/namespace/kv/requests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ def get_request(key, opts)
Etcdserverpb::RangeRequest.new(opts)
end

def del_request(key, range_end=nil)
def del_request(key, range_end='')
key = prepend_prefix(@namespace, key)
# In order to enforce the scope of the specified namespace, we are going to
# intercept the zero-byte reference and re-target everything under the given namespace.
if range_end =~ /\x00/
range_end = (@namespace[0..-2] + (@namespace[-1].ord + 1).chr)
else
range_end = prepend_prefix(@namespace, range_end) if range_end
range_end = prepend_prefix(@namespace, range_end) unless range_end.empty?
end
Etcdserverpb::DeleteRangeRequest.new(key: key, range_end: range_end)
end
Expand Down
14 changes: 10 additions & 4 deletions spec/etcdv3_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -578,17 +578,23 @@

context 'no range' do
before { del_conn.put('test', 'value') }
subject { del_conn.del('test') }
it { is_expected.to_not be_nil }
it 'deleting key should be scoped to namespace' do
resp = del_conn.del('test')
expect(resp.deleted).to eq(1)
expect(del_conn.get('test').kvs).to be_empty
end
end

context 'ranged del' do
before do
del_conn.put('test', 'value')
del_conn.put('testt', 'value')
end
subject { del_conn.del('test', range_end: 'testtt') }
it { is_expected.to_not be_nil }
it 'deleting keys should be scoped to namespace' do
resp = del_conn.del('test', range_end: 'testtt')
expect(resp.deleted).to eq(2)
expect(del_conn.get('test', range_end: 'testtt').kvs).to be_empty
end
end
end

Expand Down