Changeset: 57cde37aed46 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/57cde37aed46
Branch: copyfaster
Log Message:
merged with default
diffs (30 lines):
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -804,7 +804,7 @@ BAThash_impl(BAT *restrict b, struct can
mask = HASHmask(ci->ncand);
} else if (!hascand && bi.unique_est != 0) {
maxmask = HASHmask(ci->ncand);
- mask = HASHmask(bi.unique_est);
+ mask = HASHmask((BUN) bi.unique_est);
if (mask < maxmask) {
/* it's only an estimate: try out on first 25%
* of b */
diff --git a/testing/tlstester.py b/testing/tlstester.py
--- a/testing/tlstester.py
+++ b/testing/tlstester.py
@@ -11,7 +11,13 @@
# Copyright 1997 - July 2008 CWI.
from argparse import ArgumentParser
-from datetime import datetime, timedelta, UTC
+from datetime import datetime, timedelta
+try:
+ from datetime import UTC
+except ImportError:
+ # Python 3.10 and older
+ from datetime import timezone
+ UTC = timezone.utc
import hashlib
import http.server
import io
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
