Changeset: af594d55b1b7 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=af594d55b1b7
Modified Files:
gdk/gdk_join.c
sql/storage/bat/bat_logger.c
sql/storage/store.c
Branch: default
Log Message:
Merge with Oct2020 branch.
diffs (96 lines):
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -2400,8 +2400,10 @@ mergejoin(BAT **r1p, BAT **r2p, BAT *l,
nr = 0; \
if ((!nil_matches || not_in) && is_##TYPE##_nil(v)) { \
/* no match */ \
- if (not_in) \
+ if (not_in) { \
+ lskipped = BATcount(r1) > 0; \
continue; \
+ } \
} else if (hash_cand) { \
for (rb = HASHget(hsh, hash_##TYPE(hsh, &v)); \
rb != HASHnil(hsh); \
@@ -2673,8 +2675,10 @@ hashjoin(BAT **r1p, BAT **r2p, BAT *l, B
nr = 0;
if ((!nil_matches || not_in) && cmp(v, nil) == 0) {
/* no match */
- if (not_in)
+ if (not_in) {
+ lskipped = BATcount(r1) > 0;
continue;
+ }
} else if (hash_cand) {
for (rb = HASHget(hsh, HASHprobe(hsh, v));
rb != HASHnil(hsh);
diff --git a/tools/merovingian/daemon/merovingian.c
b/tools/merovingian/daemon/merovingian.c
--- a/tools/merovingian/daemon/merovingian.c
+++ b/tools/merovingian/daemon/merovingian.c
@@ -655,14 +655,9 @@ main(int argc, char *argv[])
}
host = kv->val;
- if (strncmp(host, "127.0.0.1", strlen("127.0.0.1")) == 0 ||
- strncmp(host, "0.0.0.0", strlen("0.0.0.0")) == 0) {
- use_ipv6 = false;
- } else {
- use_ipv6 = true;
- }
+ use_ipv6 = (strcmp(host, "127.0.0.1") != 0 && strcmp(host, "0.0.0.0")
!= 0);
- if (strncmp(host, "all", strlen("all")) == 0) {
+ if (strcmp(host, "all") == 0) {
host = NULL;
}
diff --git a/tools/merovingian/daemon/monetdbd.1.in
b/tools/merovingian/daemon/monetdbd.1.in
--- a/tools/merovingian/daemon/monetdbd.1.in
+++ b/tools/merovingian/daemon/monetdbd.1.in
@@ -176,16 +176,36 @@ This property specifies which TCP port
.I monetdbd
should listen to for connection requests. Defaults to 50000.
.TP
-.B ipv6
-This property forces
-.I monetdbd
-to bind connections on IPv6 addresses only.
-Defaults to false.
+.B listenaddr
+This property specifies an address that is allowed to connect to the
+server.
+The following possibilities exist:
+.RS
+.TP
+.B localhost
+The server only listens on the IPv4 and IPv6 loopback interface (if
+available). This is the default.
+.TP
+.B 127.0.0.1
+The server only listens on the IPv4 loopback interface.
.TP
-.B listenaddr
-This property specifies an address that is allowed to connect to the server.
-The user can specify one IP(v6) address, or use the 0.0.0.0 notation to allow
-connections from everywhere. Defaults to localhost (127.0.0.1).
+.B ::1
+The server only listens on the IPv6 loopback interface.
+.TP
+.B all
+The server listens on all available IPv4 and IPv6 interfaces.
+.TP
+.B 0.0.0.0
+The server listens on all available IPv4 interfaces.
+.TP
+.B ::
+The server listens on all available IPv6 interfaces.
+.TP
+.I hostname
+The server listens on the interface designated by
+.I hostname
+which is looked up using the normal hostname lookup facilities.
+.RE
.TP
.B control
For remote management of
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
