Changeset: 61f960159827 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/61f960159827
Modified Files:
sql/backends/monet5/sql_statement.c
sql/include/sql_catalog.h
sql/storage/bat/res_table.c
Branch: nested
Log Message:
Introduces MS_OUTPUT_ARG for nested result column logic
diffs (44 lines):
diff --git a/sql/backends/monet5/sql_statement.c
b/sql/backends/monet5/sql_statement.c
--- a/sql/backends/monet5/sql_statement.c
+++ b/sql/backends/monet5/sql_statement.c
@@ -14,6 +14,7 @@
#include "sql_statement.h"
#include "sql_pp_statement.h"
#include "sql_gencode.h"
+#include "sql_catalog.h"
#include "rel_rel.h"
#include "rel_exp.h"
#include "rel_prop.h"
@@ -3636,7 +3637,7 @@ nested_dump_header(mvc *sql, MalBlkPtr m
lenPtr = pushInt(mb, lenPtr, t->digits);
scalePtr = pushInt(mb, scalePtr, t->scale);
if (c->nested) {
- multisetPtr = pushInt(mb, multisetPtr,
c->subtype.multiset + (c->nested?4:0));
+ multisetPtr = pushInt(mb, multisetPtr,
c->subtype.multiset + (c->nested?MS_OUTPUT_ARG:0));
dimPtr = pushInt(mb, dimPtr, c->subtype.dim);
InstrPtr q = newStmt(mb, batRef, newRef);
diff --git a/sql/include/sql_catalog.h b/sql/include/sql_catalog.h
--- a/sql/include/sql_catalog.h
+++ b/sql/include/sql_catalog.h
@@ -101,6 +101,8 @@ typedef enum sql_dependency {
#define MS_ARRAY 2
#define MS_VECTOR 3
+#define MS_OUTPUT_ARG 4
+
/* the following list of macros are used by rel_rankop function */
#define UNBOUNDED_PRECEDING_BOUND 0
#define UNBOUNDED_FOLLOWING_BOUND 1
diff --git a/sql/storage/bat/res_table.c b/sql/storage/bat/res_table.c
--- a/sql/storage/bat/res_table.c
+++ b/sql/storage/bat/res_table.c
@@ -62,7 +62,7 @@ res_col_create(sql_trans *tr, res_table
sql_init_subtype(&c->type, sql_trans_bind_type(tr, NULL,
typename), digits, scale);
c->type.dim = dim;
c->nrfields = 1;
- c->virt = (multiset&4)?true:false;
+ c->virt = (multiset&MS_OUTPUT_ARG)?true:false;
c->type.multiset = multiset&3;
c->multiset = c->type.multiset;
c->composite = c->type.type->composite;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
