improve foreach

Author: xianjimli

src/tkc/darray.c

@@ -349,13 +349,13 @@ ret_t darray_foreach(darray_t* darray, tk_visit_t visit, void* ctx) {
   return_value_if_fail(darray != NULL && visit != NULL, RET_BAD_PARAMS);
 
   if (darray->elms != NULL) {
-    uint32_t i = 0;
+    int64_t i = 0;
     void** elms = darray->elms;
 
     for (i = 0; i < darray->size; i++) {
       void* iter = elms[i];
       ret = visit(ctx, iter);
-      TK_FOREACH_VISIT_RESULT_PROCESSING(ret, darray_remove_index(darray, i));
+      TK_FOREACH_VISIT_RESULT_PROCESSING(ret, darray_remove_index(darray, i); i--);
     }
   }
 

src/tkc/types_def.h

@@ -669,6 +669,7 @@ typedef struct _key_type_value_t {
       continue;                                                             \
     } else if (RET_REPEAT == result) {                                      \
       log_warn("%s: result type REPEAT is not supported!\n", __FUNCTION__); \
+      result = RET_OK;                                                      \
     } else if (result != RET_OK) {                                          \
       break;                                                                \
     }                                                                       \

tests/darray_test.cc

@@ -5,6 +5,9 @@
 #include <math.h>
 #include <stdlib.h>
 
+#include <string>
+using std::string;
+
 #define NR 1000
 
 static void test_add(darray_t* darray, void* pv) {
@@ -849,6 +852,52 @@ TEST(DArrayTest, foreach) {
   darray_deinit(&darray);
 }
 
+static ret_t visit_dump(void* ctx, const void* data) {
+  char text[32];
+  string& str = *(string*)ctx;
+  int32_t n = (const char*)data - (const char*)NULL;
+  tk_snprintf(text, sizeof(text), "%d:", n);
+
+  str += text;
+
+  return RET_OK;
+}
+
+static ret_t remove_data(void* ctx, const void* data) {
+  char text[32];
+  string& str = *(string*)ctx;
+  int32_t n = (const char*)data - (const char*)NULL;
+  tk_snprintf(text, sizeof(text), "%d:", n);
+
+  str += text;
+  if (n % 2 == 0) {
+    return RET_OK;
+  } else {
+    return RET_REMOVE;
+  }
+}
+
+TEST(DArrayTest, foreach_ex) {
+  string log;
+  darray_t darray;
+  darray_init(&darray, 10, NULL, NULL);
+
+  ASSERT_EQ(darray_push(&darray, tk_pointer_from_int(1)), RET_OK);
+  ASSERT_EQ(darray_push(&darray, tk_pointer_from_int(2)), RET_OK);
+  ASSERT_EQ(darray_push(&darray, tk_pointer_from_int(3)), RET_OK);
+  ASSERT_EQ(darray_push(&darray, tk_pointer_from_int(4)), RET_OK);
+
+  log = "";
+  darray_foreach(&darray, remove_data, &log);
+  ASSERT_EQ(log, "1:2:3:4:");
+
+  log = "";
+  darray_foreach(&darray, visit_dump, &log);
+  ASSERT_EQ(log, "2:4:");
+
+  darray_deinit(&darray);
+}
+
 TEST(DArrayTest, bsearch_index_ex) {
   darray_t darray;
   int32_t low = -1;