mirror
/
etcd-cpp-apiv3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

put deleted keys in values() when prefix = true.

This commit is contained in:
arches 2016-07-11 05:27:09 -04:00
parent 82034a87db
commit 93f8131e83
2 changed files with 21 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
tst/EtcdTest.cpp
View File

@ -16,6 +16,7 @@ TEST_CASE("add a new key")
{ {
etcd::Client etcd("http://127.0.0.1:2379"); etcd::Client etcd("http://127.0.0.1:2379");
etcd.rmdir("/test", true).wait();
etcd::Response resp = etcd.add("/test/key1", "42").get(); etcd::Response resp = etcd.add("/test/key1", "42").get();
REQUIRE(0 == resp.error_code()); REQUIRE(0 == resp.error_code());
CHECK("create" == resp.action()); CHECK("create" == resp.action());
@ -50,6 +51,7 @@ TEST_CASE("simplified read")
etcd::Client etcd("http://127.0.0.1:2379"); etcd::Client etcd("http://127.0.0.1:2379");
CHECK("42" == etcd.get("/test/key1").get().value().as_string()); CHECK("42" == etcd.get("/test/key1").get().value().as_string());
CHECK(100 == etcd.get("/test/key2").get().error_code()); // Key not found CHECK(100 == etcd.get("/test/key2").get().error_code()); // Key not found
CHECK("" == etcd.get("/test/key2").get().value().as_string()); // Key not found
} }
@ -129,7 +131,7 @@ TEST_CASE("delete a value")
CHECK( create_index == resp.prev_value().created_index()); CHECK( create_index == resp.prev_value().created_index());
CHECK( modify_index == resp.prev_value().modified_index()); CHECK( modify_index == resp.prev_value().modified_index());
CHECK("delete" == resp.action()); CHECK("delete" == resp.action());
CHECK( resp.index() == resp.value().modified_index()); CHECK( modify_index == resp.value().modified_index());
CHECK( create_index == resp.value().created_index()); CHECK( create_index == resp.value().created_index());
CHECK("" == resp.value().as_string()); CHECK("" == resp.value().as_string());
CHECK( "/test/key1" == resp.value().key()); CHECK( "/test/key1" == resp.value().key());
@ -246,41 +248,30 @@ TEST_CASE("list a directory")
TEST_CASE("delete a directory") TEST_CASE("delete a directory")
{ {
etcd::Client etcd("http://127.0.0.1:2379"); etcd::Client etcd("http://127.0.0.1:2379");
//CHECK(108 == etcd.rmdir("/test/new_dir").get().error_code()); // Directory not empty //CHECK(108 == etcd.rmdir("/test/new_dir").get().error_code()); // Directory not empty
etcd::Response resp = etcd.ls("/test/new_dir").get(); etcd::Response resp = etcd.ls("/test/new_dir").get();
//get the lowest created index
std::vector<int> myset;
for(unsigned int cnt=0; cnt < resp.values().size(); cnt++)
{
myset.push_back(resp.value(cnt).created_index());
}
std::sort(myset.begin(),myset.end());
//get the latest modified index
std::vector<int> myset1;
for(unsigned int cnt=0; cnt < resp.values().size(); cnt++)
{
myset1.push_back(resp.value(cnt).modified_index());
}
std::sort(myset1.begin(),myset1.end());
resp = etcd.rmdir("/test/new_dir", true).get(); resp = etcd.rmdir("/test/new_dir", true).get();
int index = resp.index(); int index = resp.index();
CHECK("" == resp.prev_value().as_string());
CHECK( myset[0] == resp.prev_value().created_index());
CHECK( myset1[myset1.size() - 1] == resp.prev_value().modified_index());
CHECK( "/test/new_dir" == resp.prev_value().key());
CHECK("delete" == resp.action()); CHECK("delete" == resp.action());
CHECK( index == resp.value().modified_index()); REQUIRE(3 == resp.keys().size());
CHECK( myset[0] == resp.value().created_index()); CHECK("/test/new_dir/key1" == resp.key(0));
CHECK("" == resp.value().as_string()); CHECK("/test/new_dir/key2" == resp.key(1));
CHECK("value1" == resp.value(0).as_string());
CHECK("value2" == resp.value(1).as_string());
resp = etcd.rmdir("/test/dirnotfound", true).get(); resp = etcd.rmdir("/test/dirnotfound", true).get();
CHECK(!resp.is_ok()); CHECK(!resp.is_ok());
CHECK(100 == resp.error_code()); CHECK(100 == resp.error_code());
CHECK("Key not found" == resp.error_message()); CHECK("Key not found" == resp.error_message());
resp = etcd.rmdir("/test/new_dir", false).get();
CHECK(!resp.is_ok());
CHECK(100 == resp.error_code());
CHECK("Key not found" == resp.error_message());
} }
TEST_CASE("wait for a value change") TEST_CASE("wait for a value change")

61
v3/src/AsyncDeleteRangeResponse.cpp
View File

@ -17,65 +17,16 @@ void etcdv3::AsyncDeleteRangeResponse::ParseResponse(std::string const& key, boo
//get all previous values //get all previous values
for(int cnt=0; cnt < resp.prev_kvs_size(); cnt++) for(int cnt=0; cnt < resp.prev_kvs_size(); cnt++)
{ {
prev_values.push_back(resp.prev_kvs(cnt)); values.push_back(resp.prev_kvs(cnt));
} }
//copy previous vales to values. We will format this later if(!prefix)
for(unsigned int cnt=0; cnt < prev_values.size(); cnt++)
{ {
auto temp_value = prev_values[cnt]; prev_value = values[0];
temp_value.set_mod_revision(index); value = values[0];
temp_value.clear_value(); value.clear_value();
values.push_back(temp_value); values.clear();
} }
prev_value = prev_values[0];
value = values[0];
//get all mod revisions of previous values
std::vector<int> mod_index;
for(unsigned int cnt = 0; cnt < prev_values.size(); ++cnt)
{
mod_index.push_back(prev_values[cnt].mod_revision());
}
//sort it ascending
std::sort(mod_index.begin(),mod_index.end());
// use the latest mod index
prev_value.set_mod_revision(mod_index.back());
//get all created revision of previous values
std::vector<int> create_index;
for(unsigned int cnt = 0; cnt < prev_values.size(); ++cnt)
{
create_index.push_back(prev_values[cnt].create_revision());
}
//sort it ascending
std::sort(create_index.begin(),create_index.end());
//use earliest create index
prev_value.set_create_revision(create_index.front());
//value modified index should be the same as index
value.set_mod_revision(index);
//value created index should be the same as prev value created index
value.set_create_revision(prev_value.create_revision());
//set key.When prefix delete is done, we should use the prefix provided by
//client as the key
value.set_key(key);
prev_value.set_key(key);
//clear the value
value.clear_value();
//if withPrefix, clear previous value also
if(prefix)
{
prev_value.clear_value();
}
prev_values.clear();
values.clear();
} }
} }