Changeset: 71473ad73d31 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=71473ad73d31
Added Files:
sql/backends/monet5/Tests/rapi16.sql
sql/backends/monet5/Tests/rapi16.stable.err
sql/backends/monet5/Tests/rapi16.stable.out
sql/test/Users/Tests/copyinto.SQL.py
sql/test/pg_regress/Tests/loadwisconsin.timeout
sql/test/pg_regress/Tests/oid.stable.err.Windows.oid32
Removed Files:
gdk/gdk_join_legacy.c
gdk/gdk_select_legacy.c
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/00_cluster_hge.mal
monetdb5/modules/mal/Tests/ascii_io2.load
monetdb5/modules/mal/Tests/mapi03.mal
monetdb5/modules/mal/cluster.c
monetdb5/modules/mal/cluster.h
monetdb5/modules/mal/cluster.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/tst4610.mal
monetdb5/optimizer/Tests/tst4610.stable.err
monetdb5/optimizer/Tests/tst4610.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/optimizer/opt_accumulators.c
monetdb5/optimizer/opt_accumulators.h
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/storage/restrict/restrict_logger.c
sql/storage/restrict/restrict_logger.h
sql/storage/restrict/restrict_storage.c
sql/storage/restrict/restrict_storage.h
sql/storage/restrict/restrict_table.c
sql/storage/restrict/restrict_table.h
sql/test/pg_regress/Tests/oid.stable.err.oid32.Windows
Modified Files:
NT/installer32/MonetDB5-SQL-Installer.vdproj
NT/installer64/MonetDB5-SQL-Installer.vdproj
clients/R/MonetDB.R/R/mapi.R
clients/R/Tests/dbi.R
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
clients/nodejs/monetdb/mapiclient.js
gdk/ChangeLog
gdk/Makefile.ag
gdk/gdk.h
gdk/gdk_align.c
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_delta.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_private.h
gdk/gdk_setop.c
gdk/gdk_storage.c
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
monetdb5/ChangeLog
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/extras/rapi/Tests/All
monetdb5/extras/rapi/Tests/rapi08.malC
monetdb5/extras/sphinx/sphinx.c
monetdb5/mal/Tests/All
monetdb5/mal/Tests/dataflow01.mal
monetdb5/mal/Tests/dataflow01.stable.out
monetdb5/mal/Tests/performanceTests/join.mal
monetdb5/mal/Tests/performanceTests/tst901c.mal
monetdb5/mal/Tests/recycle05.stable.out
monetdb5/mal/Tests/tst025.mal
monetdb5/mal/Tests/tst025.stable.out
monetdb5/mal/Tests/tst032.stable.out
monetdb5/mal/Tests/tst033.mal
monetdb5/mal/Tests/tst033.stable.out
monetdb5/mal/Tests/tst034.mal
monetdb5/mal/Tests/tst034.stable.out
monetdb5/mal/Tests/tst047.mal
monetdb5/mal/Tests/tst047.stable.out
monetdb5/mal/Tests/tst077.mal
monetdb5/mal/Tests/tst077.stable.out
monetdb5/mal/Tests/tst104.mal
monetdb5/mal/Tests/tst104.stable.out
monetdb5/mal/Tests/tst105.mal
monetdb5/mal/Tests/tst105.stable.out
monetdb5/mal/Tests/tst105a.mal
monetdb5/mal/Tests/tst105a.stable.out
monetdb5/mal/Tests/tst106.mal
monetdb5/mal/Tests/tst106.stable.out
monetdb5/mal/Tests/tst150.mal
monetdb5/mal/Tests/tst150.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/tst220.mal
monetdb5/mal/Tests/tst220.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/tst275.stable.out
monetdb5/mal/Tests/tst285.mal
monetdb5/mal/Tests/tst285.stable.out
monetdb5/mal/Tests/tst750.mal
monetdb5/mal/Tests/tst750.stable.out
monetdb5/mal/Tests/tst755.mal
monetdb5/mal/Tests/tst755.stable.out
monetdb5/mal/Tests/tst760.mal
monetdb5/mal/Tests/tst760.stable.out
monetdb5/mal/Tests/tst770.mal
monetdb5/mal/Tests/tst770.stable.out
monetdb5/mal/Tests/tst802.mal
monetdb5/mal/Tests/tst802.stable.out
monetdb5/mal/Tests/tst810.mal
monetdb5/mal/Tests/tst810.stable.out
monetdb5/mal/Tests/tst830.mal
monetdb5/mal/Tests/tst830.stable.out
monetdb5/mal/Tests/tst903.mal
monetdb5/mal/Tests/tst903.stable.out
monetdb5/mal/Tests/tst908.mal
monetdb5/mal/Tests/tst908.stable.out
monetdb5/mal/Tests/tst911.mal
monetdb5/mal/Tests/tst911.stable.out
monetdb5/mal/Tests/tst912.mal
monetdb5/mal/Tests/tst912.stable.out
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_authorize.h
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_private.h
monetdb5/mal/mal_session.c
monetdb5/modules/atoms/Makefile.ag
monetdb5/modules/atoms/Tests/xml10.mal
monetdb5/modules/atoms/Tests/xml10.stable.out
monetdb5/modules/atoms/batxml.c
monetdb5/modules/atoms/batxml.mal
monetdb5/modules/atoms/batxml.sql
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/xml.sql
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/kernel/batcolor.c
monetdb5/modules/kernel/batmmath.c
monetdb5/modules/kernel/batstr.c
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/Tests/ascii_io2.mal
monetdb5/modules/mal/Tests/ascii_io2.stable.out
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.mal
monetdb5/modules/mal/Tests/mapi01.stable.out
monetdb5/modules/mal/Tests/mapi07.mal
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/remote12.stable.out
monetdb5/modules/mal/Tests/remote88.mal
monetdb5/modules/mal/Tests/remoteInit.mal
monetdb5/modules/mal/Tests/remoteInit.stable.out
monetdb5/modules/mal/Tests/tokenizer00.stable.out
monetdb5/modules/mal/batExtensions.c
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/bbp.c
monetdb5/modules/mal/calc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/clients.mal
monetdb5/modules/mal/joinpath.c
monetdb5/modules/mal/mal_init.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/mal_mapi.mal
monetdb5/modules/mal/manual.c
monetdb5/modules/mal/manual.h
monetdb5/modules/mal/manual.mal
monetdb5/modules/mal/mat.c
monetdb5/modules/mal/mkey.c
monetdb5/modules/mal/pcre.c
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/remote.mal
monetdb5/modules/mal/sysmon.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/transaction.c
monetdb5/modules/mal/transaction.mal
monetdb5/modules/mal/zorder.c
monetdb5/optimizer/Makefile.ag
monetdb5/optimizer/Tests/All
monetdb5/optimizer/Tests/CXexample.mal
monetdb5/optimizer/Tests/CXexample.stable.out
monetdb5/optimizer/Tests/DCexample.mal
monetdb5/optimizer/Tests/FTexample.mal
monetdb5/optimizer/Tests/FTexample.stable.out
monetdb5/optimizer/Tests/dataflow.mal
monetdb5/optimizer/Tests/dataflow.stable.out
monetdb5/optimizer/Tests/remap.mal
monetdb5/optimizer/Tests/remap.stable.out
monetdb5/optimizer/Tests/reorder00.mal
monetdb5/optimizer/Tests/reorder00.stable.out
monetdb5/optimizer/Tests/tst4000.mal
monetdb5/optimizer/Tests/tst4000.stable.out
monetdb5/optimizer/Tests/tst4003.mal
monetdb5/optimizer/Tests/tst4003.stable.out
monetdb5/optimizer/Tests/tst4030.mal
monetdb5/optimizer/Tests/tst4030.stable.out
monetdb5/optimizer/Tests/tst4630.mal
monetdb5/optimizer/Tests/tst4630.stable.out
monetdb5/optimizer/Tests/tst4700.mal
monetdb5/optimizer/Tests/tst4700.stable.out
monetdb5/optimizer/opt_costModel.c
monetdb5/optimizer/opt_generator.c
monetdb5/optimizer/opt_joinpath.c
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_mitosis.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_reorder.c
monetdb5/optimizer/opt_support.c
monetdb5/optimizer/opt_support.h
monetdb5/optimizer/opt_wrapper.c
monetdb5/optimizer/optimizer.mal
monetdb5/scheduler/Tests/memo01.mal
monetdb5/scheduler/Tests/memo02.mal
monetdb5/scheduler/Tests/memo04.mal
monetdb5/scheduler/Tests/sched00.mal
monetdb5/scheduler/srvpool.mal
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/multiplex_nil.SF-1153664.stable.out
monetdb5/tests/BugReports/Tests/All
monetdb5/tests/BugReports/Tests/gettype_in_function.mal
monetdb5/tests/BugReports/Tests/gettype_in_function.stable.out
monetdb5/tests/BugReports/Tests/no.163.mal
monetdb5/tests/BugReports/Tests/no.163.stable.out
monetdb5/tests/gdkTests/Tests/scanselect.mal
monetdb5/tests/gdkTests/Tests/scanselect.stable.out
monetdb5/tests/mapi/Tests/sample3.stable.out
sql/backends/monet5/Makefile.ag
sql/backends/monet5/Tests/All
sql/backends/monet5/Tests/optimizers.sql
sql/backends/monet5/Tests/optimizers.stable.err
sql/backends/monet5/UDF/udf.c
sql/backends/monet5/bam/bam_export.c
sql/backends/monet5/gsl/gsl.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql.c
sql/backends/monet5/sql.h
sql/backends/monet5/sql.mal
sql/backends/monet5/sql_bat2time.c
sql/backends/monet5/sql_cast.c
sql/backends/monet5/sql_cast_impl_down_from_flt.h
sql/backends/monet5/sql_cast_impl_down_from_int.h
sql/backends/monet5/sql_cast_impl_up_to_flt.h
sql/backends/monet5/sql_cast_impl_up_to_int.h
sql/backends/monet5/sql_gencode.c
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_round_impl.h
sql/backends/monet5/sql_scenario.c
sql/backends/monet5/sql_statement.c
sql/backends/monet5/sql_statement.h
sql/backends/monet5/sql_upgrades.c
sql/backends/monet5/sql_user.c
sql/benchmarks/nobench/Tests/nobench.sql
sql/benchmarks/nobench/Tests/nobench.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/03-explain.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out
sql/benchmarks/tpch/Tests/04-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/05-explain.stable.out
sql/benchmarks/tpch/Tests/05-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/06-explain.stable.out
sql/benchmarks/tpch/Tests/07-explain.stable.out
sql/benchmarks/tpch/Tests/08-explain.stable.out
sql/benchmarks/tpch/Tests/09-explain.stable.out
sql/benchmarks/tpch/Tests/10-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out
sql/benchmarks/tpch/Tests/11-explain.stable.out.int128
sql/benchmarks/tpch/Tests/12-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out
sql/benchmarks/tpch/Tests/13-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/14-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out
sql/benchmarks/tpch/Tests/15-explain.stable.out.int128
sql/benchmarks/tpch/Tests/16-explain.stable.out
sql/benchmarks/tpch/Tests/16-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out
sql/benchmarks/tpch/Tests/18-explain.stable.out.int128
sql/benchmarks/tpch/Tests/19-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out
sql/benchmarks/tpch/Tests/20-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/20-explain.stable.out.int128
sql/benchmarks/tpch/Tests/21-explain.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out
sql/benchmarks/tpch/Tests/22-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-explain.stable.out.int128
sql/include/sql_catalog.h
sql/scripts/25_debug.sql
sql/server/rel_optimizer.c
sql/server/rel_schema.c
sql/server/rel_updates.c
sql/server/sql_mvc.c
sql/server/sql_mvc.h
sql/server/sql_parser.y
sql/server/sql_privileges.c
sql/server/sql_privileges.h
sql/storage/bat/bat_table.c
sql/storage/bat/bat_utils.c
sql/storage/bat/bat_utils.h
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.err
sql/test/BugTracker-2009/Tests/explain_gives_crash.SF-2741829.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out
sql/test/BugTracker/Tests/jdbc_no_debug.SF-1739356.stable.out.32bit
sql/test/Tests/bogus-auto-generated-keys.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/setoptimizer.stable.out.Windows
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions.stable.out.int128
sql/test/Users/Tests/All
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/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/setoptimizer.sql
sql/test/sql_xml/Tests/funcs.sql
testing/Mtest.py.in
tools/merovingian/client/monetdb.c
Branch: 2PC
Log Message:
Merge with default branch
Resolve merge conflict in sql.c related to keepting track of total number of
affected rows for larger transactions
diffs (truncated from 76081 to 300 lines):
diff --git a/NT/installer32/MonetDB5-SQL-Installer.vdproj
b/NT/installer32/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer32/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer32/MonetDB5-SQL-Installer.vdproj
@@ -675,12 +675,6 @@
}
"Entry"
{
- "MsmKey" = "8:_B262C796F62A48F596C8828B2470C0D6"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_B2CE130DAD3B4D3FA2F1CE0B77BE0F21"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -3200,26 +3194,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B262C796F62A48F596C8828B2470C0D6"
- {
- "SourcePath" = "8:lib\\monetdb5\\cluster.mal"
- "TargetName" = "8:cluster.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_B2CE130DAD3B4D3FA2F1CE0B77BE0F21"
{
"SourcePath" = "8:lib\\monetdb5\\createdb\\11_times.sql"
diff --git a/NT/installer64/MonetDB5-SQL-Installer.vdproj
b/NT/installer64/MonetDB5-SQL-Installer.vdproj
--- a/NT/installer64/MonetDB5-SQL-Installer.vdproj
+++ b/NT/installer64/MonetDB5-SQL-Installer.vdproj
@@ -63,12 +63,6 @@
}
"Entry"
{
- "MsmKey" = "8:_09037EED43A6416AA200DF27BB53F675"
- "OwnerKey" = "8:_UNDEFINED"
- "MsmSig" = "8:_UNDEFINED"
- }
- "Entry"
- {
"MsmKey" = "8:_0C663F8F9CD74DE2A56C520C4E893AA2"
"OwnerKey" = "8:_UNDEFINED"
"MsmSig" = "8:_UNDEFINED"
@@ -1180,26 +1174,6 @@
"IsDependency" = "11:FALSE"
"IsolateTo" = "8:"
}
-
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_09037EED43A6416AA200DF27BB53F675"
- {
- "SourcePath" = "8:lib\\monetdb5\\cluster.mal"
- "TargetName" = "8:cluster.mal"
- "Tag" = "8:"
- "Folder" = "8:_B593DAA0787744D6A44D17884E0C3951"
- "Condition" = "8:"
- "Transitive" = "11:FALSE"
- "Vital" = "11:TRUE"
- "ReadOnly" = "11:FALSE"
- "Hidden" = "11:FALSE"
- "System" = "11:FALSE"
- "Permanent" = "11:FALSE"
- "SharedLegacy" = "11:FALSE"
- "PackageAs" = "3:1"
- "Register" = "3:1"
- "Exclude" = "11:FALSE"
- "IsDependency" = "11:FALSE"
- "IsolateTo" = "8:"
- }
"{1FB2D0AE-D3B9-43D4-B9DD-F88EC61E35DE}:_0C663F8F9CD74DE2A56C520C4E893AA2"
{
"SourcePath" = "8:lib\\monetdb5\\querylog.mal"
diff --git a/clients/R/MonetDB.R/R/mapi.R b/clients/R/MonetDB.R/R/mapi.R
--- a/clients/R/MonetDB.R/R/mapi.R
+++ b/clients/R/MonetDB.R/R/mapi.R
@@ -118,7 +118,7 @@ REPLY_SIZE <- 100 # Apparently, -1 me
resp <- c(resp, readChar(con, length, useBytes = TRUE))
if (final == 1) break
}
- if (getOption("monetdb.debug.mapi", F)) cat(paste("RX: '",
substring(paste0(resp, collapse=""), 1, 200), "'\n", sep=""))
+ if (getOption("monetdb.debug.mapi", F)) message("RX: '",
substring(paste0(resp, collapse=""), 1, 200))
return(paste0("", resp, collapse=""))
}
@@ -128,7 +128,7 @@ REPLY_SIZE <- 100 # Apparently, -1 me
stop("I can only be called with a MonetDB connection object as parameter.")
final <- FALSE
pos <- 0
- if (getOption("monetdb.debug.mapi", F)) message("TX: '", msg, "'\n", sep="")
+ if (getOption("monetdb.debug.mapi", F)) message("TX: '", msg)
# convert to raw byte array, otherwise multibyte characters are 'difficult'
msgr <- charToRaw(msg)
msglen <- length(msgr)
diff --git a/clients/R/Tests/dbi.R b/clients/R/Tests/dbi.R
--- a/clients/R/Tests/dbi.R
+++ b/clients/R/Tests/dbi.R
@@ -90,15 +90,15 @@ dbRemoveTable(con,tname)
stopifnot(identical(dbExistsTable(con,tname),FALSE))
# test csv import
-file <- tempfile()
-write.table(iris,file,sep=",")
+tf <- tempfile()
+write.table(iris,tf,sep=",",row.names=FALSE)
tname2 <- "Need to quote this table name"
-monetdb.read.csv(con,file,tname)
-monetdb.read.csv(con,file,tname2)
+monetdb.read.csv(con,tf,tname)
+monetdb.read.csv(con,tf,tname2)
###
dbListTables(con)
-unlink(file)
+unlink(tf)
stopifnot(identical(dbExistsTable(con,tname),TRUE))
stopifnot(identical(dbExistsTable(con,tname2),TRUE))
iris3 <- dbReadTable(con,tname)
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,15 +2322,13 @@ 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
-pattern algebra.leftfetchjoinPath(l:bat[:any,:any]...):bat[:any,:any]
-address ALGjoinPath;
-comment Routine to handle join paths. The type analysis is rather tricky.
-
-pattern algebra.leftjoinPath(l:bat[:any,:any]...):bat[:oid,:any]
+pattern algebra.leftfetchjoinPath(l:bat[:oid,:any]...):bat[:oid,:any]
address ALGjoinPath;
comment Routine to handle join paths. The type analysis is rather tricky.
@@ -2352,7 +2350,7 @@ command algebra.like(s:str,pat:str):bit
address PCRElike2;
command algebra.like(s:str,pat:str,esc:str):bit
address PCRElike3;
-command algebra.like(b:bat[:oid,:str],substr:str):bat[:oid,:str]
+command algebra.like(b:bat[:oid,:str],substr:str):bat[:oid,:oid]
address ALGlike;
comment Selects all elements that have 'substr' as in the tail.
@@ -2360,22 +2358,6 @@ command algebra.leftfetchjoin(left:bat[:
address ALGleftfetchjoin;
comment Hook directly into the left fetch join implementation.
-command
algebra.leftjoin(left:bat[:oid,:any_2],right:bat[:any_2,:any_3],estimate:lng):bat[:oid,:any_3]
-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
@@ -2392,11 +2374,7 @@ command algebra.reuse(b:bat[:oid,:any_1]
address ALGreuse;
comment Reuse a temporary BAT if you can. Otherwise, allocate enough storage
to accept result of an operation (not involving the heap)
-command algebra.revert(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address ALGrevert;
-comment Returns a BAT copy with buns in reverse order
-
-pattern algebra.semijoinPath(l:bat[:any,:any]...):bat[:any,:any]
+pattern algebra.semijoinPath(l:bat[:oid,:any]...):bat[:oid,:any]
address ALGjoinPath;
comment Routine to handle join paths. The type analysis is rather tricky.
@@ -2420,6 +2398,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
@@ -2493,26 +2479,10 @@ command algebra.subsort(b:bat[:oid,:any_
address ALGsubsort11;
comment Returns a copy of the BAT sorted on tail values. The input and
output are (must be) dense headed. The order is descending if the
reverse bit is set. This is a stable sort if the stable bit is set.
-command algebra.sample(b:bat[:oid,:any_1],num:int):bat[:oid,:oid]
-address ALGsample;
-comment Returns the oids of a random selection of size 'num' from the input
BAT.
-
command algebra.selectNotNil(b:bat[:oid,:any_2]):bat[:oid,:any_2]
address ALGselectNotNil;
comment Select all not-nil values
-command algebra.select(b:bat[:oid,:any_2],value:any_2):bat[:oid,:any_2]
-address ALGselect1;
-comment Select all BUNs of a BAT with a certain tail value. Selection
on NIL is also possible (it should be properly casted, e.g.:int(nil)).
-
-command
algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2,li:bit,hi:bit):bat[:oid,:any_2]
-address ALGselectInclusive;
-comment Select all BUNs that have tail values: {v| low <{=} v <{=} high}.
Boundary inclusion is indicated separately. NIL boundary values have a
special meaning. + low == nil means: no lower bound + high == nil
means: no upper bound.
-
-command
algebra.select(b:bat[:oid,:any_2],low:any_2,high:any_2):bat[:oid,:any_2]
-address ALGselect;
-comment Select all BUNs that have tail values: {v| low <= v <= high}. NIL
boundary values have a special meaning. + low == nil means: no
lower bound + high == nil means: no upper bound. NOTE 1:
you should cast the nil to the appropriate type,
e.g. int(nil) in order to circumvent type clashes. NOTE 2: as the
'nil' element has no clear place in the ordered domain
of values, tuples with 'nil' values are NEVER
returned by the range select.
-
command
algebra.subselect(b:bat[:oid,:any_1],s:bat[:oid,:oid],low:any_1,high:any_1,li:bit,hi:bit,anti:bit):bat[:oid,:oid]
address ALGsubselect2;
comment Select all head values of the first input BAT for which the tail value
is in range and for which the head value occurs in the tail of the second
input BAT. The first input is a dense-headed BAT, the second input is a
dense-headed BAT with sorted tail, output is a dense-headed BAT with in the
tail the head value of the input BAT for which the tail value is between the
values low and high (inclusive if li respectively hi is set). The output BAT
is sorted on the tail value. If low or high is nil, the boundary is not
considered (effectively - and + infinity). If anti is set, the result is the
complement. Nil values in the tail are never matched, unless low=nil,
high=nil, li=1, hi=1, anti=0. All non-nil values are returned if low=nil,
high=nil, and li, hi are not both 1, or anti=1. Note that the output is
suitable as second input for this function.
@@ -2521,10 +2491,6 @@ command algebra.subselect(b:bat[:oid,:an
address ALGsubselect1;
comment Select all head values for which the tail value is in range. 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 tail value is between the
values low and high (inclusive if li respectively hi is set). The
output BAT is sorted on the tail value. If low or high is nil, the
boundary is not considered (effectively - and + infinity). If anti is
set, the result is the complement. Nil values in the tail are never
matched, unless low=nil, high=nil, li=1, hi=1, anti=0. All non-nil values are
returned if low=nil, high=nil, and li, hi are not both 1, or anti=1.
Note that the output is suitable as second input for the other version of this
function.
-command algebra.tdiff(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtdiff;
-command
algebra.tinter(left:bat[:oid,:oid],right:bat[:oid,:oid]):bat[:oid,:oid]
-address ALGtinter;
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 +2499,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.
@@ -31181,18 +31143,18 @@ command bat.densebat(sz:wrd):bat[:oid,:o
address BKCdensebat;
comment Creates a new [void,void] BAT of size 'sz'.
+command bat.delete(b:bat[:oid,:any_1]):bat[:oid,:any_1]
+address BKCdelete_all;
+comment Delete all entries.
+
+command bat.delete(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1]
+address BKCdelete;
+comment Delete an entry with a certain head value.
+
command bat.delete(b:bat[:oid,:any_1],src:bat[:oid,:any_1]):bat[:oid,:any_1]
address BKCdelete_bat_bun;
comment Delete from the first BAT all BUNs with a corresponding BUN in
the second.
-command bat.delete(b:bat[:oid,:any_1]):bat[:oid,:any_1]
-address BKCdelete_all;
-comment Delete all BUNs in a BAT.
-
-command bat.delete(b:bat[:oid,:any_1],h:oid):bat[:oid,:any_1]
-address BKCdelete;
-comment Delete all BUNs with a certain head value.
-
command bat.getName(b:bat[:oid,:any_1]):str
address BKCgetBBPname;
comment Gives back the logical name of a BAT.
@@ -31281,7 +31243,7 @@ command bat.mergecand(a:bat[:oid,:oid],b
address BKCmergecand;
comment Merge two candidate lists into one
-command bat.mirror(b:bat[:any_1,:any_2]):bat[:any_1,:any_1]
+command bat.mirror(b:bat[:oid,:any_2]):bat[:oid,:oid]
address BKCmirror;
comment Returns the head-mirror image of a BAT (two head columns).
@@ -31315,14 +31277,6 @@ pattern bat.new(ht:oid,tt:any_1):bat[:oi
address CMDBATnew;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
