Changeset: ddfaf9b1036d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ddfaf9b1036d
Modified Files:
gdk/gdk.h
Branch: strimps_update
Log Message:
Merge with default
diffs (truncated from 2872 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -764,3 +764,5 @@ 5872f047d97c98d3a848514438b8f97fa446855d
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/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/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/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])
@@ -4022,12 +4012,12 @@ bataggr
allnotequal
pattern bataggr.allnotequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit
SQLallnotequal;
-(empty)
+if all values in r are not equal to l, return true, else if r has nil, return
nil, else return false
bataggr
anyequal
pattern bataggr.anyequal(X_0:bat[:any_1], X_1:bat[:any_1]):bat[:bit]
SQLanyequal;
-(empty)
+if any value in r is equal to l, return true, else if r has nil, return nil,
else return false
bataggr
exist
pattern bataggr.exist(X_0:any_1):bat[:bit]
@@ -25986,8 +25976,8 @@ BLOBblob_blob_bulk;
batcalc
blob
command batcalc.blob(X_0:bat[:str], X_1:bat[:oid]):bat[:blob]
-batstr_2_blob;
-cast to blob
+BLOBblob_fromstr_bulk;
+(empty)
batcalc
bte
pattern batcalc.bte(X_0:bat[:bit]):bat[:bte]
@@ -27760,11 +27750,6 @@ MTIMEtimestamp_extract_date_bulk;
(empty)
batcalc
date
-command batcalc.date(X_0:bat[:str], X_1:bat[:oid]):bat[:date]
-batstr_2_date;
-cast to date
-batcalc
-date
pattern batcalc.date(X_0:bat[:oid]):bat[:date]
nil_2_date;
cast to date
@@ -41834,11 +41819,6 @@ command calc.blob(X_0:str):blob
BLOBblob_fromstr;
(empty)
calc
-blob
-command calc.blob(X_0:str):blob
-str_2_blob;
-cast to blob
-calc
bte
pattern calc.bte(X_0:bit):bte
CMDvarCONVERT;
@@ -42269,11 +42249,6 @@ pattern calc.date(X_0:void):date
nil_2_date;
cast to date
calc
-date
-pattern calc.date(X_0:str):date
-str_2_date;
-cast to date
-calc
daytime
command calc.daytime(X_0:daytime):daytime
MTIMEdaytime_daytime;
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
@@ -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]
@@ -977,42 +977,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])
@@ -3447,12 +3437,12 @@ bataggr
allnotequal
pattern bataggr.allnotequal(X_0:bat[:any_1], X_1:bat[:any_1]):bit
SQLallnotequal;
-(empty)
+if all values in r are not equal to l, return true, else if r has nil, return
nil, else return false
bataggr
anyequal
pattern bataggr.anyequal(X_0:bat[:any_1], X_1:bat[:any_1]):bat[:bit]
SQLanyequal;
-(empty)
+if any value in r is equal to l, return true, else if r has nil, return nil,
else return false
bataggr
exist
pattern bataggr.exist(X_0:any_1):bat[:bit]
@@ -18091,8 +18081,8 @@ BLOBblob_blob_bulk;
batcalc
blob
command batcalc.blob(X_0:bat[:str], X_1:bat[:oid]):bat[:blob]
-batstr_2_blob;
-cast to blob
+BLOBblob_fromstr_bulk;
+(empty)
batcalc
bte
pattern batcalc.bte(X_0:bat[:bit]):bat[:bte]
@@ -19450,11 +19440,6 @@ MTIMEtimestamp_extract_date_bulk;
(empty)
batcalc
date
-command batcalc.date(X_0:bat[:str], X_1:bat[:oid]):bat[:date]
-batstr_2_date;
-cast to date
-batcalc
-date
pattern batcalc.date(X_0:bat[:oid]):bat[:date]
nil_2_date;
cast to date
@@ -30724,11 +30709,6 @@ command calc.blob(X_0:str):blob
BLOBblob_fromstr;
(empty)
calc
-blob
-command calc.blob(X_0:str):blob
-str_2_blob;
-cast to blob
-calc
bte
pattern calc.bte(X_0:bit):bte
CMDvarCONVERT;
@@ -31074,11 +31054,6 @@ pattern calc.date(X_0:void):date
nil_2_date;
cast to date
calc
-date
-pattern calc.date(X_0:str):date
-str_2_date;
-cast to date
-calc
daytime
command calc.daytime(X_0:daytime):daytime
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
