MonetDB: linear-hashing - Merge with Nov2019.

[Aris Koning]

Changeset: a7f3d55af990 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a7f3d55af990
Modified Files:
        MonetDB.spec
        NT/rules.msc
        monetdb5/modules/kernel/algebra.c
        monetdb5/modules/mal/mal_mapi.c
Branch: linear-hashing
Log Message:

Merge with Nov2019.


diffs (52 lines):

diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -90,9 +90,9 @@
 %if 0%{?rhel} == 7 || %{!?fedora:1000}%{?fedora} <= 30
 %bcond_without py2integration
 %endif
-%if %{?rhel:0}%{!?rhel:1}
-# On RHEL 6, Python 3 is too old, and on RHEL 7, the default Python 3
-# is too old (in both cases 3.4).
+%if 0%{?rhel} >= 7 || 0%{?fedora} > 0
+# On RHEL 6, Python 3 is too old.  On RHEL 7, Python 3 was too old
+# when RHEL 7 was released, but now it is ok.
 %bcond_without py3integration
 %endif
 
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -64,7 +64,7 @@ PTHREAD_LIBS =
 ODBCINST_LIBS = odbccp32.lib user32.lib $(LEGACY_STDIO_DEFINITIONS)
 ODBC_LIBS = odbc32.lib
 
-!IFNDEF PY3VER
+!IFNDEF PY2VER
 PY2VER=7
 !ENDIF
 !IFNDEF PYTHON2BASE
diff --git a/monetdb5/modules/kernel/algebra.c 
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -310,7 +310,7 @@ ALGselect2nil(bat *result, const bat *bi
                low = high; 
        else if (*hi == 1 && ATOMcmp(b->ttype, high, nilptr) == 0)
                high = low;
-       if (low == high && ATOMcmp(b->ttype, high, nilptr) == 0) /* ugh sql nil 
!= nil */
+       if (ATOMcmp(b->ttype, low, high) == 0 && ATOMcmp(b->ttype, high, 
nilptr) == 0) /* ugh sql nil != nil */
                nanti = !nanti;
        bn = BATselect(b, s, low, high, *li, *hi, nanti);
        BBPunfix(b->batCacheid);
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -930,7 +930,7 @@ SERVERlisten(int port, const char *usock
                throw(MAL, "mal_mapi.listen", OPERATION_FAILED ": starting 
thread failed");
        }
 #ifdef DEBUG_SERVER
-       gethostname(host, (int) 512);
+       gethostname(host, sizeof(host));
        snprintf(msg, (int) 512, "#Ready to accept connections on %s:%d\n", 
host, port);
        fprintf(stderr, "%s", msg);
 #endif
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list