MonetDB: copyparpipe - Pass claimed rows to copy.parse_append

[Joeri van Ruth]

Changeset: e45c430b15dd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e45c430b15dd
Modified Files:
        sql/backends/monet5/copy.c
        sql/backends/monet5/rel_bin.c
Branch: copyparpipe
Log Message:

Pass claimed rows to copy.parse_append


diffs (57 lines):

diff --git a/sql/backends/monet5/copy.c b/sql/backends/monet5/copy.c
--- a/sql/backends/monet5/copy.c
+++ b/sql/backends/monet5/copy.c
@@ -92,7 +92,7 @@ end:
 }
 
 static str
-COPYparse_append(int *ret, int *mvc, str *s, str *t, str *c, bat *block, bat 
*fields)
+COPYparse_append(int *ret, int *mvc, str *s, str *t, str *c, oid *position, 
bat *positions, bat *block, bat *fields)
 {
        str msg = MAL_SUCCEED;
 
@@ -101,6 +101,8 @@ COPYparse_append(int *ret, int *mvc, str
        (void)s;
        (void)t;
        (void)c;
+       (void)position;
+       (void)positions;
        (void)block;
        (void)fields;
 
@@ -128,9 +130,9 @@ static mel_func copy_init_funcs[] = {
  )),
 
  command("copy", "parse_append", COPYparse_append, true, "parse the fields and 
append them to the column",
- args(1, 7,
+ args(1, 9,
        arg("", int),
-       arg("mvc", int), arg("s", str), arg("t", str), arg("c", str), 
batarg("block", bte), batarg("fields", int)
+       arg("mvc", int), arg("s", str), arg("t", str), arg("c", str), arg 
("position", oid), batarg("positions", oid), batarg("block", bte), 
batarg("fields", int)
  )),
  { .imp=NULL }
 };
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -4663,17 +4663,12 @@ rel2bin_copyparpipe(backend *be, sql_rel
                q = pushStr(mb, q, schema_name);
                q = pushStr(mb, q, table_name);
                q = pushStr(mb, q, column_name);
+               q = pushArgument(mb, q, var_position);
+               q = pushArgument(mb, q, var_positions);
                q = pushArgument(mb, q, var_our_block);
 
                q = pushArgument(mb, q, getArg(splitlines_instr, i++));
-
-               // COPYparse_append(int *mvc, str *s, str *t, str *c, bat 
*block, int *skip, bat *fields)
-       }
-
-
-       (void)var_position;
-       (void)var_positions;
-
+       }
 
        q = newStmt(mb, "calc", "+");
        setDestVar(q, var_total_row_count);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list