Changeset: 826840fe09a1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=826840fe09a1
Added Files:
sql/ChangeLog.linear-hashing
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
debian/control
gdk/gdk_aggr.c
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_cand.c
gdk/gdk_delta.c
gdk/gdk_delta.h
gdk/gdk_group.c
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_orderidx.c
gdk/gdk_posix.c
gdk/gdk_private.h
gdk/gdk_project.c
gdk/gdk_sample.c
gdk/gdk_select.c
gdk/gdk_storage.c
gdk/gdk_system.c
gdk/gdk_system.h
gdk/gdk_tracer.c
gdk/gdk_tracer.h
gdk/gdk_unique.c
gdk/gdk_utils.c
gdk/gdk_utils.h
geom/sql/functions/Tests/ST_IsSimple.stable.out
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_private.h
monetdb5/mal/mal_profiler.c
monetdb5/modules/kernel/alarm.c
monetdb5/modules/kernel/alarm.mal
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/clients.h
monetdb5/modules/mal/clients.mal
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/sysmon.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statistics.c
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/backends/monet5/wlr.c
sql/include/sql_catalog.h
sql/rel.txt
sql/scripts/22_clients.sql
sql/scripts/25_debug.sql
sql/scripts/26_sysmon.sql
sql/server/rel_optimizer.c
sql/server/rel_psm.c
sql/server/rel_rel.c
sql/server/rel_schema.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/server/sql_atom.c
sql/server/sql_mvc.c
sql/server/sql_privileges.c
sql/server/sql_symbol.c
sql/server/sql_tokens.h
sql/storage/bat/bat_table.c
sql/test/BugTracker-2010/Tests/LIMIT_OFFSET_big-endian.Bug-2622.stable.out
sql/test/BugTracker-2010/Tests/TypeException_with_missing_function.Bug-2674.stable.err
sql/test/BugTracker-2012/Tests/create_function.Bug-3172.stable.err
sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err
sql/test/BugTracker-2012/Tests/table_returning_func_returns_too_many_columns.Bug-3077.stable.err
sql/test/BugTracker-2013/Tests/psm_functions_and_accessrights.Bug-3300.stable.err
sql/test/BugTracker-2016/Tests/invalidcolumns.Bug-3968.stable.err
sql/test/BugTracker-2017/Tests/udf_crash_subquery_scalar_paramters.Bug-6399.stable.err
sql/test/BugTracker-2018/Tests/crash-after-call-non-existing-loader.stable.err
sql/test/BugTracker/Tests/ambiguous_join.SF-1580565.stable.err
sql/test/Tests/drop-function-if-exists.stable.err
sql/test/Tests/ifexists-views.sql
sql/test/Users/Tests/sessioncontrol.stable.err
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.powerpc64.int128
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/miscellaneous/Tests/simple_selects.sql
sql/test/miscellaneous/Tests/simple_selects.stable.err
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.32bit
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
testing/Mtest.py.in
testing/listexports.py.in
Branch: scoping
Log Message:
Merged with default
diffs (truncated from 8236 to 300 lines):
diff --git a/clients/Tests/MAL-signatures.stable.out
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -565,9 +565,9 @@ stdout of test 'MAL-signatures` in direc
[ "aggr", "variancep", "command aggr.variancep(b:bat[:any_2]):dbl ",
"ALGvariancep;", "Gives the variance of all tail values" ]
[ "alarm", "ctime", "unsafe command alarm.ctime():str ",
"ALARMctime;", "Return the current time as a C-time string." ]
[ "alarm", "epoch", "unsafe command alarm.epoch():int ",
"ALARMepoch;", "Return time since Jan 1, 1970 in seconds." ]
-[ "alarm", "sleep", "unsafe pattern
alarm.sleep(msecs:bat[:int]):bat[:int] ", "ALARMsleep;", "Sleep a few
milliseconds and return the slept value" ]
-[ "alarm", "sleep", "unsafe pattern alarm.sleep(msecs:int):int ",
"ALARMsleep;", "Sleep a few milliseconds and return the slept value" ]
-[ "alarm", "sleep", "unsafe pattern alarm.sleep(msecs:int):void ",
"ALARMsleep;", "Sleep a few milliseconds" ]
+[ "alarm", "sleep", "unsafe pattern alarm.sleep(msecs:any_1):any_1
", "ALARMsleep;", "Sleep a few milliseconds and return the slept value"
]
+[ "alarm", "sleep", "unsafe pattern alarm.sleep(msecs:any_1):void
", "ALARMsleep;", "Sleep a few milliseconds" ]
+[ "alarm", "sleep", "unsafe pattern
alarm.sleep(msecs:bat[:any_1]):bat[:any_1] ", "ALARMsleep;", "Sleep a few
milliseconds and return the slept value" ]
[ "alarm", "time", "unsafe command alarm.time():int ", "ALARMtime;",
"Return time since program start in milliseconds." ]
[ "alarm", "usec", "unsafe command alarm.usec():lng ", "ALARMusec;",
"Return time since Jan 1, 1970 in microseconds." ]
[ "algebra", "antijoin", "function algebra.antijoin(l:bat[:any_1],
r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng)
(X_0:bat[:oid], X_1:bat[:oid]);", "", "" ]
@@ -10466,7 +10466,7 @@ stdout of test 'MAL-signatures` in direc
[ "clients", "stopsession", "pattern clients.stopsession(sid:int):void ",
"CLTstopSession;", "Stop a particular session" ]
[ "clients", "stopsession", "pattern clients.stopsession(sid:sht):void ",
"CLTstopSession;", "" ]
[ "clients", "suspend", "pattern clients.suspend(id:int):void ",
"CLTsuspend;", "Put a client process to sleep for some time.\nIt will simple
sleep for a second at a time, until\nthe awake bit has been set in its
descriptor" ]
-[ "clients", "wakeup", "command clients.wakeup(id:int):void ",
"CLTwakeup;", "Wakeup a client process" ]
+[ "clients", "wakeup", "pattern clients.wakeup(id:int):void ",
"CLTwakeup;", "Wakeup a client process" ]
[ "color", "#fromstr", "command color.#fromstr():void ",
"color_fromstr;", "" ]
[ "color", "#tostr", "command color.#tostr():void ", "color_tostr;",
"" ]
[ "color", "blue", "command color.blue(c:color):int ", "CLRblue;",
"Extracts blue component from a color atom" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -674,9 +674,9 @@ stdout of test 'MAL-signatures` in direc
[ "aggr", "variancep", "command aggr.variancep(b:bat[:any_2]):dbl ",
"ALGvariancep;", "Gives the variance of all tail values" ]
[ "alarm", "ctime", "unsafe command alarm.ctime():str ",
"ALARMctime;", "Return the current time as a C-time string." ]
[ "alarm", "epoch", "unsafe command alarm.epoch():int ",
"ALARMepoch;", "Return time since Jan 1, 1970 in seconds." ]
-[ "alarm", "sleep", "unsafe pattern
alarm.sleep(msecs:bat[:int]):bat[:int] ", "ALARMsleep;", "Sleep a few
milliseconds and return the slept value" ]
-[ "alarm", "sleep", "unsafe pattern alarm.sleep(msecs:int):int ",
"ALARMsleep;", "Sleep a few milliseconds and return the slept value" ]
-[ "alarm", "sleep", "unsafe pattern alarm.sleep(msecs:int):void ",
"ALARMsleep;", "Sleep a few milliseconds" ]
+[ "alarm", "sleep", "unsafe pattern alarm.sleep(msecs:any_1):any_1
", "ALARMsleep;", "Sleep a few milliseconds and return the slept value"
]
+[ "alarm", "sleep", "unsafe pattern alarm.sleep(msecs:any_1):void
", "ALARMsleep;", "Sleep a few milliseconds" ]
+[ "alarm", "sleep", "unsafe pattern
alarm.sleep(msecs:bat[:any_1]):bat[:any_1] ", "ALARMsleep;", "Sleep a few
milliseconds and return the slept value" ]
[ "alarm", "time", "unsafe command alarm.time():int ", "ALARMtime;",
"Return time since program start in milliseconds." ]
[ "alarm", "usec", "unsafe command alarm.usec():lng ", "ALARMusec;",
"Return time since Jan 1, 1970 in microseconds." ]
[ "algebra", "antijoin", "function algebra.antijoin(l:bat[:any_1],
r:bat[:any_1], sl:bat[:oid], sr:bat[:oid], nil_matches:bit, estimate:lng)
(X_0:bat[:oid], X_1:bat[:oid]);", "", "" ]
@@ -14872,7 +14872,7 @@ stdout of test 'MAL-signatures` in direc
[ "clients", "stopsession", "pattern clients.stopsession(sid:int):void ",
"CLTstopSession;", "Stop a particular session" ]
[ "clients", "stopsession", "pattern clients.stopsession(sid:sht):void ",
"CLTstopSession;", "" ]
[ "clients", "suspend", "pattern clients.suspend(id:int):void ",
"CLTsuspend;", "Put a client process to sleep for some time.\nIt will simple
sleep for a second at a time, until\nthe awake bit has been set in its
descriptor" ]
-[ "clients", "wakeup", "command clients.wakeup(id:int):void ",
"CLTwakeup;", "Wakeup a client process" ]
+[ "clients", "wakeup", "pattern clients.wakeup(id:int):void ",
"CLTwakeup;", "Wakeup a client process" ]
[ "color", "#fromstr", "command color.#fromstr():void ",
"color_fromstr;", "" ]
[ "color", "#tostr", "command color.#tostr():void ", "color_tostr;",
"" ]
[ "color", "blue", "command color.blue(c:color):int ", "CLRblue;",
"Extracts blue component from a color atom" ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -304,7 +304,7 @@ void GDKsyserror(_In_z_ _Printf_format_s
gdk_return GDKtracer_fill_comp_info(BAT *id, BAT *component, BAT *log_level);
gdk_return GDKtracer_flush_buffer(void);
char *GDKtracer_get_timestamp(const char *fmt, char *buf, size_t sz);
-gdk_return GDKtracer_log(LOG_LEVEL level, const char *fmt, ...)
__attribute__((format(printf, 2, 3)));
+gdk_return GDKtracer_log(LOG_LEVEL level, const char *fmt, ...)
__attribute__((__format__(__printf__, 2, 3)));
void GDKtracer_reinit_basic(int sig);
gdk_return GDKtracer_reset_adapter(void);
gdk_return GDKtracer_reset_component_level(const char *comp);
@@ -826,7 +826,6 @@ str AUTHgetUsername(str *ret, Client c);
str AUTHgetUsers(BAT **ret1, BAT **ret2, Client c);
str AUTHinitTables(const char *passwd);
str AUTHremoveUser(Client c, const char *username);
-void AUTHreset(void) __attribute__((__visibility__("hidden")));
str AUTHresolveUser(str *ret, oid uid);
str AUTHsetPassword(Client c, const char *username, const char *passwd);
str AUTHunlockVault(const char *password);
@@ -993,7 +992,7 @@ str CLTshutdown(Client cntxt, MalBlkPtr
str CLTstop(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTstopSession(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CLTsuspend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-str CLTwakeup(void *ret, int *id);
+str CLTwakeup(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str CMDBATimprints(void *ret, bat *bid);
str CMDBATimprintsize(lng *ret, bat *bid);
str CMDBATnew(Client cntxt, MalBlkPtr m, MalStkPtr s, InstrPtr p);
@@ -1497,11 +1496,8 @@ str MCawakeClient(int id);
void MCcloseClient(Client c);
Client MCforkClient(Client father);
Client MCgetClient(int id);
-bool MCinit(void);
Client MCinitClient(oid user, bstream *fin, stream *fout);
-int MCinitClientThread(Client c);
int MCpushClientInput(Client c, bstream *new_input, int listing, char *prompt);
-int MCshutdowninprogress(void);
void MCstopClients(Client c);
str MCsuspendClient(int id);
int MCvalid(Client c);
@@ -1715,8 +1711,6 @@ str PCREreplace_wrap(str *res, const str
str PCREreplacefirst_bat_wrap(bat *res, const bat *or, const str *pat, const
str *repl, const str *flags);
str PCREreplacefirst_wrap(str *res, const str *or, const str *pat, const str
*repl, const str *flags);
str PCREsql2pcre(str *ret, const str *pat, const str *esc);
-str PROFexitClient(Client c);
-str PROFinitClient(Client c);
str QLOGappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str QLOGcalls(BAT **r);
@@ -2384,25 +2378,17 @@ char *malLibraryHowToEnable(str name);
int malProfileMode;
str malRef;
void mal_atom_reset(void);
-void mal_client_reset(void) __attribute__((__visibility__("hidden")));
ClientRec *mal_clients;
MT_Lock mal_contextLock;
MT_Lock mal_copyLock;
-void mal_dataflow_reset(void) __attribute__((__visibility__("hidden")));
MT_Lock mal_delayLock;
_Noreturn void mal_exit(int status);
-void mal_factory_reset(void) __attribute__((__visibility__("hidden")));
int mal_init(void);
void mal_instruction_reset(void);
-void mal_linker_reset(void) __attribute__((__visibility__("hidden")));
-void mal_module_reset(void) __attribute__((__visibility__("hidden")));
-void mal_namespace_reset(void) __attribute__((__visibility__("hidden")));
MT_Lock mal_oltpLock;
MT_Lock mal_profileLock;
str mal_quote(const char *msg, size_t size);
MT_Lock mal_remoteLock;
-void mal_resource_reset(void) __attribute__((__visibility__("hidden")));
-void mal_runtime_reset(void) __attribute__((__visibility__("hidden")));
void mal_unquote(char *msg);
stream *maleventstream;
str manifoldRef;
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -252,7 +252,7 @@ Description: MonetDB5 128 bit integer (h
Package: monetdb-python3
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version})
+ monetdb5-sql (= ${source:Version}), python3-numpy
Description: Integration of MonetDB and Python, allowing use of Python from
within SQL
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
@@ -269,7 +269,7 @@ Description: Integration of MonetDB and
Package: monetdb-r
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends},
- monetdb5-sql (= ${source:Version})
+ monetdb5-sql (= ${source:Version}), r-base-core
Description: Integration of MonetDB and R, allowing use of R from within SQL
MonetDB is a database management system that is developed from a
main-memory perspective with use of a fully decomposed storage model,
diff --git a/gdk/gdk_aggr.c b/gdk/gdk_aggr.c
--- a/gdk/gdk_aggr.c
+++ b/gdk/gdk_aggr.c
@@ -944,13 +944,14 @@ BATgroupsum(BAT *b, BAT *g, BAT *e, BAT
bn = NULL;
}
- TRC_DEBUG(ALGO,
"%s(b="ALGOBATFMT",g="ALGOOPTBATFMT",e="ALGOOPTBATFMT",s="ALGOOPTBATFMT")="ALGOOPTBATFMT":
%s; "
- "start " OIDFMT ", count " BUNFMT " (" LLFMT "
usec)\n",
- __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(g),
ALGOOPTBATPAR(e),
- ALGOOPTBATPAR(s), ALGOOPTBATPAR(bn),
- algo ? algo : "",
- ci.seq, ncand, GDKusec() - t0);
+ TRC_DEBUG(ALGO, "%s(b=" ALGOBATFMT ",g=" ALGOOPTBATFMT ","
+ "e=" ALGOOPTBATFMT ",s=" ALGOOPTBATFMT ")=" ALGOOPTBATFMT ":"
+ " %s; start " OIDFMT ", count " BUNFMT " (" LLFMT " usec)\n",
+ __func__,
+ ALGOBATPAR(b), ALGOOPTBATPAR(g), ALGOOPTBATPAR(e),
+ ALGOOPTBATPAR(s), ALGOOPTBATPAR(bn),
+ algo ? algo : "",
+ ci.seq, ncand, GDKusec() - t0);
return bn;
}
@@ -1067,11 +1068,11 @@ BATsum(void *res, int tp, BAT *b, BAT *s
res, true, b->ttype, tp, &min, min, max,
skip_nils, abort_on_error, nil_if_empty, "BATsum", &algo);
TRC_DEBUG(ALGO, "%s(b="ALGOBATFMT",s="ALGOOPTBATFMT"): %s; "
- "start " OIDFMT ", count " BUNFMT " (" LLFMT "
usec)\n",
- __func__,
- ALGOBATPAR(b), ALGOOPTBATPAR(s),
- algo ? algo : "",
- ci.seq, ncand, GDKusec() - t0);
+ "start " OIDFMT ", count " BUNFMT " (" LLFMT " usec)\n",
+ __func__,
+ ALGOBATPAR(b), ALGOOPTBATPAR(s),
+ algo ? algo : "",
+ ci.seq, ncand, GDKusec() - t0);
return nils < BUN_NONE ? GDK_SUCCEED : GDK_FAIL;
}
@@ -3594,14 +3595,20 @@ dogroupcovariance(BAT *b1, BAT *b2, BAT
delta1 = GDKmalloc(ngrp * sizeof(dbl));
delta2 = GDKmalloc(ngrp * sizeof(dbl));
- m2 = GDKzalloc(ngrp * sizeof(dbl));
+ m2 = GDKmalloc(ngrp * sizeof(dbl));
cnts = GDKzalloc(ngrp * sizeof(BUN));
- mean1 = GDKzalloc(ngrp * sizeof(dbl));
- mean2 = GDKzalloc(ngrp * sizeof(dbl));
+ mean1 = GDKmalloc(ngrp * sizeof(dbl));
+ mean2 = GDKmalloc(ngrp * sizeof(dbl));
if (mean1 == NULL || mean2 == NULL || delta1 == NULL || delta2 == NULL
|| m2 == NULL || cnts == NULL)
goto alloc_fail;
+ for (i = 0; i < ngrp; i++) {
+ m2[i] = 0;
+ mean1[i] = 0;
+ mean2[i] = 0;
+ }
+
bn = COLnew(min, TYPE_dbl, ngrp, TRANSIENT);
if (bn == NULL)
goto alloc_fail;
@@ -3766,16 +3773,24 @@ BATgroupcorrelation(BAT *b1, BAT *b2, BA
delta1 = GDKmalloc(ngrp * sizeof(dbl));
delta2 = GDKmalloc(ngrp * sizeof(dbl));
- up = GDKzalloc(ngrp * sizeof(dbl));
- down1 = GDKzalloc(ngrp * sizeof(dbl));
- down2 = GDKzalloc(ngrp * sizeof(dbl));
+ up = GDKmalloc(ngrp * sizeof(dbl));
+ down1 = GDKmalloc(ngrp * sizeof(dbl));
+ down2 = GDKmalloc(ngrp * sizeof(dbl));
cnts = GDKzalloc(ngrp * sizeof(BUN));
- mean1 = GDKzalloc(ngrp * sizeof(dbl));
- mean2 = GDKzalloc(ngrp * sizeof(dbl));
+ mean1 = GDKmalloc(ngrp * sizeof(dbl));
+ mean2 = GDKmalloc(ngrp * sizeof(dbl));
if (mean1 == NULL || mean2 == NULL || delta1 == NULL || delta2 == NULL
|| up == NULL || down1 == NULL || down2 == NULL || cnts == NULL)
goto alloc_fail;
+ for (i = 0; i < ngrp; i++) {
+ up[i] = 0;
+ down1[i] = 0;
+ down2[i] = 0;
+ mean1[i] = 0;
+ mean2[i] = 0;
+ }
+
bn = COLnew(min, TYPE_dbl, ngrp, TRANSIENT);
if (bn == NULL)
goto alloc_fail;
diff --git a/gdk/gdk_align.c b/gdk/gdk_align.c
--- a/gdk/gdk_align.c
+++ b/gdk/gdk_align.c
@@ -137,7 +137,8 @@ VIEWcreate(oid seq, BAT *b)
GDKfree(bn);
return NULL;
}
- TRC_DEBUG(ALGO, "VIEWcreate(" ALGOBATFMT ")=" ALGOBATFMT "\n",
ALGOBATPAR(b), ALGOBATPAR(bn));
+ TRC_DEBUG(ALGO, "VIEWcreate(" ALGOBATFMT ")=" ALGOBATFMT "\n",
+ ALGOBATPAR(b), ALGOBATPAR(bn));
return bn;
}
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -847,7 +847,7 @@ COLcopy(BAT *b, int tt, bool writable, r
if (!writable)
bn->batRestricted = BAT_READ;
TRC_DEBUG(ALGO, "COLcopy(" ALGOBATFMT ")=" ALGOBATFMT "\n",
- ALGOBATPAR(b), ALGOBATPAR(bn));
+ ALGOBATPAR(b), ALGOBATPAR(bn));
return bn;
bunins_failed:
BBPreclaim(bn);
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -521,7 +521,7 @@ BATappend(BAT *b, BAT *n, BAT *s, bool f
if (BATttype(b) != BATttype(n) &&
ATOMtype(b->ttype) != ATOMtype(n->ttype)) {
TRC_DEBUG(CHECK_, "Interpreting %s as %s.\n",
-
ATOMname(BATttype(n)), ATOMname(BATttype(b)));
+ ATOMname(BATttype(n)), ATOMname(BATttype(b)));
}
cnt = canditer_init(&ci, n, s);
@@ -1297,8 +1297,8 @@ BATslice(BAT *b, BUN l, BUN h)
BATkey(bn, BATtkey(b));
}
TRC_DEBUG(ALGO, "BATslice(" ALGOBATFMT "," BUNFMT "," BUNFMT ")"
- "=" ALGOBATFMT "\n",
- ALGOBATPAR(b), l, h, ALGOBATPAR(bn));
+ "=" ALGOBATFMT "\n",
+ ALGOBATPAR(b), l, h, ALGOBATPAR(bn));
return bn;
}
@@ -1741,15 +1741,15 @@ BATsort(BAT **sorted, BAT **order, BAT *
*groups = gn;
}
TRC_DEBUG(ALGO, "BATsort(b=" ALGOBATFMT ",o="
- ALGOOPTBATFMT ",g=" ALGOOPTBATFMT
- ",reverse=%d,nilslast=%d,stable=%d) = ("
- ALGOOPTBATFMT "," ALGOOPTBATFMT ","
- ALGOOPTBATFMT ") -- trivial (" LLFMT
- " usec)\n",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
