tranfi 0.1.2 → 0.2.1

package/csrc/op_grep.c

@@ -34,15 +34,22 @@ static int grep_process(tf_step *self, tf_batch *in, tf_batch **out,
     if (col_idx < 0) {
         /* Column not found — pass through or drop all depending on invert */
         if (st->invert) {
-            *out = in;
-            /* Don't free — caller owns it, but we need to copy */
             tf_batch *ob = tf_batch_create(in->n_cols, in->n_rows);
             if (!ob) return TF_ERROR;
-            for (size_t c = 0; c < in->n_cols; c++)
-                tf_batch_set_schema(ob, c, in->col_names[c], in->col_types[c]);
-            for (size_t r = 0; r < in->n_rows; r++)
-                tf_batch_copy_row(ob, r, in, r);
-            ob->n_rows = in->n_rows;
+            if (tf_batch_clone_schema(ob, in) != TF_OK) {
+                tf_batch_free(ob);
+                return TF_ERROR;
+            }
+            for (size_t r = 0; r < in->n_rows; r++) {
+                if (tf_batch_copy_row(ob, r, in, r) != TF_OK) {
+                    tf_batch_free(ob);
+                    return TF_ERROR;
+                }
+                if (tf_batch_expose_row(ob, r) != TF_OK) {
+                    tf_batch_free(ob);
+                    return TF_ERROR;
+                }
+            }
             *out = ob;
         }
         return TF_OK;
@@ -51,8 +58,10 @@ static int grep_process(tf_step *self, tf_batch *in, tf_batch **out,
     /* Create output batch with same schema */
     tf_batch *ob = tf_batch_create(in->n_cols, in->n_rows);
     if (!ob) return TF_ERROR;
-    for (size_t c = 0; c < in->n_cols; c++)
-        tf_batch_set_schema(ob, c, in->col_names[c], in->col_types[c]);
+    if (tf_batch_clone_schema(ob, in) != TF_OK) {
+        tf_batch_free(ob);
+        return TF_ERROR;
+    }
 
     size_t out_row = 0;
     for (size_t r = 0; r < in->n_rows; r++) {
@@ -77,10 +86,16 @@ static int grep_process(tf_step *self, tf_batch *in, tf_batch **out,
             return TF_ERROR;
         }
 
-        tf_batch_copy_row(ob, out_row, in, r);
+        if (tf_batch_copy_row(ob, out_row, in, r) != TF_OK) {
+            tf_batch_free(ob);
+            return TF_ERROR;
+        }
+        if (tf_batch_expose_row(ob, out_row) != TF_OK) {
+            tf_batch_free(ob);
+            return TF_ERROR;
+        }
         out_row++;
     }
-    ob->n_rows = out_row;
 
     st->rows_in += in->n_rows;
     st->rows_out += out_row;
@@ -88,9 +103,12 @@ static int grep_process(tf_step *self, tf_batch *in, tf_batch **out,
     if (side && side->stats) {
         char stats_buf[128];
         snprintf(stats_buf, sizeof(stats_buf),
-                 "{\"op\":\"grep\",\"rows_in\":%zu,\"rows_out\":%zu}\n",
+                 "{\"op\":\"grep\",\"rows_in\":%zu,\"rows_out\":%zu}",
                  in->n_rows, out_row);
-        tf_buffer_write_str(side->stats, stats_buf);
+        if (tf_buffer_write_line(side->stats, stats_buf) != TF_OK) {
+            tf_batch_free(ob);
+            return TF_ERROR;
+        }
     }
 
     if (out_row > 0) {
@@ -124,17 +142,17 @@ tf_step *tf_grep_create(const cJSON *args) {
     cJSON *pattern_json = cJSON_GetObjectItemCaseSensitive(args, "pattern");
     if (!cJSON_IsString(pattern_json)) return NULL;
 
-    grep_state *st = calloc(1, sizeof(grep_state));
+    grep_state *st = tf_callocarray_checked(1, sizeof(grep_state));
     if (!st) return NULL;
 
-    st->pattern = strdup(pattern_json->valuestring);
+    st->pattern = tf_strdup_checked(pattern_json->valuestring);
     if (!st->pattern) { free(st); return NULL; }
 
     cJSON *column_json = cJSON_GetObjectItemCaseSensitive(args, "column");
     if (cJSON_IsString(column_json))
-        st->column = strdup(column_json->valuestring);
+        st->column = tf_strdup_checked(column_json->valuestring);
     else
-        st->column = strdup("_line");
+        st->column = tf_strdup_checked("_line");
     if (!st->column) { free(st->pattern); free(st); return NULL; }
 
     cJSON *invert_json = cJSON_GetObjectItemCaseSensitive(args, "invert");
@@ -153,7 +171,7 @@ tf_step *tf_grep_create(const cJSON *args) {
         }
     }
 
-    tf_step *step = malloc(sizeof(tf_step));
+    tf_step *step = tf_callocarray_checked(1, sizeof(tf_step));
     if (!step) { free(st->pattern); free(st->column); free(st); return NULL; }
     step->process = grep_process;
     step->flush = grep_flush;