Skip to content

Commit

Permalink
Feature: add set offset command
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeesup0103
jeesup0103 committed Dec 30, 2024
1 parent 9dd8c10 commit a5d99ee
Show file tree
Hide file tree
Showing 6 changed files with 95 additions and 41 deletions.
71 changes: 56 additions & 15 deletions engines/default/coll_set.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ static void do_set_node_link(set_meta_info *info,

par_node->htab[par_hidx] = node;
par_node->hcnt[par_hidx] = -1; /* child hash node */
par_node->tot_elem_cnt -= num_found;
par_node->tot_hash_cnt += 1;
}

Expand Down Expand Up @@ -288,11 +287,14 @@ static ENGINE_ERROR_CODE do_set_elem_link(set_meta_info *info, set_elem_item *el
set_hash_node *node = info->root;
set_elem_item *find;
int hidx = -1;
set_hash_node *parents[100];
int cur_depth = 0;

/* set hash value */
elem->hval = genhash_string_hash(elem->value, elem->nbytes);

while (node != NULL) {
parents[cur_depth++] = node;
hidx = SET_GET_HASHIDX(elem->hval, node->hdepth);
if (node->hcnt[hidx] >= 0) /* set element hash chain */
break;
Expand Down Expand Up @@ -326,6 +328,10 @@ static ENGINE_ERROR_CODE do_set_elem_link(set_meta_info *info, set_elem_item *el
node->hcnt[hidx] += 1;
node->tot_elem_cnt += 1;

for (int i = 0; i < cur_depth-1; i++) {
parents[i]->tot_elem_cnt++;
}

info->ccnt++;

if (1) { /* apply memory space */
Expand Down Expand Up @@ -396,10 +402,18 @@ static ENGINE_ERROR_CODE do_set_elem_traverse_delete(set_meta_info *info, set_ha
set_hash_node *child_node = node->htab[hidx];
ret = do_set_elem_traverse_delete(info, child_node, hval, val, vlen);
if (ret == ENGINE_SUCCESS) {
if (child_node->tot_hash_cnt == 0 &&
child_node->tot_elem_cnt < (SET_MAX_HASHCHAIN_SIZE/2)) {
int64_t sum_of_children = 0;
for (int i = 0; i < SET_HASHTAB_SIZE; i++) {
if (node->hcnt[i] == -1) {
set_hash_node *child = (set_hash_node *)node->htab[i];
sum_of_children += child->tot_elem_cnt;
}
}
int64_t local_elem_cnt = (int64_t)node->tot_elem_cnt - sum_of_children;
if (child_node->tot_hash_cnt == 0 && local_elem_cnt < (SET_MAX_HASHCHAIN_SIZE/2)) {
do_set_node_unlink(info, node, hidx);
}
node->tot_elem_cnt -= 1;
}
} else {
ret = ENGINE_ELEM_ENOENT;
Expand Down Expand Up @@ -487,26 +501,43 @@ static uint32_t do_set_elem_traverse_fast(set_meta_info *info,
#endif

static int do_set_elem_traverse_dfs(set_meta_info *info, set_hash_node *node,
const uint32_t count, const bool delete,
set_elem_item **elem_array)
const uint32_t offset, const uint32_t count, const bool delete,
set_elem_item **elem_array, uint32_t *skip_cnt)
{
int hidx;
int fcnt = 0; /* found count */

if (offset && (*skip_cnt) + node->tot_elem_cnt <= offset) {
(*skip_cnt) += node->tot_elem_cnt;
return 0;
}

if (node->tot_hash_cnt > 0) {
set_hash_node *child_node;
int rcnt; /* request count */
for (hidx = 0; hidx < SET_HASHTAB_SIZE; hidx++) {
if (node->hcnt[hidx] == -1) {
child_node = (set_hash_node *)node->htab[hidx];
if (offset && ((*skip_cnt + child_node->tot_elem_cnt) <= offset)) {
(*skip_cnt) += child_node->tot_elem_cnt;
continue;
}
rcnt = (count > 0 ? (count - fcnt) : 0);
fcnt += do_set_elem_traverse_dfs(info, child_node, rcnt, delete,
(elem_array==NULL ? NULL : &elem_array[fcnt]));
fcnt += do_set_elem_traverse_dfs(info, child_node, offset, rcnt, delete,
(elem_array==NULL ? NULL : &elem_array[fcnt]), skip_cnt);
if (delete) {
int sum_of_children = 0;
for (int i = 0; i < SET_HASHTAB_SIZE; i++) {
if (node->hcnt[i] == -1) {
set_hash_node *child = (set_hash_node *)node->htab[i];
sum_of_children += (int)child->tot_elem_cnt;
}
}
int local_elem_cnt = node->tot_elem_cnt - sum_of_children;
if (child_node->tot_hash_cnt == 0 &&
child_node->tot_elem_cnt < (SET_MAX_HASHCHAIN_SIZE/2)) {
local_elem_cnt < (SET_MAX_HASHCHAIN_SIZE/2)) {
do_set_node_unlink(info, node, hidx);
}
}
}
if (count > 0 && fcnt >= count)
return fcnt;
Expand All @@ -517,8 +548,17 @@ static int do_set_elem_traverse_dfs(set_meta_info *info, set_hash_node *node,

for (hidx = 0; hidx < SET_HASHTAB_SIZE; hidx++) {
if (node->hcnt[hidx] > 0) {
if (offset && ((*skip_cnt + node->hcnt[hidx]) <= offset)) {
(*skip_cnt) += node->hcnt[hidx];
continue;
}
set_elem_item *elem = node->htab[hidx];
while (elem != NULL) {
if (offset && (*skip_cnt < offset)) {
*skip_cnt += 1;
elem = (delete ? node->htab[hidx] : elem->next);
continue;
}
if (elem_array) {
elem->refcount++;
elem_array[fcnt] = elem;
Expand Down Expand Up @@ -561,15 +601,15 @@ static uint32_t do_set_elem_delete(set_meta_info *info, const uint32_t count,
assert(cause == ELEM_DELETE_COLL);
uint32_t fcnt = 0;
if (info->root != NULL) {
fcnt = do_set_elem_traverse_dfs(info, info->root, count, true, NULL);
fcnt = do_set_elem_traverse_dfs(info, info->root, 0, count, true, NULL, NULL);
if (info->root->tot_hash_cnt == 0 && info->root->tot_elem_cnt == 0) {
do_set_node_unlink(info, NULL, 0);
}
}
return fcnt;
}

static uint32_t do_set_elem_get(set_meta_info *info,
static uint32_t do_set_elem_get(set_meta_info *info, const uint32_t offset,
const uint32_t count, const bool delete,
set_elem_item **elem_array)
{
Expand All @@ -579,7 +619,8 @@ static uint32_t do_set_elem_get(set_meta_info *info,
if (delete) {
CLOG_ELEM_DELETE_BEGIN((coll_meta_info*)info, count, ELEM_DELETE_NORMAL);
}
fcnt = do_set_elem_traverse_dfs(info, info->root, count, delete, elem_array);
uint32_t skip_cnt = 0;
fcnt = do_set_elem_traverse_dfs(info, info->root, offset, count, delete, elem_array, &skip_cnt);
if (delete && info->root->tot_hash_cnt == 0 && info->root->tot_elem_cnt == 0) {
do_set_node_unlink(info, NULL, 0);
}
Expand Down Expand Up @@ -792,7 +833,7 @@ ENGINE_ERROR_CODE set_elem_exist(const char *key, const uint32_t nkey,
}

ENGINE_ERROR_CODE set_elem_get(const char *key, const uint32_t nkey,
const uint32_t count,
const uint32_t offset, const uint32_t count,
const bool delete, const bool drop_if_empty,
struct elems_result *eresult,
const void *cookie)
Expand All @@ -812,7 +853,7 @@ ENGINE_ERROR_CODE set_elem_get(const char *key, const uint32_t nkey,
if ((info->mflags & COLL_META_FLAG_READABLE) == 0) {
ret = ENGINE_UNREADABLE; break;
}
if (info->ccnt <= 0) {
if (info->ccnt <= 0 || offset >= info->ccnt) {
ret = ENGINE_ELEM_ENOENT; break;
}
if (count == 0 || info->ccnt < count) {
Expand All @@ -823,7 +864,7 @@ ENGINE_ERROR_CODE set_elem_get(const char *key, const uint32_t nkey,
if (eresult->elem_array == NULL) {
ret = ENGINE_ENOMEM; break;
}
eresult->elem_count = do_set_elem_get(info, count, delete,
eresult->elem_count = do_set_elem_get(info, offset, count, delete,
(set_elem_item**)(eresult->elem_array));
assert(eresult->elem_count > 0);
if (info->ccnt == 0 && drop_if_empty) {
Expand Down
2 changes: 1 addition & 1 deletion engines/default/coll_set.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ ENGINE_ERROR_CODE set_elem_exist(const char *key, const uint32_t nkey,
bool *exist);

ENGINE_ERROR_CODE set_elem_get(const char *key, const uint32_t nkey,
const uint32_t count,
const uint32_t offset, const uint32_t count,
const bool delete, const bool drop_if_empty,
struct elems_result *eresult,
const void *cookie);
Expand Down
4 changes: 2 additions & 2 deletions engines/default/default_engine.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ default_set_elem_exist(ENGINE_HANDLE* handle, const void* cookie,
static ENGINE_ERROR_CODE
default_set_elem_get(ENGINE_HANDLE* handle, const void* cookie,
const void* key, const int nkey,
const uint32_t count,
const uint32_t offset, const uint32_t count,
const bool delete, const bool drop_if_empty,
struct elems_result *eresult, uint16_t vbucket)
{
Expand All @@ -674,7 +674,7 @@ default_set_elem_get(ENGINE_HANDLE* handle, const void* cookie,

if (delete) ACTION_BEFORE_WRITE(cookie, key, nkey);
else ACTION_BEFORE_READ(cookie, key, nkey);
ret = set_elem_get(key, nkey, count, delete, drop_if_empty,
ret = set_elem_get(key, nkey, offset, count, delete, drop_if_empty,
eresult, cookie);
if (delete) ACTION_AFTER_WRITE(cookie, engine, ret);
return ret;
Expand Down
2 changes: 1 addition & 1 deletion engines/demo/demo_engine.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@ Demo_set_elem_exist(ENGINE_HANDLE* handle, const void* cookie,
static ENGINE_ERROR_CODE
Demo_set_elem_get(ENGINE_HANDLE* handle, const void* cookie,
const void* key, const int nkey,
const uint32_t count,
const uint32_t offset, const uint32_t count,
const bool delete, const bool drop_if_empty,
struct elems_result *eresult, uint16_t vbucket)
{
Expand Down
2 changes: 1 addition & 1 deletion include/memcached/engine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@ extern "C" {

ENGINE_ERROR_CODE (*set_elem_get)(ENGINE_HANDLE* handle, const void* cookie,
const void* key, const int nkey,
const uint32_t count,
const uint32_t offset, const uint32_t count,
const bool delete, const bool drop_if_empty,
struct elems_result *eresult, uint16_t vbucket);

Expand Down
55 changes: 34 additions & 21 deletions memcached.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5167,7 +5167,7 @@ static void process_bin_sop_get(conn *c)
(req->message.body.delete ? "true" : "false"));
}

ret = mc_engine.v1->set_elem_get(mc_engine.v0, c, key, nkey, req_count,
ret = mc_engine.v1->set_elem_get(mc_engine.v0, c, key, nkey, 0, req_count,
(bool)req->message.body.delete,
(bool)req->message.body.drop,
&eresult, c->binary_header.request.vbucket);
Expand Down Expand Up @@ -10589,14 +10589,14 @@ out_sop_get_response(conn *c, bool delete, struct elems_result *eresultp)
return ret;
}

static void process_sop_get(conn *c, char *key, size_t nkey, uint32_t count,
bool delete, bool drop_if_empty)
static void process_sop_get(conn *c, char *key, size_t nkey, uint32_t offset,
uint32_t count, bool delete, bool drop_if_empty)
{
assert(c->ewouldblock == false);
struct elems_result eresult;
ENGINE_ERROR_CODE ret;

ret = mc_engine.v1->set_elem_get(mc_engine.v0, c, key, nkey,
ret = mc_engine.v1->set_elem_get(mc_engine.v0, c, key, nkey, offset,
count, delete, drop_if_empty,
&eresult, 0);
CONN_CHECK_AND_SET_EWOULDBLOCK(ret, c);
Expand Down Expand Up @@ -10853,34 +10853,47 @@ static void process_sop_command(conn *c, token_t *tokens, const size_t ntokens)
conn_set_state(c, conn_swallow);
}
}
else if ((ntokens==5 || ntokens==6) && (strcmp(subcommand, "get") == 0))
else if ((ntokens >= 5 && ntokens <= 7) && (strcmp(subcommand, "get") == 0))
{
uint32_t offset = 0;
uint32_t count = 0;
bool delete = false;
bool drop_if_empty = false;
uint32_t count = 0;

if (! safe_strtoul(tokens[SOP_KEY_TOKEN+1].value, &count)) {
print_invalid_command(c, tokens, ntokens);
out_string(c, "CLIENT_ERROR bad command line format");
return;
}
if (ntokens == 6) {
if (strcmp(tokens[SOP_KEY_TOKEN+2].value, "delete")==0) {
delete = true;
} else if (strcmp(tokens[SOP_KEY_TOKEN+2].value, "drop")==0) {
int read_ntokens = SOP_KEY_TOKEN + 1;
int post_ntokens = 1;
int rest_ntokens = ntokens - read_ntokens - post_ntokens;

if (rest_ntokens > 0) {
if (strcmp(tokens[read_ntokens+rest_ntokens-1].value, "delete")==0 ||
strcmp(tokens[read_ntokens+rest_ntokens-1].value, "drop")==0) {
delete = true;
drop_if_empty = true;
} else {
if (strlen(tokens[read_ntokens+rest_ntokens-1].value) == 4)
drop_if_empty = true;
rest_ntokens -= 1;
}
}
if (rest_ntokens == 1) {
if (! safe_strtoul(tokens[read_ntokens].value, &count)) {
print_invalid_command(c, tokens, ntokens);
out_string(c, "CLIENT_ERROR bad command line format");
return;
}
} else if (rest_ntokens == 2) {
if ((! safe_strtoul(tokens[read_ntokens].value, &offset)) ||
(! safe_strtoul(tokens[read_ntokens+1].value, &count))) {
print_invalid_command(c, tokens, ntokens);
out_string(c, "CLIENT_ERROR bad command line format");
return;
}
} else {
print_invalid_command(c, tokens, ntokens);
out_string(c, "CLIENT_ERROR bad command line format");
return;
}

process_sop_get(c, key, nkey, count, delete, drop_if_empty);
process_sop_get(c, key, nkey, offset, count, delete, drop_if_empty);
}
else
{
else {
print_invalid_command(c, tokens, ntokens);
out_string(c, "CLIENT_ERROR bad command line format");
}
Expand Down

0 comments on commit a5d99ee

Please sign in to comment.