Changeset: def0638a6f77 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=def0638a6f77
Added Files:
clients/Tests/SQL-dump.SQL.py
sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.sql
sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.stable.err
sql/test/BugTracker-2016/Tests/catalog_name_qualifier.Bug-3948.stable.out
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.sql
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.err
sql/test/BugTracker-2016/Tests/column_alias_in_where_clause.Bug-3947.stable.out
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.sql
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.err
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2016/Tests/foreign_key.Bug-3938.sql
sql/test/BugTracker-2016/Tests/foreign_key.Bug-3938.stable.err
sql/test/BugTracker-2016/Tests/foreign_key.Bug-3938.stable.out
sql/test/BugTracker-2016/Tests/group_distinct_quantile.Bug-3927.sql
sql/test/BugTracker-2016/Tests/group_distinct_quantile.Bug-3927.stable.err
sql/test/BugTracker-2016/Tests/group_distinct_quantile.Bug-3927.stable.out
sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.sql
sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.err
sql/test/BugTracker-2016/Tests/merge_project.Bug-3955.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/All
sql/test/emptydb-upgrade-chain-hge/Tests/check.SQL.py
sql/test/emptydb-upgrade-chain-hge/Tests/check.reqtests
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.err
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain-hge/Tests/dump.SQL.py
sql/test/emptydb-upgrade-chain-hge/Tests/dump.reqtests
sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.err
sql/test/emptydb-upgrade-chain-hge/Tests/dump.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/package.py
sql/test/emptydb-upgrade-chain-hge/Tests/package.reqtests
sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.err
sql/test/emptydb-upgrade-chain-hge/Tests/package.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.py
sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.err
sql/test/emptydb-upgrade-chain-hge/Tests/unpackage.stable.out
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.sql
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.err
sql/test/emptydb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/All
sql/test/emptydb-upgrade-chain/Tests/check.SQL.py
sql/test/emptydb-upgrade-chain/Tests/check.reqtests
sql/test/emptydb-upgrade-chain/Tests/check.stable.err
sql/test/emptydb-upgrade-chain/Tests/check.stable.out
sql/test/emptydb-upgrade-chain/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-chain/Tests/dump.SQL.py
sql/test/emptydb-upgrade-chain/Tests/dump.reqtests
sql/test/emptydb-upgrade-chain/Tests/dump.stable.err
sql/test/emptydb-upgrade-chain/Tests/dump.stable.out
sql/test/emptydb-upgrade-chain/Tests/package.py
sql/test/emptydb-upgrade-chain/Tests/package.reqtests
sql/test/emptydb-upgrade-chain/Tests/unpackage.py
sql/test/emptydb-upgrade-chain/Tests/unpackage.stable.err
sql/test/emptydb-upgrade-chain/Tests/unpackage.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.sql
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.err
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out
sql/test/emptydb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/All
sql/test/emptydb-upgrade-hge/Tests/check.SQL.py
sql/test/emptydb-upgrade-hge/Tests/check.reqtests
sql/test/emptydb-upgrade-hge/Tests/check.stable.err
sql/test/emptydb-upgrade-hge/Tests/check.stable.out
sql/test/emptydb-upgrade-hge/Tests/check.stable.out.int128
sql/test/emptydb-upgrade-hge/Tests/dump.SQL.py
sql/test/emptydb-upgrade-hge/Tests/dump.reqtests
sql/test/emptydb-upgrade-hge/Tests/dump.stable.err
sql/test/emptydb-upgrade-hge/Tests/dump.stable.out
sql/test/emptydb-upgrade-hge/Tests/unpackage.py
sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.err
sql/test/emptydb-upgrade-hge/Tests/unpackage.stable.out
sql/test/emptydb-upgrade-hge/Tests/upgrade.sql
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.err
sql/test/emptydb-upgrade-hge/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/All
sql/test/emptydb-upgrade/Tests/check.SQL.py
sql/test/emptydb-upgrade/Tests/check.reqtests
sql/test/emptydb-upgrade/Tests/check.stable.err
sql/test/emptydb-upgrade/Tests/check.stable.out
sql/test/emptydb-upgrade/Tests/check.stable.out.int128
sql/test/emptydb-upgrade/Tests/dump.SQL.py
sql/test/emptydb-upgrade/Tests/dump.reqtests
sql/test/emptydb-upgrade/Tests/dump.stable.err
sql/test/emptydb-upgrade/Tests/dump.stable.out
sql/test/emptydb-upgrade/Tests/unpackage.py
sql/test/emptydb-upgrade/Tests/unpackage.stable.err
sql/test/emptydb-upgrade/Tests/unpackage.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.sql
sql/test/emptydb-upgrade/Tests/upgrade.stable.err
sql/test/emptydb-upgrade/Tests/upgrade.stable.out
sql/test/emptydb-upgrade/Tests/upgrade.stable.out.int128
sql/test/emptydb/Tests/All
sql/test/emptydb/Tests/check.SQL.py
sql/test/emptydb/Tests/check.reqtests
sql/test/emptydb/Tests/check.stable.err
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
sql/test/emptydb/Tests/dump.SQL.py
sql/test/emptydb/Tests/dump.reqtests
sql/test/emptydb/Tests/dump.stable.err
sql/test/emptydb/Tests/dump.stable.out
sql/test/emptydb/Tests/load.sql
sql/test/emptydb/Tests/load.stable.err
sql/test/emptydb/Tests/load.stable.out
sql/test/emptydb/Tests/package-hge.py
sql/test/emptydb/Tests/package-hge.stable.err
sql/test/emptydb/Tests/package-hge.stable.out
sql/test/emptydb/Tests/package.py
sql/test/emptydb/Tests/package.reqtests
sql/test/emptydb/updatetests
Removed Files:
clients/Tests/SQL-dump.sql
Modified Files:
NT/rules.msc
clients/R/MonetDB.R/R/dbi.R
clients/R/MonetDB.R/R/dplyr.R
clients/R/Tests/deps-install.R
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.int128
clients/mapiclient/dump.c
java/ChangeLog.Jun2016
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDatabaseMetaData.java
java/src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in
monetdb5/optimizer/opt_mergetable.c
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_execute.c
sql/backends/monet5/sql_upgrades.c
sql/benchmarks/tpch/Tests/20-plan.stable.out
sql/benchmarks/tpch/Tests/20-plan.stable.out.int128
sql/common/sql_types.c
sql/include/sql_mem.h
sql/server/rel_optimizer.c
sql/storage/sql_storage.h
sql/test/BugTracker-2015/Tests/crash.Bug-3736.stable.out
sql/test/BugTracker-2016/Tests/All
sql/test/Via-m/Tests/event_s11.stable.err
sql/test/Via-m/Tests/event_s11.stable.out
sql/test/Via-m/Tests/media_s18.stable.err
sql/test/Via-m/Tests/media_s18.stable.out
sql/test/Via-m/Tests/media_s19.stable.err
sql/test/Via-m/Tests/media_s19.stable.out
sql/test/copy/Tests/int_parse.stable.err
sql/test/copy/Tests/int_parse.stable.out
sql/test/copy/Tests/int_parse_best.stable.out
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.err
sql/test/copy/Tests/load_stdin_incorrect_line_nr.stable.out
sql/test/copy/Tests/null_as_string_errors.stable.err
sql/test/copy/Tests/null_as_string_errors.stable.out
sql/test/pg_regress/Tests/case.stable.out
sql/test/pg_regress/Tests/create_misc.stable.err
sql/test/testdb-upgrade-chain-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out.int128
sql/test/testdb-upgrade-hge/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out.int128
sql/test/testdb/Tests/testdb-dump.stable.out
sql/test/testdb/Tests/testdb-dump.stable.out.Windows
sql/test/testdb/Tests/testdb-load.sql
testing/Mtest.py.in
testing/process.py
tools/embedded/build-rpkg.sh
tools/embedded/demo.c
tools/embedded/embedded.c
tools/embedded/embedded.h
tools/embedded/embeddedr.c
tools/embedded/embeddedr.h
tools/embedded/rpackage/R/monetdb.R
tools/embedded/rpackage/man/embedded.Rd
Branch: default
Log Message:
Merge with Jun2016 branch.
diffs (truncated from 173470 to 300 lines):
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -282,6 +282,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) BITS64_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF BITS64OID32
+ $(ECHO) BITS64OID32_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) BITS64OID32_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF CROSS_COMPILING
$(ECHO) CROSS_COMPILING_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!ELSE
diff --git a/clients/R/MonetDB.R/R/dbi.R b/clients/R/MonetDB.R/R/dbi.R
--- a/clients/R/MonetDB.R/R/dbi.R
+++ b/clients/R/MonetDB.R/R/dbi.R
@@ -97,7 +97,8 @@ setMethod("dbConnect", "MonetDBDriver",
if (!requireNamespace("MonetDBLite", quietly=T)) {
stop("MonetDBLite package required for embedded mode")
}
- MonetDBLite::monetdb_embedded_startup(embedded,
!getOption("monetdb.debug.embedded", FALSE))
+ MonetDBLite::monetdb_embedded_startup(embedded,
!getOption("monetdb.debug.embedded", FALSE),
+ getOption("monetdb.sequential", TRUE))
connenv <- new.env(parent=emptyenv())
connenv$conn <- MonetDBLite::monetdb_embedded_connect()
connenv$open <- TRUE
@@ -331,7 +332,7 @@ setMethod("dbSendQuery", signature(conn=
# This one does all the work in this class
setMethod("dbSendQuery", signature(conn="MonetDBEmbeddedConnection",
statement="character"),
- def=function(conn, statement, ..., list=NULL, notreally=F) {
+ def=function(conn, statement, ..., list=NULL, execute = T,
resultconvert = T) {
if (!conn@connenv$open) {
stop("This connection was closed.")
}
@@ -344,7 +345,7 @@ setMethod("dbSendQuery", signature(conn=
if(!is.null(log_file <- getOption("monetdb.log.query", NULL)))
cat(c(statement, ";\n"), file = log_file, sep="", append = TRUE)
startt <- Sys.time()
- resp <- MonetDBLite::monetdb_embedded_query(conn@connenv$conn, statement,
notreally)
+ resp <- MonetDBLite::monetdb_embedded_query(conn@connenv$conn, statement,
execute, resultconvert)
takent <- round(as.numeric(Sys.time() - startt), 2)
env <- new.env(parent=emptyenv())
if (resp$type == Q_TABLE) {
diff --git a/clients/R/MonetDB.R/R/dplyr.R b/clients/R/MonetDB.R/R/dplyr.R
--- a/clients/R/MonetDB.R/R/dplyr.R
+++ b/clients/R/MonetDB.R/R/dplyr.R
@@ -78,7 +78,7 @@ db_query_fields.MonetDBConnection <- fun
}
db_query_fields.MonetDBEmbeddedConnection <- function(con, sql, ...) {
- names(DBI::dbGetQuery(con, dplyr::build_sql("SELECT * FROM ", sql),
notreally=T))
+ names(DBI::dbGetQuery(con, dplyr::build_sql("SELECT * FROM ", sql), execute
= F))
}
db_query_rows.MonetDBConnection <- function(con, sql, ...) {
@@ -86,7 +86,7 @@ db_query_rows.MonetDBConnection <- funct
}
db_query_rows.MonetDBEmbeddedConnection <- function(con, sql, ...) {
- attr(DBI::dbGetQuery(con, sql, notreally=T), "__rows")
+ attr(DBI::dbGetQuery(con, sql, resultconvert = F), "__rows")
}
db_insert_into.MonetDBConnection <- function(con, table, values, ...) {
diff --git a/clients/R/Tests/deps-install.R b/clients/R/Tests/deps-install.R
--- a/clients/R/Tests/deps-install.R
+++ b/clients/R/Tests/deps-install.R
@@ -3,11 +3,6 @@ dir.create(unlist(strsplit(Sys.getenv("R
# autoinstall DBI and digest, we need those to install MonetDB.R
dd <- capture.output(suppressMessages(suppressWarnings({
- (function(lp) {
- np <- lp[!(lp %in% installed.packages()[,"Package"])]
- repos <- "http://cran.rstudio.com/";
- if(length(np)) install.packages(np,repos=repos, quiet=T)
- update.packages(repos=repos, ask=F, oldPkgs=lp, quiet=T)
- x <- lapply(lp,function(x){library(x,character.only=TRUE,quietly=T)})
- })(c("DBI", "digest"))
+ install.packages(c("devtools", "digest"),
repos="http://cran.rstudio.com/";, quiet=T)
+ devtools::install_github("rstats-db/DBI", quiet=T)
})))
diff --git a/clients/Tests/SQL-dump.sql b/clients/Tests/SQL-dump.SQL.py
rename from clients/Tests/SQL-dump.sql
rename to clients/Tests/SQL-dump.SQL.py
--- a/clients/Tests/SQL-dump.sql
+++ b/clients/Tests/SQL-dump.SQL.py
@@ -1,241 +1,92 @@
-\dn
-\dt
-\dv
-\ds
-\df
+import os, sys, re
+try:
+ from MonetDBtesting import process
+except ImportError:
+ import process
-\dSn
-\dSt
-\dSv
-\dSs
-\dSf
+clt = process.client('sql', format = 'csv', echo = False,
+ stdin = process.PIPE, stdout = process.PIPE, stderr =
process.PIPE)
-\dn bam
-\dn json
-\dn tmp
+for c in 'ntvsf':
+ clt.stdin.write("select '\\\\d%s';\n" % c)
-\dSn sys
+for c in 'ntvsf':
+ clt.stdin.write("select '\\\\dS%s';\n" % c)
-\dSt sys._columns
-\dSt sys._tables
-\dSt sys.args
-\dSt sys.auths
-\dSt sys.connections
-\dSt sys.db_user_info
-\dSt sys.dependencies
-\dSt sys.functions
-\dSt sys.idxs
-\dSt sys.keys
-\dSt sys.objects
-\dSt sys.privileges
-\dSt sys.schemas
-\dSt sys.sequences
-\dSt sys.statistics
-\dSt sys.storagemodelinput
-\dSt sys.systemfunctions
-\dSt sys.triggers
-\dSt sys.types
-\dSt sys.user_role
+clt.stdin.write("select '\\\\dn ' || name from sys.schemas order by name;\n")
-\dSv sys.columns
-\dSv sys.environment
-\dSv sys.optimizers
-\dSv sys.querylog_calls
-\dSv sys.querylog_catalog
-\dSv sys.querylog_history
-\dSv sys.queue
-\dSv sys.sessions
-\dSv sys.storage
-\dSv sys.storagemodel
-\dSv sys.tables
-\dSv sys.tablestoragemodel
-\dSv sys.tracelog
-\dSv sys.users
+clt.stdin.write("select '\\\\dSt ' || s.name || '.' || t.name from sys._tables
t, sys.schemas s where t.schema_id = s.id and t.query is null order by s.name,
t.name;\n")
--- select distinct '\\dSf ' || s.name || '.' || f.name from sys.functions f,
sys.schemas s where f.language between 1 and 2 and f.schema_id = s.id order and
s.name = 'sys' by s.name, f.name;
-\dSf sys.Intersect
-\dSf sys.Union
-\dSf sys.abbrev
-\dSf sys.alpha
-\dSf sys.analyze
-\dSf sys.area
-\dSf sys.astext
-\dSf sys.bbp
-\dSf sys.boundary
-\dSf sys.broadcast
-\dSf sys.buffer
-\dSf sys.chi2prob
-\dSf sys.clearrejects
-\dSf sys.columnsize
-\dSf sys.contains
-\dSf sys.convexhull
-\dSf sys.corr
-\dSf sys.crosses
-\dSf sys.date_to_str
-\dSf sys.db_users
-\dSf sys.degrees
-\dSf sys.dependencies_columns_on_functions
-\dSf sys.dependencies_columns_on_indexes
-\dSf sys.dependencies_columns_on_keys
-\dSf sys.dependencies_columns_on_triggers
-\dSf sys.dependencies_columns_on_views
-\dSf sys.dependencies_functions_on_functions
-\dSf sys.dependencies_functions_os_triggers
-\dSf sys.dependencies_keys_on_foreignkeys
-\dSf sys.dependencies_owners_on_schemas
-\dSf sys.dependencies_schemas_on_users
-\dSf sys.dependencies_tables_on_foreignkeys
-\dSf sys.dependencies_tables_on_functions
-\dSf sys.dependencies_tables_on_indexes
-\dSf sys.dependencies_tables_on_triggers
-\dSf sys.dependencies_tables_on_views
-\dSf sys.dependencies_views_on_functions
-\dSf sys.dependencies_views_on_triggers
-\dSf sys.difference
-\dSf sys.dimension
-\dSf sys.disjoint
-\dSf sys.distance
-\dSf sys.env
-\dSf sys.envelope
-\dSf sys.environment
-\dSf sys.epoch
-\dSf sys.equals
-\dSf sys.evalalgebra
-\dSf sys.fitsattach
-\dSf sys.fitsload
-\dSf sys.fuse
-\dSf sys.generate_series
-\dSf sys.geomcollectionfromtext
-\dSf sys.geometrytypeid
-\dSf sys.geomfromtext
-\dSf sys.getanchor
-\dSf sys.getbasename
-\dSf sys.getcontent
-\dSf sys.getcontext
-\dSf sys.getdomain
-\dSf sys.getextension
-\dSf sys.getfile
-\dSf sys.gethost
-\dSf sys.getport
-\dSf sys.getprotocol
-\dSf sys.getquery
-\dSf sys.getroboturl
-\dSf sys.getuser
-\dSf sys.hashsize
-\dSf sys.heapsize
-\dSf sys.host
-\dSf sys.hostmask
-\dSf sys.ilike
-\dSf sys.imprintsize
-\dSf sys.intersection
-\dSf sys.isaurl
-\dSf sys.isauuid
-\dSf sys.isempty
-\dSf sys.issimple
-\dSf sys.left_shift
-\dSf sys.left_shift_assign
-\dSf sys.length
-\dSf sys.like
-\dSf sys.linefromtext
-\dSf sys.listdir
-\dSf sys.listdirpat
-\dSf sys.masklen
-\dSf sys.mbr
-\dSf sys.mbroverlaps
-\dSf sys.md5
-\dSf sys.median
-\dSf sys.mlinefromtext
-\dSf sys.mpointfromtext
-\dSf sys.mpolyfromtext
-\dSf sys.ms_round
-\dSf sys.ms_str
-\dSf sys.ms_stuff
-\dSf sys.ms_trunc
-\dSf sys.netcdf_attach
-\dSf sys.netcdf_importvar
-\dSf sys.netmask
-\dSf sys.network
-\dSf sys.newurl
-\dSf sys.optimizer_stats
-\dSf sys.optimizers
-\dSf sys.overlaps
-\dSf sys.password_hash
-\dSf sys.pause
-\dSf sys.point
-\dSf sys.pointfromtext
-\dSf sys.polyfromtext
-\dSf sys.polygonfromtext
-\dSf sys.profiler_openstream
-\dSf sys.profiler_stethoscope
-\dSf sys.quantile
-\dSf sys.querycache
-\dSf sys.querylog
-\dSf sys.querylog_calls
-\dSf sys.querylog_catalog
-\dSf sys.querylog_disable
-\dSf sys.querylog_empty
-\dSf sys.querylog_enable
-\dSf sys.queue
-\dSf sys.radians
-\dSf sys.rejects
-\dSf sys.relate
-\dSf sys.resume
-\dSf sys.reuse
-\dSf sys.reverse
-\dSf sys.right_shift
-\dSf sys.right_shift_assign
-\dSf sys.sessions
-\dSf sys.setmasklen
-\dSf sys.setsession
-\dSf sys.settimeout
-\dSf sys.shrink
-\dSf sys.shutdown
-\dSf sys.srid
-\dSf sys.stddev_pop
-\dSf sys.stddev_samp
-\dSf sys.stop
-\dSf sys.storage
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
