Changeset: d0aec472f390 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d0aec472f390
Modified Files:
clients/mapiclient/eventparser.c
clients/mapiclient/eventparser.h
clients/mapiclient/tachograph.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_profiler.c
monetdb5/optimizer/opt_joinpath.c
sql/test/pg_regress/Tests/float4.stable.err
sql/test/pg_regress/Tests/float4.stable.out
sql/test/pg_regress/Tests/float8.stable.err
sql/test/pg_regress/Tests/float8.stable.err.Windows
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/float8.stable.out.Windows
sql/test/remote/Tests/ssbm.SQL.py
tools/mserver/mserver5.c
Branch: rdf
Log Message:
Merge with default
diffs (truncated from 683 to 300 lines):
diff --git a/clients/mapiclient/eventparser.c b/clients/mapiclient/eventparser.c
--- a/clients/mapiclient/eventparser.c
+++ b/clients/mapiclient/eventparser.c
@@ -17,7 +17,7 @@ int malargtop;
char *malvariables[MAXMALARGS];
int malvartop;
int debug;
-char *monet_characteristics;
+char *monetdb_characteristics;
void
clearArguments(void)
@@ -107,8 +107,6 @@ eventparser(char *row, EventRecord *ev)
/* check basic validaty first */
if (row[0] =='#'){
- if( row[1] =='{')
- monet_characteristics = strdup(row+1);
return 0;
}
if (row[0] != '[')
@@ -264,6 +262,9 @@ eventparser(char *row, EventRecord *ev)
ev->fcn = strdup(c);
ev->stmt = strdup(ev->fcn);
c= ev->fcn;
+ if( ev->state == MDB_SYSTEM){
+ monetdb_characteristics = strdup(ev->stmt);
+ } else
if( *c != '[')
{
c = strstr(c + 1, ":=");
diff --git a/clients/mapiclient/eventparser.h b/clients/mapiclient/eventparser.h
--- a/clients/mapiclient/eventparser.h
+++ b/clients/mapiclient/eventparser.h
@@ -94,7 +94,7 @@ extern int malargtop;
extern char *malvariables[MAXMALARGS];
extern int malvartop;
extern int debug;
-extern char *monet_characteristics;
+extern char *monetdb_characteristics;
extern void clearArguments(void);
extern int eventparser(char *row, EventRecord *ev);
diff --git a/clients/mapiclient/tachograph.c b/clients/mapiclient/tachograph.c
--- a/clients/mapiclient/tachograph.c
+++ b/clients/mapiclient/tachograph.c
@@ -481,14 +481,13 @@ initFiles(void)
fprintf(stderr,"Could not create %s\n",buf);
exit(0);
}
- if( monet_characteristics)
- fprintf(tachotrace,"%s\n",monet_characteristics);
}
static void
progressBarInit(char *qry)
{
fprintf(tachojson,"{ \"tachograph\":0.1,\n");
+ fprintf(tachojson," \"system\":%s,\n",monetdb_characteristics);
fprintf(tachojson,"
\"qid\":\"%s\",\n",currentfunction?currentfunction:"");
fprintf(tachojson," \"tag\":\"%d\",\n",currenttag);
fprintf(tachojson," \"query\":\"%s\",\n",qry);
@@ -930,7 +929,7 @@ main(int argc, char **argv)
update(&event);
if (debug )
fprintf(stderr, "PARSE %d:%s\n", i, response);
- if( trace && i >=0 && capturing)
+ if( trace && i >=0 && (capturing || event.state ==
MDB_SYSTEM))
fprintf(trace,"%s\n",response);
if( tachotrace && i >=0 && capturing)
fprintf(tachotrace,"%s\n",response);
diff --git a/monetdb5/mal/mal_listing.c b/monetdb5/mal/mal_listing.c
--- a/monetdb5/mal/mal_listing.c
+++ b/monetdb5/mal/mal_listing.c
@@ -95,7 +95,7 @@ renderTerm(MalBlkPtr mb, MalStkPtr stk,
len++;
}
showtype =closequote > TYPE_str ||
((isVarUDFtype(mb,varid) || isVarTypedef(mb,varid)) && isVarConstant(mb,varid))
||
- (isaBatType(getVarType(mb,varid) && idx <
p->retc));
+ (isaBatType(getVarType(mb,varid)) && idx <
p->retc);
if (stk && isaBatType(getVarType(mb,varid)) &&
abs(stk->stk[varid].val.ival) ){
BAT *d=
BBPquickdesc(abs(stk->stk[varid].val.ival),TRUE);
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
@@ -55,8 +55,6 @@ offlineProfilerHeader(void)
if (eventstream == NULL)
return ;
- mnstr_printf(eventstream,"%s\n", monet_characteristics);
- mnstr_flush(eventstream);
lognew();
logadd("# ");
@@ -94,15 +92,20 @@ offlineProfilerHeader(void)
*/
static void logsend(char *logbuffer)
-{ int error=0;
+{ int error=0;
+ int showsystem = 0;
if (eventstream) {
MT_lock_set(&mal_profileLock, "logsend");
- if( eventcounter == 0)
+ if( eventcounter == 0){
offlineProfilerHeader();
+ showsystem++;
+ }
eventcounter++;
error= mnstr_printf(eventstream,"[ %d,\t%s", eventcounter,
logbuffer);
error= mnstr_flush(eventstream);
MT_lock_unset(&mal_profileLock, "logsend");
+ if( showsystem)
+ offlineProfilerEvent(0, 0, 0, 0, "system",
monet_characteristics);
if ( error) stopProfiler();
}
}
diff --git a/monetdb5/optimizer/opt_joinpath.c
b/monetdb5/optimizer/opt_joinpath.c
--- a/monetdb5/optimizer/opt_joinpath.c
+++ b/monetdb5/optimizer/opt_joinpath.c
@@ -258,7 +258,7 @@ OPTjoinPathImplementation(Client cntxt,
/* perform a second phase, trial code, many TPCH queries have subpaths of
interest.
* The count is meant to illustrate the impact
*/
- if ( actions )
+ if (0 && actions )
actions = 10000*actions+ OPTjoinSubPath(cntxt, mb);
GDKfree(old);
GDKfree(pc);
diff --git a/sql/test/pg_regress/Tests/float4.stable.err
b/sql/test/pg_regress/Tests/float4.stable.err
--- a/sql/test/pg_regress/Tests/float4.stable.err
+++ b/sql/test/pg_regress/Tests/float4.stable.err
@@ -29,55 +29,70 @@ stderr of test 'float4` in directory 'sq
# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
# 17:11:19 >
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('10e40');
ERROR = !conversion of string '10e40' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e40');
ERROR = !conversion of string '-10e40' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES (' ');
ERROR = !conversion of string ' ' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('xyz');
ERROR = !conversion of string 'xyz' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('5.0.0');
ERROR = !conversion of string '5.0.0' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('5 . 0');
ERROR = !conversion of string '5 . 0' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('5. 0');
ERROR = !conversion of string '5. 0' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES (' - 3.0');
ERROR = !conversion of string ' - 3.0' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT4_TBL(f1) VALUES ('123 5');
ERROR = !conversion of string '123 5' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
+QUERY = SELECT cast('NaN' as real);
+ERROR = !conversion of string 'NaN' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
+QUERY = SELECT cast('nan' as real);
+ERROR = !conversion of string 'nan' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
+QUERY = SELECT cast(' NAN ' as real);
+ERROR = !conversion of string ' NAN ' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT cast('infinity' as real);
ERROR = !conversion of string 'infinity' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
+QUERY = SELECT cast(' -INFINiTY ' as real);
+ERROR = !conversion of string ' -INFINiTY ' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT cast('N A N' as real);
ERROR = !conversion of string 'N A N' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT cast('NaN x' as real);
ERROR = !conversion of string 'NaN x' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT cast(' INFINITY x' as real);
ERROR = !conversion of string ' INFINITY x' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT cast('Infinity' as real) + 100.0;
ERROR = !conversion of string 'Infinity' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT cast('Infinity' as real) / cast('Infinity' as real);
ERROR = !conversion of string 'Infinity' to type flt failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
+QUERY = SELECT cast('nan' as real) / cast('nan' as real);
+ERROR = !conversion of string 'nan' to type flt failed.
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT '' AS bad, f.f1 / '0.0' from FLOAT4_TBL f;
ERROR = !division by zero.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT '' AS five, f.f1, @f.f1 AS abs_f1 FROM FLOAT4_TBL f;
ERROR = !syntax error, unexpected '.', expecting SCOLON in: "select '' as
five, f.f1, @f."
diff --git a/sql/test/pg_regress/Tests/float4.stable.out
b/sql/test/pg_regress/Tests/float4.stable.out
--- a/sql/test/pg_regress/Tests/float4.stable.out
+++ b/sql/test/pg_regress/Tests/float4.stable.out
@@ -42,36 +42,6 @@ Ready.
[ 1 ]
#INSERT INTO FLOAT4_TBL(f1) VALUES ('-10e-40');
[ 1 ]
-#SELECT cast('NaN' as real);
-% .L1 # table_name
-% L1 # name
-% real # type
-% 15 # length
-[ NULL ]
-#SELECT cast('nan' as real);
-% .L1 # table_name
-% L1 # name
-% real # type
-% 15 # length
-[ NULL ]
-#SELECT cast(' NAN ' as real);
-% .L1 # table_name
-% L1 # name
-% real # type
-% 15 # length
-[ NULL ]
-#SELECT cast(' -INFINiTY ' as real);
-% .L1 # table_name
-% L1 # name
-% real # type
-% 15 # length
-[ -inf ]
-#SELECT cast('nan' as real) / cast('nan' as real);
-% .L2 # table_name
-% sql_div_single_value # name
-% real # type
-% 15 # length
-[ NULL ]
#SELECT '' AS five, * FROM FLOAT4_TBL;
% .L, sys.float4_tbl # table_name
% five, f1 # name
diff --git a/sql/test/pg_regress/Tests/float8.stable.err
b/sql/test/pg_regress/Tests/float8.stable.err
--- a/sql/test/pg_regress/Tests/float8.stable.err
+++ b/sql/test/pg_regress/Tests/float8.stable.err
@@ -29,85 +29,106 @@ stderr of test 'float8` in directory 'sq
# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
# 17:11:19 >
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT cast('10e400' as double);
ERROR = !conversion of string '10e400' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = SELECT cast('-10e400' as double);
ERROR = !conversion of string '-10e400' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES (' ');
ERROR = !conversion of string ' ' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('xyz');
ERROR = !conversion of string 'xyz' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5.0.0');
ERROR = !conversion of string '5.0.0' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5 . 0');
ERROR = !conversion of string '5 . 0' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES ('5. 0');
ERROR = !conversion of string '5. 0' to type dbl failed.
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-30808/.s.monetdb.35989
QUERY = INSERT INTO FLOAT8_TBL(f1) VALUES (' - 3');
ERROR = !conversion of string ' - 3' to type dbl failed.
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
