Merge pull request #589 from SuhwanJang/develop

FIX: need to clear elems_result in process_bop_mget_single() when ret…

Author: jhpark816

engines/default/coll_btree.c

@@ -3910,9 +3910,6 @@ ENGINE_ERROR_CODE btree_elem_get(const char *key, const uint32_t nkey,
                                                         : UPD_BT_ELEM_DELETE));
     }
 
-    eresult->elem_array = NULL;
-    eresult->elem_count = 0;
-
     LOCK_CACHE();
     ret = do_btree_item_find(key, nkey, DO_UPDATE, &it);
     if (ret == ENGINE_SUCCESS) {
@@ -4045,9 +4042,6 @@ ENGINE_ERROR_CODE btree_posi_find_with_get(const char *key, const uint32_t nkey,
     int bkrtype = do_btree_bkey_range_type(bkrange);
     assert(bkrtype == BKEY_RANGE_TYPE_SIN);
 
-    eresult->elem_array = NULL;
-    eresult->elem_count = 0;
-
     LOCK_CACHE();
     ret = do_btree_item_find(key, nkey, DO_UPDATE, &it);
     if (ret == ENGINE_SUCCESS) {
@@ -4092,9 +4086,6 @@ ENGINE_ERROR_CODE btree_elem_get_by_posi(const char *key, const uint32_t nkey,
     hash_item *it;
     ENGINE_ERROR_CODE ret;
 
-    eresult->elem_array = NULL;
-    eresult->elem_count = 0;
-
     LOCK_CACHE();
     ret = do_btree_item_find(key, nkey, DO_UPDATE, &it);
     if (ret == ENGINE_SUCCESS) {

engines/default/coll_list.c

@@ -541,9 +541,6 @@ ENGINE_ERROR_CODE list_elem_get(const char *key, const uint32_t nkey,
                                                         : UPD_LIST_ELEM_DELETE));
     }
 
-    eresult->elem_array = NULL;
-    eresult->elem_count = 0;
-
     LOCK_CACHE();
     ret = do_list_item_find(key, nkey, DO_UPDATE, &it);
     if (ret == ENGINE_SUCCESS) {

engines/default/coll_map.c

@@ -887,9 +887,6 @@ ENGINE_ERROR_CODE map_elem_get(const char *key, const uint32_t nkey,
                                                         : UPD_MAP_ELEM_DELETE));
     }
 
-    eresult->elem_array = NULL;
-    eresult->elem_count = 0;
-
     LOCK_CACHE();
     ret = do_map_item_find(key, nkey, DO_UPDATE, &it);
     if (ret == ENGINE_SUCCESS) {

engines/default/coll_set.c

@@ -809,9 +809,6 @@ ENGINE_ERROR_CODE set_elem_get(const char *key, const uint32_t nkey,
                                                         : UPD_SET_ELEM_DELETE));
     }
 
-    eresult->elem_array = NULL;
-    eresult->elem_count = 0;
-
     LOCK_CACHE();
     ret = do_set_item_find(key, nkey, DO_UPDATE, &it);
     if (ret == ENGINE_SUCCESS) {

engines/default/default_engine.c

@@ -533,6 +533,9 @@ default_list_elem_get(ENGINE_HANDLE* handle, const void* cookie,
     ENGINE_ERROR_CODE ret;
     VBUCKET_GUARD(engine, vbucket);
 
+    eresult->elem_array = NULL;
+    eresult->elem_count = 0;
+
     if (delete) ACTION_BEFORE_WRITE(cookie, key, nkey);
     else        ACTION_BEFORE_READ(cookie, key, nkey);
     ret = list_elem_get(key, nkey, from_index, to_index, delete, drop_if_empty,
@@ -653,6 +656,9 @@ default_set_elem_get(ENGINE_HANDLE* handle, const void* cookie,
     ENGINE_ERROR_CODE ret;
     VBUCKET_GUARD(engine, vbucket);
 
+    eresult->elem_array = NULL;
+    eresult->elem_count = 0;
+
     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,
@@ -772,6 +778,9 @@ default_map_elem_get(ENGINE_HANDLE* handle, const void* cookie,
     ENGINE_ERROR_CODE ret;
     VBUCKET_GUARD(engine, vbucket);
 
+    eresult->elem_array = NULL;
+    eresult->elem_count = 0;
+
     if (delete) ACTION_BEFORE_WRITE(cookie, key, nkey);
     else        ACTION_BEFORE_READ(cookie, key, nkey);
     ret = map_elem_get(key, nkey, numfields, flist, delete, drop_if_empty,
@@ -932,6 +941,9 @@ default_btree_elem_get(ENGINE_HANDLE* handle, const void* cookie,
     ENGINE_ERROR_CODE ret;
     VBUCKET_GUARD(engine, vbucket);
 
+    eresult->elem_array = NULL;
+    eresult->elem_count = 0;
+
     if (delete) ACTION_BEFORE_WRITE(cookie, key, nkey);
     else        ACTION_BEFORE_READ(cookie, key, nkey);
     ret = btree_elem_get(key, nkey, bkrange, efilter, offset, req_count,
@@ -984,6 +996,9 @@ default_btree_posi_find_with_get(ENGINE_HANDLE* handle, const void* cookie,
     ENGINE_ERROR_CODE ret;
     VBUCKET_GUARD(engine, vbucket);
 
+    eresult->elem_array = NULL;
+    eresult->elem_count = 0;
+
     ACTION_BEFORE_READ(cookie, key, nkey);
     ret = btree_posi_find_with_get(key, nkey, bkrange, order, count,
                                    position, eresult);
@@ -1000,6 +1015,9 @@ default_btree_elem_get_by_posi(ENGINE_HANDLE* handle, const void* cookie,
     ENGINE_ERROR_CODE ret;
     VBUCKET_GUARD(engine, vbucket);
 
+    eresult->elem_array = NULL;
+    eresult->elem_count = 0;
+
     ACTION_BEFORE_READ(cookie, key, nkey);
     ret = btree_elem_get_by_posi(key, nkey, order, from_posi, to_posi, eresult);
     return ret;