Changeset: accd294d2ebc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=accd294d2ebc
Modified Files:
monetdb5/mal/mal_profiler.c
Branch: makelibstreamgreatagain
Log Message:
Merge with default branch.
diffs (94 lines):
diff --git a/monetdb5/mal/mal_profiler.c b/monetdb5/mal/mal_profiler.c
--- a/monetdb5/mal/mal_profiler.c
+++ b/monetdb5/mal/mal_profiler.c
@@ -176,19 +176,19 @@ renderProfilerEvent(Client cntxt, MalBlk
if( pci->token < FCNcall || pci->token > PATcall)
logadd(",\"operator\":\"%s\"", operatorName(pci->token));
if (!GDKinmemory() && !GDKembedded()) {
- char *uuid = NULL;
- str c;
- if ((c = msab_getUUID(&uuid)) == NULL) {
- logadd(",\"session\":\"%s\"", uuid);
- free(uuid);
- } else
- free(c);
- }
- logadd(",\"state\":\"%s\"", start?"start":"done");
- logadd(",\"usec\":"LLFMT, pci->ticks);
- const char *algo = MT_thread_getalgorithm();
- if (algo) {
- logadd(",\"algorithm\":\"%s\"", algo);
+ char *uuid = NULL;
+ str c;
+ if ((c = msab_getUUID(&uuid)) == NULL) {
+ logadd(",\"session\":\"%s\"", uuid);
+ free(uuid);
+ } else
+ free(c);
+ }
+ logadd(",\"state\":\"%s\"", start?"start":"done");
+ logadd(",\"usec\":"LLFMT, pci->ticks);
+ const char *algo = MT_thread_getalgorithm();
+ if (algo) {
+ logadd(",\"algorithm\":\"%s\"", algo);
}
/* EXAMPLE MAL statement argument decomposition
* The eventparser may assume this layout for ease of parsing
@@ -291,7 +291,7 @@ This information can be used to determin
GDKfree(cv);
GDKfree(stmtq);
}
- // logadd(",\"eol\":%d",
getVarEolife(mb,getArg(pci,j))); useful for MAL debugging
+ logadd(",\"eol\":%d",
getVarEolife(mb,getArg(pci,j)));
// logadd(",\"used\":%d",
isVarUsed(mb,getArg(pci,j)));
// logadd(",\"fixed\":%d",
isVarFixed(mb,getArg(pci,j)));
// logadd(",\"udf\":%d",
isVarUDFtype(mb,getArg(pci,j)));
diff --git
a/sql/test/BugTracker-2020/Tests/values-like-join.Bug-6954.stable.out
b/sql/test/BugTracker-2020/Tests/values-like-join.Bug-6954.stable.out
--- a/sql/test/BugTracker-2020/Tests/values-like-join.Bug-6954.stable.out
+++ b/sql/test/BugTracker-2020/Tests/values-like-join.Bug-6954.stable.out
@@ -21,27 +21,25 @@ project (
% mal # name
% clob # type
% 197 # length
-function user.s2_0():void;
- X_6:void := querylog.define("explain select 1 from (values (\\'one\\'),
(\\'two\\')) as l(s), (values (\\'three\\'), (\\'four\\')) as r(s) where l.s
like r.s;":str, "default_pipe":str, 27:int);
-barrier X_99:bit := language.dataflow();
- X_10:bat[:str] := bat.new(nil:str);
- X_13:bat[:str] := bat.append(X_10:bat[:str], "one":str, true:bit);
- X_16:bat[:str] := bat.append(X_13:bat[:str], "two":str, true:bit);
+function user.main():void;
+ X_1:void := querylog.define("explain select 1 from (values (\\'one\\'),
(\\'two\\')) as l(s), (values (\\'three\\'), (\\'four\\')) as r(s) where l.s
like r.s;":str, "default_pipe":str, 23:int);
+barrier X_92:bit := language.dataflow();
+ X_33:bat[:str] := bat.pack(".%7":str);
+ X_34:bat[:str] := bat.pack("%7":str);
+ X_35:bat[:str] := bat.pack("tinyint":str);
+ X_36:bat[:int] := bat.pack(1:int);
+ X_37:bat[:int] := bat.pack(0:int);
+ X_9:bat[:str] := bat.new(nil:str);
+ X_11:bat[:str] := bat.appendBulk(X_9:bat[:str], true:bit, "one":str,
"two":str);
X_17:bat[:str] := bat.new(nil:str);
- X_19:bat[:str] := bat.append(X_17:bat[:str], "three":str, true:bit);
- X_27:bat[:str] := bat.append(X_19:bat[:str], "four":str, true:bit);
- X_40:bat[:str] := bat.pack(".%7":str);
- X_41:bat[:str] := bat.pack("%7":str);
- X_42:bat[:str] := bat.pack("tinyint":str);
- X_43:bat[:int] := bat.pack(1:int);
- X_44:bat[:int] := bat.pack(0:int);
- (X_30:bat[:oid], X_31:bat[:oid]) := algebra.likejoin(X_16:bat[:str],
X_27:bat[:str], "":str, nil:BAT, nil:BAT, true:bit, nil:lng);
- X_35:bat[:str] := algebra.projection(X_30:bat[:oid], X_16:bat[:str]);
- X_38:bat[:bte] := algebra.project(X_35:bat[:str], 1:bte);
- language.pass(X_16:bat[:str]);
-exit X_99:bit;
- sql.resultSet(X_40:bat[:str], X_41:bat[:str], X_42:bat[:str],
X_43:bat[:int], X_44:bat[:int], X_38:bat[:bte]);
-end user.s2_0;
+ X_18:bat[:str] := bat.appendBulk(X_17:bat[:str], true:bit, "three":str,
"four":str);
+ X_21:bat[:oid] := algebra.likejoin(X_11:bat[:str], X_18:bat[:str], "":str,
nil:BAT, nil:BAT, true:bit, nil:lng, false:bit);
+ X_27:bat[:str] := algebra.projection(X_21:bat[:oid], X_11:bat[:str]);
+ X_31:bat[:bte] := algebra.project(X_27:bat[:str], 1:bte);
+ language.pass(X_11:bat[:str]);
+exit X_92:bit;
+ sql.resultSet(X_33:bat[:str], X_34:bat[:str], X_35:bat[:str],
X_36:bat[:int], X_37:bat[:int], X_31:bat[:bte]);
+end user.main;
#inline actions= 0 time=0 usec
#remap actions= 0 time=2 usec
#costmodel actions= 1 time=1 usec
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
