Changeset: 161ba4c1d5e3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=161ba4c1d5e3
Added Files:
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.sql
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.err
sql/test/BugTracker-2017/Tests/double-groupby-column.Bug-6207.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-distinct-coalesce.Bug-6431.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-having-avg.Bug-6428.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-aggregation-not-in.Bug-6416.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-in.Bug-6433.stable.out
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.sql
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.stable.err
sql/test/BugTracker-2017/Tests/sqlitelogictest-select-not-in.Bug-6435.stable.out
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.err
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.sql
sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith-semijoin-constant.bug-6417.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6418.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6423.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6424.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6425.stable.out
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.sql
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.stable.err
sql/test/BugTracker-2017/Tests/sqlsmith.Bug-6432.stable.out
sql/test/mergetables/Tests/mergedb.Bug-6820.sql
sql/test/mergetables/Tests/mergedb.Bug-6820.stable.err
sql/test/mergetables/Tests/mergedb.Bug-6820.stable.out
sql/test/mergetables/Tests/mergedb_create.sql
sql/test/mergetables/Tests/mergedb_create.stable.err
sql/test/mergetables/Tests/mergedb_create.stable.out
sql/test/mergetables/Tests/mergedb_drop.sql
sql/test/mergetables/Tests/mergedb_drop.stable.err
sql/test/mergetables/Tests/mergedb_drop.stable.out
sql/test/mergetables/Tests/sqlsmith.Bug-6426.sql
sql/test/mergetables/Tests/sqlsmith.Bug-6426.stable.err
sql/test/mergetables/Tests/sqlsmith.Bug-6426.stable.out
Modified Files:
clients/R/Tests/All
clients/R/Tests/copy_into_fwf.stable.out
clients/R/Tests/dbi.R
clients/R/Tests/dbi.stable.err
clients/R/Tests/deps-install.R
clients/R/Tests/deps-test.R
clients/R/Tests/dplyr-flights.R
clients/R/Tests/dplyr-flights.reqtests
clients/R/Tests/dplyr.R
clients/R/Tests/install.R
gdk/gdk_calc_compare.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_interpreter.c
monetdb5/modules/atoms/mtime.c
monetdb5/optimizer/opt_constants.c
sql/backends/monet5/UDF/cudf/Tests/udf-reverse.stable.out
sql/backends/monet5/rel_bin.c
sql/backends/monet5/sql_cat.c
sql/backends/monet5/sql_user.c
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
sql/include/sql_catalog.h
sql/scripts/51_sys_schema_extension.sql
sql/server/rel_exp.c
sql/server/rel_exp.h
sql/server/rel_optimizer.c
sql/server/rel_rel.c
sql/server/rel_select.c
sql/server/rel_updates.c
sql/storage/bat/bat_storage.c
sql/storage/store.c
sql/test/BugDay_2005-11-09_2.9.3/Tests/sql_server_crash.SF-1080024.stable.out
sql/test/BugTracker-2008/Tests/count_with_order_by_and_limit_crashes.SF-2229936.stable.err
sql/test/BugTracker-2009/Tests/use_order_column_first.SF-2686008.stable.out
sql/test/BugTracker-2011/Tests/and-power.Bug-3013.stable.out.int128
sql/test/BugTracker-2012/Tests/querycache.Bug-3212.stable.out
sql/test/BugTracker-2014/Tests/manifold.Bug-3556.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out
sql/test/BugTracker-2016/Tests/convert-function-test.Bug-3460.stable.out.int128
sql/test/BugTracker-2016/Tests/decimal_vs_integer.Bug-3941.stable.out
sql/test/BugTracker-2017/Tests/All
sql/test/BugTracker-2017/Tests/case.Bug-6386.sql
sql/test/BugTracker-2017/Tests/case.Bug-6386.stable.out
sql/test/BugTracker-2017/Tests/sqllitelogistest_case.Bug-6335.sql
sql/test/BugTracker/Tests/caching.SF-1651599.stable.out
sql/test/LSST/Tests/dbQuery036.stable.err
sql/test/Tests/marcin3.stable.err
sql/test/mapi/Tests/sql_int128.stable.out.int128
sql/test/mergetables/Tests/All
sql/test/mergetables/Tests/mergequery.stable.out
sql/test/pg_regress/Tests/strings.stable.out
sql/test/pg_regress/Tests/strings_cast.stable.out
sql/test/remote/Tests/partition_elim.stable.out
Branch: compressedcandidates
Log Message:
merge with default
diffs (truncated from 6532 to 300 lines):
diff --git a/clients/R/Tests/All b/clients/R/Tests/All
--- a/clients/R/Tests/All
+++ b/clients/R/Tests/All
@@ -1,8 +1,8 @@
HAVE_LIBR?deps-install
HAVE_LIBR?install
HAVE_LIBR?deps-test
-HAVE_LIBR&HAVE_PERL?dbi
-HAVE_LIBR?dplyr
+HAVE_LIBR?dbi
+#HAVE_LIBR?dplyr too slow
HAVE_LIBR?dplyr-flights
HAVE_LIBR?copy_into_fwf
HAVE_LIBR&NOT_WIN32?dbapply
diff --git a/clients/R/Tests/copy_into_fwf.stable.out
b/clients/R/Tests/copy_into_fwf.stable.out
--- a/clients/R/Tests/copy_into_fwf.stable.out
+++ b/clients/R/Tests/copy_into_fwf.stable.out
@@ -26,6 +26,8 @@ Ready.
<MonetDBResult>
SQL CREATE TABLE mtcars (mpg DOUBLE PRECISION, cyl DOUBLE PRECISION, disp
DOUBLE PRECISION, hp DOUBLE PRECISION, drat DOUBLE PRECISION, wt DOUBLE
PRECISION, qsec DOUBLE PRECISION, vs DOUBLE PRECISION, am DOUBLE PRECISION,
gear DOUBLE PRECISION, carb DOUBLE PRECISION)
+ ROWS Fetched: 0 [complete]
+ Changed: NA
mpg cyl disp hp drat wt qsec vs am gear carb
1 21.0 6 160.0 110 3.90 2.620 16.46 0 1 4 4
2 21.0 6 160.0 110 3.90 2.875 17.02 0 1 4 4
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
@@ -198,7 +198,7 @@ stopifnot(identical(1L, as.integer(dbGet
# reserved words in data frame column names
stopifnot(dbIsValid(conn))
dbBegin(conn)
-dbWriteTable(conn, "evilt", data.frame(year=42, month=12, day=24,
some.dot=12), transaction=F)
+dbWriteTable(conn, "evilt", data.frame(year=42, month=12, day=24, some.dot=12))
stopifnot(dbExistsTable(conn, "evilt"))
dbRollback(conn)
@@ -208,7 +208,7 @@ dbBegin(conn)
data(api, package="survey")
x <- apiclus1
x$idkey <- seq( nrow( x ) )
-dbWriteTable( conn , 'x' , x , transaction=F)
+dbWriteTable( conn , 'x' , x )
stopifnot(dbExistsTable(conn, "x"))
dbRollback(conn)
@@ -217,7 +217,7 @@ stopifnot(!is.null(dbGetQuery(conn, "SEL
#non-standard dbwritetable use
dbBegin(conn)
-dbWriteTable(conn, "vectable", 1:1000, transaction=F)
+dbWriteTable(conn, "vectable", 1:1000)
stopifnot(dbExistsTable(conn, "vectable"))
dbRollback(conn)
diff --git a/clients/R/Tests/dbi.stable.err b/clients/R/Tests/dbi.stable.err
--- a/clients/R/Tests/dbi.stable.err
+++ b/clients/R/Tests/dbi.stable.err
@@ -33,19 +33,16 @@ stderr of test 'dbi` in directory 'clien
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Warning message:
'MonetDBLite::isIdCurrent' is deprecated.
-Use 'dbIsValid' instead.
+Use 'use dbIsValid() instead' instead.
See help("Deprecated")
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
-Treating character vector parameter as file name(s) for monetdb.read.csv()
Identifier(s) "Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width",
"Species" contain uppercase or reserved SQL characters and need(s) to be quoted
in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
-Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
-Identifier(s) "Need to quote this table name" contain uppercase or reserved
SQL characters and need(s) to be quoted in queries.
Identifier(s) "some.dot" contain uppercase or reserved SQL characters and
need(s) to be quoted in queries.
Identifier(s) "year", "month", "day" are reserved SQL keywords and need(s) to
be quoted in queries.
Identifier(s) "sch.wide", "comp.imp", "yr.rnd", "acs.k3", "acs.46",
"acs.core", "pct.resp", "not.hsg", "some.col", "col.grad", "grad.sch",
"avg.ed", "api.stu" contain uppercase or reserved SQL characters and need(s) to
be quoted in queries.
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
@@ -1,13 +1,11 @@
# autoinstall DBI and digest, we need those to install MonetDB.R
+options(warn = -1)
+packages_required <- c("digest", "DBI")
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
-repos <- "http://cran.rstudio.com/";
-packages_required <- c("devtools", "digest")
-install.packages(packages_required, repos=repos, quiet=T)
-update.packages(repos=repos, ask=F, oldPkgs=packages_required)
-devtools::install_github("rstats-db/DBI", quiet=T)
+install.packages(packages_required, repos="http://cran.rstudio.com/";)
cat("#~EndProfilingOutput~#\n", file=stderr())
cat("#~EndProfilingOutput~#\n\n", file=stdout())
diff --git a/clients/R/Tests/deps-test.R b/clients/R/Tests/deps-test.R
--- a/clients/R/Tests/deps-test.R
+++ b/clients/R/Tests/deps-test.R
@@ -1,26 +1,16 @@
-packages_required <- c('Rcpp', 'dplyr', 'Lahman', 'nycflights13', 'gdata',
'survey')
+packages_required <-
c("assertthat","testthat","survey","nycflights13","RSQLite","dbplyr","dplyr","gdata","callr","devtools","DBItest")
install_or_upgrade_packages <- 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)
-
- # dev dplyr
- if (packageVersion("devtools") < 1.6) {
- install.packages("devtools")
- }
- devtools::install_github("hadley/lazyeval")
- devtools::install_github("hadley/dplyr")
-
}
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
-devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
-
install_or_upgrade_packages(packages_required)
cat("#~EndProfilingOutput~#\n", file=stderr())
diff --git a/clients/R/Tests/dplyr-flights.R b/clients/R/Tests/dplyr-flights.R
--- a/clients/R/Tests/dplyr-flights.R
+++ b/clients/R/Tests/dplyr-flights.R
@@ -20,7 +20,7 @@ so <- function(x) {
}
my_db <- MonetDBLite::src_monetdb(dbname=dbname, port=dbport, wait=T)
-if (!DBI::dbExistsTable(con_acquire(my_db) , 'flights')) DBI::dbWriteTable(
con_acquire(my_db) , 'flights' , nycflights13::flights , csvdump=T, overwrite=T)
+if (!DBI::dbExistsTable(my_db$con , 'flights')) DBI::dbWriteTable(my_db$con ,
'flights' , nycflights13::flights , csvdump=T, overwrite=T)
flights <- tbl( my_db , 'flights')
dim(flights)
diff --git a/clients/R/Tests/dplyr-flights.reqtests
b/clients/R/Tests/dplyr-flights.reqtests
--- a/clients/R/Tests/dplyr-flights.reqtests
+++ b/clients/R/Tests/dplyr-flights.reqtests
@@ -1,1 +1,1 @@
-dplyr
+dbi
diff --git a/clients/R/Tests/dplyr.R b/clients/R/Tests/dplyr.R
--- a/clients/R/Tests/dplyr.R
+++ b/clients/R/Tests/dplyr.R
@@ -15,7 +15,7 @@ if (length(args) > 1)
dbname <- args[[2]]
dps <- MonetDBLite::src_monetdb(dbname=dbname, port=dbport)
-if (!DBI::dbExistsTable(con_acquire(dps), "AllstarFull")) copy_lahman(dps)
+if (!DBI::dbExistsTable(dps$con, "AllstarFull")) dbplyr::copy_lahman(dps)
}))
diff --git a/clients/R/Tests/install.R b/clients/R/Tests/install.R
--- a/clients/R/Tests/install.R
+++ b/clients/R/Tests/install.R
@@ -1,11 +1,17 @@
+options(warn = -1)
cat("#~BeginProfilingOutput~#\n", file=stderr())
cat("#~BeginProfilingOutput~#\n", file=stdout())
-devtools::install_github("hannesmuehleisen/MonetDBLite", quiet=T)
+install_submodule_git <- function(x, ...) {
+ install_dir <- tempfile()
+ system(paste("git clone --recursive --depth 1", shQuote(x),
+shQuote(install_dir)))
+ devtools::install(install_dir, ...)
+}
+install_submodule_git("https://github.com/hannesmuehleisen/MonetDBLite-R";)
cat("#~EndProfilingOutput~#\n", file=stderr())
cat("#~EndProfilingOutput~#\n", file=stdout())
stopifnot("MonetDBLite" %in% installed.packages()[,"Package"])
-
library(MonetDBLite, quietly=T)
diff --git a/gdk/gdk_calc_compare.h b/gdk/gdk_calc_compare.h
--- a/gdk/gdk_calc_compare.h
+++ b/gdk/gdk_calc_compare.h
@@ -599,15 +599,25 @@ BATcalcop(BAT *b1, BAT *b2, BAT *s)
return BATconstant(b1->hseqbase, TYPE_TPE, &res, cnt,
TRANSIENT);
}
- bn = BATcalcop_intern(b1->ttype == TYPE_void ? (void *) &b1->tseqbase :
(void *) Tloc(b1, 0), ATOMtype(b1->ttype) == TYPE_oid ? b1->ttype :
ATOMbasetype(b1->ttype), 1,
+ bn = BATcalcop_intern(b1->ttype == TYPE_void ? (const void *)
&b1->tseqbase : (const void *) Tloc(b1, 0),
+ ATOMtype(b1->ttype) == TYPE_oid ? b1->ttype :
ATOMbasetype(b1->ttype),
+ 1,
b1->tvheap ? b1->tvheap->base : NULL,
b1->twidth,
- b2->ttype == TYPE_void ? (void *) &b2->tseqbase :
(void *) Tloc(b2, 0), ATOMtype(b2->ttype) == TYPE_oid ? b2->ttype :
ATOMbasetype(b2->ttype), 1,
+ b2->ttype == TYPE_void ? (const void *)
&b2->tseqbase : (const void *) Tloc(b2, 0),
+ ATOMtype(b2->ttype) == TYPE_oid ? b2->ttype :
ATOMbasetype(b2->ttype),
+ 1,
b2->tvheap ? b2->tvheap->base : NULL,
b2->twidth,
- cnt, start, end, cand, candend, b1->hseqbase,
+ cnt,
+ start,
+ end,
+ cand,
+ candend,
+ b1->hseqbase,
cand == NULL && b1->tnonil && b2->tnonil,
- b1->hseqbase, __func__);
+ b1->hseqbase,
+ __func__);
return bn;
}
@@ -623,14 +633,25 @@ BATcalcopcst(BAT *b, const ValRecord *v,
CANDINIT(b, s, start, end, cnt, cand, candend);
- bn = BATcalcop_intern(Tloc(b, 0), ATOMbasetype(b->ttype), 1,
+ bn = BATcalcop_intern(b->ttype == TYPE_void ? (const void *)
&b->tseqbase : (const void *) Tloc(b, 0),
+ ATOMtype(b->ttype) == TYPE_oid ? b->ttype :
ATOMbasetype(b->ttype),
+ 1,
b->tvheap ? b->tvheap->base : NULL,
b->twidth,
- VALptr(v), ATOMbasetype(v->vtype), 0,
- NULL, 0,
- cnt, start, end, cand, candend, b->hseqbase,
+ VALptr(v),
+ ATOMtype(v->vtype) == TYPE_oid ? v->vtype :
ATOMbasetype(v->vtype),
+ 0,
+ NULL,
+ 0,
+ cnt,
+ start,
+ end,
+ cand,
+ candend,
+ b->hseqbase,
cand == NULL && b->tnonil && ATOMcmp(v->vtype,
VALptr(v), ATOMnilptr(v->vtype)) != 0,
- b->hseqbase, __func__);
+ b->hseqbase,
+ __func__);
return bn;
}
@@ -646,14 +667,25 @@ BATcalccstop(const ValRecord *v, BAT *b,
CANDINIT(b, s, start, end, cnt, cand, candend);
- bn = BATcalcop_intern(VALptr(v), ATOMbasetype(v->vtype), 0,
- NULL, 0,
- Tloc(b, 0), ATOMbasetype(b->ttype), 1,
+ bn = BATcalcop_intern(VALptr(v),
+ ATOMtype(v->vtype) == TYPE_oid ? v->vtype :
ATOMbasetype(v->vtype),
+ 0,
+ NULL,
+ 0,
+ b->ttype == TYPE_void ? (const void *)
&b->tseqbase : (const void *) Tloc(b, 0),
+ ATOMtype(b->ttype) == TYPE_oid ? b->ttype :
ATOMbasetype(b->ttype),
+ 1,
b->tvheap ? b->tvheap->base : NULL,
b->twidth,
- cnt, start, end, cand, candend, b->hseqbase,
+ cnt,
+ start,
+ end,
+ cand,
+ candend,
+ b->hseqbase,
cand == NULL && b->tnonil && ATOMcmp(v->vtype,
VALptr(v), ATOMnilptr(v->vtype)) != 0,
- b->hseqbase, __func__);
+ b->hseqbase,
+ __func__);
return bn;
}
@@ -662,9 +694,24 @@ gdk_return
VARcalcop(ValPtr ret, const ValRecord *lft, const ValRecord *rgt)
{
ret->vtype = TYPE_TPE;
- if (op_typeswitchloop(VALptr(lft), ATOMbasetype(lft->vtype), 0, NULL, 0,
- VALptr(rgt), ATOMbasetype(rgt->vtype), 0, NULL, 0,
- VALget(ret), 1, 0, 1, NULL, NULL, 0, 0,
+ if (op_typeswitchloop(VALptr(lft),
+ ATOMtype(lft->vtype) == TYPE_oid ? lft->vtype :
ATOMbasetype(lft->vtype),
+ 0,
+ NULL,
+ 0,
+ VALptr(rgt),
+ ATOMtype(rgt->vtype) == TYPE_oid ? rgt->vtype :
ATOMbasetype(rgt->vtype),
+ 0,
+ NULL,
+ 0,
+ VALget(ret),
+ 1,
+ 0,
+ 1,
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
