Changeset: b81b525fc5c7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b81b525fc5c7
Added Files:
sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.py
sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.err
sql/test/BugTracker-2018/Tests/remote-table-where-not-equal.Bug-6621.stable.out
Modified Files:
clients/mapiclient/dump.c
clients/mapiclient/mclient.c
gdk/gdk_join.c
gdk/gdk_private.h
gdk/gdk_select.c
monetdb5/modules/kernel/mmath.c
sql/test/BugTracker-2018/Tests/All
Branch: default
Log Message:
Merge with Mar2018 branch
diffs (truncated from 1336 to 300 lines):
diff --git a/clients/mapiclient/dump.c b/clients/mapiclient/dump.c
--- a/clients/mapiclient/dump.c
+++ b/clients/mapiclient/dump.c
@@ -1781,7 +1781,8 @@ dump_database(Mapi mid, stream *toConsol
"WHEN 4 THEN 'INSERT' "
"WHEN 8 THEN 'DELETE' "
"WHEN 16 THEN 'EXECUTE' "
- "WHEN 32 THEN 'GRANT' END, "
+ "WHEN 32 THEN 'GRANT' "
+ "WHEN 64 THEN 'TRUNCATE' END, "
"g.name, p.grantable "
"FROM sys.schemas s, sys.tables t, "
"sys.columns c, sys.auths a, "
@@ -1801,7 +1802,8 @@ dump_database(Mapi mid, stream *toConsol
"WHEN 4 THEN 'INSERT' "
"WHEN 8 THEN 'DELETE' "
"WHEN 16 THEN 'EXECUTE' "
- "WHEN 32 THEN 'GRANT' END, "
+ "WHEN 32 THEN 'GRANT' "
+ "WHEN 64 THEN 'TRUNCATE' END, "
"g.name, p.grantable "
"FROM sys.schemas s, sys.functions f, "
"sys.auths a, sys.privileges p, sys.auths g "
@@ -2276,6 +2278,10 @@ dump_database(Mapi mid, stream *toConsol
mnstr_printf(toConsole, "%s GRANT", sep);
sep = ",";
}
+ if (priv & 64) {
+ mnstr_printf(toConsole, "%s TRUNCATE", sep);
+ sep = ",";
+ }
}
mnstr_printf(toConsole, " ON TABLE \"%s\" TO \"%s\"",
tname, aname);
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -302,8 +302,7 @@ timerHuman(int64_t sqloptimizer, int64_t
fflush(stderr);
return;
}
- if (timermode == T_PERF && (!total || singleinstr != total) &&
- (sqloptimizer > 0 || maloptimizer > 0 || querytime > 0)) {
+ if (timermode == T_PERF && (!total || singleinstr != total)) {
/* for performance measures we use milliseconds as the base */
fflush(stderr);
mnstr_flush(toConsole);
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -277,17 +277,10 @@ nomatch(BAT *r1, BAT *r2, BAT *l, BAT *r
BATtseqbase(r2, oid_nil);
}
ALGODEBUG fprintf(stderr,
- "#%s(l=%s,r=%s)=(%s#"BUNFMT"%s%s%s,%s#"BUNFMT"%s%s%s)
" LLFMT "us -- nomatch\n",
+ "#%s(l=%s,r=%s)=(" ALGOBATFMT "," ALGOOPTBATFMT ") "
LLFMT "us -- nomatch\n",
func,
BATgetId(l), BATgetId(r),
- BATgetId(r1), BATcount(r1),
- r1->tsorted ? "-sorted" : "",
- r1->trevsorted ? "-revsorted" : "",
- r1->tkey ? "-key" : "",
- r2 ? BATgetId(r2) : "--", r2 ? BATcount(r2) : 0,
- r2 && r2->tsorted ? "-sorted" : "",
- r2 && r2->trevsorted ? "-revsorted" : "",
- r2 && r2->tkey ? "-key" : "",
+ ALGOBATPAR(r1), ALGOOPTBATPAR(r2),
GDKusec() - t0);
return GDK_SUCCEED;
@@ -307,25 +300,10 @@ selectjoin(BAT *r1, BAT *r2, BAT *l, BAT
BUN lstart, lend, lcnt;
BAT *bn = NULL;
- ALGODEBUG fprintf(stderr, "#selectjoin(l=%s#" BUNFMT "[%s]%s%s%s,"
- "r=%s#" BUNFMT "[%s]%s%s%s,sl=%s#" BUNFMT "%s%s%s,"
- "sr=%s#" BUNFMT "%s%s%s,nil_matches=%d)%s\n",
- BATgetId(l), BATcount(l), ATOMname(l->ttype),
- l->tsorted ? "-sorted" : "",
- l->trevsorted ? "-revsorted" : "",
- l->tkey ? "-key" : "",
- BATgetId(r), BATcount(r), ATOMname(r->ttype),
- r->tsorted ? "-sorted" : "",
- r->trevsorted ? "-revsorted" : "",
- r->tkey ? "-key" : "",
- sl ? BATgetId(sl) : "NULL", sl ? BATcount(sl) : 0,
- sl && sl->tsorted ? "-sorted" : "",
- sl && sl->trevsorted ? "-revsorted" : "",
- sl && sl->tkey ? "-key" : "",
- sr ? BATgetId(sr) : "NULL", sr ? BATcount(sr) : 0,
- sr && sr->tsorted ? "-sorted" : "",
- sr && sr->trevsorted ? "-revsorted" : "",
- sr && sr->tkey ? "-key" : "",
+ ALGODEBUG fprintf(stderr, "#selectjoin(l=" ALGOBATFMT ","
+ "r=" ALGOBATFMT ",sl=" ALGOOPTBATFMT ","
+ "sr=" ALGOOPTBATFMT ",nil_matches=%d)%s\n",
+ ALGOBATPAR(l), ALGOBATPAR(r), ALGOOPTBATPAR(sl),
ALGOOPTBATPAR(sr),
nil_matches,
swapped ? " swapped" : "");
@@ -431,18 +409,9 @@ selectjoin(BAT *r1, BAT *r2, BAT *l, BAT
BATsetcount(r1, lcnt * BATcount(bn));
BATsetcount(r2, lcnt * BATcount(bn));
BBPunfix(bn->batCacheid);
- ALGODEBUG fprintf(stderr,
"#selectjoin(l=%s,r=%s)=(%s#"BUNFMT"%s%s%s%s,%s#"BUNFMT"%s%s%s%s) " LLFMT
"us\n",
+ ALGODEBUG fprintf(stderr, "#selectjoin(l=%s,r=%s)=(" ALGOBATFMT ","
ALGOOPTBATFMT ") " LLFMT "us\n",
BATgetId(l), BATgetId(r),
- BATgetId(r1), BATcount(r1),
- r1->tsorted ? "-sorted" : "",
- r1->trevsorted ? "-revsorted" : "",
- BATtdense(r1) ? "-dense" : "",
- r1->tkey ? "-key" : "",
- r2 ? BATgetId(r2) : "--", r2 ? BATcount(r2) : 0,
- r2 && r2->tsorted ? "-sorted" : "",
- r2 && r2->trevsorted ? "-revsorted" : "",
- r2 && BATtdense(r2) ? "-dense" : "",
- r2 && r2->tkey ? "-key" : "",
+ ALGOBATPAR(r1), ALGOOPTBATPAR(r2),
GDKusec() - t0);
return GDK_SUCCEED;
@@ -470,26 +439,11 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l,
const oid *lvals;
oid o, seq;
- ALGODEBUG fprintf(stderr, "#mergejoin_void(l=%s#" BUNFMT "[%s]%s%s%s,"
- "r=%s#" BUNFMT "[%s]%s%s%s,sl=%s#" BUNFMT "%s%s%s,"
- "sr=%s#" BUNFMT "%s%s%s,"
+ ALGODEBUG fprintf(stderr, "#mergejoin_void(l=" ALGOBATFMT ","
+ "r=" ALGOBATFMT ",sl=" ALGOOPTBATFMT ","
+ "sr=" ALGOOPTBATFMT ","
"nil_on_miss=%d,only_misses=%d)%s\n",
- BATgetId(l), BATcount(l), ATOMname(l->ttype),
- l->tsorted ? "-sorted" : "",
- l->trevsorted ? "-revsorted" : "",
- l->tkey ? "-key" : "",
- BATgetId(r), BATcount(r), ATOMname(r->ttype),
- r->tsorted ? "-sorted" : "",
- r->trevsorted ? "-revsorted" : "",
- r->tkey ? "-key" : "",
- sl ? BATgetId(sl) : "NULL", sl ? BATcount(sl) : 0,
- sl && sl->tsorted ? "-sorted" : "",
- sl && sl->trevsorted ? "-revsorted" : "",
- sl && sl->tkey ? "-key" : "",
- sr ? BATgetId(sr) : "NULL", sr ? BATcount(sr) : 0,
- sr && sr->tsorted ? "-sorted" : "",
- sr && sr->trevsorted ? "-revsorted" : "",
- sr && sr->tkey ? "-key" : "",
+ ALGOBATPAR(l), ALGOBATPAR(r), ALGOOPTBATPAR(sl),
ALGOOPTBATPAR(sr),
nil_on_miss, only_misses,
swapped ? " swapped" : "");
@@ -904,18 +858,9 @@ mergejoin_void(BAT *r1, BAT *r2, BAT *l,
virtualize(r1);
if (r2 && r2->tkey && r2->tsorted)
virtualize(r2);
- ALGODEBUG fprintf(stderr,
"#mergejoin_void(l=%s,r=%s)=(%s#"BUNFMT"%s%s%s%s,%s#"BUNFMT"%s%s%s%s) " LLFMT
"us\n",
+ ALGODEBUG fprintf(stderr, "#mergejoin_void(l=%s,r=%s)=(" ALGOBATFMT ","
ALGOOPTBATFMT ") " LLFMT "us\n",
BATgetId(l), BATgetId(r),
- BATgetId(r1), BATcount(r1),
- r1->tsorted ? "-sorted" : "",
- r1->trevsorted ? "-revsorted" : "",
- BATtdense(r1) ? "-dense" : "",
- r1->tkey ? "-key" : "",
- r2 ? BATgetId(r2) : "--", r2 ? BATcount(r2) : 0,
- r2 && r2->tsorted ? "-sorted" : "",
- r2 && r2->trevsorted ? "-revsorted" : "",
- r2 && BATtdense(r2) ? "-dense" : "",
- r2 && r2->tkey ? "-key" : "",
+ ALGOBATPAR(r1), ALGOOPTBATPAR(r2),
GDKusec() - t0);
return GDK_SUCCEED;
bailout:
@@ -937,16 +882,9 @@ mergejoin_int(BAT *r1, BAT *r2, BAT *l,
oid lv;
BUN i;
- ALGODEBUG fprintf(stderr, "#mergejoin_int(l=%s#" BUNFMT "[%s]%s%s%s,"
- "r=%s#" BUNFMT "[%s]%s%s%s)%s\n",
- BATgetId(l), BATcount(l), ATOMname(l->ttype),
- l->tsorted ? "-sorted" : "",
- l->trevsorted ? "-revsorted" : "",
- l->tkey ? "-key" : "",
- BATgetId(r), BATcount(r), ATOMname(r->ttype),
- r->tsorted ? "-sorted" : "",
- r->trevsorted ? "-revsorted" : "",
- r->tkey ? "-key" : "",
+ ALGODEBUG fprintf(stderr, "#mergejoin_int(l=" ALGOBATFMT ","
+ "r=" ALGOBATFMT ")%s\n",
+ ALGOBATPAR(l), ALGOBATPAR(r),
swapped ? " swapped" : "");
assert(ATOMtype(l->ttype) == ATOMtype(r->ttype));
@@ -1204,18 +1142,9 @@ mergejoin_int(BAT *r1, BAT *r2, BAT *l,
} else {
r1->tseqbase = r2->tseqbase = 0;
}
- ALGODEBUG fprintf(stderr,
"#mergejoin_int(l=%s,r=%s)=(%s#"BUNFMT"%s%s%s%s,%s#"BUNFMT"%s%s%s%s) " LLFMT
"us\n",
+ ALGODEBUG fprintf(stderr, "#mergejoin_int(l=%s,r=%s)=(" ALGOBATFMT ","
ALGOBATFMT ") " LLFMT "us\n",
BATgetId(l), BATgetId(r),
- BATgetId(r1), BATcount(r1),
- r1->tsorted ? "-sorted" : "",
- r1->trevsorted ? "-revsorted" : "",
- BATtdense(r1) ? "-dense" : "",
- r1->tkey ? "-key" : "",
- BATgetId(r2), BATcount(r2),
- r2->tsorted ? "-sorted" : "",
- r2->trevsorted ? "-revsorted" : "",
- BATtdense(r2) ? "-dense" : "",
- r2->tkey ? "-key" : "",
+ ALGOBATPAR(r1), ALGOBATPAR(r2),
GDKusec() - t0);
return GDK_SUCCEED;
@@ -1238,16 +1167,9 @@ mergejoin_lng(BAT *r1, BAT *r2, BAT *l,
oid lv;
BUN i;
- ALGODEBUG fprintf(stderr, "#mergejoin_lng(l=%s#" BUNFMT "[%s]%s%s%s,"
- "r=%s#" BUNFMT "[%s]%s%s%s)%s\n",
- BATgetId(l), BATcount(l), ATOMname(l->ttype),
- l->tsorted ? "-sorted" : "",
- l->trevsorted ? "-revsorted" : "",
- l->tkey ? "-key" : "",
- BATgetId(r), BATcount(r), ATOMname(r->ttype),
- r->tsorted ? "-sorted" : "",
- r->trevsorted ? "-revsorted" : "",
- r->tkey ? "-key" : "",
+ ALGODEBUG fprintf(stderr, "#mergejoin_lng(l=" ALGOBATFMT ","
+ "r=" ALGOBATFMT ")%s\n",
+ ALGOBATPAR(l), ALGOBATPAR(r),
swapped ? " swapped" : "");
assert(ATOMtype(l->ttype) == ATOMtype(r->ttype));
@@ -1505,18 +1427,9 @@ mergejoin_lng(BAT *r1, BAT *r2, BAT *l,
} else {
r1->tseqbase = r2->tseqbase = 0;
}
- ALGODEBUG fprintf(stderr,
"#mergejoin_lng(l=%s,r=%s)=(%s#"BUNFMT"%s%s%s%s,%s#"BUNFMT"%s%s%s%s) " LLFMT
"us\n",
+ ALGODEBUG fprintf(stderr, "#mergejoin_lng(l=%s,r=%s)=(" ALGOBATFMT ","
ALGOBATFMT ") " LLFMT "us\n",
BATgetId(l), BATgetId(r),
- BATgetId(r1), BATcount(r1),
- r1->tsorted ? "-sorted" : "",
- r1->trevsorted ? "-revsorted" : "",
- BATtdense(r1) ? "-dense" : "",
- r1->tkey ? "-key" : "",
- BATgetId(r2), BATcount(r2),
- r2->tsorted ? "-sorted" : "",
- r2->trevsorted ? "-revsorted" : "",
- BATtdense(r2) ? "-dense" : "",
- r2->tkey ? "-key" : "",
+ ALGOBATPAR(r1), ALGOBATPAR(r2),
GDKusec() - t0);
return GDK_SUCCEED;
@@ -1597,26 +1510,11 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT
}
}
- ALGODEBUG fprintf(stderr, "#mergejoin(l=%s#" BUNFMT "[%s]%s%s%s,"
- "r=%s#" BUNFMT "[%s]%s%s%s,sl=%s#" BUNFMT "%s%s%s,"
- "sr=%s#" BUNFMT "%s%s%s,nil_matches=%d,"
+ ALGODEBUG fprintf(stderr, "#mergejoin(l=" ALGOBATFMT ","
+ "r=" ALGOBATFMT ",sl=" ALGOOPTBATFMT ","
+ "sr=" ALGOOPTBATFMT ",nil_matches=%d,"
"nil_on_miss=%d,semi=%d)%s\n",
- BATgetId(l), BATcount(l), ATOMname(l->ttype),
- l->tsorted ? "-sorted" : "",
- l->trevsorted ? "-revsorted" : "",
- l->tkey ? "-key" : "",
- BATgetId(r), BATcount(r), ATOMname(r->ttype),
- r->tsorted ? "-sorted" : "",
- r->trevsorted ? "-revsorted" : "",
- r->tkey ? "-key" : "",
- sl ? BATgetId(sl) : "NULL", sl ? BATcount(sl) : 0,
- sl && sl->tsorted ? "-sorted" : "",
- sl && sl->trevsorted ? "-revsorted" : "",
- sl && sl->tkey ? "-key" : "",
- sr ? BATgetId(sr) : "NULL", sr ? BATcount(sr) : 0,
- sr && sr->tsorted ? "-sorted" : "",
- sr && sr->trevsorted ? "-revsorted" : "",
- sr && sr->tkey ? "-key" : "",
+ ALGOBATPAR(l), ALGOBATPAR(r), ALGOOPTBATPAR(sl),
ALGOOPTBATPAR(sr),
nil_matches, nil_on_miss, semi,
swapped ? " swapped" : "");
@@ -2519,18 +2417,9 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT
r2->tseqbase = 0;
}
}
- ALGODEBUG fprintf(stderr,
"#mergejoin(l=%s,r=%s)=(%s#"BUNFMT"%s%s%s%s,%s#"BUNFMT"%s%s%s%s) " LLFMT "us\n",
+ ALGODEBUG fprintf(stderr, "#mergejoin(l=%s,r=%s)=(" ALGOBATFMT ","
ALGOOPTBATFMT ") " LLFMT "us\n",
BATgetId(l), BATgetId(r),
- BATgetId(r1), BATcount(r1),
- r1->tsorted ? "-sorted" : "",
- r1->trevsorted ? "-revsorted" : "",
- BATtdense(r1) ? "-dense" : "",
- r1->tkey ? "-key" : "",
- r2 ? BATgetId(r2) : "--", r2 ? BATcount(r2) : 0,
- r2 && r2->tsorted ? "-sorted" : "",
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
