Changeset: 5dd019e39439 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5dd019e39439
Added Files:
clients/R/monet.frame/DESCRIPTION
clients/R/monet.frame/NAMESPACE
clients/R/monet.frame/NEWS
clients/R/monet.frame/R/monetframe.R
clients/R/monet.frame/db.tests/monetframe.test.R
clients/R/monet.frame/man/aggregatef.Rd
clients/R/monet.frame/man/as.data.frame.Rd
clients/R/monet.frame/man/as.list.Rd
clients/R/monet.frame/man/mf.Rd
clients/R/monet.frame/man/monet.frame.Rd
clients/R/monet.frame/man/sample.Rd
clients/R/monet.frame/man/sd.Rd
clients/R/monet.frame/man/set.debug.Rd
clients/R/monet.frame/man/tabulate.Rd
clients/R/monet.frame/man/tabulate.monet.frame.Rd
clients/R/monet.frame/man/var.Rd
clients/Tests/MAL-signatures_nocfitsio.malC.src
clients/Tests/MAL-signatures_nocfitsio.stable.err
clients/Tests/MAL-signatures_nocfitsio.stable.out
clients/Tests/MAL-signatures_sphinxclient.malC.src
clients/Tests/MAL-signatures_sphinxclient.stable.err
clients/Tests/MAL-signatures_sphinxclient.stable.out
clients/Tests/SQL-dump.stable.out.64bit.oid32
monetdb5/modules/mal/Tests/groupby00.mal
monetdb5/modules/mal/Tests/groupby00.stable.err
monetdb5/modules/mal/Tests/groupby00.stable.out
sql/backends/monet5/gsl/46_gsl.sql
sql/backends/monet5/gsl/73_gsl.mal
sql/backends/monet5/gsl/Makefile.ag
sql/backends/monet5/gsl/Tests/All
sql/backends/monet5/gsl/Tests/gsl00.mal
sql/backends/monet5/gsl/Tests/gsl00.stable.err
sql/backends/monet5/gsl/Tests/gsl00.stable.out
sql/backends/monet5/gsl/Tests/gsl01.sql
sql/backends/monet5/gsl/Tests/gsl01.stable.err
sql/backends/monet5/gsl/Tests/gsl01.stable.out
sql/backends/monet5/gsl/gsl.c
sql/backends/monet5/gsl/gsl.mal
sql/backends/monet5/rest/Tests/All
sql/backends/monet5/rest/Tests/jsonstore00.sql
sql/backends/monet5/rest/Tests/jsonstore00.stable.err
sql/backends/monet5/rest/Tests/jsonstore00.stable.out
sql/backends/monet5/rest/Tests/jsonstore01.sql
sql/backends/monet5/rest/Tests/jsonstore01.stable.err
sql/backends/monet5/rest/Tests/jsonstore01.stable.out
sql/test/BugTracker-2013/Tests/Cannot_Find_Column_Type.Bug-3394.sql
sql/test/BugTracker-2013/Tests/Cannot_Find_Column_Type.Bug-3394.stable.err
sql/test/BugTracker-2013/Tests/Cannot_Find_Column_Type.Bug-3394.stable.out
sql/test/BugTracker-2013/Tests/case-orderby.Bug-3388.sql
sql/test/BugTracker-2013/Tests/case-orderby.Bug-3388.stable.err
sql/test/BugTracker-2013/Tests/case-orderby.Bug-3388.stable.out
sql/test/BugTracker-2013/Tests/case_when.Bug-3395.sql
sql/test/BugTracker-2013/Tests/case_when.Bug-3395.stable.err
sql/test/BugTracker-2013/Tests/case_when.Bug-3395.stable.out
sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.err
sql/test/BugTracker-2013/Tests/pivot.Bug-3339.stable.out
sql/test/BugTracker-2013/Tests/recursion.stable.err
sql/test/BugTracker-2013/Tests/recursion.stable.out
sql/test/BugTracker-2013/Tests/singleton-median.Bug-3389.sql
sql/test/BugTracker-2013/Tests/singleton-median.Bug-3389.stable.err
sql/test/BugTracker-2013/Tests/singleton-median.Bug-3389.stable.out
sql/test/BugTracker-2013/Tests/udf_error.Bug-3396.sql
sql/test/BugTracker-2013/Tests/udf_error.Bug-3396.stable.err
sql/test/BugTracker-2013/Tests/udf_error.Bug-3396.stable.out
sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.sql
sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.err
sql/test/BugTracker-2013/Tests/unop_vs_aggr.Bug-3885.stable.out
sql/test/json/Tests/spaceissue.sql
sql/test/json/Tests/spaceissue.stable.err
sql/test/json/Tests/spaceissue.stable.out
sql/test/quantiles/Tests/All
sql/test/quantiles/Tests/quantiles.sql
sql/test/quantiles/Tests/quantiles.stable.err
sql/test/quantiles/Tests/quantiles.stable.out
Removed Files:
clients/R/MonetDB.R/R/monetframe.R
clients/R/MonetDB.R/man/aggregatef.Rd
clients/R/MonetDB.R/man/as.data.frame.Rd
clients/R/MonetDB.R/man/as.list.Rd
clients/R/MonetDB.R/man/mf.Rd
clients/R/MonetDB.R/man/monet.frame.Rd
clients/R/MonetDB.R/man/sample.Rd
clients/R/MonetDB.R/man/sd.Rd
clients/R/MonetDB.R/man/set.debug.Rd
clients/R/MonetDB.R/man/tabulate.Rd
clients/R/MonetDB.R/man/tabulate.monet.frame.Rd
clients/R/MonetDB.R/man/var.Rd
clients/Tests/MAL-signatures.stable.out.Windows
clients/Tests/SQL-dump.stable.out.oid32
monetdb5/modules/mal/groups.c
monetdb5/modules/mal/groups.h
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Darwin.32bit
sql/benchmarks/tpch/fileleak/Tests/delete_all_nogeom.SQL.py.src
sql/benchmarks/tpch/fileleak/Tests/delete_all_nogeom.stable.err
sql/benchmarks/tpch/fileleak/Tests/delete_all_nogeom.stable.out
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Darwin.32bit
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
sql/benchmarks/tpch/fileleak/Tests/leaks_nogeom.SQL.py.src
sql/benchmarks/tpch/fileleak/Tests/leaks_nogeom.stable.err
sql/benchmarks/tpch/fileleak/Tests/leaks_nogeom.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.sql.src
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out
sql/test/mapi/Tests/php_monetdb_nogeom.SQL.bat
sql/test/mapi/Tests/php_monetdb_nogeom.SQL.sh
sql/test/mapi/Tests/php_monetdb_nogeom.stable.err
sql/test/mapi/Tests/php_monetdb_nogeom.stable.out
Modified Files:
NT/monetdb_config.h.in
NT/rules.msc
clients/ChangeLog.Feb2013
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NAMESPACE
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/monetdb.R
clients/R/MonetDB.R/man/MonetDB.R.Rd
clients/Tests/All
clients/Tests/MAL-signatures.stable.out
clients/Tests/MAL-signatures_nogeom.stable.out
clients/Tests/SQL-dump.stable.out
clients/Tests/SQL-dump.stable.out.32bit
clients/Tests/SQL-dump_nogeom.stable.out
clients/Tests/exports.stable.out
clients/examples/php/sqlsample.php
clients/mapiclient/ReadlineTools.c
clients/mapiclient/mclient.c
clients/mapiclient/tomograph.c
clients/odbc/driver/ODBCConvert.c
clients/odbc/driver/SQLGetConnectAttr.c
clients/odbc/driver/SQLGetInfo.c
clients/odbc/driver/SQLSetConnectAttr.c
clients/odbc/samples/arraytest.c
configure.ag
gdk/gdk.h
gdk/gdk_aggr.c
gdk/gdk_atomic.h
gdk/gdk_atoms.c
gdk/gdk_atoms.h
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_calc.h
gdk/gdk_calc_compare.h
gdk/gdk_heap.c
gdk/gdk_imprints.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_mapreduce.c
gdk/gdk_mapreduce.h
gdk/gdk_posix.c
gdk/gdk_posix.h
gdk/gdk_private.h
gdk/gdk_rangejoin.mx
gdk/gdk_search.c
gdk/gdk_search.h
gdk/gdk_select.c
gdk/gdk_system.c
gdk/gdk_utils.c
monetdb5/extras/jaql/jaqlscenario.c
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.err
monetdb5/extras/mal_optimizer_template/Tests/opt_sql_append.stable.out
monetdb5/mal/mal.c
monetdb5/mal/mal.h
monetdb5/mal/mal_atom.c
monetdb5/mal/mal_atom.h
monetdb5/mal/mal_authorize.c
monetdb5/mal/mal_authorize.h
monetdb5/mal/mal_box.c
monetdb5/mal/mal_box.h
monetdb5/mal/mal_builder.c
monetdb5/mal/mal_builder.h
monetdb5/mal/mal_client.c
monetdb5/mal/mal_client.h
monetdb5/mal/mal_dataflow.c
monetdb5/mal/mal_debugger.c
monetdb5/mal/mal_debugger.h
monetdb5/mal/mal_exception.c
monetdb5/mal/mal_exception.h
monetdb5/mal/mal_factory.c
monetdb5/mal/mal_factory.h
monetdb5/mal/mal_function.c
monetdb5/mal/mal_function.h
monetdb5/mal/mal_http_daemon.c
monetdb5/mal/mal_http_daemon.h
monetdb5/mal/mal_import.c
monetdb5/mal/mal_import.h
monetdb5/mal/mal_instruction.c
monetdb5/mal/mal_instruction.h
monetdb5/mal/mal_interpreter.c
monetdb5/mal/mal_linker.c
monetdb5/mal/mal_listing.c
monetdb5/mal/mal_module.c
monetdb5/mal/mal_namespace.c
monetdb5/mal/mal_parser.c
monetdb5/mal/mal_private.h
monetdb5/mal/mal_profiler.c
monetdb5/mal/mal_properties.c
monetdb5/mal/mal_readline.c
monetdb5/mal/mal_recycle.c
monetdb5/mal/mal_resolve.c
monetdb5/mal/mal_resource.c
monetdb5/mal/mal_resource.h
monetdb5/mal/mal_runtime.c
monetdb5/mal/mal_scenario.c
monetdb5/mal/mal_scenario.h
monetdb5/mal/mal_session.c
monetdb5/mal/mal_stack.c
monetdb5/modules/atoms/json_atom.c
monetdb5/modules/atoms/json_atom.mal
monetdb5/modules/atoms/mtime.c
monetdb5/modules/atoms/mtime.h
monetdb5/modules/atoms/mtime.mal
monetdb5/modules/kernel/aggr.c
monetdb5/modules/kernel/aggr.mal
monetdb5/modules/kernel/aggr.mal.sh
monetdb5/modules/kernel/algebra.c
monetdb5/modules/kernel/algebra.h
monetdb5/modules/kernel/algebra.mal
monetdb5/modules/kernel/group.c
monetdb5/modules/kernel/microbenchmark.c
monetdb5/modules/kernel/microbenchmark.h
monetdb5/modules/kernel/microbenchmark.mal
monetdb5/modules/kernel/status.c
monetdb5/modules/mal/01_calc.mal
monetdb5/modules/mal/01_calc.mal.sh
monetdb5/modules/mal/Makefile.ag
monetdb5/modules/mal/Tests/All
monetdb5/modules/mal/batcalc.c
monetdb5/modules/mal/clients.c
monetdb5/modules/mal/clients.h
monetdb5/modules/mal/clients.mal
monetdb5/modules/mal/cluster.c
monetdb5/modules/mal/groupby.c
monetdb5/modules/mal/groupby.h
monetdb5/modules/mal/groupby.mal
monetdb5/modules/mal/joinpath.c
monetdb5/modules/mal/mal_init.mal
monetdb5/modules/mal/mal_io.c
monetdb5/modules/mal/mal_mapi.c
monetdb5/modules/mal/mdb.c
monetdb5/modules/mal/recycle.mal
monetdb5/modules/mal/remote.c
monetdb5/modules/mal/tablet.c
monetdb5/modules/mal/tokenizer.c
monetdb5/modules/mal/trader.c
monetdb5/modules/mal/txtsim.c
monetdb5/optimizer/Tests/dataflow.mal
monetdb5/optimizer/Tests/dataflow.stable.out
monetdb5/optimizer/Tests/groups00.mal
monetdb5/optimizer/Tests/groups00.stable.out
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_centipede.h
monetdb5/optimizer/opt_cluster.c
monetdb5/optimizer/opt_groups.c
monetdb5/optimizer/opt_groups.h
monetdb5/optimizer/opt_mergetable.c
monetdb5/optimizer/opt_multiplex.c
monetdb5/optimizer/opt_octopus.c
monetdb5/optimizer/opt_pipes.c
monetdb5/optimizer/opt_prejoin.c
monetdb5/optimizer/opt_prelude.c
monetdb5/optimizer/opt_prelude.h
monetdb5/optimizer/opt_pushselect.c
monetdb5/optimizer/opt_qep.c
monetdb5/optimizer/optimizer.mal
monetdb5/tests/BugDay_2005-10-06_4.8/Tests/multiple_servers.SF-914113.MIL.bat
monetdb5/tests/BugDay_2005-10-06_4.9.3/Tests/monet_daemon.SF-623743.bat
monetdb5/tests/BugTracker/Tests/merge-join_properties.SF-2952191.malC
monetdb5/tests/BugsViaSourgeforce/Tests/ID.905495s.bat
sql/backends/monet5/Makefile.ag
sql/backends/monet5/rel_bin.c
sql/backends/monet5/rest/Makefile.ag
sql/backends/monet5/rest/rest_jsonstore.c
sql/backends/monet5/rest/rest_jsonstore_handle_get.c
sql/backends/monet5/rest/rest_jsonstore_handle_get.h
sql/backends/monet5/sql.mx
sql/backends/monet5/sql_result.c
sql/backends/monet5/sql_scenario.c
sql/benchmarks/tpch/fileleak/Tests/All
sql/benchmarks/tpch/fileleak/Tests/delete_all.SQL.py
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out
sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out.Windows
sql/benchmarks/tpch/fileleak/Tests/leaks.SQL.py
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out
sql/jdbc/tests/Tests/Test_Dobjects.stable.out
sql/scripts/22_clients.sql
sql/scripts/39_analytics.sql
sql/server/rel_dump.c
sql/server/rel_exp.c
sql/server/rel_optimizer.c
sql/server/rel_select.c
sql/server/sql_scan.c
sql/storage/bat/bat_storage.c
sql/storage/bat/bat_storage.h
sql/storage/store.c
sql/test/BugTracker-2008/Tests/sql_command_kills_db.SF-2233677.stable.err
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.sql
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
sql/test/BugTracker-2011/Tests/count-count-distinct.Bug-2808.stable.out
sql/test/BugTracker-2011/Tests/exists-select.Bug-2933.stable.out
sql/test/BugTracker-2012/Tests/All
sql/test/BugTracker-2012/Tests/aggregate_vs_positional_column_crash.Bug-3085.stable.out
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.sql
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err
sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.out
sql/test/BugTracker-2013/Tests/All
sql/test/BugTracker-2013/Tests/recursion.sql
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.sql
sql/test/BugTracker-2013/Tests/swapped_likejoin.Bug-3375.stable.out
sql/test/BugTracker/Tests/bind_with_cast.SF-1720934.stable.out
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
sql/test/BugTracker/Tests/rank_over.SF-1691098.stable.out
sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out
sql/test/BugTracker/Tests/with_only_once.SF-1720293.stable.out
sql/test/Dependencies/Tests/dependency_loop.stable.out
sql/test/Tests/add_column_with_seq.stable.out
sql/test/Tests/default.stable.err
sql/test/Tests/default.stable.out
sql/test/Tests/marcin1.stable.out
sql/test/Tests/setoptimizer.stable.err
sql/test/Tests/setoptimizer.stable.out
sql/test/Tests/systemfunctions.stable.out
sql/test/Tests/systemfunctions_nogeom.stable.out
sql/test/add_column_with_seq.sql
sql/test/bugs/Tests/crash_order_by.stable.out
sql/test/bugs/Tests/simple_view.stable.out
sql/test/centipede/Tests/All
sql/test/default.sql
sql/test/json/Tests/All
sql/test/leaks/Tests/check0.stable.out
sql/test/leaks/Tests/check1.stable.out
sql/test/leaks/Tests/check1_nogeom.stable.out
sql/test/leaks/Tests/check2.stable.out
sql/test/leaks/Tests/check2_nogeom.stable.out
sql/test/leaks/Tests/check3.stable.out
sql/test/leaks/Tests/check3_nogeom.stable.out
sql/test/leaks/Tests/check4.stable.out
sql/test/leaks/Tests/check4_nogeom.stable.out
sql/test/leaks/Tests/check5.stable.out
sql/test/leaks/Tests/check5_nogeom.stable.out
sql/test/leaks/Tests/drop3.stable.out
sql/test/leaks/Tests/select1.stable.out
sql/test/leaks/Tests/select2.stable.out
sql/test/leaks/Tests/temp1.stable.out
sql/test/leaks/Tests/temp2.stable.out
sql/test/leaks/Tests/temp3.stable.out
sql/test/mapi/Tests/All
sql/test/mapi/Tests/php_monetdb.stable.out
sql/test/marcin1.sql
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.err
sql/test/testdb-upgrade/Tests/upgrade.stable.out
testing/Mtest.py.in
tools/merovingian/ChangeLog.Feb2013
tools/merovingian/client/monetdb.c
tools/merovingian/daemon/merovingian.c
Branch: int128
Log Message:
Merge with default branch (changeset 750928afe023).
diffs (truncated from 187997 to 300 lines):
diff --git a/NT/monetdb_config.h.in b/NT/monetdb_config.h.in
--- a/NT/monetdb_config.h.in
+++ b/NT/monetdb_config.h.in
@@ -187,6 +187,9 @@
/* Define to 1 if you have the `gettimeofday' function. */
/* #undef HAVE_GETTIMEOFDAY */
+/* Define if you have the gsl library */
+/* #undef HAVE_GSL */
+
/* Define to 1 if you have the `getuid' function. */
/* #undef HAVE_GETUID */
diff --git a/NT/rules.msc b/NT/rules.msc
--- a/NT/rules.msc
+++ b/NT/rules.msc
@@ -330,6 +330,11 @@ create_winconfig_conds_new_py:
!ELSE
$(ECHO) HAVE_GEOM_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
!ENDIF
+!IFDEF HAVE_GSL
+ $(ECHO) HAVE_GSL_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ELSE
+ $(ECHO) HAVE_GSL_FALSE='' >> "$(TOPDIR)\winconfig_conds_new.py"
+!ENDIF
!IFDEF HAVE_JAVA
$(ECHO) HAVE_JAVA_FALSE='#' >> "$(TOPDIR)\winconfig_conds_new.py"
!IFDEF HAVE_JAVAJDBC
diff --git a/clients/ChangeLog.Feb2013 b/clients/ChangeLog.Feb2013
--- a/clients/ChangeLog.Feb2013
+++ b/clients/ChangeLog.Feb2013
@@ -1,3 +1,12 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Wed Nov 6 2013 Sjoerd Mullender <[email protected]>
+- ODBC: Fixed interpretation SQL_C_SLONG/SQL_C_ULONG/SQL_C_LONG to
+ refer to a 32 bit integer always (i.e. "int" on 64 bit architectures
+ despite the name and the Microsoft documentation). This seems to be
+ the consensus.
+- ODBC: Fixed transaction level: MonetDB only supports the highest level
+ (SQL_TXN_SERIALIZABLE), so setting the transaction level can be accepted
+ and ignored.
+
diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION
--- a/clients/R/MonetDB.R/DESCRIPTION
+++ b/clients/R/MonetDB.R/DESCRIPTION
@@ -1,13 +1,13 @@
Package: MonetDB.R
-Version: 0.8.0
-Date: 2013-09-25
+Version: 0.8.2
+Date: 2013-10-16
Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"[email protected]"),
person("Thomas Lumley", role = "ctb"),
person("Anthony Damico", role = "ctb"))
-Depends: DBI (>= 0.2-5), digest (>= 0.6.0), methods, utils, stats
+Depends: DBI (>= 0.2-5), digest (>= 0.6.0),methods
Description: Allows to pull data from MonetDB into R
License: MPL (== 1.1)
URL: http://monetr.r-forge.r-project.org
Maintainer: Hannes Muehleisen <[email protected]>
-SystemRequirements: MonetDB installation, available at http://www.monetdb.org
\ No newline at end of file
+SystemRequirements: MonetDB installation, available at http://www.monetdb.org
diff --git a/clients/R/MonetDB.R/NAMESPACE b/clients/R/MonetDB.R/NAMESPACE
--- a/clients/R/MonetDB.R/NAMESPACE
+++ b/clients/R/MonetDB.R/NAMESPACE
@@ -1,4 +1,4 @@
-import(DBI,utils,stats,digest,methods)
+import(DBI,digest,methods)
# export only driver constructor, everything else is DBI stuff..
export(MonetDB,MonetR,MonetDBR,MonetDB.R)
@@ -8,78 +8,14 @@ exportMethods(dbSendUpdate,dbSendUpdateA
export(monetdbGetTransferredBytes)
export(monetdbRtype)
-# monet.frame things, this is an S3 class
-# constructors
-export(monet.frame)
-export(mf)
-export(set.debug)
-
# shorthand for db connections
export(mc)
-# conversion to native R
-S3method(as.list,monet.frame)
-S3method(as.data.frame,monet.frame)
-S3method(as.vector,monet.frame)
-export(av)
-export(adf)
-
-# inspection
-S3method(str,monet.frame)
-S3method(print,monet.frame)
-S3method(Summary,monet.frame)
-S3method(summary,monet.frame)
-S3method(names,monet.frame)
-S3method(dim,monet.frame)
-S3method(length,monet.frame)
-S3method(na.fail,monet.frame)
-
-# subsetting
-S3method(head,monet.frame)
-S3method(tail,monet.frame)
-S3method("[",monet.frame)
-S3method("$",monet.frame)
-S3method(subset,monet.frame)
-S3method(na.omit,monet.frame)
-S3method(sample, monet.frame)
-S3method(sample, default)
-export(sample)
-
-
-
-# math/stats
-S3method(Ops,monet.frame)
-S3method(Math,monet.frame)
-S3method(mean,monet.frame)
-S3method(sd, monet.frame)
-S3method(sd, default)
-export(sd)
-S3method(var, monet.frame)
-S3method(var, default)
-export(var)
-S3method(quantile,monet.frame)
-S3method(median,monet.frame)
-S3method(aggregate,monet.frame)
-export(aggregatef) # temp!
-
-export(tabulate)
-S3method(tabulate, monet.frame)
-S3method(tabulate, default)
-
-S3method(unique, monet.frame)
-S3method(range, monet.frame)
-
-# reorganization
-S3method(rbind,monet.frame)
-S3method(merge,monet.frame)
-S3method(sort,monet.frame)
-
# control.R
export(monetdb.server.setup)
export(monetdb.server.start)
export(monetdb.server.stop)
-
useDynLib(MonetDB.R)
diff --git a/clients/R/MonetDB.R/NEWS b/clients/R/MonetDB.R/NEWS
--- a/clients/R/MonetDB.R/NEWS
+++ b/clients/R/MonetDB.R/NEWS
@@ -1,3 +1,7 @@
+0.8.1
+- fixed bug in dbWriteTable() where VARCHAR(255) was used for character data
instead of STRING
+- moved monet.frame into separate package
+
0.8
- New All-C socket code (Thanks, Windows)
- new dbConnect() parameter organization (!)
diff --git a/clients/R/MonetDB.R/R/monetdb.R b/clients/R/MonetDB.R/R/monetdb.R
--- a/clients/R/MonetDB.R/R/monetdb.R
+++ b/clients/R/MonetDB.R/R/monetdb.R
@@ -239,13 +239,13 @@ setMethod("dbWriteTable", "MonetDBConnec
})
-setMethod("dbDataType", signature(dbObj="MonetDBConnection", obj = "ANY"), def
= function(dbObj, obj, ...) {
+setMethod("dbDataType", signature(dbObj="MonetDBConnection", obj = "ANY"),
def=function(dbObj, obj, ...) {
if (is.logical(obj)) "BOOLEAN"
else if (is.integer(obj)) "INTEGER"
else if (is.numeric(obj)) "DOUBLE PRECISION"
else if (is.raw(obj)) "BLOB"
- else "VARCHAR(255)"
+ else "STRING"
}, valueClass = "character")
@@ -779,14 +779,6 @@ REPLY_SIZE <- 100 # Apparently, -1 me
}
-.hasColFunc <- function(conn,func) {
- tryCatch({
- r <- dbSendQuery(conn,paste0("SELECT
",func,"(1);"))
- TRUE
- }, error = function(e) {
- FALSE
- })
-}
# copied from RMonetDB, no java-specific things in here...
# TODO: read first few rows with read.table and check types etc.
diff --git a/clients/R/MonetDB.R/R/monetframe.R
b/clients/R/MonetDB.R/R/monetframe.R
deleted file mode 100644
--- a/clients/R/MonetDB.R/R/monetframe.R
+++ /dev/null
@@ -1,1218 +0,0 @@
-# this wraps a sql database (in particular MonetDB) with a DBI connector
-# to have it appear like a data.frame
-
-# shorthand constructor, also creates connection to db
-mf <-
function(database,table,host="localhost",port=50000,user="monetdb",pass="monetdb",debug=FALSE,timeout=100)
{
- dburl <- paste0("monetdb://",host,":",port,"/",database)
- con <- dbConnect(MonetDB.R(), dburl,user,pass,timeout=timeout)
- monet.frame(con,table,debug)
-}
-
-# can either be given a query or simply a table name
-# now supports hints on table structure to speed up initialization
-monet.frame <- monetframe <- function(conn,tableOrQuery,debug=FALSE)
monet.frame.internal(conn,tableOrQuery,debug)
-
-monet.frame.internal <-
function(conn,tableOrQuery,debug=FALSE,rtypes.hint=NA,cnames.hint=NA,ncol.hint=NA,nrow.hint=NA)
{
- if(missing(conn)) stop("'conn' must be specified")
- if(missing(tableOrQuery)) stop("a sql query or a table name must be
specified")
-
- obj = new.env()
- class(obj) = "monet.frame"
- attr(obj,"conn") <- conn
- query <- tableOrQuery
-
- if (length(grep("^SELECT.*",tableOrQuery,ignore.case=TRUE)) == 0) {
- query <- paste0("SELECT * FROM
",make.db.names(conn,tableOrQuery,allow.keywords=FALSE))
- }
-
- attr(obj,"query") <- query
- attr(obj,"debug") <- debug
-
- if (debug) cat(paste0("QQ: '",query,"'\n",sep=""))
- # do this here, in case the nrow thing needs it
- coltestquery <- gsub("SELECT (.*?) FROM (.*?)
(ORDER|LIMIT|OFFSET).*","SELECT \\1 FROM \\2",query,ignore.case=TRUE)
-
- if (!is.na(cnames.hint) && !is.na(ncol.hint) && !is.na(rtypes.hint)) {
- attr(obj,"cnames") <- cnames.hint
- attr(obj,"ncol") <- ncol.hint
- attr(obj,"rtypes") <- rtypes.hint
-
- } else {
- # strip away things the prepare does not like
- coltestquery <- gsub("SELECT (.*?) FROM (.*?)
(ORDER|LIMIT|OFFSET).*","SELECT \\1 FROM \\2",query,ignore.case=TRUE)
-
- # get column names and types from prepare response
- res <- dbGetQuery(conn, paste0("PREPARE ",coltestquery))
- attr(obj,"cnames") <- res$column
- attr(obj,"ncol") <- length(res$column)
- attr(obj,"rtypes") <- lapply(res$type,monetdbRtype)
-
- if (debug) cat(paste0("II: 'Re-Initializing column
info.'\n",sep=""))
-
- }
-
- if (!is.na(nrow.hint)) {
- attr(obj,"nrow") <- nrow.hint
- }
- else {
- # get result set length by rewriting to count(*), should be
much faster
- # temporarily remove offset/limit, as this screws up counting
- counttestquery <- sub("(SELECT )(.*?)(
FROM.*)","\\1COUNT(*)\\3",coltestquery,ignore.case=TRUE)
- nrow <- dbGetQuery(conn,counttestquery)[[1,1]] -
.getOffset(query)
-
- limit <- .getLimit(query)
- if (limit > 0) nrow <- min(nrow,limit)
- if (nrow < 1)
- warning(query, " has zero-row result set.")
-
- attr(obj,"nrow") <- nrow
- if (debug) cat(paste0("II: 'Re-Initializing row
count.'\n",sep=""))
-
- }
- return(obj)
-}
-
-set.debug <- function(x,debug){
- attr(x,"debug") <- debug
-}
-
-.is.debug <- function(x) {
- attr(x,"debug")
-}
-
-.element.limit <- 10000000
-
-as.data.frame.monet.frame <- adf <- function(x, row.names, optional,
warnSize=TRUE,...) {
- # check if amount of tuples/fields is larger than some limit
- # raise error if over limit and warnSize==TRUE
- if (ncol(x)*nrow(x) > .element.limit && warnSize)
- stop(paste0("The total number of elements to be loaded is
larger than ",.element.limit,". This is probably very slow. Consider dropping
columns and/or rows, e.g. using the [] function. If you really want to do this,
call as.data.frame() with the warnSize parameter set to FALSE."))
- # get result set object from frame
- if (.is.debug(x)) cat(paste0("EX: '",attr(x,"query"),"'\n",sep=""))
-
- return(dbGetQuery(attr(x,"conn"),attr(x,"query")))
-}
-
-as.vector.monet.frame <- av <- function(x,...) {
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
