Changeset: 3fbd59d69a94 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3fbd59d69a94
Added Files:
java/src/main/java/nl/cwi/monetdb/client/JMonetDB.java
java/src/main/java/nl/cwi/monetdb/client/JdbcClient.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetBlob.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetClob.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetConnection.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDataSource.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
java/src/main/java/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetSavepoint.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetStatement.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetWrapper.java
java/src/main/java/nl/cwi/monetdb/jdbc/types/INET.java
java/src/main/java/nl/cwi/monetdb/jdbc/types/URL.java
java/src/main/java/nl/cwi/monetdb/mcl/MCLException.java
java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
java/src/main/java/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
java/src/main/java/nl/cwi/monetdb/mcl/net/MapiSocket.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParseException.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/MCLParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
java/src/main/java/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
java/src/main/java/nl/cwi/monetdb/merovingian/Control.java
java/src/main/java/nl/cwi/monetdb/merovingian/MerovingianException.java
java/src/main/java/nl/cwi/monetdb/merovingian/SabaothDB.java
java/src/main/java/nl/cwi/monetdb/util/CmdLineOpts.java
java/src/main/java/nl/cwi/monetdb/util/Exporter.java
java/src/main/java/nl/cwi/monetdb/util/Extract.java
java/src/main/java/nl/cwi/monetdb/util/OptionsException.java
java/src/main/java/nl/cwi/monetdb/util/SQLExporter.java
java/src/main/java/nl/cwi/monetdb/util/SQLRestore.java
java/src/main/java/nl/cwi/monetdb/util/XMLExporter.java
sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out.int128
sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.sql
sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.err
sql/test/BugTracker-2015/Tests/sql2pcre.Bug-3800.stable.out
sql/test/pg_regress/Tests/loadwisconsin.timeout
sql/test/pg_regress/Tests/oid.stable.err.Windows.oid32
sql/test/testdb-upgrade-chain-hge/Tests/All
sql/test/testdb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/dump.reqtests
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/dump.timeout
sql/test/testdb-upgrade-chain-hge/Tests/package.py
sql/test/testdb-upgrade-chain-hge/Tests/package.reqtests
sql/test/testdb-upgrade-chain-hge/Tests/package.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/package.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/unpackage.py
sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/unpackage.stable.out
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.SQL.py
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.reqtests
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-hge/Tests/All
sql/test/testdb-upgrade-hge/Tests/dump.SQL.py
sql/test/testdb-upgrade-hge/Tests/dump.reqtests
sql/test/testdb-upgrade-hge/Tests/dump.stable.err
sql/test/testdb-upgrade-hge/Tests/dump.stable.out
sql/test/testdb-upgrade-hge/Tests/dump.timeout
sql/test/testdb-upgrade-hge/Tests/unpackage.py
sql/test/testdb-upgrade-hge/Tests/unpackage.stable.err
sql/test/testdb-upgrade-hge/Tests/unpackage.stable.out
sql/test/testdb-upgrade-hge/Tests/upgrade.SQL.py
sql/test/testdb-upgrade-hge/Tests/upgrade.reqtests
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.err
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb/Tests/testdb-package-hge.py
sql/test/testdb/Tests/testdb-package-hge.stable.err
sql/test/testdb/Tests/testdb-package-hge.stable.out
Removed Files:
java/src/nl/cwi/monetdb/client/JMonetDB.java
java/src/nl/cwi/monetdb/client/JdbcClient.java
java/src/nl/cwi/monetdb/jdbc/MonetBlob.java
java/src/nl/cwi/monetdb/jdbc/MonetClob.java
java/src/nl/cwi/monetdb/jdbc/MonetConnection.java
java/src/nl/cwi/monetdb/jdbc/MonetDataSource.java
java/src/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/nl/cwi/monetdb/jdbc/MonetDriver.java.in
java/src/nl/cwi/monetdb/jdbc/MonetPreparedStatement.java
java/src/nl/cwi/monetdb/jdbc/MonetResultSet.java
java/src/nl/cwi/monetdb/jdbc/MonetSavepoint.java
java/src/nl/cwi/monetdb/jdbc/MonetStatement.java
java/src/nl/cwi/monetdb/jdbc/MonetWrapper.java
java/src/nl/cwi/monetdb/jdbc/types/INET.java
java/src/nl/cwi/monetdb/jdbc/types/URL.java
java/src/nl/cwi/monetdb/mcl/MCLException.java
java/src/nl/cwi/monetdb/mcl/io/BufferedMCLReader.java
java/src/nl/cwi/monetdb/mcl/io/BufferedMCLWriter.java
java/src/nl/cwi/monetdb/mcl/net/MapiSocket.java
java/src/nl/cwi/monetdb/mcl/parser/HeaderLineParser.java
java/src/nl/cwi/monetdb/mcl/parser/MCLParseException.java
java/src/nl/cwi/monetdb/mcl/parser/MCLParser.java
java/src/nl/cwi/monetdb/mcl/parser/StartOfHeaderParser.java
java/src/nl/cwi/monetdb/mcl/parser/TupleLineParser.java
java/src/nl/cwi/monetdb/merovingian/Control.java
java/src/nl/cwi/monetdb/merovingian/MerovingianException.java
java/src/nl/cwi/monetdb/merovingian/SabaothDB.java
java/src/nl/cwi/monetdb/util/CmdLineOpts.java
java/src/nl/cwi/monetdb/util/Exporter.java
java/src/nl/cwi/monetdb/util/Extract.java
java/src/nl/cwi/monetdb/util/OptionsException.java
java/src/nl/cwi/monetdb/util/SQLExporter.java
java/src/nl/cwi/monetdb/util/SQLRestore.java
java/src/nl/cwi/monetdb/util/XMLExporter.java
monetdb5/mal/Tests/performanceTests/tst901d.mal
monetdb5/mal/Tests/prejoin.mal
monetdb5/mal/Tests/tst017.stable.err
monetdb5/mal/Tests/tst017.stable.out
monetdb5/mal/Tests/tst1501.mal
monetdb5/mal/Tests/tst1501.stable.err
monetdb5/mal/Tests/tst1501.stable.out
monetdb5/mal/Tests/tst253.mal
monetdb5/mal/Tests/tst253.stable.err
monetdb5/mal/Tests/tst253.stable.out
monetdb5/mal/Tests/tst271.mal
monetdb5/mal/Tests/tst277.mal
monetdb5/mal/Tests/tst277.stable.err
monetdb5/mal/Tests/tst277.stable.out
monetdb5/mal/Tests/tst654.mal
monetdb5/mal/Tests/tst654.stable.err
monetdb5/mal/Tests/tst654.stable.out
monetdb5/mal/Tests/tst655.mal
monetdb5/mal/Tests/tst655.stable.err
monetdb5/mal/Tests/tst655.stable.out
monetdb5/modules/mal/Tests/mapi03.mal
monetdb5/optimizer/Tests/RMexample.mal
monetdb5/optimizer/Tests/tst4300.mal
monetdb5/optimizer/Tests/tst4300.stable.err
monetdb5/optimizer/Tests/tst4300.stable.out
monetdb5/optimizer/Tests/tst4600.mal
monetdb5/optimizer/Tests/tst4600.stable.err
monetdb5/optimizer/Tests/tst4600.stable.out
monetdb5/optimizer/Tests/tst4611.mal
monetdb5/optimizer/Tests/tst4611.stable.err
monetdb5/optimizer/Tests/tst4611.stable.out
monetdb5/optimizer/Tests/tst4620.mal
monetdb5/optimizer/Tests/tst4620.stable.err
monetdb5/optimizer/Tests/tst4620.stable.out
monetdb5/tests/BugReports/Tests/no.100.mal
monetdb5/tests/BugReports/Tests/no.100.stable.err
monetdb5/tests/BugReports/Tests/no.100.stable.out
monetdb5/tests/gdkTests/Tests/void.mal
monetdb5/tests/gdkTests/Tests/void.stable.err
monetdb5/tests/gdkTests/Tests/void.stable.out
sql/benchmarks/as3ap/NJAMD
sql/benchmarks/as3ap/as3ap-load.sql
sql/benchmarks/as3ap/as3ap-queries.sql
sql/benchmarks/as3ap/as3ap-schema.sql
sql/benchmarks/as3ap/as3ap.c
sql/benchmarks/as3ap/as3ap.sh
sql/benchmarks/as3ap/as3ap.sql
sql/benchmarks/as3ap/drop.sql
sql/benchmarks/as3ap/hundred.dat
sql/benchmarks/as3ap/hundred.fmt
sql/benchmarks/as3ap/run.all
sql/benchmarks/as3ap/tenpct.dat
sql/benchmarks/as3ap/tenpct.fmt
sql/benchmarks/as3ap/uniques.dat
sql/benchmarks/as3ap/uniques.fmt
sql/benchmarks/as3ap/updates.dat
sql/benchmarks/as3ap/updates.fmt
sql/test/mergetables/Tests/mergequery.stable.out.single
sql/test/pg_regress/Tests/oid.stable.err.oid32.Windows
Modified Files:
.hgignore
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures.stable.out.int128
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/Tests/exports.stable.out
clients/mapiclient/mclient.c
gdk/ChangeLog
gdk/gdk.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_join.c
gdk/gdk_join_legacy.c
gdk/gdk_logger.c
gdk/gdk_setop.c
gdk/gdk_storage.c
java/build.xml
java/example/MJDBCTest.java
java/example/PreparedExample.java
java/example/SQLImport.java
java/example/SQLcopyinto.java
java/pom.xml
monetdb5/ChangeLog
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/Tests/All
monetdb5/mal/Tests/performanceTests/join.mal
monetdb5/mal/Tests/performanceTests/tst901c.mal
monetdb5/mal/Tests/recycle05.stable.out
monetdb5/mal/Tests/tst032.stable.out
monetdb5/mal/Tests/tst033.stable.out
monetdb5/mal/Tests/tst034.stable.out
monetdb5/mal/Tests/tst047.mal
monetdb5/mal/Tests/tst047.stable.out
monetdb5/mal/Tests/tst1502.stable.out
monetdb5/mal/Tests/tst1504.stable.out
monetdb5/mal/Tests/tst1602.stable.out
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst230.mal
monetdb5/mal/Tests/tst230.stable.out
monetdb5/mal/Tests/tst233.mal
monetdb5/mal/Tests/tst233.stable.out
monetdb5/mal/Tests/tst234.mal
monetdb5/mal/Tests/tst234.stable.out
monetdb5/mal/Tests/tst235.mal
monetdb5/mal/Tests/tst235.stable.out
monetdb5/mal/Tests/tst810.stable.out
monetdb5/mal/Tests/tst830.mal
monetdb5/mal/Tests/tst830.stable.out
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_authorize.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_private.h
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/json.c
monetdb5/modules/kernel/Tests/TriBool.malC
monetdb5/modules/kernel/Tests/TriBool.stable.out
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/kernel/bat5.c
monetdb5/modules/kernel/bat5.h
monetdb5/modules/kernel/bat5.mal
monetdb5/modules/mal/Tests/batpartition.stable.out
monetdb5/modules/mal/Tests/inspect05.mal
monetdb5/modules/mal/Tests/inspect05.stable.out.int128
monetdb5/modules/mal/Tests/iterator03.stable.out
monetdb5/modules/mal/Tests/mapi01.stable.out
monetdb5/modules/mal/Tests/mapi07.stable.out
monetdb5/modules/mal/Tests/partition.stable.out
monetdb5/modules/mal/Tests/remote03.stable.out
monetdb5/modules/mal/Tests/remote88.mal
monetdb5/modules/mal/Tests/tokenizer00.stable.out
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/clients.mal
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_io.h
monetdb5/modules/mal/mal_io.mal
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/sysmon.c
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/DCexample.mal
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushselect.c
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
monetdb5/tests/BugReports/Tests/All
monetdb5/tests/gdkTests/Tests/scanselect.stable.out
monetdb5/tests/mapi/Tests/sample3.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_user.c
sql/benchmarks/nobench/Tests/nobench.sql
sql/benchmarks/nobench/Tests/nobench.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/storage/bat/bat_table.c
sql/test/BugTracker-2015/Tests/All
sql/test/BugTracker-2015/Tests/nil_cast.Bug-3787.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/Tests/bogus-auto-generated-keys.stable.out
sql/test/copy/Tests/key_copy.stable.err
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1.stable.out.int128
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2.stable.out.int128
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3.stable.out.int128
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4.stable.out.int128
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5.stable.out.int128
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/drop3.stable.out.int128
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select1.stable.out.int128
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/select2.stable.out.int128
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp1.stable.out.int128
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp2.stable.out.int128
sql/test/leaks/Tests/temp3.stable.out
sql/test/leaks/Tests/temp3.stable.out.int128
sql/test/mapi/Tests/sql_int128.stable.out
sql/test/mergetables/Tests/All
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/pg_regress/Tests/float8.sql
sql/test/pg_regress/Tests/float8.stable.err.Windows
sql/test/pg_regress/Tests/float8.stable.out
sql/test/pg_regress/Tests/float8.stable.out.Windows
sql/test/pg_regress/Tests/strings.stable.err
sql/test/testdb-upgrade-chain/Tests/All
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade/Tests/dump.stable.out
sql/test/testdb-upgrade/Tests/dump.stable.out.Windows
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb/Tests/All
testing/Mtest.py.in
tools/merovingian/client/monetdb.c
Branch: profiler
Log Message:
Merge with default
diffs (truncated from 264697 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -65,7 +65,10 @@ lex.yy.c
*.gem
# java:
*.jar
-java/target/classes/nl/cwi/monetdb/jdbc/MonetDriver.java.in
+java/build
+java/target
+java/bin
+java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java
# python:
dist
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
@@ -2322,6 +2322,8 @@ command algebra.ilike(s:str,pat:str,esc:
address PCREilike3;
command
algebra.join(left:bat[:oid,:any_2],rl:bat[:oid,:any_2],rh:bat[:oid,:any_2],li:bit,hi:bit)
(l:bat[:oid,:oid],r:bat[:oid,:oid])
address ALGrangejoin2;
+comment Deprecated, see algebra.subrangejoin. Range join
+
command algebra.join(left:bat[:oid,:any_1],right:bat[:oid,:any_1])
(l:bat[:oid,:oid],r:bat[:oid,:oid])
address ALGjoin2;
comment Returns 2 columns with all BUNs, consisting of the head-oids from
'left' and 'right' for which there are BUNs in 'left' and 'right' with
equal tails
@@ -2364,18 +2366,6 @@ command algebra.leftjoin(left:bat[:oid,:
address ALGleftjoinestimate;
command
algebra.leftjoin(left:bat[:oid,:any_2],right:bat[:any_2,:any_3]):bat[:oid,:any_3]
address ALGleftjoin;
-command
algebra.mark(b:bat[:any_1,:any_2],nr_parts:int,part_nr:int):bat[:any_1,:oid]
-address ALGtmarkp;
-comment Produces a BAT with fresh unique dense sequense of OIDs in the
tail that starts at base (i.e. [base,..base+b.count()-1] ). The base is
uniquely defined by the part_nr (ie we set the highest bits based on the
part_nr/nr_parts)
-
-command algebra.mark(b:bat[:any_1,:any_2]):bat[:any_1,:oid]
-address ALGtmark_default;
-comment Produces a BAT with fresh unique OIDs in the tail starting at 0@0.
-
-command algebra.mark(b:bat[:any_1,:any_2],base:oid):bat[:any_1,:oid]
-address ALGtmark;
-comment Produces a BAT with fresh unique dense sequense of OIDs in
the tail that starts at base (i.e. [base,..base+b.count()-1] ).
-
command algebra.not_ilike(s:str,pat:str):bit
address PCREnotilike2;
command algebra.not_ilike(s:str,pat:str,esc:str):bit
@@ -2420,6 +2410,14 @@ command algebra.slice(b:bat[:oid,:any_1]
address ALGslice_oid;
comment Return the slice based on head oid x till y (exclusive).
+command
algebra.subinter(l:bat[:oid,:any_1],r:bat[:oid,:any_1],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng):bat[:oid,:oid]
+address ALGsubinter;
+comment Intersection of l and r with candidate lists (i.e. half of semi-join)
+
+command
algebra.subdiff(l:bat[:oid,:any_1],r:bat[:oid,:any_1],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng):bat[:oid,:oid]
+address ALGsubdiff;
+comment Difference of l and r with candidate lists
+
command
algebra.subrangejoin(l:bat[:oid,:any_1],r1:bat[:oid,:any_1],r2:bat[:oid,:any_1],sl:bat[:oid,:oid],sr:bat[:oid,:oid],li:bit,hi:bit,estimate:lng)
(X_9:bat[:oid,:oid],X_10:bat[:oid,:oid])
address ALGsubrangejoin;
comment Range join: values in l and r1/r2 match if r1 <[=] l <[=] r2
@@ -2523,8 +2521,12 @@ comment Select all head values for which
command algebra.tdiff(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
address ALGtdiff;
+comment Deprecated, see algebra.subdiff
+
command
algebra.tinter(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
address ALGtinter;
+comment Deprecated, see algebra.semijoin
+
command
algebra.thetasubselect(b:bat[:oid,:any_1],s:bat[:oid,:oid],val:any_1,op:str):bat[:oid,:oid]
address ALGthetasubselect2;
comment Select all head values of the first input BAT for which the tail value
obeys the relation value OP VAL and for which the head value occurs in the
tail of the second input BAT. Input is a dense-headed BAT, output is a
dense-headed BAT with in the tail the head value of the input BAT for
which the relationship holds. The output BAT is sorted on the tail value.
@@ -2533,10 +2535,6 @@ command algebra.thetasubselect(b:bat[:oi
address ALGthetasubselect1;
comment Select all head values for which the tail value obeys the relation
value OP VAL. Input is a dense-headed BAT, output is a dense-headed BAT with
in the tail the head value of the input BAT for which the relationship
holds. The output BAT is sorted on the tail value.
-command
algebra.tdifference(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtdifference;
-command
algebra.tintersect(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtintersect;
command alarm.ctime{unsafe}():str
address ALARMctime;
comment Return the current time as a C-time string.
@@ -31315,14 +31313,6 @@ pattern bat.new(ht:oid,tt:any_1):bat[:oi
address CMDBATnew;
comment Creates a new empty transient BAT, with head- and tail-types as
indicated.
-command bat.orderReverse(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address BKCorder_rev;
-comment Reverse sorts the BAT itself on the head, in place.
-
-command bat.order(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address BKCorder;
-comment Sorts the BAT itself on the head, in place.
-
pattern bat.partition(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1]
address CMDBATpartition2;
comment Create the n-th slice over the BAT broken into several pieces.
@@ -37593,9 +37583,9 @@ pattern clients.changeUsername(old:str,n
address CLTchangeUsername;
comment Change the username of the user into the new string
-pattern clients.getUsers():bat[:oid,:str]
+pattern clients.getUsers() (X_1:bat[:oid,:oid],X_2:bat[:oid,:str])
address CLTgetUsers;
-comment return a BAT with user id and name available in the system
+comment return a BAT with user id and one with name available in the system
pattern clients.getPasswordHash(user:str):str
address CLTgetPasswordHash;
@@ -38425,22 +38415,10 @@ command inet.#tostr():void
address INETtoString;
comment Convert inet to string equivalent
-command io.data(fname:str):str
-address IOdatafile;
-comment Signals receipt of tuples in a file fname.It returns the name of the
file, if it still exists.
-
command io.export(b:bat[:oid,:any_2],filepath:str):bit
address IOexport;
comment Export a BAT as ASCII to a file. If the 'filepath' is not absolute, it
is put into the $DBPATH directory. Success of failure is indicated.
-pattern
io.ftable(fp:streams,order:int,b1:bat[:oid,:any],b:bat[:oid,:any]...):void
-address IOfotable;
-comment Print an n-ary table to a file.
-
-pattern io.ftable(filep:streams,b1:bat[:oid,:any],b:bat[:oid,:any]...):void
-address IOftable;
-comment Print an n-ary table to a file.
-
command io.import(b:bat[:oid,:any_2],filepath:str):bat[:oid,:any_2]
address IOimport;
comment Import a BAT from an ASCII dump. The new tuples are *inserted* into
the parameter BAT. You have to create it! Its signature must match the dump,
else parsing errors will occur and FALSE is returned.
@@ -38465,7 +38443,7 @@ pattern io.prompt(val:any_1):void
address IOprompt_val;
comment Print a MAL value without brackets.
-pattern io.print(val:bat[:oid,:any_2]):void
+pattern io.print(val:bat[:oid,:any_1]):void
address IOprint_val;
comment Print a MAL value column .
@@ -38473,10 +38451,6 @@ pattern io.print(val:any_1):void
address IOprint_val;
comment Print a MAL value tuple .
-pattern io.print(order:int,b:bat[:oid,:any],b2:bat[:oid,:any]...):void
-address IOotable;
-comment The same as normal table print, but enforces to use the order of
BAT number [1..argc] to do the printing.
-
pattern io.print(b1:bat[:oid,:any]...):void
address IOtable;
comment BATs are printed with '#' for legend lines, and the BUNs on seperate
lines between brackets, containing each to comma separated values (head
and tail). If multiple BATs are passed for printing, print()
performs an implicit natural join, producing a multi attribute table.
@@ -40440,7 +40414,7 @@ pattern sql.argRecord():str
address SQLargRecord;
comment Glue together the calling sequence
-pattern sql.affectedRows{unsafe}(mvc:int,nr:wrd,w:str):int
+pattern sql.affectedRows{unsafe}(mvc:int,nr:wrd):int
address mvc_affected_rows_wrap;
comment export the number of affected rows by the current query
@@ -40676,7 +40650,7 @@ comment Return column bat with delta's a
command sql.epilogue():void
address SQLepilogue;
-pattern sql.exportOperation{unsafe}(w:str):void
+pattern sql.exportOperation{unsafe}():void
address mvc_export_operation_wrap;
comment Export result of schema/transaction queries
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
@@ -2833,6 +2833,8 @@ command algebra.ilike(s:str,pat:str,esc:
address PCREilike3;
command
algebra.join(left:bat[:oid,:any_2],rl:bat[:oid,:any_2],rh:bat[:oid,:any_2],li:bit,hi:bit)
(l:bat[:oid,:oid],r:bat[:oid,:oid])
address ALGrangejoin2;
+comment Deprecated, see algebra.subrangejoin. Range join
+
command algebra.join(left:bat[:oid,:any_1],right:bat[:oid,:any_1])
(l:bat[:oid,:oid],r:bat[:oid,:oid])
address ALGjoin2;
comment Returns 2 columns with all BUNs, consisting of the head-oids from
'left' and 'right' for which there are BUNs in 'left' and 'right' with
equal tails
@@ -2875,18 +2877,6 @@ command algebra.leftjoin(left:bat[:oid,:
address ALGleftjoinestimate;
command
algebra.leftjoin(left:bat[:oid,:any_2],right:bat[:any_2,:any_3]):bat[:oid,:any_3]
address ALGleftjoin;
-command
algebra.mark(b:bat[:any_1,:any_2],nr_parts:int,part_nr:int):bat[:any_1,:oid]
-address ALGtmarkp;
-comment Produces a BAT with fresh unique dense sequense of OIDs in the
tail that starts at base (i.e. [base,..base+b.count()-1] ). The base is
uniquely defined by the part_nr (ie we set the highest bits based on the
part_nr/nr_parts)
-
-command algebra.mark(b:bat[:any_1,:any_2]):bat[:any_1,:oid]
-address ALGtmark_default;
-comment Produces a BAT with fresh unique OIDs in the tail starting at 0@0.
-
-command algebra.mark(b:bat[:any_1,:any_2],base:oid):bat[:any_1,:oid]
-address ALGtmark;
-comment Produces a BAT with fresh unique dense sequense of OIDs in
the tail that starts at base (i.e. [base,..base+b.count()-1] ).
-
command algebra.not_ilike(s:str,pat:str):bit
address PCREnotilike2;
command algebra.not_ilike(s:str,pat:str,esc:str):bit
@@ -2931,6 +2921,14 @@ command algebra.slice(b:bat[:oid,:any_1]
address ALGslice_oid;
comment Return the slice based on head oid x till y (exclusive).
+command
algebra.subinter(l:bat[:oid,:any_1],r:bat[:oid,:any_1],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng):bat[:oid,:oid]
+address ALGsubinter;
+comment Intersection of l and r with candidate lists (i.e. half of semi-join)
+
+command
algebra.subdiff(l:bat[:oid,:any_1],r:bat[:oid,:any_1],sl:bat[:oid,:oid],sr:bat[:oid,:oid],nil_matches:bit,estimate:lng):bat[:oid,:oid]
+address ALGsubdiff;
+comment Difference of l and r with candidate lists
+
command
algebra.subrangejoin(l:bat[:oid,:any_1],r1:bat[:oid,:any_1],r2:bat[:oid,:any_1],sl:bat[:oid,:oid],sr:bat[:oid,:oid],li:bit,hi:bit,estimate:lng)
(X_9:bat[:oid,:oid],X_10:bat[:oid,:oid])
address ALGsubrangejoin;
comment Range join: values in l and r1/r2 match if r1 <[=] l <[=] r2
@@ -3034,8 +3032,12 @@ comment Select all head values for which
command algebra.tdiff(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
address ALGtdiff;
+comment Deprecated, see algebra.subdiff
+
command
algebra.tinter(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
address ALGtinter;
+comment Deprecated, see algebra.semijoin
+
command
algebra.thetasubselect(b:bat[:oid,:any_1],s:bat[:oid,:oid],val:any_1,op:str):bat[:oid,:oid]
address ALGthetasubselect2;
comment Select all head values of the first input BAT for which the tail value
obeys the relation value OP VAL and for which the head value occurs in the
tail of the second input BAT. Input is a dense-headed BAT, output is a
dense-headed BAT with in the tail the head value of the input BAT for
which the relationship holds. The output BAT is sorted on the tail value.
@@ -3044,10 +3046,6 @@ command algebra.thetasubselect(b:bat[:oi
address ALGthetasubselect1;
comment Select all head values for which the tail value obeys the relation
value OP VAL. Input is a dense-headed BAT, output is a dense-headed BAT with
in the tail the head value of the input BAT for which the relationship
holds. The output BAT is sorted on the tail value.
-command
algebra.tdifference(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtdifference;
-command
algebra.tintersect(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtintersect;
command alarm.ctime{unsafe}():str
address ALARMctime;
comment Return the current time as a C-time string.
@@ -40360,14 +40358,6 @@ pattern bat.new(ht:oid,tt:any_1):bat[:oi
address CMDBATnew;
comment Creates a new empty transient BAT, with head- and tail-types as
indicated.
-command bat.orderReverse(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address BKCorder_rev;
-comment Reverse sorts the BAT itself on the head, in place.
-
-command bat.order(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address BKCorder;
-comment Sorts the BAT itself on the head, in place.
-
pattern bat.partition(b:bat[:oid,:any_1],pieces:int,n:int):bat[:oid,:any_1]
address CMDBATpartition2;
comment Create the n-th slice over the BAT broken into several pieces.
@@ -48476,9 +48466,9 @@ pattern clients.changeUsername(old:str,n
address CLTchangeUsername;
comment Change the username of the user into the new string
-pattern clients.getUsers():bat[:oid,:str]
+pattern clients.getUsers() (X_1:bat[:oid,:oid],X_2:bat[:oid,:str])
address CLTgetUsers;
-comment return a BAT with user id and name available in the system
+comment return a BAT with user id and one with name available in the system
pattern clients.getPasswordHash(user:str):str
address CLTgetPasswordHash;
@@ -49344,22 +49334,10 @@ command inet.#tostr():void
address INETtoString;
comment Convert inet to string equivalent
-command io.data(fname:str):str
-address IOdatafile;
-comment Signals receipt of tuples in a file fname.It returns the name of the
file, if it still exists.
-
command io.export(b:bat[:oid,:any_2],filepath:str):bit
address IOexport;
comment Export a BAT as ASCII to a file. If the 'filepath' is not absolute, it
is put into the $DBPATH directory. Success of failure is indicated.
-pattern
io.ftable(fp:streams,order:int,b1:bat[:oid,:any],b:bat[:oid,:any]...):void
-address IOfotable;
-comment Print an n-ary table to a file.
-
-pattern io.ftable(filep:streams,b1:bat[:oid,:any],b:bat[:oid,:any]...):void
-address IOftable;
-comment Print an n-ary table to a file.
-
command io.import(b:bat[:oid,:any_2],filepath:str):bat[:oid,:any_2]
address IOimport;
comment Import a BAT from an ASCII dump. The new tuples are *inserted* into
the parameter BAT. You have to create it! Its signature must match the dump,
else parsing errors will occur and FALSE is returned.
@@ -49384,7 +49362,7 @@ pattern io.prompt(val:any_1):void
address IOprompt_val;
comment Print a MAL value without brackets.
-pattern io.print(val:bat[:oid,:any_2]):void
+pattern io.print(val:bat[:oid,:any_1]):void
address IOprint_val;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
