Changeset: 5cdc33404f19 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5cdc33404f19
Modified Files:
monetdb5/modules/atoms/str.c
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (truncated from 1876 to 300 lines):
diff --git a/clients/Tests/MAL-signatures-hge.test
b/clients/Tests/MAL-signatures-hge.test
--- a/clients/Tests/MAL-signatures-hge.test
+++ b/clients/Tests/MAL-signatures-hge.test
@@ -3504,11 +3504,6 @@ command algebra.markjoin(X_0:bat[:any_1]
ALGmark3join;
Mark join with candidate lists
algebra
-markjoin
-command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bit, X_5:lng) (X_6:bat[:oid], X_7:bat[:bit])
-ALGmarkjoin;
-Left mark join with candidate lists, produces left output and mark flag;
-algebra
markselect
command algebra.markselect(X_0:bat[:oid], X_1:bat[:bit], X_2:bat[:bit],
X_3:bit) (X_4:bat[:oid], X_5:bat[:bit])
ALGmarkselect;
@@ -46804,16 +46799,6 @@ pattern inspect.optimizer_stats() (X_0:b
OPTstatistics;
Get optimizer use statistics, i.e. calls and total time
io
-export
-command io.export(X_0:bat[:any_2], X_1:str):void
-IOexport;
-Export a BAT as ASCII to a file. If the 'filepath' is not absolute, it@is put
into the $DBPATH directory. Success of failure is indicated.
-io
-import
-command io.import(X_0:bat[:any_2], X_1:str):void
-IOimport;
-Import a BAT from an ASCII dump. The tuples are appended to the@first
argument. Its signature must match the dump,@else parsing errors will occur as
an exception.
-io
print
pattern io.print(X_0:any_1):void
IOprint_val;
diff --git a/clients/Tests/MAL-signatures.test
b/clients/Tests/MAL-signatures.test
--- a/clients/Tests/MAL-signatures.test
+++ b/clients/Tests/MAL-signatures.test
@@ -2939,11 +2939,6 @@ command algebra.markjoin(X_0:bat[:any_1]
ALGmark3join;
Mark join with candidate lists
algebra
-markjoin
-command algebra.markjoin(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bit, X_5:lng) (X_6:bat[:oid], X_7:bat[:bit])
-ALGmarkjoin;
-Left mark join with candidate lists, produces left output and mark flag;
-algebra
markselect
command algebra.markselect(X_0:bat[:oid], X_1:bat[:bit], X_2:bat[:bit],
X_3:bit) (X_4:bat[:oid], X_5:bat[:bit])
ALGmarkselect;
@@ -35254,16 +35249,6 @@ pattern inspect.optimizer_stats() (X_0:b
OPTstatistics;
Get optimizer use statistics, i.e. calls and total time
io
-export
-command io.export(X_0:bat[:any_2], X_1:str):void
-IOexport;
-Export a BAT as ASCII to a file. If the 'filepath' is not absolute, it@is put
into the $DBPATH directory. Success of failure is indicated.
-io
-import
-command io.import(X_0:bat[:any_2], X_1:str):void
-IOimport;
-Import a BAT from an ASCII dump. The tuples are appended to the@first
argument. Its signature must match the dump,@else parsing errors will occur as
an exception.
-io
print
pattern io.print(X_0:any_1):void
IOprint_val;
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
@@ -119,7 +119,6 @@ BAT *BATdense(oid hseq, oid tseq, BUN cn
BAT *BATdescriptor(bat i);
BAT *BATdiff(BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, bool not_in,
BUN estimate);
BAT *BATdiffcand(BAT *a, BAT *b);
-BAT *BATdiffcand(BAT *a, BAT *b);
gdk_return BATextend(BAT *b, BUN newcap)
__attribute__((__warn_unused_result__));
void BATfakeCommit(BAT *b);
gdk_return BATfirstn(BAT **topn, BAT **gids, BAT *b, BAT *cands, BAT *grps,
BUN n, bool asc, bool nilslast, bool distinct)
__attribute__((__warn_unused_result__));
@@ -156,7 +155,6 @@ void BAThseqbase(BAT *b, oid o);
gdk_return BATimprints(BAT *b);
BAT *BATintersect(BAT *l, BAT *r, BAT *sl, BAT *sr, bool nil_matches, bool
max_one, BUN estimate);
BAT *BATintersectcand(BAT *a, BAT *b);
-BAT *BATintersectcand(BAT *a, BAT *b);
gdk_return BATjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
gdk_return BATkey(BAT *b, bool onoff);
gdk_return BATleftjoin(BAT **r1p, BAT **r2p, BAT *l, BAT *r, BAT *sl, BAT *sr,
bool nil_matches, BUN estimate) __attribute__((__warn_unused_result__));
@@ -165,7 +163,6 @@ BAT *BATmaskedcands(oid hseq, BUN nr, BA
void *BATmax(BAT *b, void *aggr);
void *BATmax_skipnil(BAT *b, void *aggr, bit skipnil);
BAT *BATmergecand(BAT *a, BAT *b);
-BAT *BATmergecand(BAT *a, BAT *b);
void *BATmin(BAT *b, void *aggr);
void *BATmin_skipnil(BAT *b, void *aggr, bit skipnil);
gdk_return BATmode(BAT *b, bool transient);
@@ -799,7 +796,6 @@ int QLOGisset(void);
str RMTdisconnect(void *ret, str *conn);
BUN SQLload_file(Client cntxt, Tablet *as, bstream *b, stream *out, const char
*csep, const char *rsep, char quote, lng skip, lng maxrow, int best, bool
from_stdin, const char *tabnam, bool escape);
str TABLETcollect(BAT **bats, Tablet *as);
-str TABLETcollect_parts(BAT **bats, Tablet *as, BUN offset);
str TABLETcreate_bats(Tablet *as, BUN est);
void TABLETdestroy_format(Tablet *as);
int TABLEToutput_file(Tablet *as, BAT *order, stream *s);
diff --git a/clients/mapilib/Tests/tlssecurity.py
b/clients/mapilib/Tests/tlssecurity.py
--- a/clients/mapilib/Tests/tlssecurity.py
+++ b/clients/mapilib/Tests/tlssecurity.py
@@ -120,7 +120,7 @@ attempt('connect_tls', 'server1', None,
# Connect to port 'server1' over TLS, without passing a certificate. The
# connection should fail because ca1.crt is not in the system trust root store.
-attempt('refuse_no_cert', 'server1', "verify failed")
+attempt('refuse_no_cert', 'server1', "") # we expect "verify failed" but Mac
gives "No such file or directory", i.e. still an error so we take it
# refuse_wrong_cert
#
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -2329,10 +2329,6 @@ gdk_export BAT *BATslice(BAT *b, BUN low
gdk_export BAT *BATunique(BAT *b, BAT *s);
-gdk_export BAT *BATmergecand(BAT *a, BAT *b);
-gdk_export BAT *BATintersectcand(BAT *a, BAT *b);
-gdk_export BAT *BATdiffcand(BAT *a, BAT *b);
-
gdk_export gdk_return BATfirstn(BAT **topn, BAT **gids, BAT *b, BAT *cands,
BAT *grps, BUN n, bool asc, bool nilslast, bool distinct)
__attribute__((__warn_unused_result__));
diff --git a/gdk/gdk_analytic_func.c b/gdk/gdk_analytic_func.c
--- a/gdk/gdk_analytic_func.c
+++ b/gdk/gdk_analytic_func.c
@@ -1293,7 +1293,7 @@ GDKanalytical##OP(BAT *r, BAT *p, BAT *o
ANALYTICAL_MIN_MAX_BRANCHES(MIN_MAX, GT_LT,
CURRENT_ROW); \
break; \
default: \
- if (!(st = GDKinitialize_segment_tree())) { \
+ if ((st = GDKinitialize_segment_tree()) == NULL) { \
res = GDK_FAIL; \
goto cleanup; \
} \
@@ -1653,7 +1653,7 @@ GDKanalyticalcount(BAT *r, BAT *p, BAT *
ANALYTICAL_COUNT_BRANCHES(CURRENT_ROW);
break;
default:
- if (!count_all && !(st = GDKinitialize_segment_tree()))
{
+ if (!count_all && (st = GDKinitialize_segment_tree())
== NULL) {
res = GDK_FAIL;
goto cleanup;
}
@@ -1981,7 +1981,7 @@ GDKanalyticalsum(BAT *r, BAT *p, BAT *o,
ANALYTICAL_SUM_BRANCHES(CURRENT_ROW);
break;
default:
- if (!(st = GDKinitialize_segment_tree())) {
+ if ((st = GDKinitialize_segment_tree()) == NULL) {
res = GDK_FAIL;
goto cleanup;
}
@@ -2500,7 +2500,7 @@ GDKanalyticalprod(BAT *r, BAT *p, BAT *o
ANALYTICAL_PROD_BRANCHES(CURRENT_ROW);
break;
default:
- if (!(st = GDKinitialize_segment_tree())) {
+ if ((st = GDKinitialize_segment_tree()) == NULL) {
res = GDK_FAIL;
goto cleanup;
}
diff --git a/gdk/gdk_analytic_statistics.c b/gdk/gdk_analytic_statistics.c
--- a/gdk/gdk_analytic_statistics.c
+++ b/gdk/gdk_analytic_statistics.c
@@ -94,7 +94,7 @@
curval = n > 0 ? (dbl) sum / n : dbl_nil; \
if (0) { /* overflow handling from STEP1 */ \
ANALYTICAL_AVERAGE_CALC_NUM_STEP2(TPE,
IMP); \
- while (!(op[j] || j == k)) { \
+ while (!op[j] && j != k) { \
TPE v = bp[j--]; \
if (is_##TPE##_nil(v)) \
continue; \
@@ -396,7 +396,7 @@ GDKanalyticalavg(BAT *r, BAT *p, BAT *o,
ANALYTICAL_AVG_BRANCHES(CURRENT_ROW);
break;
default:
- if (!(st = GDKinitialize_segment_tree())) {
+ if ((st = GDKinitialize_segment_tree()) == NULL) {
res = GDK_FAIL;
goto cleanup;
}
@@ -656,7 +656,7 @@ GDKanalyticalavginteger(BAT *r, BAT *p,
ANALYTICAL_AVG_INT_BRANCHES(CURRENT_ROW);
break;
default:
- if (!(st = GDKinitialize_segment_tree())) {
+ if ((st = GDKinitialize_segment_tree()) == NULL) {
res = GDK_FAIL;
goto cleanup;
}
@@ -924,7 +924,7 @@ GDKanalytical_##NAME(BAT *r, BAT *p, BAT
ANALYTICAL_STATISTICS_BRANCHES(STDEV_VARIANCE_CURRENT_ROW, SAMPLE, OP); \
break; \
default: \
- if (!(st = GDKinitialize_segment_tree())) { \
+ if ((st = GDKinitialize_segment_tree()) == NULL) {
\
res = GDK_FAIL; \
goto cleanup; \
} \
@@ -1147,7 +1147,7 @@ GDKanalytical_##NAME(BAT *r, BAT *p, BAT
ANALYTICAL_STATISTICS_BRANCHES(COVARIANCE_CURRENT_ROW,
SAMPLE, OP); \
break; \
default: \
- if (!(st = GDKinitialize_segment_tree())) { \
+ if ((st = GDKinitialize_segment_tree()) == NULL) {
\
res = GDK_FAIL; \
goto cleanup; \
} \
@@ -1404,7 +1404,7 @@ GDKanalytical_correlation(BAT *r, BAT *p
ANALYTICAL_STATISTICS_BRANCHES(CORRELATION_CURRENT_ROW,
;, ;);
break;
default:
- if (!(st = GDKinitialize_segment_tree())) {
+ if ((st = GDKinitialize_segment_tree()) == NULL) {
res = GDK_FAIL;
goto cleanup;
}
diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c
--- a/gdk/gdk_bbp.c
+++ b/gdk/gdk_bbp.c
@@ -1709,7 +1709,6 @@ BBPjson_upgrade(json_storage_conversion
return GDK_FAIL;
}
GDKfree(upd);
- GDKunlink(0, BATDIR, "jsonupgradeneeded", NULL);
return GDK_SUCCEED;
}
#endif
@@ -2074,15 +2073,14 @@ BBPinit(bool allow_hge_upgrade)
* initialzation with a callback that actually
* knows how to perform the upgrade. */
int fd = MT_open(jsonupgradestr, O_WRONLY | O_CREAT);
+ GDKfree(jsonupgradestr);
if (fd < 0) {
TRC_CRITICAL(GDK, "cannot create signal file
jsonupgradeneeded");
- GDKfree(jsonupgradestr);
ATOMIC_SET(&GDKdebug, dbg);
return GDK_FAIL;
}
close(fd);
- GDKfree(jsonupgradestr);
}
}
#endif
@@ -4571,7 +4569,7 @@ BBPdiskscan(const char *parent, size_t b
continue; /* ignore .dot files and directories (.
..) */
#ifdef GDKLIBRARY_JSON
- if (strncmp(dent->d_name, "jsonupgradeneed", 15) == 0) {
+ if (strcmp(dent->d_name, "jsonupgradeneed") == 0) {
continue; /* ignore json upgrade signal file */
}
#endif
diff --git a/gdk/gdk_cross.c b/gdk/gdk_cross.c
--- a/gdk/gdk_cross.c
+++ b/gdk/gdk_cross.c
@@ -81,10 +81,9 @@ BATcrossci(BAT **r1p, BAT **r2p, struct
bn1 = COLnew(0, TYPE_oid, ci1->ncand * ci2->ncand, TRANSIENT);
if (r2p)
bn2 = COLnew(0, TYPE_oid, ci1->ncand * ci2->ncand, TRANSIENT);
- if (!bn1 || (r2p && !bn2)) {
+ if (bn1 == NULL || (r2p && bn2 == NULL)) {
BBPreclaim(bn1);
- if (bn2)
- BBPreclaim(bn2);
+ BBPreclaim(bn2);
return GDK_FAIL;
}
if (ci1->ncand > 0 && ci2->ncand > 0) {
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -4103,28 +4103,30 @@ leftjoin(BAT **r1p, BAT **r2p, BAT **r3p
if ((parent = VIEWtparent(l)) != 0) {
lp = BATdescriptor(parent);
- if (lp != NULL) {
- if (l->hseqbase == lp->hseqbase &&
- BATcount(l) == BATcount(lp) &&
- ATOMtype(l->ttype) == ATOMtype(lp->ttype)) {
- l = lp;
- } else {
- BBPunfix(lp->batCacheid);
- lp = NULL;
- }
+ if (lp == NULL)
+ return GDK_FAIL;
+ if (l->hseqbase == lp->hseqbase &&
+ BATcount(l) == BATcount(lp) &&
+ ATOMtype(l->ttype) == ATOMtype(lp->ttype)) {
+ l = lp;
+ } else {
+ BBPunfix(lp->batCacheid);
+ lp = NULL;
}
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
