Changeset: 9e0805f7fbc1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9e0805f7fbc1
Modified Files:
monetdb5/modules/atoms/str.c
Branch: Jun2023
Log Message:
Don't mix ALGO and ACCELERATOR.
diffs (38 lines):
diff --git a/monetdb5/modules/atoms/str.c b/monetdb5/modules/atoms/str.c
--- a/monetdb5/modules/atoms/str.c
+++ b/monetdb5/modules/atoms/str.c
@@ -5362,10 +5362,10 @@ strjoin(BAT *r1, BAT *r2, BAT *l, BAT *r
}
TRC_DEBUG(ALGO,
- "%s(%s, l=%s#" BUNFMT "[%s]%s%s,"
+ "(%s, l=%s#" BUNFMT "[%s]%s%s,"
"r=%s#" BUNFMT "[%s]%s%s,sl=%s#" BUNFMT "%s%s,"
"sr=%s#" BUNFMT "%s%s)\n",
- with_strimps ? "true" : "false", fname,
+ fname,
BATgetId(l), BATcount(l), ATOMname(l->ttype),
l->tsorted ? "-sorted" : "",
l->trevsorted ? "-revsorted" : "",
@@ -5416,8 +5416,8 @@ strjoin(BAT *r1, BAT *r2, BAT *l, BAT *r
if (r2)
TRC_DEBUG(ALGO,
- "%s(%s,
l=%s,r=%s)=(%s#"BUNFMT"%s%s,%s#"BUNFMT"%s%s\n",
- with_strimps ? "true" : "false", fname,
+ "(%s,
l=%s,r=%s)=(%s#"BUNFMT"%s%s,%s#"BUNFMT"%s%s\n",
+ fname,
BATgetId(l), BATgetId(r),
BATgetId(r1), BATcount(r1),
r1->tsorted ? "-sorted" : "",
@@ -5427,8 +5427,8 @@ strjoin(BAT *r1, BAT *r2, BAT *l, BAT *r
r2->trevsorted ? "-revsorted" : "");
else
TRC_DEBUG(ALGO,
- "%s(%s, l=%s,r=%s)=(%s#"BUNFMT"%s%s\n",
- with_strimps ? "true" : "false", fname,
+ "(%s, l=%s,r=%s)=(%s#"BUNFMT"%s%s\n",
+ fname,
BATgetId(l), BATgetId(r),
BATgetId(r1), BATcount(r1),
r1->tsorted ? "-sorted" : "",
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
