Changeset: 6ad61b14fa42 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6ad61b14fa42
Modified Files:
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/exports.stable.out
gdk/gdk_select.c
monetdb5/modules/mal/pcre.c
sql/backends/monet5/rel_bin.c
sql/common/sql_types.c
sql/test/sys-schema/Tests/systemfunctions.stable.out
sql/test/sys-schema/Tests/systemfunctions.stable.out.int128
Branch: unlock
Log Message:
Merge with default branch.
diffs (truncated from 6076 to 300 lines):
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -111,7 +111,7 @@ BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
BuildRequires: hardlink
%endif
-BuildRequires: cmake >= 3.12
+BuildRequires: cmake3 >= 3.12
BuildRequires: gcc
BuildRequires: bison
BuildRequires: /usr/bin/python3
@@ -605,7 +605,7 @@ use SQL with MonetDB, you will need to i
%config(noreplace) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_properties
%verify(not mtime) %attr(664,monetdb,monetdb)
%{_localstatedir}/monetdb5/dbfarm/.merovingian_lock
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/logrotate.d/monetdbd
-%{_libdir}/monetdb5/lib_sql.so*
+%{_libdir}/libmonetdbsql.so*
%doc %{_mandir}/man1/monetdb.1.gz
%doc %{_mandir}/man1/monetdbd.1.gz
%dir %{_datadir}/doc/MonetDB-SQL
@@ -762,7 +762,7 @@ fi
%setup -q
%build
-%{cmake} \
+%cmake3 \
-DASSERT=OFF \
-DCINTEGRATION=%{?with_cintegration:ON}%{!?with_cintegration:OFF} \
-DFITS=%{?with_fits:ON}%{!?with_fits:OFF} \
@@ -791,7 +791,7 @@ fi
-DWITH_XML2=ON \
-DWITH_ZLIB=ON
-%cmake_build
+%cmake3_build
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
cd buildtools/selinux
@@ -810,7 +810,7 @@ cd -
%endif
%install
-%cmake_install
+%cmake3_install
# move file to correct location
%if %{?rhel:0}%{!?rhel:1} || 0%{?rhel} >= 7
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -124,9 +124,10 @@ def main():
[r'bin\mclient.exe',
r'bin\mserver5.exe',
r'bin\msqldump.exe',
- r'bin\gdk.dll',
+ r'bin\bat.dll',
r'bin\mapi.dll',
r'bin\monetdb5.dll',
+ r'bin\monetdbsql.dll',
r'bin\stream.dll',
vcpkg.format(r'bin\libiconv.dll'),
vcpkg.format(r'bin\bz2.dll'),
@@ -166,18 +167,19 @@ def main():
id = comp(features, id, 16,
[r'lib\monetdb5\microbenchmark.mal'])
id = comp(features, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi'
not in x) and ('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.dll') and ('geom' not in x) and ('pyapi' not
in x) and ('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3],
'lib', 'monetdb5'))))])
id = comp(debug, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and x.endswith('.pdb') and ('geom' not in x) and
('opt_sql_append' not in x), os.listdir(os.path.join(sys.argv[3], 'lib',
'monetdb5'))))])
id = comp(geom, id, 16,
- [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('lib_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom'
in x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
+ [r'lib\monetdb5\{}'.format(x) for x in sorted(filter(lambda x:
x.startswith('_') and (x.endswith('.dll') or x.endswith('.pdb')) and ('geom' in
x), os.listdir(os.path.join(sys.argv[3], 'lib', 'monetdb5'))))])
id = comp(pyapi3, id, 16,
[r'lib\monetdb5\_pyapi3.dll'])
print(r' </Directory>')
id = comp(extend, id, 14,
- [r'lib\gdk.lib',
+ [r'lib\bat.lib',
r'lib\mapi.lib',
r'lib\monetdb5.lib',
+ r'lib\monetdbsql.lib',
r'lib\stream.lib',
vcpkg.format(r'lib\libiconv.lib'),
vcpkg.format(r'lib\bz2.lib'),
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
@@ -777,14 +777,30 @@ stdout of test 'MAL-signatures` in direc
[ "bataggr", "not_exist", "pattern bataggr.not_exist(X_1:any_1):bat[:bit]
", "SQLnot_exist;", "" ]
[ "bataggr", "not_exist", "pattern
bataggr.not_exist(X_1:bat[:any_1]):bat[:bit] ", "SQLnot_exist;",
"" ]
[ "bataggr", "not_exist", "pattern bataggr.not_exist(X_1:bat[:any_1]):bit
", "SQLnot_exist;", "" ]
-[ "batalgebra", "ilike", "command
batalgebra.ilike(X_1:bat[:str], X_2:str):bat[:bit] ", "BATPCREilike2;",
"" ]
-[ "batalgebra", "ilike", "command
batalgebra.ilike(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ", "BATPCREilike;",
"" ]
-[ "batalgebra", "like", "command batalgebra.like(X_1:bat[:str],
X_2:str):bat[:bit] ", "BATPCRElike2;", "" ]
-[ "batalgebra", "like", "command batalgebra.like(X_1:bat[:str],
X_2:str, X_3:str):bat[:bit] ", "BATPCRElike;", "" ]
-[ "batalgebra", "not_ilike", "command
batalgebra.not_ilike(X_1:bat[:str], X_2:str):bat[:bit] ",
"BATPCREnotilike2;", "" ]
-[ "batalgebra", "not_ilike", "command
batalgebra.not_ilike(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ",
"BATPCREnotilike;", "" ]
-[ "batalgebra", "not_like", "command
batalgebra.not_like(X_1:bat[:str], X_2:str):bat[:bit] ",
"BATPCREnotlike2;", "" ]
-[ "batalgebra", "not_like", "command
batalgebra.not_like(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ",
"BATPCREnotlike;", "" ]
+[ "batalgebra", "ilike", "pattern
batalgebra.ilike(X_1:bat[:str], X_2:bat[:str]):bat[:bit] ",
"BATPCREilike2;", "" ]
+[ "batalgebra", "ilike", "pattern
batalgebra.ilike(X_1:bat[:str], X_2:str):bat[:bit] ", "BATPCREilike2;",
"" ]
+[ "batalgebra", "ilike", "pattern batalgebra.ilike(X_1:str,
X_2:bat[:str]):bat[:bit] ", "BATPCREilike2;", "" ]
+[ "batalgebra", "ilike", "pattern
batalgebra.ilike(X_1:bat[:str], X_2:bat[:str], X_3:str):bat[:bit] ",
"BATPCREilike;", "" ]
+[ "batalgebra", "ilike", "pattern
batalgebra.ilike(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ", "BATPCREilike;",
"" ]
+[ "batalgebra", "ilike", "pattern batalgebra.ilike(X_1:str,
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCREilike;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:bat[:str],
X_2:bat[:str]):bat[:bit] ", "BATPCRElike2;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:bat[:str],
X_2:str):bat[:bit] ", "BATPCRElike2;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:str,
X_2:bat[:str]):bat[:bit] ", "BATPCRElike2;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:bat[:str],
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCRElike;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:bat[:str],
X_2:str, X_3:str):bat[:bit] ", "BATPCRElike;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:str,
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCRElike;", "" ]
+[ "batalgebra", "not_ilike", "pattern
batalgebra.not_ilike(X_1:bat[:str], X_2:bat[:str]):bat[:bit] ",
"BATPCREnotilike2;", "" ]
+[ "batalgebra", "not_ilike", "pattern
batalgebra.not_ilike(X_1:bat[:str], X_2:str):bat[:bit] ",
"BATPCREnotilike2;", "" ]
+[ "batalgebra", "not_ilike", "pattern batalgebra.not_ilike(X_1:str,
X_2:bat[:str]):bat[:bit] ", "BATPCREnotilike2;", "" ]
+[ "batalgebra", "not_ilike", "pattern
batalgebra.not_ilike(X_1:bat[:str], X_2:bat[:str], X_3:str):bat[:bit] ",
"BATPCREnotilike;", "" ]
+[ "batalgebra", "not_ilike", "pattern
batalgebra.not_ilike(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ",
"BATPCREnotilike;", "" ]
+[ "batalgebra", "not_ilike", "pattern batalgebra.not_ilike(X_1:str,
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCREnotilike;", "" ]
+[ "batalgebra", "not_like", "pattern
batalgebra.not_like(X_1:bat[:str], X_2:bat[:str]):bat[:bit] ",
"BATPCREnotlike2;", "" ]
+[ "batalgebra", "not_like", "pattern
batalgebra.not_like(X_1:bat[:str], X_2:str):bat[:bit] ",
"BATPCREnotlike2;", "" ]
+[ "batalgebra", "not_like", "pattern batalgebra.not_like(X_1:str,
X_2:bat[:str]):bat[:bit] ", "BATPCREnotlike2;", "" ]
+[ "batalgebra", "not_like", "pattern
batalgebra.not_like(X_1:bat[:str], X_2:bat[:str], X_3:str):bat[:bit] ",
"BATPCREnotlike;", "" ]
+[ "batalgebra", "not_like", "pattern
batalgebra.not_like(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ",
"BATPCREnotlike;", "" ]
+[ "batalgebra", "not_like", "pattern batalgebra.not_like(X_1:str,
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCREnotlike;", "" ]
[ "batblob", "nitems", "command
batblob.nitems(X_1:bat[:blob]):bat[:int] ", "BLOBnitems_bulk;", "" ]
[ "batcalc", "!=", "pattern batcalc.!=(X_1:any_1,
X_2:bat[:any_1]):bat[:bit] ", "CMDbatNE;", "" ]
[ "batcalc", "!=", "pattern batcalc.!=(X_1:any_1, X_2:bat[:any_1],
X_3:bat[:oid]):bat[:bit] ", "CMDbatNE;", "" ]
diff --git a/clients/Tests/MAL-signatures.stable.out.int128
b/clients/Tests/MAL-signatures.stable.out.int128
--- a/clients/Tests/MAL-signatures.stable.out.int128
+++ b/clients/Tests/MAL-signatures.stable.out.int128
@@ -896,14 +896,30 @@ stdout of test 'MAL-signatures` in direc
[ "bataggr", "not_exist", "pattern bataggr.not_exist(X_1:any_1):bat[:bit]
", "SQLnot_exist;", "" ]
[ "bataggr", "not_exist", "pattern
bataggr.not_exist(X_1:bat[:any_1]):bat[:bit] ", "SQLnot_exist;",
"" ]
[ "bataggr", "not_exist", "pattern bataggr.not_exist(X_1:bat[:any_1]):bit
", "SQLnot_exist;", "" ]
-[ "batalgebra", "ilike", "command
batalgebra.ilike(X_1:bat[:str], X_2:str):bat[:bit] ", "BATPCREilike2;",
"" ]
-[ "batalgebra", "ilike", "command
batalgebra.ilike(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ", "BATPCREilike;",
"" ]
-[ "batalgebra", "like", "command batalgebra.like(X_1:bat[:str],
X_2:str):bat[:bit] ", "BATPCRElike2;", "" ]
-[ "batalgebra", "like", "command batalgebra.like(X_1:bat[:str],
X_2:str, X_3:str):bat[:bit] ", "BATPCRElike;", "" ]
-[ "batalgebra", "not_ilike", "command
batalgebra.not_ilike(X_1:bat[:str], X_2:str):bat[:bit] ",
"BATPCREnotilike2;", "" ]
-[ "batalgebra", "not_ilike", "command
batalgebra.not_ilike(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ",
"BATPCREnotilike;", "" ]
-[ "batalgebra", "not_like", "command
batalgebra.not_like(X_1:bat[:str], X_2:str):bat[:bit] ",
"BATPCREnotlike2;", "" ]
-[ "batalgebra", "not_like", "command
batalgebra.not_like(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ",
"BATPCREnotlike;", "" ]
+[ "batalgebra", "ilike", "pattern
batalgebra.ilike(X_1:bat[:str], X_2:bat[:str]):bat[:bit] ",
"BATPCREilike2;", "" ]
+[ "batalgebra", "ilike", "pattern
batalgebra.ilike(X_1:bat[:str], X_2:str):bat[:bit] ", "BATPCREilike2;",
"" ]
+[ "batalgebra", "ilike", "pattern batalgebra.ilike(X_1:str,
X_2:bat[:str]):bat[:bit] ", "BATPCREilike2;", "" ]
+[ "batalgebra", "ilike", "pattern
batalgebra.ilike(X_1:bat[:str], X_2:bat[:str], X_3:str):bat[:bit] ",
"BATPCREilike;", "" ]
+[ "batalgebra", "ilike", "pattern
batalgebra.ilike(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ", "BATPCREilike;",
"" ]
+[ "batalgebra", "ilike", "pattern batalgebra.ilike(X_1:str,
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCREilike;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:bat[:str],
X_2:bat[:str]):bat[:bit] ", "BATPCRElike2;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:bat[:str],
X_2:str):bat[:bit] ", "BATPCRElike2;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:str,
X_2:bat[:str]):bat[:bit] ", "BATPCRElike2;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:bat[:str],
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCRElike;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:bat[:str],
X_2:str, X_3:str):bat[:bit] ", "BATPCRElike;", "" ]
+[ "batalgebra", "like", "pattern batalgebra.like(X_1:str,
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCRElike;", "" ]
+[ "batalgebra", "not_ilike", "pattern
batalgebra.not_ilike(X_1:bat[:str], X_2:bat[:str]):bat[:bit] ",
"BATPCREnotilike2;", "" ]
+[ "batalgebra", "not_ilike", "pattern
batalgebra.not_ilike(X_1:bat[:str], X_2:str):bat[:bit] ",
"BATPCREnotilike2;", "" ]
+[ "batalgebra", "not_ilike", "pattern batalgebra.not_ilike(X_1:str,
X_2:bat[:str]):bat[:bit] ", "BATPCREnotilike2;", "" ]
+[ "batalgebra", "not_ilike", "pattern
batalgebra.not_ilike(X_1:bat[:str], X_2:bat[:str], X_3:str):bat[:bit] ",
"BATPCREnotilike;", "" ]
+[ "batalgebra", "not_ilike", "pattern
batalgebra.not_ilike(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ",
"BATPCREnotilike;", "" ]
+[ "batalgebra", "not_ilike", "pattern batalgebra.not_ilike(X_1:str,
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCREnotilike;", "" ]
+[ "batalgebra", "not_like", "pattern
batalgebra.not_like(X_1:bat[:str], X_2:bat[:str]):bat[:bit] ",
"BATPCREnotlike2;", "" ]
+[ "batalgebra", "not_like", "pattern
batalgebra.not_like(X_1:bat[:str], X_2:str):bat[:bit] ",
"BATPCREnotlike2;", "" ]
+[ "batalgebra", "not_like", "pattern batalgebra.not_like(X_1:str,
X_2:bat[:str]):bat[:bit] ", "BATPCREnotlike2;", "" ]
+[ "batalgebra", "not_like", "pattern
batalgebra.not_like(X_1:bat[:str], X_2:bat[:str], X_3:str):bat[:bit] ",
"BATPCREnotlike;", "" ]
+[ "batalgebra", "not_like", "pattern
batalgebra.not_like(X_1:bat[:str], X_2:str, X_3:str):bat[:bit] ",
"BATPCREnotlike;", "" ]
+[ "batalgebra", "not_like", "pattern batalgebra.not_like(X_1:str,
X_2:bat[:str], X_3:str):bat[:bit] ", "BATPCREnotlike;", "" ]
[ "batblob", "nitems", "command
batblob.nitems(X_1:bat[:blob]):bat[:int] ", "BLOBnitems_bulk;", "" ]
[ "batcalc", "!=", "pattern batcalc.!=(X_1:any_1,
X_2:bat[:any_1]):bat[:bit] ", "CMDbatNE;", "" ]
[ "batcalc", "!=", "pattern batcalc.!=(X_1:any_1, X_2:bat[:any_1],
X_3:bat[:oid]):bat[:bit] ", "CMDbatNE;", "" ]
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -704,14 +704,6 @@ str AUTHremoveUser(Client c, const char
str AUTHresolveUser(str *ret, oid uid);
str AUTHsetPassword(Client c, const char *username, const char *passwd);
str AUTHunlockVault(const char *password);
-str BATPCREilike(bat *ret, const bat *b, const str *pat, const str *esc);
-str BATPCREilike2(bat *ret, const bat *b, const str *pat);
-str BATPCRElike(bat *ret, const bat *b, const str *pat, const str *esc);
-str BATPCRElike2(bat *ret, const bat *b, const str *pat);
-str BATPCREnotilike(bat *ret, const bat *b, const str *pat, const str *esc);
-str BATPCREnotilike2(bat *ret, const bat *b, const str *pat);
-str BATPCREnotlike(bat *ret, const bat *b, const str *pat, const str *esc);
-str BATPCREnotlike2(bat *ret, const bat *b, const str *pat);
str BATinfo(BAT **key, BAT **val, const bat bid);
str BKCappend_cand_force_wrap(bat *r, const bat *bid, const bat *uid, const
bat *sid, const bit *force);
str BKCappend_cand_wrap(bat *r, const bat *bid, const bat *uid, const bat
*sid);
@@ -861,10 +853,6 @@ str GRPsubgroup6(bat *ngid, bat *next, c
str GRPsubgroup7(bat *ngid, bat *next, const bat *bid, const bat *sid, const
bat *gid);
str GRPsubgroup8(bat *ngid, bat *next, const bat *bid, const bat *gid, const
bat *eid, const bat *hid);
str GRPsubgroup9(bat *ngid, bat *next, const bat *bid, const bat *sid, const
bat *gid, const bat *eid, const bat *hid);
-str ILIKEjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat
*slid, const bat *srid, const bit *nil_matches, const lng *estimate, const bit
*anti);
-str ILIKEjoin1(bat *r1, const bat *lid, const bat *rid, const bat *slid, const
bat *srid, const bit *nil_matches, const lng *estimate, const bit *anti);
-str ILIKEjoin_esc(bat *r1, bat *r2, const bat *lid, const bat *rid, const str
*esc, const bat *slid, const bat *srid, const bit *nil_matches, const lng
*estimate, const bit *anti);
-str ILIKEjoin_esc1(bat *r1, const bat *lid, const bat *rid, const str *esc,
const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate,
const bit *anti);
str INSPECTatom_names(bat *ret);
str INSPECTatom_sizes(bat *ret);
str INSPECTatom_sup_names(bat *ret);
@@ -903,10 +891,6 @@ str ITRnext_int(int *i, int *step, int *
str ITRnext_lng(lng *i, lng *step, lng *last);
str ITRnext_oid(oid *i, oid *step, oid *last);
str ITRnext_sht(sht *i, sht *step, sht *last);
-str LIKEjoin(bat *r1, bat *r2, const bat *lid, const bat *rid, const bat
*slid, const bat *srid, const bit *nil_matches, const lng *estimate, const bit
*anti);
-str LIKEjoin1(bat *r1, const bat *lid, const bat *rid, const bat *slid, const
bat *srid, const bit *nil_matches, const lng *estimate, const bit *anti);
-str LIKEjoin_esc(bat *r1, bat *r2, const bat *lid, const bat *rid, const str
*esc, const bat *slid, const bat *srid, const bit *nil_matches, const lng
*estimate, const bit *anti);
-str LIKEjoin_esc1(bat *r1, const bat *lid, const bat *rid, const str *esc,
const bat *slid, const bat *srid, const bit *nil_matches, const lng *estimate,
const bit *anti);
str MACROprocessor(Client cntxt, MalBlkPtr mb, Symbol t);
int MAL_MAXCLIENTS;
int MALadmission_claim(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci, lng argclaim);
@@ -1013,29 +997,6 @@ str OPTremoteQueriesImplementation(Clien
str OPTreorderImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
str OPTvolcanoImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk,
InstrPtr p);
str OPTwlcImplementation(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr
pci);
-str PCREilike2(bit *ret, const str *s, const str *pat);
-str PCREilike3(bit *ret, const str *s, const str *pat, const str *esc);
-str PCREimatch(bit *ret, const str *val, const str *pat);
-str PCREindex(int *ret, const pcre *pat, const str *val);
-str PCRElike2(bit *ret, const str *s, const str *pat);
-str PCRElike3(bit *ret, const str *s, const str *pat, const str *esc);
-str PCRElikeselect1(bat *ret, const bat *bid, const bat *cid, const str *pat,
const str *esc, const bit *anti);
-str PCRElikeselect2(bat *ret, const bat *bid, const bat *sid, const str *pat,
const str *esc, const bit *caseignore, const bit *anti);
-str PCRElikeselect3(bat *ret, const bat *bid, const bat *sid, const str *pat,
const str *esc, const bit *anti);
-str PCRElikeselect4(bat *ret, const bat *bid, const bat *cid, const str *pat,
const bit *anti);
-str PCRElikeselect5(bat *ret, const bat *bid, const bat *sid, const str *pat,
const bit *anti);
-str PCREmatch(bit *ret, const str *val, const str *pat);
-str PCREnotilike2(bit *ret, const str *s, const str *pat);
-str PCREnotilike3(bit *ret, const str *s, const str *pat, const str *esc);
-str PCREnotlike2(bit *ret, const str *s, const str *pat);
-str PCREnotlike3(bit *ret, const str *s, const str *pat, const str *esc);
-str PCREpatindex(int *ret, const str *pat, const str *val);
-str PCREquote(str *r, const str *v);
-str PCREreplace_bat_wrap(bat *res, const bat *or, const str *pat, const str
*repl, const str *flags);
-str PCREreplace_wrap(str *res, const str *or, const str *pat, const str *repl,
const str *flags);
-str PCREreplacefirst_bat_wrap(bat *res, const bat *or, const str *pat, const
str *repl, const str *flags);
-str PCREreplacefirst_wrap(str *res, const str *or, const str *pat, const str
*repl, const str *flags);
-str PCREsql2pcre(str *ret, const str *pat, const str *esc);
str QLOGappend(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str QLOGcall(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str QLOGcalls(BAT **r);
@@ -1693,7 +1654,6 @@ void parseMAL(Client cntxt, Symbol curPr
str partitionRef;
str passRef;
str pcreRef;
-str pcre_init(void *ret);
str percent_rankRef;
str pinRef;
str plusRef;
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -5,11 +5,10 @@ Maintainer: MonetDB BV <i...@monetdb.org
Homepage: https://www.monetdb.org/
Vcs-Browser: https://dev.monetdb.org/hg/MonetDB/
Vcs-Hg: https://dev.monetdb.org/hg/MonetDB/
-Build-Depends: debhelper (>= 9), cmake, bison,
+Build-Depends: debhelper (>= 9), cmake (>= 3.12), bison,
libbz2-dev, libcurl4-gnutls-dev, libgeos-dev (>= 3.4.0),
libpcre3-dev, libreadline-dev, liblzma-dev,
libssl-dev, libxml2-dev, pkg-config,
- python, python-dev, python-numpy,
python3, python3-dev, python3-numpy,
unixodbc-dev, uuid-dev, zlib1g-dev, r-base-dev,
libcfitsio-dev
diff --git a/debian/monetdb5-sql.install b/debian/monetdb5-sql.install
--- a/debian/monetdb5-sql.install
+++ b/debian/monetdb5-sql.install
@@ -3,6 +3,6 @@ debian/tmp/usr/bin/monetdb usr/bin
debian/tmp/usr/lib/systemd/system/monetdbd.service lib/systemd/system
debian/tmp/etc/logrotate.d/monetdbd etc/logrotate.d
debian/tmp/etc/tmpfiles.d/monetdbd.conf usr/lib/tmpfiles.d
-debian/tmp/usr/lib/x86_64-linux-gnu/monetdb5/lib_sql.so*
usr/lib/x86_64-linux-gnu/monetdb5
+debian/tmp/usr/lib/x86_64-linux-gnu/libmonetdbsql.so* usr/lib/x86_64-linux-gnu
debian/tmp/var/monetdb5/dbfarm/.merovingian_properties var/monetdb5/dbfarm
debian/tmp/var/monetdb5/dbfarm/.merovingian_lock var/monetdb5/dbfarm
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -316,7 +316,7 @@ hashselect(BAT *b, struct canditer *rest
buninsfix(bn, dst, cnt, o, \
(BUN) ((dbl) cnt / (dbl) (p == 0 ? 1
: p) \
* (dbl) (ci->ncand-p) * 1.1 +
1024), \
- BATcapacity(bn) + ci->ncand - p,
BUN_NONE)); \
+ maximum, BUN_NONE)); \
} else { \
impsloop(ISDENSE, TEST, quickins(dst, cnt, o, bn)); \
} \
@@ -371,7 +371,7 @@ hashselect(BAT *b, struct canditer *rest
buninsfix(bn, dst, cnt, o, \
(BUN) ((dbl) cnt / (dbl) (p
== 0 ? 1 : p) \
* (dbl) (ci->ncand-p)
* 1.1 + 1024), \
- BATcapacity(bn) + ci->ncand -
p, BUN_NONE); \
+ maximum, BUN_NONE); \
cnt++; \
} \
} \
@@ -536,7 +536,7 @@ fullscan_any(BAT *b, struct canditer *re
buninsfix(bn, dst, cnt, o,
(BUN) ((dbl) cnt / (dbl) (p == 0 ? 1
: p)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
