Changeset: d1ada4f6fa8e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d1ada4f6fa8e
Removed Files:
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.sql
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.err
        
sql/test/BugTracker-2009/Tests/segfault_when_quitting_debugger.SF-2538837.stable.out
Modified Files:
        clients/Tests/MAL-signatures.stable.out
        clients/Tests/MAL-signatures.stable.out.int128
Branch: monetdbe-proxy
Log Message:

Merge with default.


diffs (truncated from 172140 to 300 lines):

diff --git a/.editorconfig b/.editorconfig
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,9 +1,11 @@
+root = true
+
 # Unix-style newlines with a newline ending every file
 [*]
 end_of_line = lf
 insert_final_newline = true
 
-[*.{c,h}]
+[*.{c,h}{,.in}]
 indent_style = tab
 tab_width = 4
 indent_size = tab
@@ -11,12 +13,13 @@ trim_trailing_whitespace = true
 charset = utf-8
 max_line_length = 120
 
-[*.py]
+[*.py{,.in}]
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 charset = utf-8
 
-[gdk/*.{c,h}]
-tab_width = 8
-max_line_length = 72
+[{CMakeLists.txt,*.cmake}{,.in}]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -140,6 +140,13 @@ BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(libpcre) >= 4.5
 %endif
 BuildRequires: pkgconfig(zlib)
+%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} > 7
+# not on RHEL 7
+BuildRequires: pkgconfig(liblz4) >= 1.8
+%global LZ4 ON
+%else
+%global LZ4 OFF
+%endif
 %if %{with py3integration}
 BuildRequires: pkgconfig(python3) >= 3.5
 BuildRequires: python3-numpy
@@ -149,8 +156,6 @@ BuildRequires: pkgconfig(libR)
 %endif
 # if we were to compile with cmocka support (-DWITH_CMOCKA=ON):
 # BuildRequires: pkgconfig(cmocka)
-# if we were to compile with lz4 support (-DWITH_LZ4=ON):
-# BuildRequires: pkgconfig(liblz4)
 # if we were to compile with NetCDF support (-DNETCDF=ON):
 # BuildRequires: pkgconfig(netcdf)
 # if we were to compile with proj support (-DWITH_PROJ=ON):
@@ -784,8 +789,6 @@ export CFLAGS
 %endif
 %cmake3 \
        -DRELEASE_VERSION=ON \
-       -DRUNDIR=%{_rundir}/monetdb \
-       -DLOGDIR=%{_localstatedir}/log/monetdb \
        -DASSERT=OFF \
        -DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
        -DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
@@ -803,7 +806,7 @@ export CFLAGS
        -DWITH_CMOCKA=OFF \
        -DWITH_CRYPTO=ON \
        -DWITH_CURL=ON \
-       -DWITH_LZ4=OFF \
+       -DWITH_LZ4=%{LZ4} \
        -DWITH_LZMA=ON \
        -DWITH_PCRE=ON \
        -DWITH_PROJ=OFF \
@@ -817,7 +820,10 @@ export CFLAGS
 %cmake3_build
 
 %install
+mkdir -p "%{buildroot}/usr"
+for d in etc var; do mkdir "%{buildroot}/$d"; ln -s ../$d 
"%{buildroot}/usr/$d"; done
 %cmake3_install
+rm "%{buildroot}/usr/var" "%{buildroot}/usr/etc"
 
 # move file to correct location
 %if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
diff --git a/NT/mkodbcwxs.py b/NT/mkodbcwxs.py
--- a/NT/mkodbcwxs.py
+++ b/NT/mkodbcwxs.py
@@ -77,8 +77,8 @@ def main():
     print(r'            <Directory Id="lib" Name="lib">')
     id = comp(features, id, 14,
               [r'bin\mapi.dll', # r'lib\mapi.pdb',
-               r'bin\MonetODBC.dll', # r'lib\MonetODBC.pdb',
-               r'bin\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
+               r'lib\MonetODBC.dll', # r'lib\MonetODBC.pdb',
+               r'lib\MonetODBCs.dll', # r'lib\MonetODBCs.pdb',
                r'bin\stream.dll', # r'lib\stream.pdb',
                vcpkg.format(r'bin\libiconv.dll'),
                vcpkg.format(r'bin\bz2.dll'),
diff --git a/buildtools/conf/monetdbd.conf.in b/buildtools/conf/monetdbd.conf.in
--- a/buildtools/conf/monetdbd.conf.in
+++ b/buildtools/conf/monetdbd.conf.in
@@ -1,3 +1,3 @@
 # this file is for systemd
 # monetdbd needs a directory in /run that is owned by monetdb:monetdb
-d @RUNDIR@ 0775 monetdb monetdb -
+d @CMAKE_INSTALL_FULL_RUNSTATEDIR@/monetdb 0775 monetdb monetdb -
diff --git a/clients/Tests/MAL-signatures.stable.out 
b/clients/Tests/MAL-signatures.stable.out
--- a/clients/Tests/MAL-signatures.stable.out
+++ b/clients/Tests/MAL-signatures.stable.out
@@ -3774,8 +3774,7 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "bit_noerror",  "pattern batcalc.bit_noerror(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:bit] ", "CMDconvert_bit;",      ""      ]
 [ "batcalc",   "bit_noerror",  "pattern 
batcalc.bit_noerror(X_1:bat[:str]):bat[:bit] ",        "CMDconvert_bit;",      
""      ]
 [ "batcalc",   "bit_noerror",  "pattern batcalc.bit_noerror(X_1:bat[:str], 
X_2:bat[:oid]):bat[:bit] ", "CMDconvert_bit;",      ""      ]
-[ "batcalc",   "blob", "command batcalc.blob(X_1:bat[:str]):bat[:blob] ",      
"batstr_2_blob;",       ""      ]
-[ "batcalc",   "blob", "command batcalc.blob(X_1:bat[:str], 
X_2:bat[:oid]):bat[:blob] ",       "batstr_2_blob_cand;",  ""      ]
+[ "batcalc",   "blob", "command batcalc.blob(X_1:bat[:str], 
X_2:bat[:oid]):bat[:blob] ",       "batstr_2_blob;",       ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:bit]):bat[:bte] ",        
"CMDconvertsignal_bte;",        ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:bte] ", "CMDconvertsignal_bte;",        ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:bte]):bat[:bte] ",        
"CMDconvertsignal_bte;",        ""      ]
@@ -3794,37 +3793,22 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:bte] ", "CMDconvertsignal_bte;",        ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:str]):bat[:bte] ",        
"CMDconvertsignal_bte;",        ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:str], 
X_2:bat[:oid]):bat[:bte] ", "CMDconvertsignal_bte;",        ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte]):bat[:bte] 
",       "batbte_dec2_bte;",     ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:bte] ",        "batbte_dec2_cand_bte;",        ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte], X_3:int, 
X_4:int):bat[:bte] ",     "batbte_dec2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batbte_dec2dec_cand_bte;",  
   ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:bte], X_2:int, 
X_3:int):bat[:bte] ",      "batbte_num2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batbte_num2dec_cand_bte;",     ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:dbl], X_2:int, 
X_3:int):bat[:bte] ",      "batdbl_num2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:dbl], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batdbl_num2dec_cand_bte;",     ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:flt], X_2:int, 
X_3:int):bat[:bte] ",      "batflt_num2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:flt], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batflt_num2dec_cand_bte;",     ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int]):bat[:bte] 
",       "batint_dec2_bte;",     ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:bte] ",        "batint_dec2_cand_bte;",        ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int], X_3:int, 
X_4:int):bat[:bte] ",     "batint_dec2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batint_dec2dec_cand_bte;",  
   ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:int], X_2:int, 
X_3:int):bat[:bte] ",      "batint_num2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batint_num2dec_cand_bte;",     ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng]):bat[:bte] 
",       "batlng_dec2_bte;",     ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:bte] ",        "batlng_dec2_cand_bte;",        ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng], X_3:int, 
X_4:int):bat[:bte] ",     "batlng_dec2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batlng_dec2dec_cand_bte;",  
   ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:lng], X_2:int, 
X_3:int):bat[:bte] ",      "batlng_num2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batlng_num2dec_cand_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:bte] ",        "batbte_dec2_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batbte_dec2dec_bte;",  ""   
   ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batbte_num2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:dbl], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batdbl_num2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:flt], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batflt_num2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:bte] ",        "batint_dec2_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batint_dec2dec_bte;",  ""   
   ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batint_num2dec_bte;",  ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:bte] ",        "batlng_dec2_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batlng_dec2dec_bte;",  ""   
   ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batlng_num2dec_bte;",  ""      ]
 [ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:oid], X_2:int, 
X_3:int):bat[:bte] ",      "batnil_2dec_bte;",     ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht]):bat[:bte] 
",       "batsht_dec2_bte;",     ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:bte] ",        "batsht_dec2_cand_bte;",        ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht], X_3:int, 
X_4:int):bat[:bte] ",     "batsht_dec2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batsht_dec2dec_cand_bte;",  
   ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:sht], X_2:int, 
X_3:int):bat[:bte] ",      "batsht_num2dec_bte;",  ""      ]
-[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batsht_num2dec_cand_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:bte] ",        "batsht_dec2_bte;",     ""      ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:bte] ",      "batsht_dec2dec_bte;",  ""   
   ]
+[ "batcalc",   "bte",  "command batcalc.bte(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batsht_num2dec_bte;",  ""      ]
 [ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:str], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:bte] ",       "batstr_2dec_bte;",     ""      ]
-[ "batcalc",   "bte",  "pattern batcalc.bte(X_1:bat[:str], X_2:int, 
X_3:int):bat[:bte] ",      "batstr_2dec_bte;",     ""      ]
 [ "batcalc",   "bte_noerror",  "pattern 
batcalc.bte_noerror(X_1:bat[:bit]):bat[:bte] ",        "CMDconvert_bte;",      
""      ]
 [ "batcalc",   "bte_noerror",  "pattern batcalc.bte_noerror(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:bte] ", "CMDconvert_bte;",      ""      ]
 [ "batcalc",   "bte_noerror",  "pattern 
batcalc.bte_noerror(X_1:bat[:bte]):bat[:bte] ",        "CMDconvert_bte;",      
""      ]
@@ -4077,34 +4061,21 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "cmp",  "pattern batcalc.cmp(X_1:sht, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:bte] ",        "CMDbatCMP;",   ""      ]
 [ "batcalc",   "cmp",  "pattern batcalc.cmp(X_1:str, X_2:bat[:str]):bat[:bte] 
",       "CMDbatCMP;",   ""      ]
 [ "batcalc",   "cmp",  "pattern batcalc.cmp(X_1:str, X_2:bat[:str], 
X_3:bat[:oid]):bat[:bte] ",        "CMDbatCMP;",   ""      ]
-[ "batcalc",   "date", "command batcalc.date(X_1:bat[:date]):bat[:date] ",     
"MTIMEdate_date_bulk;", ""      ]
-[ "batcalc",   "date", "command batcalc.date(X_1:bat[:date], 
X_2:bat[:oid]):bat[:date] ",      "MTIMEdate_date_bulk_cand;",    ""      ]
-[ "batcalc",   "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ",      
"MTIMEdate_fromstr_bulk;",      ""      ]
-[ "batcalc",   "date", "command batcalc.date(X_1:bat[:str], 
X_2:bat[:oid]):bat[:date] ",       "MTIMEdate_fromstr_bulk_cand;", ""      ]
-[ "batcalc",   "date", "command batcalc.date(X_1:bat[:timestamp]):bat[:date] 
",        "MTIMEtimestamp_extract_date_bulk;",    ""      ]
-[ "batcalc",   "date", "command batcalc.date(X_1:bat[:timestamp], 
X_2:bat[:oid]):bat[:date] ", "MTIMEtimestamp_extract_date_bulk_cand;",       "" 
     ]
-[ "batcalc",   "date", "command batcalc.date(X_1:bat[:str]):bat[:date] ",      
"batstr_2_date;",       ""      ]
-[ "batcalc",   "date", "command batcalc.date(X_1:bat[:str], 
X_2:bat[:oid]):bat[:date] ",       "batstr_2_date_cand;",  ""      ]
+[ "batcalc",   "date", "pattern batcalc.date(X_1:bat[:date], 
X_2:bat[:oid]):bat[:date] ",      "MTIMEdate_date_bulk;", ""      ]
+[ "batcalc",   "date", "pattern batcalc.date(X_1:bat[:str], 
X_2:bat[:oid]):bat[:date] ",       "MTIMEdate_fromstr_bulk;",      ""      ]
+[ "batcalc",   "date", "pattern batcalc.date(X_1:bat[:timestamp], 
X_2:bat[:oid]):bat[:date] ", "MTIMEtimestamp_extract_date_bulk;",    ""      ]
+[ "batcalc",   "date", "command batcalc.date(X_1:bat[:str], 
X_2:bat[:oid]):bat[:date] ",       "batstr_2_date;",       ""      ]
 [ "batcalc",   "date", "pattern batcalc.date(X_1:bat[:oid]):bat[:date] ",      
"nil_2_date;",  ""      ]
-[ "batcalc",   "daytime",      "command 
batcalc.daytime(X_1:bat[:daytime]):bat[:daytime] ",    
"MTIMEdaytime_daytime_bulk;",   ""      ]
-[ "batcalc",   "daytime",      "command batcalc.daytime(X_1:bat[:daytime], 
X_2:bat[:oid]):bat[:daytime] ",     "MTIMEdaytime_daytime_bulk_cand;",      ""  
    ]
-[ "batcalc",   "daytime",      "command 
batcalc.daytime(X_1:bat[:lng]):bat[:daytime] ",        
"MTIMEdaytime_fromseconds_bulk;",       ""      ]
-[ "batcalc",   "daytime",      "command batcalc.daytime(X_1:bat[:lng], 
X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromseconds_bulk_cand;",  ""      
]
-[ "batcalc",   "daytime",      "command 
batcalc.daytime(X_1:bat[:str]):bat[:daytime] ",        
"MTIMEdaytime_fromstr_bulk;",   ""      ]
-[ "batcalc",   "daytime",      "command batcalc.daytime(X_1:bat[:str], 
X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromstr_bulk_cand;",      ""      
]
-[ "batcalc",   "daytime",      "command 
batcalc.daytime(X_1:bat[:timestamp]):bat[:daytime] ",  
"MTIMEtimestamp_extract_daytime_bulk;", ""      ]
-[ "batcalc",   "daytime",      "command batcalc.daytime(X_1:bat[:timestamp], 
X_2:bat[:oid]):bat[:daytime] ",   "MTIMEtimestamp_extract_daytime_bulk_cand;",  
  ""      ]
-[ "batcalc",   "daytime",      "command batcalc.daytime(X_1:bat[:str], 
X_2:int):bat[:daytime] ",       "batstr_2time_daytime;",        ""      ]
-[ "batcalc",   "daytime",      "command batcalc.daytime(X_1:bat[:str], 
X_2:bat[:oid], X_3:int):bat[:daytime] ",        "batstr_2time_daytime_cand;",   
""      ]
+[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:daytime], 
X_2:bat[:oid]):bat[:daytime] ",     "MTIMEdaytime_daytime_bulk;",   ""      ]
+[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:lng], 
X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromseconds_bulk;",       ""      
]
+[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:str], 
X_2:bat[:oid]):bat[:daytime] ", "MTIMEdaytime_fromstr_bulk;",   ""      ]
+[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:timestamp], 
X_2:bat[:oid]):bat[:daytime] ",   "MTIMEtimestamp_extract_daytime_bulk;", ""    
  ]
+[ "batcalc",   "daytime",      "command batcalc.daytime(X_1:bat[:str], 
X_2:bat[:oid], X_3:int):bat[:daytime] ",        "batstr_2time_daytime;",        
""      ]
 [ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:daytime], 
X_2:bat[:oid], X_3:int):bat[:daytime] ",    "daytime_2time_daytime;",       ""  
    ]
-[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:daytime], 
X_2:int):bat[:daytime] ",   "daytime_2time_daytime;",       ""      ]
 [ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:oid], 
X_2:int):bat[:daytime] ",       "nil_2time_daytime;",   ""      ]
 [ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:lng], 
X_2:bat[:oid], X_3:int):bat[:daytime] ",        "second_interval_2_daytime;",   
""      ]
-[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:lng], 
X_2:int):bat[:daytime] ",       "second_interval_2_daytime;",   ""      ]
 [ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:str], 
X_2:bat[:oid], X_3:int, X_4:int):bat[:daytime] ",       "str_2time_daytimetz;", 
""      ]
-[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:str], 
X_2:int, X_3:int):bat[:daytime] ",      "str_2time_daytimetz;", ""      ]
 [ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:timestamp], 
X_2:bat[:oid], X_3:int):bat[:daytime] ",  "timestamp_2_daytime;", ""      ]
-[ "batcalc",   "daytime",      "pattern batcalc.daytime(X_1:bat[:timestamp], 
X_2:int):bat[:daytime] ", "timestamp_2_daytime;", ""      ]
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:bit]):bat[:dbl] ",        
"CMDconvertsignal_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvertsignal_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:bte]):bat[:dbl] ",        
"CMDconvertsignal_dbl;",        ""      ]
@@ -4123,30 +4094,18 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvertsignal_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:str]):bat[:dbl] ",        
"CMDconvertsignal_dbl;",        ""      ]
 [ "batcalc",   "dbl",  "pattern batcalc.dbl(X_1:bat[:str], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvertsignal_dbl;",        ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:dbl] ",        "batbte_dec2_cand_dbl;",        ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte]):bat[:dbl] 
",       "batbte_dec2_dbl;",     ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batbte_dec2dec_cand_dbl;",  
   ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte], X_3:int, 
X_4:int):bat[:dbl] ",     "batbte_dec2dec_dbl;",  ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batbte_num2dec_cand_dbl;",     ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:bte], X_2:int, 
X_3:int):bat[:dbl] ",      "batbte_num2dec_dbl;",  ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:dbl] ",        "batint_dec2_cand_dbl;",        ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int]):bat[:dbl] 
",       "batint_dec2_dbl;",     ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batint_dec2dec_cand_dbl;",  
   ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int], X_3:int, 
X_4:int):bat[:dbl] ",     "batint_dec2dec_dbl;",  ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batint_num2dec_cand_dbl;",     ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:int], X_2:int, 
X_3:int):bat[:dbl] ",      "batint_num2dec_dbl;",  ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:dbl] ",        "batlng_dec2_cand_dbl;",        ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng]):bat[:dbl] 
",       "batlng_dec2_dbl;",     ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batlng_dec2dec_cand_dbl;",  
   ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng], X_3:int, 
X_4:int):bat[:dbl] ",     "batlng_dec2dec_dbl;",  ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batlng_num2dec_cand_dbl;",     ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:lng], X_2:int, 
X_3:int):bat[:dbl] ",      "batlng_num2dec_dbl;",  ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:dbl] ",        "batsht_dec2_cand_dbl;",        ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht]):bat[:dbl] 
",       "batsht_dec2_dbl;",     ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batsht_dec2dec_cand_dbl;",  
   ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht], X_3:int, 
X_4:int):bat[:dbl] ",     "batsht_dec2dec_dbl;",  ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batsht_num2dec_cand_dbl;",     ""      ]
-[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:sht], X_2:int, 
X_3:int):bat[:dbl] ",      "batsht_num2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid]):bat[:dbl] ",        "batbte_dec2_dbl;",     ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:bte], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batbte_dec2dec_dbl;",  ""   
   ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:bte], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batbte_num2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int], 
X_3:bat[:oid]):bat[:dbl] ",        "batint_dec2_dbl;",     ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:int], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batint_dec2dec_dbl;",  ""   
   ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:int], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batint_num2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid]):bat[:dbl] ",        "batlng_dec2_dbl;",     ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:lng], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batlng_dec2dec_dbl;",  ""   
   ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:lng], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batlng_num2dec_dbl;",  ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid]):bat[:dbl] ",        "batsht_dec2_dbl;",     ""      ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:int, X_2:bat[:sht], 
X_3:bat[:oid], X_4:int, X_5:int):bat[:dbl] ",      "batsht_dec2dec_dbl;",  ""   
   ]
+[ "batcalc",   "dbl",  "command batcalc.dbl(X_1:bat[:sht], X_2:bat[:oid], 
X_3:int, X_4:int):bat[:dbl] ",       "batsht_num2dec_dbl;",  ""      ]
 [ "batcalc",   "dbl_noerror",  "pattern 
batcalc.dbl_noerror(X_1:bat[:bit]):bat[:dbl] ",        "CMDconvert_dbl;",      
""      ]
 [ "batcalc",   "dbl_noerror",  "pattern batcalc.dbl_noerror(X_1:bat[:bit], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvert_dbl;",      ""      ]
 [ "batcalc",   "dbl_noerror",  "pattern 
batcalc.dbl_noerror(X_1:bat[:bte]):bat[:dbl] ",        "CMDconvert_dbl;",      
""      ]
@@ -4165,6 +4124,42 @@ stdout of test 'MAL-signatures` in direc
 [ "batcalc",   "dbl_noerror",  "pattern batcalc.dbl_noerror(X_1:bat[:sht], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvert_dbl;",      ""      ]
 [ "batcalc",   "dbl_noerror",  "pattern 
batcalc.dbl_noerror(X_1:bat[:str]):bat[:dbl] ",        "CMDconvert_dbl;",      
""      ]
 [ "batcalc",   "dbl_noerror",  "pattern batcalc.dbl_noerror(X_1:bat[:str], 
X_2:bat[:oid]):bat[:dbl] ", "CMDconvert_dbl;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:bte], 
X_2:bte):bat[:bte] ", "bte_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:bte], 
X_2:bte, X_3:bat[:oid]):bat[:bte] ",  "bte_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bte, 
X_2:bat[:bte]):bat[:bte] ", "bte_bat_dec_round_wrap_cst;",  ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bte, 
X_2:bat[:bte], X_3:bat[:oid]):bat[:bte] ",  "bte_bat_dec_round_wrap_cst;",  ""  
    ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:bte], 
X_2:bat[:bte]):bat[:bte] ",   "bte_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:bte], 
X_2:bat[:bte], X_3:bat[:oid], X_4:bat[:oid]):bat[:bte] ",     
"bte_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:dbl], 
X_2:dbl):bat[:dbl] ", "dbl_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:dbl], 
X_2:dbl, X_3:bat[:oid]):bat[:dbl] ",  "dbl_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:dbl, 
X_2:bat[:dbl]):bat[:dbl] ", "dbl_bat_dec_round_wrap_cst;",  ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:dbl, 
X_2:bat[:dbl], X_3:bat[:oid]):bat[:dbl] ",  "dbl_bat_dec_round_wrap_cst;",  ""  
    ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:dbl], 
X_2:bat[:dbl]):bat[:dbl] ",   "dbl_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:dbl], 
X_2:bat[:dbl], X_3:bat[:oid], X_4:bat[:oid]):bat[:dbl] ",     
"dbl_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:flt], 
X_2:flt):bat[:flt] ", "flt_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:flt], 
X_2:flt, X_3:bat[:oid]):bat[:flt] ",  "flt_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:flt, 
X_2:bat[:flt]):bat[:flt] ", "flt_bat_dec_round_wrap_cst;",  ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:flt, 
X_2:bat[:flt], X_3:bat[:oid]):bat[:flt] ",  "flt_bat_dec_round_wrap_cst;",  ""  
    ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:flt], 
X_2:bat[:flt]):bat[:flt] ",   "flt_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:flt], 
X_2:bat[:flt], X_3:bat[:oid], X_4:bat[:oid]):bat[:flt] ",     
"flt_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:int], 
X_2:int):bat[:int] ", "int_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:int], 
X_2:int, X_3:bat[:oid]):bat[:int] ",  "int_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:int, 
X_2:bat[:int]):bat[:int] ", "int_bat_dec_round_wrap_cst;",  ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:int, 
X_2:bat[:int], X_3:bat[:oid]):bat[:int] ",  "int_bat_dec_round_wrap_cst;",  ""  
    ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:int], 
X_2:bat[:int]):bat[:int] ",   "int_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:int], 
X_2:bat[:int], X_3:bat[:oid], X_4:bat[:oid]):bat[:int] ",     
"int_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:lng], 
X_2:lng):bat[:lng] ", "lng_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:lng], 
X_2:lng, X_3:bat[:oid]):bat[:lng] ",  "lng_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:lng, 
X_2:bat[:lng]):bat[:lng] ", "lng_bat_dec_round_wrap_cst;",  ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:lng, 
X_2:bat[:lng], X_3:bat[:oid]):bat[:lng] ",  "lng_bat_dec_round_wrap_cst;",  ""  
    ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:lng], 
X_2:bat[:lng]):bat[:lng] ",   "lng_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:lng], 
X_2:bat[:lng], X_3:bat[:oid], X_4:bat[:oid]):bat[:lng] ",     
"lng_bat_dec_round_wrap_nocst;",        ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:sht], 
X_2:sht):bat[:sht] ", "sht_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:bat[:sht], 
X_2:sht, X_3:bat[:oid]):bat[:sht] ",  "sht_bat_dec_round_wrap;",      ""      ]
+[ "batcalc",   "dec_round",    "pattern batcalc.dec_round(X_1:sht, 
X_2:bat[:sht]):bat[:sht] ", "sht_bat_dec_round_wrap_cst;",  ""      ]
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to