Changeset: 8c959b97dcd9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8c959b97dcd9
Modified Files:
sql/backends/monet5/CMakeLists.txt
sql/backends/monet5/UDF/capi/capi.c
sql/backends/monet5/rel_bin.c
Branch: default
Log Message:
small cleanup
diffs (64 lines):
diff --git a/sql/backends/monet5/CMakeLists.txt
b/sql/backends/monet5/CMakeLists.txt
--- a/sql/backends/monet5/CMakeLists.txt
+++ b/sql/backends/monet5/CMakeLists.txt
@@ -32,6 +32,7 @@ set(sql_public_headers
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../server/sql_parser.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../server/sql_privileges.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../server/rel_optimizer.h>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../server/rel_rewriter.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../server/rel_partition.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../server/rel_prop.h>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../server/rel_exp.h>
diff --git a/sql/backends/monet5/UDF/capi/capi.c
b/sql/backends/monet5/UDF/capi/capi.c
--- a/sql/backends/monet5/UDF/capi/capi.c
+++ b/sql/backends/monet5/UDF/capi/capi.c
@@ -1950,8 +1950,6 @@ static mel_func capi_init_funcs[] = {
pattern("capi", "subeval_aggr", CUDFevalAggr, false, "grouped aggregates
through CUDF", args(1,5,
varargany("",0),arg("fptr",ptr),arg("cpp",bit),arg("expr",str),varargany("arg",0))),
pattern("capi", "eval_aggr", CUDFevalAggr, false, "grouped aggregates through
CUDF", args(1,5,
varargany("",0),arg("fptr",ptr),arg("cpp",bit),arg("expr",str),varargany("arg",0))),
pattern("batcapi", "eval", CUDFevalStd, false, "Execute a simple CUDF script
value", args(1,5,
varargany("",0),arg("fptr",ptr),arg("cpp",bit),arg("expr",str),varargany("arg",0))),
- pattern("batcapi", "subeval_aggr", CUDFevalAggr, false, "grouped aggregates
through CUDF", args(1,5,
varargany("",0),arg("fptr",ptr),arg("cpp",bit),arg("expr",str),varargany("arg",0))),
- pattern("batcapi", "eval_aggr", CUDFevalAggr, false, "grouped aggregates
through CUDF", args(1,5,
varargany("",0),arg("fptr",ptr),arg("cpp",bit),arg("expr",str),varargany("arg",0))),
{ .imp=NULL }
};
#include "mal_import.h"
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
@@ -4104,7 +4104,7 @@ insert_check_fkey(backend *be, list *ins
/* foreach column add predicate */
stmt_add_column_predicate(be, c->c);
-
+
// foreach column aggregate the nonil (literally 'null') values.
// mind that null values are valid fkeys with undefined value so
// we won't have an entry for them in the idx_inserts col
@@ -4114,20 +4114,20 @@ insert_check_fkey(backend *be, list *ins
if (!s && pin && list_length(pin->op4.lval))
s = pin->op4.lval->h->data;
-
+
// we want to make sure that the data column(s) has the same number
// of (nonil) rows as the index column. if that is **not** the case
- // then we are obviously dealing with an invalid foreign key
+ // then we are obviously dealing with an invalid foreign key
if (s->key && s->nrcols == 0) {
- s = stmt_binop(be,
- stmt_aggr(be, idx_inserts, NULL, NULL, cnt, 1, 1, 1),
- stmt_aggr(be, const_column(be, nonil_rows), NULL, NULL,
cnt, 1, 1, 1),
+ s = stmt_binop(be,
+ stmt_aggr(be, idx_inserts, NULL, NULL, cnt, 1, 1, 1),
+ stmt_aggr(be, const_column(be, nonil_rows), NULL, NULL,
cnt, 1, 1, 1),
NULL, ne);
} else {
/* relThetaJoin.notNull.count <> inserts[notNull(col1) && ...
&& notNull(colN)].count */
- s = stmt_binop(be,
- stmt_aggr(be, idx_inserts, NULL, NULL, cnt, 1, 1, 1),
- stmt_aggr(be, column(be, nonil_rows), NULL, NULL, cnt,
1, 1, 1),
+ s = stmt_binop(be,
+ stmt_aggr(be, idx_inserts, NULL, NULL, cnt, 1, 1, 1),
+ stmt_aggr(be, column(be, nonil_rows), NULL, NULL, cnt,
1, 1, 1),
NULL, ne);
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
