Changeset: bf494bbdee2d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=bf494bbdee2d
Modified Files:
NT/monetdb_config.h.in
clients/R/MonetDB.R/DESCRIPTION
clients/R/MonetDB.R/NEWS
clients/R/MonetDB.R/R/control.R
clients/R/MonetDB.R/R/monetdb.R
clients/R/MonetDB.R/src/mapi.c
clients/Tests/SQL-dump.stable.out.32bit
clients/mapiclient/mclient.c
configure.ag
gdk/gdk_logger.c
gdk/gdk_logger.h
gdk/gdk_sample.c
gdk/gdk_storage.c
gdk/gdk_unique.c
monetdb5/modules/atoms/json.c
monetdb5/modules/atoms/json.mal
monetdb5/optimizer/opt_centipede.c
monetdb5/optimizer/opt_pushselect.c
sql/backends/monet5/sql_scenario.c
sql/benchmarks/tpch/Tests/01-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/17-plan.stable.out
sql/benchmarks/tpch/Tests/21-explain.stable.out.32bit
sql/benchmarks/tpch/Tests/22-plan.stable.out
sql/common/sql_types.c
sql/scripts/40_json.sql
sql/storage/bat/bat_logger.c
sql/storage/store.c
sql/test/BugTracker-2009/Tests/error_while_drop_func_returns_table_type.SF-2604573.sql
sql/test/BugTracker-2010/Tests/group-by_ordered_column.Bug-2564.stable.out.32bit
sql/test/BugTracker-2010/Tests/limit_in_prepare.Bug-2552.stable.out.32bit
sql/test/BugTracker/Tests/between_with_column.SF-1959410.stable.err
sql/test/Tests/zones.stable.out
sql/test/centipede/Tests/olap.stable.out
sql/test/json/Tests/aggregate01.sql
sql/test/json/Tests/aggregate01.stable.out
Branch: transaction-replication
Log Message:
Merge with default branch
diffs (truncated from 2578 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
@@ -171,7 +171,7 @@
/* Define to 1 if you have the `ftruncate' function. */
#define HAVE_FTRUNCATE 1
-#define ftruncate(fd, sz) (_chsize_s((fd), (__int64) (sz)) == 0 ? 0 : -1)
+#define ftruncate(fd, sz) (-(_chsize_s((fd), (__int64) (sz)) != 0))
/* Does your compiler support function attributes (__attribute__)? */
/* #undef HAVE_FUNCTION_ATTRIBUTES */
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,6 +1,6 @@
Package: MonetDB.R
-Version: 0.9.2
-Date: 2013-04-22
+Version: 0.9.3
+Date: 2013-06-12
Title: Connect MonetDB to R
Authors@R: c(person("Hannes Muehleisen", role = c("aut", "cre"),email =
"[email protected]"),
person("Thomas Lumley", role = "ctb"),
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.9.3
+- Remove trailing slashes for monetdb.program.path parameter for
monetdb.server.setup (Thanks, Anthony!)
+- fixed monetdbd.liststatus (Thanks, Bart)
+
0.9.2
- monetdb_queryinfo method to find out things about an arbitrary query cheaply
- new options monetdb.sequential, monetdb.debug.query and monetdb.debug.mapi
diff --git a/clients/R/MonetDB.R/R/control.R b/clients/R/MonetDB.R/R/control.R
--- a/clients/R/MonetDB.R/R/control.R
+++ b/clients/R/MonetDB.R/R/control.R
@@ -114,6 +114,8 @@ monetdb.server.setup <-
# switch all slashes to match windows
monetdb.program.path <- normalizePath( monetdb.program.path , mustWork =
FALSE )
+ # remove trailing slash from paths, otherwise the server won't start
+ monetdb.program.path <- gsub("\\\\$|/$", "", monetdb.program.path)
database.directory <- normalizePath( database.directory , mustWork = FALSE
)
# if the database directory does not exist, print that it's being created
@@ -234,7 +236,8 @@ monetdbd.liststatus <- monetdb.liststatu
lines <- lines[grepl("^=sabdb:2:", lines)] # make sure we get a db list
here, protocol v.2
lines <- sub("=sabdb:2:", "", lines, fixed=T)
# convert value into propert types etc
- dbdf <- as.data.frame(do.call("rbind", strsplit(lines, ", ", fixed=T)),
stringsAsFactors=F)
+ dbdf <- as.data.frame(do.call("rbind", strsplit(lines, ",", fixed=T)),
stringsAsFactors=F)
+
names(dbdf) <- c("dbname", "uri", "locked", "state", "scenarios",
"startCounter", "stopCounter",
"crashCounter", "avgUptime", "maxUptime", "minUptime",
"lastCrash", "lastStart", "lastStop",
"crashAvg1", "crashAvg10", "crashAvg30")
@@ -266,4 +269,4 @@ monetdbd.liststatus <- monetdb.liststatu
dbdf$scenarios <- gsub("'", ", ", dbdf$scenarios, fixed=T)
return(dbdf[order(dbdf$dbname), ])
-}
\ No newline at end of file
+}
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
@@ -21,7 +21,7 @@ MonetR <- MonetDB <- MonetDBR <- MonetDB
setMethod("dbGetInfo", "MonetDBDriver", def=function(dbObj, ...)
list(name="MonetDBDriver",
- driver.version="0.9.2",
+ driver.version="0.9.3",
DBI.version="0.2-7",
client.version=NA,
max.connections=NA)
diff --git a/clients/R/MonetDB.R/src/mapi.c b/clients/R/MonetDB.R/src/mapi.c
--- a/clients/R/MonetDB.R/src/mapi.c
+++ b/clients/R/MonetDB.R/src/mapi.c
@@ -257,8 +257,8 @@ SEXP mapiRead(SEXP conn) {
while (response_buf_offset + block_length > response_buf_len) {
response_buf_len += ALLOCSIZE;
if (DEBUG) {
- printf("II: Reallocating memory, new size
"SZFMT"\n",
- response_buf_len);
+ printf("II: Reallocating memory, new size
%lu\n",
+ (unsigned long)
response_buf_len);
}
response_buf = realloc(response_buf, response_buf_len);
if (response_buf == NULL) {
diff --git a/clients/Tests/SQL-dump.stable.out.32bit
b/clients/Tests/SQL-dump.stable.out.32bit
--- a/clients/Tests/SQL-dump.stable.out.32bit
+++ b/clients/Tests/SQL-dump.stable.out.32bit
@@ -1680,60 +1680,60 @@ 5713 "progress" "int" 32 0 5717
NULL tru
5714 "status" "clob" 0 0 5717 NULL true 5
NULL
5715 "tag" "oid" 31 0 5717 NULL true 6 NULL
5716 "query" "clob" 0 0 5717 NULL true 7 NULL
-6352 "schema" "clob" 0 0 6364 NULL true 0
NULL
-6353 "table" "clob" 0 0 6364 NULL true 1 NULL
-6354 "column" "clob" 0 0 6364 NULL true 2
NULL
-6355 "type" "clob" 0 0 6364 NULL true 3 NULL
-6356 "location" "clob" 0 0 6364 NULL true 4
NULL
-6357 "count" "bigint" 64 0 6364 NULL true 5
NULL
-6358 "typewidth" "int" 32 0 6364 NULL true 6
NULL
-6359 "columnsize" "bigint" 64 0 6364 NULL true
7 NULL
-6360 "heapsize" "bigint" 64 0 6364 NULL true
8 NULL
-6361 "hashes" "bigint" 64 0 6364 NULL true
9 NULL
-6362 "imprints" "bigint" 64 0 6364 NULL true
10 NULL
-6363 "sorted" "boolean" 1 0 6364 NULL true
11 NULL
-6366 "schema" "clob" 0 0 6376 NULL true 0
NULL
-6367 "table" "clob" 0 0 6376 NULL true 1 NULL
-6368 "column" "clob" 0 0 6376 NULL true 2
NULL
-6369 "type" "clob" 0 0 6376 NULL true 3 NULL
-6370 "typewidth" "int" 32 0 6376 NULL true 4
NULL
-6371 "count" "bigint" 64 0 6376 NULL true 5
NULL
-6372 "distinct" "bigint" 64 0 6376 NULL true
6 NULL
-6373 "atomwidth" "int" 32 0 6376 NULL true 7
NULL
-6374 "reference" "boolean" 1 0 6376 NULL true
8 NULL
-6375 "sorted" "boolean" 1 0 6376 NULL true
9 NULL
-6414 "schema" "clob" 0 0 6424 NULL true 0
NULL
-6415 "table" "clob" 0 0 6424 NULL true 1 NULL
-6416 "column" "clob" 0 0 6424 NULL true 2
NULL
-6417 "type" "clob" 0 0 6424 NULL true 3 NULL
-6418 "count" "bigint" 64 0 6424 NULL true 4
NULL
-6419 "columnsize" "bigint" 64 0 6424 NULL true
5 NULL
-6420 "heapsize" "bigint" 64 0 6424 NULL true
6 NULL
-6421 "hashes" "bigint" 64 0 6424 NULL true
7 NULL
-6422 "imprints" "bigint" 64 0 6424 NULL true
8 NULL
-6423 "sorted" "boolean" 1 0 6424 NULL true
9 NULL
-6426 "schema" "clob" 0 0 6434 NULL true 0
NULL
-6427 "table" "clob" 0 0 6434 NULL true 1 NULL
-6428 "count" "bigint" 64 0 6434 NULL true 2
NULL
-6429 "columnsize" "bigint" 64 0 6434 NULL true
3 NULL
-6430 "heapsize" "bigint" 64 0 6434 NULL true
4 NULL
-6431 "hashes" "bigint" 64 0 6434 NULL true
5 NULL
-6432 "imprints" "bigint" 64 0 6434 NULL true
6 NULL
-6433 "auxillary" "bigint" 53 0 6434 NULL true
7 NULL
-6436 "schema" "clob" 0 0 6449 NULL true 0
NULL
-6437 "table" "clob" 0 0 6449 NULL true 1 NULL
-6438 "column" "clob" 0 0 6449 NULL true 2
NULL
-6439 "type" "clob" 0 0 6449 NULL true 3 NULL
-6440 "width" "int" 32 0 6449 NULL true 4 NULL
-6441 "stamp" "timestamp" 7 0 6449 NULL true 5
NULL
-6442 "sample" "bigint" 64 0 6449 NULL true
6 NULL
-6443 "count" "bigint" 64 0 6449 NULL true 7
NULL
-6444 "unique" "bigint" 64 0 6449 NULL true
8 NULL
-6445 "nils" "bigint" 64 0 6449 NULL true 9
NULL
-6446 "minval" "clob" 0 0 6449 NULL true 10
NULL
-6447 "maxval" "clob" 0 0 6449 NULL true 11
NULL
-6448 "sorted" "boolean" 1 0 6449 NULL true
12 NULL
-6502 "function_id" "int" 32 0 6503 NULL true 0
NULL
+6356 "schema" "clob" 0 0 6368 NULL true 0
NULL
+6357 "table" "clob" 0 0 6368 NULL true 1 NULL
+6358 "column" "clob" 0 0 6368 NULL true 2
NULL
+6359 "type" "clob" 0 0 6368 NULL true 3 NULL
+6360 "location" "clob" 0 0 6368 NULL true 4
NULL
+6361 "count" "bigint" 64 0 6368 NULL true 5
NULL
+6362 "typewidth" "int" 32 0 6368 NULL true 6
NULL
+6363 "columnsize" "bigint" 64 0 6368 NULL true
7 NULL
+6364 "heapsize" "bigint" 64 0 6368 NULL true
8 NULL
+6365 "hashes" "bigint" 64 0 6368 NULL true
9 NULL
+6366 "imprints" "bigint" 64 0 6368 NULL true
10 NULL
+6367 "sorted" "boolean" 1 0 6368 NULL true
11 NULL
+6370 "schema" "clob" 0 0 6380 NULL true 0
NULL
+6371 "table" "clob" 0 0 6380 NULL true 1 NULL
+6372 "column" "clob" 0 0 6380 NULL true 2
NULL
+6373 "type" "clob" 0 0 6380 NULL true 3 NULL
+6374 "typewidth" "int" 32 0 6380 NULL true 4
NULL
+6375 "count" "bigint" 64 0 6380 NULL true 5
NULL
+6376 "distinct" "bigint" 64 0 6380 NULL true
6 NULL
+6377 "atomwidth" "int" 32 0 6380 NULL true 7
NULL
+6378 "reference" "boolean" 1 0 6380 NULL true
8 NULL
+6379 "sorted" "boolean" 1 0 6380 NULL true
9 NULL
+6418 "schema" "clob" 0 0 6428 NULL true 0
NULL
+6419 "table" "clob" 0 0 6428 NULL true 1 NULL
+6420 "column" "clob" 0 0 6428 NULL true 2
NULL
+6421 "type" "clob" 0 0 6428 NULL true 3 NULL
+6422 "count" "bigint" 64 0 6428 NULL true 4
NULL
+6423 "columnsize" "bigint" 64 0 6428 NULL true
5 NULL
+6424 "heapsize" "bigint" 64 0 6428 NULL true
6 NULL
+6425 "hashes" "bigint" 64 0 6428 NULL true
7 NULL
+6426 "imprints" "bigint" 64 0 6428 NULL true
8 NULL
+6427 "sorted" "boolean" 1 0 6428 NULL true
9 NULL
+6430 "schema" "clob" 0 0 6438 NULL true 0
NULL
+6431 "table" "clob" 0 0 6438 NULL true 1 NULL
+6432 "count" "bigint" 64 0 6438 NULL true 2
NULL
+6433 "columnsize" "bigint" 64 0 6438 NULL true
3 NULL
+6434 "heapsize" "bigint" 64 0 6438 NULL true
4 NULL
+6435 "hashes" "bigint" 64 0 6438 NULL true
5 NULL
+6436 "imprints" "bigint" 64 0 6438 NULL true
6 NULL
+6437 "auxillary" "bigint" 53 0 6438 NULL true
7 NULL
+6440 "schema" "clob" 0 0 6453 NULL true 0
NULL
+6441 "table" "clob" 0 0 6453 NULL true 1 NULL
+6442 "column" "clob" 0 0 6453 NULL true 2
NULL
+6443 "type" "clob" 0 0 6453 NULL true 3 NULL
+6444 "width" "int" 32 0 6453 NULL true 4 NULL
+6445 "stamp" "timestamp" 7 0 6453 NULL true 5
NULL
+6446 "sample" "bigint" 64 0 6453 NULL true
6 NULL
+6447 "count" "bigint" 64 0 6453 NULL true 7
NULL
+6448 "unique" "bigint" 64 0 6453 NULL true
8 NULL
+6449 "nils" "bigint" 64 0 6453 NULL true 9
NULL
+6450 "minval" "clob" 0 0 6453 NULL true 10
NULL
+6451 "maxval" "clob" 0 0 6453 NULL true 11
NULL
+6452 "sorted" "boolean" 1 0 6453 NULL true
12 NULL
+6506 "function_id" "int" 32 0 6507 NULL true 0
NULL
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."_tables" (
@@ -1781,12 +1781,12 @@ 5591 "sessions" 2000 "create view sys.se
5671 "optimizers" 2000 "create view sys.optimizers as select * from
sys.optimizers();" 1 true 0 false
5679 "environment" 2000 "create view sys.environment as select * from
sys.environment();" 1 true 0 false
5717 "queue" 2000 "create view sys.queue as select * from sys.queue();"
1 true 0 false
-6364 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
-6376 "storagemodelinput" 2000 NULL 0 true 0 false
-6424 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
-6434 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxillary column denotes
the maximum space if all non-sorted columns\n-- would be augmented with a hash
(rare situation)\ncreate view sys.tablestoragemodel\nas select
""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxillary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false
-6449 "statistics" 2000 NULL 0 true 0 false
-6503 "systemfunctions" 2000 NULL 0 true 0 false
+6368 "storage" 2000 "create view sys.storage as select * from
sys.storage();" 1 true 0 false
+6380 "storagemodelinput" 2000 NULL 0 true 0 false
+6428 "storagemodel" 2000 "create view sys.storagemodel as select * from
sys.storagemodel();" 1 true 0 false
+6438 "tablestoragemodel" 2000 "-- A summary of the table storage
requirement is is available as a table view.\n-- The auxillary column denotes
the maximum space if all non-sorted columns\n-- would be augmented with a hash
(rare situation)\ncreate view sys.tablestoragemodel\nas select
""schema"",""table"",max(count) as ""count"",\n\tsum(columnsize) as
columnsize,\n\tsum(heapsize) as heapsize,\n\tsum(hashes) as
hashes,\n\tsum(imprints) as imprints,\n\tsum(case when sorted = false then 8 *
count else 0 end) as auxillary\nfrom sys.storagemodel() group by
""schema"",""table"";" 1 true 0 false
+6453 "statistics" 2000 NULL 0 true 0 false
+6507 "systemfunctions" 2000 NULL 0 true 0 false
COMMIT;
START TRANSACTION;
CREATE TABLE "sys"."args" (
@@ -1799,7 +1799,7 @@ CREATE TABLE "sys"."args" (
"inout" TINYINT,
"number" INTEGER
);
-COPY 3654 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
+COPY 3656 RECORDS INTO "sys"."args" FROM stdin USING DELIMITERS '\t','\n','"';
2155 28 "res_0" "oid" 31 0 0 0
2156 28 "arg_1" "wrd" 32 0 1 1
2157 29 "res_0" "oid" 31 0 0 0
@@ -5385,75 +5385,77 @@ 6316 6314 "js" "json" 0 0 1
1
6319 6318 "result" "clob" 0 0 0 0
6320 6318 "x" "clob" 0 0 1 1
6323 6322 "result" "clob" 0 0 0 0
-6324 6322 "v" "clob" 0 0 1 1
-6328 6327 "result" "uuid" 0 0 0 0
-6331 6330 "result" "uuid" 0 0 0 0
-6332 6330 "u" "uuid" 0 0 1 1
+6324 6322 "x" "double" 53 0 1 1
+6327 6326 "result" "clob" 0 0 0 0
+6328 6326 "v" "clob" 0 0 1 1
+6332 6331 "result" "uuid" 0 0 0 0
6335 6334 "result" "uuid" 0 0 0 0
-6336 6334 "u" "clob" 0 0 1 1
-6339 6338 "schema" "clob" 0 0 0 0
-6340 6338 "table" "clob" 0 0 0 1
-6341 6338 "column" "clob" 0 0 0 2
-6342 6338 "type" "clob" 0 0 0 3
-6343 6338 "location" "clob" 0 0 0 4
-6344 6338 "count" "bigint" 64 0 0 5
-6345 6338 "typewidth" "int" 32 0 0 6
-6346 6338 "columnsize" "bigint" 64 0 0 7
-6347 6338 "heapsize" "bigint" 64 0 0 8
-6348 6338 "hashes" "bigint" 64 0 0 9
-6349 6338 "imprints" "bigint" 64 0 0 10
-6350 6338 "sorted" "boolean" 1 0 0 11
-6381 6380 "result" "bigint" 64 0 0 0
-6382 6380 "nme" "clob" 0 0 1 1
-6383 6380 "i" "bigint" 64 0 1 2
-6384 6380 "d" "bigint" 64 0 1 3
-6387 6386 "result" "bigint" 64 0 0 0
-6388 6386 "tpe" "clob" 0 0 1 1
-6389 6386 "i" "bigint" 64 0 1 2
-6390 6386 "w" "int" 32 0 1 3
-6393 6392 "result" "bigint" 64 0 0 0
-6394 6392 "b" "boolean" 1 0 1 1
-6395 6392 "i" "bigint" 64 0 1 2
-6398 6397 "result" "bigint" 64 0 0 0
-6399 6397 "i" "bigint" 64 0 1 1
-6400 6397 "nme" "clob" 0 0 1 2
-6403 6402 "schema" "clob" 0 0 0 0
-6404 6402 "table" "clob" 0 0 0 1
-6405 6402 "column" "clob" 0 0 0 2
-6406 6402 "type" "clob" 0 0 0 3
-6407 6402 "count" "bigint" 64 0 0 4
-6408 6402 "columnsize" "bigint" 64 0 0 5
-6409 6402 "heapsize" "bigint" 64 0 0 6
-6410 6402 "hashes" "bigint" 64 0 0 7
-6411 6402 "imprints" "bigint" 64 0 0 8
-6412 6402 "sorted" "boolean" 1 0 0 9
-6454 6453 "tbl" "clob" 0 0 1 0
-6457 6456 "sch" "clob" 0 0 1 0
-6458 6456 "tbl" "clob" 0 0 1 1
+6336 6334 "u" "uuid" 0 0 1 1
+6339 6338 "result" "uuid" 0 0 0 0
+6340 6338 "u" "clob" 0 0 1 1
+6343 6342 "schema" "clob" 0 0 0 0
+6344 6342 "table" "clob" 0 0 0 1
+6345 6342 "column" "clob" 0 0 0 2
+6346 6342 "type" "clob" 0 0 0 3
+6347 6342 "location" "clob" 0 0 0 4
+6348 6342 "count" "bigint" 64 0 0 5
+6349 6342 "typewidth" "int" 32 0 0 6
+6350 6342 "columnsize" "bigint" 64 0 0 7
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
