Changeset: 9cd73232ae21 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9cd73232ae21
Added Files:
sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
Modified Files:
gdk/gdk_bat.c
gdk/gdk_heap.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_posix.c
monetdb5/modules/mal/Tests/All
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (126 lines):
diff --git a/gdk/gdk_bat.c b/gdk/gdk_bat.c
--- a/gdk/gdk_bat.c
+++ b/gdk/gdk_bat.c
@@ -337,7 +337,7 @@ BATattach(int tt, const char *heapfile)
ERRORcheck(st.st_nlink != 1, "BATattach: heapfile must have only one
link\n");
atomsize = ATOMsize(tt);
ERRORcheck(st.st_size % atomsize != 0, "BATattach: heapfile size not
integral number of atoms\n");
- ERRORcheck(st.st_size / atomsize > (off_t) BUN_MAX, "BATattach:
heapfile too large\n");
+ ERRORcheck((size_t) (st.st_size / atomsize) > (size_t) BUN_MAX,
"BATattach: heapfile too large\n");
cap = (BUN) (st.st_size / atomsize);
bs = BATcreatedesc(TYPE_void, tt, 1);
if (bs == NULL)
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -628,7 +628,7 @@ HEAPload_intern(Heap *h, const char *nme
truncsize = GDK_mmap_pagesize; /* minimum of one page */
if (truncsize < h->size &&
(fd = GDKfdlocate(nme, "mrb+", ext)) >= 0) {
- ret = ftruncate(fd, (off_t) truncsize);
+ ret = ftruncate(fd, truncsize);
HEAPDEBUG fprintf(stderr,
"#ftruncate(file=%s.%s, size=" SZFMT
") = %d\n", nme, ext, truncsize, ret);
diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1093,7 +1093,6 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT
if (lscan == 0) {
/* deduce relative positions of r matches for
* this and previous value in v */
- assert(prev != v);
if (prev) {
if (rordering * cmp(prev, v) < 0) {
/* previous value in l was
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -775,8 +775,8 @@ logger_readlog(logger *lg, char *filenam
if (t1 - t0 > 10) {
t0 = t1;
/* not more than once every 10 seconds */
- if (mnstr_fgetpos(lg->log, &fpos) == 0){
- printf("# still reading write-ahead log \"%s\"
(%d%% done)\n", filename, (int) (((off_t) fpos * 100 + 50) / sb.st_size));
+ if (mnstr_fgetpos(lg->log, &fpos) == 0) {
+ printf("# still reading write-ahead log \"%s\"
(%d%% done)\n", filename, (int) ((fpos * 100 + 50) / sb.st_size));
fflush(stdout);
}
}
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -399,7 +399,7 @@ MT_mremap(const char *path, int mode, vo
fprintf(stderr, "= %s:%d:
MT_mremap(%s,"PTRFMT","SZFMT","SZFMT"): munmap() failed\n", __FILE__, __LINE__,
path?path:"NULL", PTRFMTCAST old_address, old_size, *new_size);
return NULL;
}
- if (truncate(path, (off_t) *new_size) < 0)
+ if (truncate(path, *new_size) < 0)
fprintf(stderr, "#MT_mremap(%s): truncate failed\n",
path);
#ifdef MMAP_DEBUG
fprintf(stderr, "MT_mremap(%s,"PTRFMT","SZFMT","SZFMT") ->
shrinking\n", path?path:"NULL", PTRFMTCAST old_address, old_size, *new_size);
diff --git a/monetdb5/modules/mal/Tests/All b/monetdb5/modules/mal/Tests/All
--- a/monetdb5/modules/mal/Tests/All
+++ b/monetdb5/modules/mal/Tests/All
@@ -5,7 +5,7 @@ clients01
bigsum
-compress
+NOT_WIN32?compress
inspect00
inspect05
diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
new file mode 100644
--- /dev/null
+++ b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out.Windows
@@ -0,0 +1,48 @@
+stdout of test 'leaks` in directory 'sql/benchmarks/tpch/fileleak` itself:
+
+
+# 16:01:25 >
+# 16:01:25 > "mserver5" "--debug=10" "--set" "gdk_nr_threads=0" "--set"
"mapi_open=true" "--set" "mapi_port=35740" "--set"
"mapi_usock=/var/tmp/mtest-3945/.s.monetdb.35740" "--set" "monet_prompt="
"--forcemito" "--set" "mal_listing=2"
"--dbpath=/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak"
"--set" "mal_listing=0"
+# 16:01:25 >
+
+# MonetDB 5 server v11.15.12
+# This is an unreleased version
+# Serving database 'mTests_sql_benchmarks_tpch_fileleak', using 4 threads
+# Compiled for x86_64-unknown-linux-gnu/64bit with 64bit OIDs dynamically
linked
+# Found 3.775 GiB available main-memory.
+# Copyright (c) 1993-July 2008 CWI.
+# Copyright (c) August 2008-2014 MonetDB B.V., all rights reserved
+# Visit http://www.monetdb.org/ for further information
+# Listening for connection requests on
mapi:monetdb://niels.nesco.mine.nu:35740/
+# Listening for UNIX domain connection requests on
mapi:monetdb:///var/tmp/mtest-3945/.s.monetdb.35740
+# MonetDB/GIS module loaded
+# MonetDB/JAQL module loaded
+# MonetDB/SQL module loaded
+
+Ready.
+
+# 16:01:26 >
+# 16:01:26 > "/usr/bin/python2" "leaks.SQL.py" "leaks"
+# 16:01:26 >
+
+(u'l_comment', 262144, 0)
+(u'l_commitdate', 262144, 0)
+(u'l_discount', 524288, 0)
+(u'l_extendedprice', 524288, 0)
+(u'l_linenumber', 262144, 0)
+(u'l_linestatus', 0, 0)
+(u'l_orderkey', 262144, 0)
+(u'l_partkey', 262144, 0)
+(u'l_quantity', 262144, 0)
+(u'l_receiptdate', 262144, 0)
+(u'l_returnflag', 0, 0)
+(u'l_shipdate', 262144, 0)
+(u'l_shipinstruct', 0, 0)
+(u'l_shipmode', 0, 0)
+(u'l_suppkey', 262144, 0)
+(u'l_tax', 524288, 0)
+
+# 16:01:26 >
+# 16:01:26 > "Done."
+# 16:01:26 >
+
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
