Changeset: 79c9bbc4e692 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/79c9bbc4e692
Modified Files:
sql/server/rel_optimize_proj.c
Branch: optimizer-testing
Log Message:
merge with default
diffs (truncated from 32372 to 300 lines):
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
[bumpversion]
-current_version = 11.46.0
+current_version = 11.48.0
commit = False
tag = False
@@ -30,4 +30,3 @@ serialize = {major},{minor},{patch}
[bumpversion:file:monetdb5/tools/libmonetdb5.rc]
parse = (?P<major>\d+),(?P<minor>\d+),(?P<patch>\d+)
serialize = {major},{minor},{patch}
-
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -793,3 +793,9 @@ 41ca60d96bd0198ca5d74937630a442a5fbaf1cd
41ca60d96bd0198ca5d74937630a442a5fbaf1cd Sep2022_SP1_release
e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_13
e8b0e5558313f4d98bc48316368299decc55ed4e Sep2022_SP2_release
+8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_31
+8a95168e853382b9b89ac7b67e343788ea837f3a Jul2021_SP9_release
+bb95192134c0d8ef8fea525204eefcd0de099a54 Jun2023_root
+24385ee6130494440e09d31ec73f4aa2e2893e98 Jul2021_33
+05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_33
+05b3d9ea9165baf1d2956d5b06ad85f817ecc6d2 Jul2021_SP10_release
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,7 +54,6 @@ include(monetdb-toolchain)
monetdb_default_compiler_options()
include(monetdb-defines)
-monetdb_hg_revision()
# required for symbol existance tests
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
diff --git a/ChangeLog b/ChangeLog.Jun2023
copy from ChangeLog
copy to ChangeLog.Jun2023
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
# Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
%global name MonetDB
-%global version 11.46.0
+%global version 11.48.0
%{!?buildno: %global buildno %(date +%Y%m%d)}
# Use bcond_with to add a --with option; i.e., "without" is default.
@@ -366,6 +366,7 @@ developer.
%{_bindir}/ODBCStmtAttr
%{_bindir}/ODBCgetInfo
%{_bindir}/ODBCmetadata
+%{_bindir}/ODBCtester
%{_bindir}/arraytest
%{_bindir}/bincopydata
%{_bindir}/odbcsample1
diff --git a/clients/ChangeLog b/clients/ChangeLog.Jun2023
copy from clients/ChangeLog
copy to clients/ChangeLog.Jun2023
diff --git a/clients/ChangeLog.Sep2022 b/clients/ChangeLog.Sep2022
--- a/clients/ChangeLog.Sep2022
+++ b/clients/ChangeLog.Sep2022
@@ -1,3 +1,8 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Mon Apr 17 2023 Sjoerd Mullender <sjo...@acm.org>
+- If the number of rows in mclient is set to 0 (using either --rows=0
+ option or \r0 on the mclient command line), the internal pager is used
+ and it then uses the height of the terminal window.
+
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
@@ -1019,11 +1019,21 @@ command aggr.quantile(X_0:bat[:any_1], X
AGGRquantile;
Quantile aggregate
aggr
+quantile
+command aggr.quantile(X_0:bat[:any_1], X_1:dbl):any_1
+AGGRquantile_cst;
+Quantile aggregate
+aggr
quantile_avg
command aggr.quantile_avg(X_0:bat[:any_1], X_1:bat[:dbl]):dbl
AGGRquantile_avg;
Quantile aggregate
aggr
+quantile_avg
+command aggr.quantile_avg(X_0:bat[:any_1], X_1:dbl):dbl
+AGGRquantile_avg_cst;
+Quantile aggregate
+aggr
stdev
command aggr.stdev(X_0:bat[:bte], X_1:bat[:oid], X_2:bat[:any_1]):bat[:dbl]
AGGRstdev3_dbl;
@@ -34574,35 +34584,130 @@ pattern batstr.ascii(X_0:bat[:str], X_1:
STRbatAscii;
Return unicode of head of string
batstr
+asciify
+command batstr.asciify(X_0:bat[:str]):bat[:str]
+BATSTRasciify;
+Transform BAT of strings from UTF8 to ASCII
+batstr
+contains
+pattern batstr.contains(X_0:bat[:str], X_1:bat[:str]):bat[:bit]
+BATSTRcontains;
+Check if bat string haystack contains bat string needle.
+batstr
+contains
+pattern batstr.contains(X_0:bat[:str], X_1:bat[:str], X_2:bat[:oid],
X_3:bat[:oid]):bat[:bit]
+BATSTRcontains;
+Check if bat string haystack contains bat string needle (with CLs).
+batstr
+contains
+pattern batstr.contains(X_0:bat[:str], X_1:bat[:str], X_2:bit):bat[:bit]
+BATSTRcontains;
+Check if bat string haystack contains bat string needle, icase flag.
+batstr
+contains
+pattern batstr.contains(X_0:bat[:str], X_1:bat[:str], X_2:bit, X_3:bat[:oid],
X_4:bat[:oid]):bat[:bit]
+BATSTRcontains;
+Check if bat string haystack contains bat string needle (with CLs) + icase
flag.
+batstr
+contains
+pattern batstr.contains(X_0:bat[:str], X_1:str):bat[:bit]
+BATSTRcontains_cst;
+Check if bat string haystack contains string needle.
+batstr
+contains
+pattern batstr.contains(X_0:bat[:str], X_1:str, X_2:bat[:oid]):bat[:bit]
+BATSTRcontains_cst;
+Check if bat string haystack contains string needle (with CL) ends with
substring.
+batstr
+contains
+pattern batstr.contains(X_0:bat[:str], X_1:str, X_2:bit):bat[:bit]
+BATSTRcontains_cst;
+Check if bat string haystack contains string needle, icase flag.
+batstr
+contains
+pattern batstr.contains(X_0:bat[:str], X_1:str, X_2:bit,
X_3:bat[:oid]):bat[:bit]
+BATSTRcontains_cst;
+Check if bat string haystack contains string needle (with CL) ends with
substring + icase flag.
+batstr
+contains
+pattern batstr.contains(X_0:str, X_1:bat[:str]):bat[:bit]
+BATSTRcontains_strcst;
+Check if string haystack contains bat string needle.
+batstr
+contains
+pattern batstr.contains(X_0:str, X_1:bat[:str], X_2:bat[:oid]):bat[:bit]
+BATSTRcontains_strcst;
+Check if string haystack contains bat string needle (with CL).
+batstr
+contains
+pattern batstr.contains(X_0:str, X_1:bat[:str], X_2:bit):bat[:bit]
+BATSTRcontains_strcst;
+Check if string haystack contains bat string needle + icase flag.
+batstr
+contains
+pattern batstr.contains(X_0:str, X_1:bat[:str], X_2:bit,
X_3:bat[:oid]):bat[:bit]
+BATSTRcontains_strcst;
+Check if string haystack contains bat string needle (with CL) + icase flag.
+batstr
endsWith
pattern batstr.endsWith(X_0:bat[:str], X_1:bat[:str]):bat[:bit]
-STRbatSuffix;
-Suffix check.
+BATSTRends_with;
+Check if bat string ends with bat substring.
batstr
endsWith
pattern batstr.endsWith(X_0:bat[:str], X_1:bat[:str], X_2:bat[:oid],
X_3:bat[:oid]):bat[:bit]
-STRbatSuffix;
-Suffix check.
+BATSTRends_with;
+Check if bat string ends with bat substring (with CLs).
+batstr
+endsWith
+pattern batstr.endsWith(X_0:bat[:str], X_1:bat[:str], X_2:bit):bat[:bit]
+BATSTRends_with;
+Check if bat string ends with bat substring, icase flag.
+batstr
+endsWith
+pattern batstr.endsWith(X_0:bat[:str], X_1:bat[:str], X_2:bit, X_3:bat[:oid],
X_4:bat[:oid]):bat[:bit]
+BATSTRends_with;
+Check if bat string ends with bat substring (with CLs) + icase flag.
+batstr
+endsWith
+pattern batstr.endsWith(X_0:bat[:str], X_1:str):bat[:bit]
+BATSTRends_with_cst;
+Check if bat string ends with substring.
+batstr
+endsWith
+pattern batstr.endsWith(X_0:bat[:str], X_1:str, X_2:bat[:oid]):bat[:bit]
+BATSTRends_with_cst;
+Check if bat string(with CL) ends with substring.
+batstr
+endsWith
+pattern batstr.endsWith(X_0:bat[:str], X_1:str, X_2:bit):bat[:bit]
+BATSTRends_with_cst;
+Check if bat string ends with substring, icase flag.
+batstr
+endsWith
+pattern batstr.endsWith(X_0:bat[:str], X_1:str, X_2:bit,
X_3:bat[:oid]):bat[:bit]
+BATSTRends_with_cst;
+Check if bat string(with CL) ends with substring + icase flag.
batstr
endsWith
pattern batstr.endsWith(X_0:str, X_1:bat[:str]):bat[:bit]
-STRbatSuffix_strcst;
-Suffix check.
+BATSTRends_with_strcst;
+Check if string ends with bat substring.
batstr
endsWith
pattern batstr.endsWith(X_0:str, X_1:bat[:str], X_2:bat[:oid]):bat[:bit]
-STRbatSuffix_strcst;
-Suffix check.
+BATSTRends_with_strcst;
+Check if string ends with bat substring(with CL).
batstr
endsWith
-pattern batstr.endsWith(X_0:bat[:str], X_1:str):bat[:bit]
-STRbatSuffixcst;
-Suffix check.
+pattern batstr.endsWith(X_0:str, X_1:bat[:str], X_2:bit):bat[:bit]
+BATSTRends_with_strcst;
+Check if string ends with bat substring + icase flag.
batstr
endsWith
-pattern batstr.endsWith(X_0:bat[:str], X_1:str, X_2:bat[:oid]):bat[:bit]
-STRbatSuffixcst;
-Suffix check.
+pattern batstr.endsWith(X_0:str, X_1:bat[:str], X_2:bit,
X_3:bat[:oid]):bat[:bit]
+BATSTRends_with_strcst;
+Check if string ends with bat substring(with CL) + icase flag.
batstr
insert
pattern batstr.insert(X_0:bat[:str], X_1:bat[:int], X_2:bat[:int],
X_3:bat[:str]):bat[:str]
@@ -34766,33 +34871,63 @@ Return the string length in bytes.
batstr
r_search
pattern batstr.r_search(X_0:bat[:str], X_1:bat[:str]):bat[:int]
-STRbatRstrSearch;
+BATSTRrevstr_search;
Reverse search for a substring. Returns position, -1 if not found.
batstr
r_search
pattern batstr.r_search(X_0:bat[:str], X_1:bat[:str], X_2:bat[:oid],
X_3:bat[:oid]):bat[:int]
-STRbatRstrSearch;
+BATSTRrevstr_search;
+Reverse search for a substring (with CLs). Returns position, -1 if not found.
+batstr
+r_search
+pattern batstr.r_search(X_0:bat[:str], X_1:bat[:str], X_2:bit):bat[:int]
+BATSTRrevstr_search;
+Reverse search for a substring + icase flag. Returns position, -1 if not found.
+batstr
+r_search
+pattern batstr.r_search(X_0:bat[:str], X_1:bat[:str], X_2:bit, X_3:bat[:oid],
X_4:bat[:oid]):bat[:int]
+BATSTRrevstr_search;
+Reverse search for a substring (with CLs) + icase flag. Returns position, -1
if not found.
+batstr
+r_search
+pattern batstr.r_search(X_0:bat[:str], X_1:str):bat[:int]
+BATSTRrevstr_search_cst;
Reverse search for a substring. Returns position, -1 if not found.
batstr
r_search
+pattern batstr.r_search(X_0:bat[:str], X_1:str, X_2:bat[:oid]):bat[:int]
+BATSTRrevstr_search_cst;
+Reverse search for a substring (with CL). Returns position, -1 if not found.
+batstr
+r_search
+pattern batstr.r_search(X_0:bat[:str], X_1:str, X_2:bit):bat[:int]
+BATSTRrevstr_search_cst;
+Reverse search for a substring + icase flag. Returns position, -1 if not found.
+batstr
+r_search
+pattern batstr.r_search(X_0:bat[:str], X_1:str, X_2:bit,
X_3:bat[:oid]):bat[:int]
+BATSTRrevstr_search_cst;
+Reverse search for a substring (with CL) + icase flag. Returns position, -1 if
not found.
+batstr
+r_search
pattern batstr.r_search(X_0:str, X_1:bat[:str]):bat[:int]
-STRbatRstrSearch_strcst;
+BATSTRrevstr_search_strcst;
Reverse search for a substring. Returns position, -1 if not found.
batstr
r_search
pattern batstr.r_search(X_0:str, X_1:bat[:str], X_2:bat[:oid]):bat[:int]
-STRbatRstrSearch_strcst;
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
