Changeset: 61c888902cfc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/61c888902cfc
Modified Files:
sql/backends/monet5/sql.c
sql/backends/monet5/sql_cat.c
sql/server/rel_schema.c
sql/server/sql_mvc.c
sql/storage/sql_storage.h
sql/storage/store.c
Branch: userprofile
Log Message:
merge default
diffs (truncated from 65335 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -763,3 +763,6 @@ cab90a348501b045e19cee5cebcc44f3800bd0a8
5872f047d97c98d3a848514438b8f97fa446855d Jan2022_11
025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_13
025239a5a6f122042798c0f1132a2c6298514e06 Jan2022_SP2_release
+2e54857a91306cc6304825c5596f65d00595db6b Jul2021_23
+2e54857a91306cc6304825c5596f65d00595db6b Jul2021_SP6_release
+1252291e5c0ddc91ccb16d612d04e34e6a7d3bc3 Jun2020_13
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,6 +183,3 @@ add_subdirectory(documentation)
if(CMAKE_SUMMARY)
monetdb_cmake_summary()
endif()
-
-
-# vim: set ts=2:sw=2:et
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -365,6 +365,7 @@ developer.
%{_bindir}/smack00
%{_bindir}/smack01
%{_bindir}/streamcat
+%{_bindir}/testcondvar
%{_bindir}/testgetinfo
%{_bindir}/testStmtAttr
%{_bindir}/malsample.pl
diff --git a/buildtools/conf/CMakeLists.txt b/buildtools/conf/CMakeLists.txt
--- a/buildtools/conf/CMakeLists.txt
+++ b/buildtools/conf/CMakeLists.txt
@@ -23,5 +23,3 @@ if(DEVELOPMENT AND NOT WIN32)
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT buildtools)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/buildtools/conf/Maddlog b/buildtools/conf/Maddlog
--- a/buildtools/conf/Maddlog
+++ b/buildtools/conf/Maddlog
@@ -189,6 +189,9 @@ fi
file=ChangeLog.$RANDOM
+# make sure we get the correct day and month names
+export LC_ALL=en_US.utf-8
+
case "$CL" in
*/*)
cd "${CL%/*}"
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -17,5 +17,3 @@ if(WIN32)
DESTINATION "."
COMPONENT server)
endif()
-
-# vim: set ts=2:sw=2:et
diff --git a/clients/Tests/All b/clients/Tests/All
--- a/clients/Tests/All
+++ b/clients/Tests/All
@@ -3,3 +3,4 @@ HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&H
!HAVE_HGE&HAVE_FITS&HAVE_GEOM&HAVE_LIBR&HAVE_LIBPY3&HAVE_NETCDF&HAVE_SHP&NOT_WIN32?MAL-signatures
NOT_WIN32&MERCURIAL?melcheck
mclient-uri
+testcondvar
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
@@ -12,7 +12,7 @@ aggr
allnotequal
pattern aggr.allnotequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit
SQLallnotequal;
-if all values in r are not equal to l return true, else if r has nil nil else
false
+if all values in r are not equal to l, return true, else if r has nil, return
nil, else return false
aggr
anyequal
pattern aggr.anyequal(X_0:any_1, X_1:any_1):bit
@@ -22,7 +22,7 @@ aggr
anyequal
pattern aggr.anyequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit
SQLanyequal;
-if any value in r is equal to l return true, else if r has nil nil else false
+if any value in r is equal to l, return true, else if r has nil, return nil,
else return false
aggr
avg
command aggr.avg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl]
@@ -1167,42 +1167,32 @@ aggr
suballnotequal
pattern aggr.suballnotequal(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bat[:oid], X_5:bat[:oid], X_6:bit):bat[:bit]
SQLallnotequal_grp2;
-if all values in r are not equal to l return true, else if r has nil nil else
false, except if rid is nil (ie empty) then true; with candidate list
+if all values in r are not equal to l, return true, else if r has nil return
nil, else return false, except if rid is nil (ie empty) then return true; with
candidate list
aggr
suballnotequal
pattern aggr.suballnotequal(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit):bat[:bit]
SQLallnotequal_grp2;
-if all values in r are not equal to l return true, else if r has nil nil else
false, except if rid is nil (ie empty) then true
-aggr
-suballnotequal
-pattern aggr.suballnotequal(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit):bat[:bit]
-SQLallnotequal_grp;
-if all values in r are not equal to l return true, else if r has nil nil else
false; with candidate list
+if all values in r are not equal to l, return true, else if r has nil return
nil, else return false, except if rid is nil (ie empty) then return true
aggr
suballnotequal
pattern aggr.suballnotequal(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bit):bat[:bit]
SQLallnotequal_grp;
-if all values in r are not equal to l return true, else if r has nil nil else
false
+if all values in r are not equal to l, return true, else if r has nil, return
nil else return false
aggr
subanyequal
pattern aggr.subanyequal(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bat[:oid], X_5:bat[:oid], X_6:bit):bat[:bit]
SQLanyequal_grp2;
-if any value in r is equal to l return true, else if r has nil nil else false,
except if rid is nil (ie empty) then false; with candidate list
+if any value in r is equal to l, return true, else if r has nil, return nil,
else return false, except if rid is nil (ie empty) then return false; with
candidate list
aggr
subanyequal
pattern aggr.subanyequal(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit):bat[:bit]
SQLanyequal_grp2;
-if any value in r is equal to l return true, else if r has nil nil else false,
except if rid is nil (ie empty) then false
-aggr
-subanyequal
-pattern aggr.subanyequal(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bat[:oid], X_5:bit):bat[:bit]
-SQLanyequal_grp;
-if any value in r is equal to l return true, else if r has nil nil else false;
with candidate list
+if any value in r is equal to l, return true, else if r has nil, return nil,
else return false, except if rid is nil (ie empty) then return false
aggr
subanyequal
pattern aggr.subanyequal(X_0:bat[:any_1], X_1:bat[:any_1], X_2:bat[:oid],
X_3:bat[:oid], X_4:bit):bat[:bit]
SQLanyequal_grp;
-if any value in r is equal to l return true, else if r has nil nil else false
+if any value in r is equal to l, return true, else if r has nil, return nil,
else return false
aggr
subavg
command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit) (X_5:bat[:bte], X_6:bat[:lng], X_7:bat[:lng])
@@ -1255,332 +1245,332 @@ AGGRavg3comb;
Grouped average aggregation combiner
aggr
subavg
-command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:dbl]
AGGRsubavg1_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:dbl]
AGGRsubavg1_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:dbl]
AGGRsubavg1_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:dbl]
AGGRsubavg1_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:dbl]
AGGRsubavg1_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:dbl]
AGGRsubavg1_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bit):bat[:dbl]
AGGRsubavg1_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:dbl]
AGGRsubavg1cand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:dbl]
AGGRsubavg1cand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:dbl]
AGGRsubavg1cand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:hge], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:dbl]
AGGRsubavg1cand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:dbl]
AGGRsubavg1cand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:dbl]
AGGRsubavg1cand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit):bat[:dbl]
+command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit):bat[:dbl]
AGGRsubavg1cand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit, X_5:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:int):bat[:dbl]
AGGRsubavg1s_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit, X_5:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:int):bat[:dbl]
AGGRsubavg1s_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit, X_5:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:int):bat[:dbl]
AGGRsubavg1s_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit, X_5:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:int):bat[:dbl]
AGGRsubavg1s_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit, X_5:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:int):bat[:dbl]
AGGRsubavg1s_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:bit, X_5:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1], X_3:bit,
X_4:int):bat[:dbl]
AGGRsubavg1s_dbl;
Grouped average aggregate
aggr
subavg
-command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl]
AGGRsubavg1scand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:dbl], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl]
AGGRsubavg1scand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:flt], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl]
AGGRsubavg1scand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:int], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl]
AGGRsubavg1scand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:lng], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl]
AGGRsubavg1scand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
-command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:bit, X_6:int):bat[:dbl]
+command aggr.subavg(X_0:bat[:sht], X_1:bat[:oid], X_2:bat[:any_1],
X_3:bat[:oid], X_4:bit, X_5:int):bat[:dbl]
AGGRsubavg1scand_dbl;
Grouped average aggregate with candidates list
aggr
subavg
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
