MonetDB: default - Merge with Feb2013 branch.
Changeset: 3b5247b0b3d8 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3b5247b0b3d8
Modified Files:
NT/monetdb_config.h.in
configure.ag
gdk/gdk_heap.c
gdk/gdk_posix.c
gdk/gdk_private.h
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (truncated from 339 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
@@ -301,6 +301,9 @@
/* Define to 1 if you have the memory.h header file. */
#define HAVE_MEMORY_H 1
+/* Define to 1 if you have the `mremap' function. */
+/* #undef HAVE_MREMAP */
+
/* Define if you have the mseed library */
/* #undef HAVE_MSEED */
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2564,6 +2564,7 @@ AC_CHECK_FUNCS([\
localtime_r \
lockf \
madvise \
+ mremap \
nl_langinfo \
_NSGetExecutablePath \
pipe \
diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -368,16 +368,24 @@ HEAPextend(Heap *h, size_t size)
if (size = h-size)
return 0;
- if (h-storage != STORE_MEM) {
- HEAPDEBUG fprintf(stderr, #HEAPextend: extending %s mmapped
heap\n, h-storage == STORE_MMAP ? shared : privately);
- /* memory mapped files extend: save and remap */
- if (HEAPsave_intern(h, nme, ext, .tmp) 0)
- return -1;
- HEAPfree(h);
- h-maxsize = h-size = size;
- if (HEAPload_intern(h, nme, ext, .tmp, FALSE) = 0) {
- return 0;
- }
+ if (h-storage != STORE_MEM) {
+ char *p;
+ long_str path;
+
+ HEAPDEBUG fprintf(stderr, #HEAPextend: extending %s mmapped
heap (%s)\n, h-storage == STORE_MMAP ? shared : privately, h-filename);
+ /* extend memory mapped file */
+ GDKfilepath(path, BATDIR, nme, ext);
+ size = (1 + ((size - 1) REMAP_PAGE_MAXBITS))
REMAP_PAGE_MAXBITS;
+ p = MT_mremap(path,
+ h-storage == STORE_PRIV ?
+ MMAP_COPY | MMAP_READ | MMAP_WRITE :
+ MMAP_READ | MMAP_WRITE,
+ h-base, h-size, size);
+ if (p) {
+ h-maxsize = h-size = size;
+ h-base = p;
+ return 0;
+ }
} else {
/* extend a malloced heap, possibly switching over to
* file-mapped storage */
diff --git a/gdk/gdk_posix.c b/gdk/gdk_posix.c
--- a/gdk/gdk_posix.c
+++ b/gdk/gdk_posix.c
@@ -57,10 +57,6 @@ extern char *sbrk(int);
# include sys/user.h
#endif
-#if defined(DEBUG_ALLOC) SIZEOF_VOID_P 4
-#undef DEBUG_ALLOC
-#endif
-
#ifdef WIN32
int GDK_mem_pagebits = 16; /* on windows, the mmap addresses can be set by
the 64KB */
#else
@@ -70,6 +66,9 @@ int GDK_mem_pagebits = 14;/* on linux,
#ifndef MAP_NORESERVE
# define MAP_NORESERVE MAP_PRIVATE
#endif
+#if defined(MAP_ANON) !defined(MAP_ANONYMOUS)
+#define MAP_ANONYMOUS MAP_ANON
+#endif
#define MMAP_ADVISE7
#define MMAP_WRITABLE (MMAP_WRITE|MMAP_COPY)
@@ -390,11 +389,188 @@ MT_munmap(void *p, size_t len)
int ret = munmap(p, len);
#ifdef MMAP_DEBUG
- mnstr_printf(GDKstdout, #munmap( LLFMT , LLFMT ,%d) = %d\n, (long
long) p, (long long) len, ret);
+ fprintf(stderr, #munmap( PTRFMT , SZFMT ,%d) = %d\n, PTRFMTCAST
p, len, ret);
#endif
return ret;
}
+/* expand or shrink a memory map (ala realloc).
+ * the address returned may be different from the address going in.
+ * in case of failure, the old address is still mapped and NULL is returned.
+ */
+void *
+MT_mremap(const char *path, int mode, void *old_address, size_t old_size,
size_t new_size)
+{
+ void *p;
+ int fd = -1;
+ int flags = mode MMAP_COPY ? MAP_PRIVATE : MAP_SHARED;
+ int prot = PROT_WRITE | PROT_READ;
+
+ /* doesn't make sense for us to extend read-only memory map */
+ assert(mode MMAP_WRITABLE);
+
+ if (new_size old_size) {
+ /* shrink */
+ munmap((char *) old_address + new_size, old_size - new_size);
+#ifdef MMAP_DEBUG
+ fprintf(stderr, MT_mremap(%s,PTRFMT,SZFMT,SZFMT) -
shrinking\n, path?path:NULL, PTRFMTCAST old_address, old_size, new_size);
+#endif
+ return old_address;
+ }
+ if (new_size == old_size) {
+ /* do nothing */
+#ifdef MMAP_DEBUG
+ fprintf(stderr, MT_mremap(%s,PTRFMT,SZFMT,SZFMT) -
unchanged\n, path?path:NULL, PTRFMTCAST
MonetDB: default - exports: approved new output after changeset ...
Changeset: e724f6be5d2a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e724f6be5d2a Modified Files: clients/Tests/exports.stable.out Branch: default Log Message: exports: approved new output after changeset 9603470ae6ad diffs (11 lines): diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out --- a/clients/Tests/exports.stable.out +++ b/clients/Tests/exports.stable.out @@ -1506,6 +1506,7 @@ str JSONprelude(int *ret); str JSONrenderarray(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str JSONrenderobject(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci); str JSONstr2json(json *ret, str *j); +str JSONtext(json *ret, json *js, str *expr); int JSONtoString(str *s, int *len, json src); str JSONunnest(int *key, int *val, json *j); str JSONunnestGrouped(int *grp, int *key, int *val, json *j); ___ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - remote03: re-approving error message that got...
Changeset: b1c09cc39de9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b1c09cc39de9
Modified Files:
monetdb5/modules/mal/Tests/remote03.stable.out
Branch: default
Log Message:
remote03: re-approving error message that got lost with changeset 418493e1e490
diffs (12 lines):
diff --git a/monetdb5/modules/mal/Tests/remote03.stable.out
b/monetdb5/modules/mal/Tests/remote03.stable.out
--- a/monetdb5/modules/mal/Tests/remote03.stable.out
+++ b/monetdb5/modules/mal/Tests/remote03.stable.out
@@ -66,7 +66,7 @@ exit MALException:str ;
remote.disconnect(conn);
end main;
[ Received first error from the remote site ]
-
+!SyntaxException:remote.exec:(mapi:monetdb://mone...@rome.ins.cwi.nl/mTests_monetdb5_modules_mal)
rmt0__8_void := io.print.bla();
SyntaxException:parseError:^'(' expected
[ rmt1_bn_bat_oid_str ]
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Feb2013 - Ported changeset b7f36537c0ea to nogeom case.
Changeset: 87fe46bbd42e for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=87fe46bbd42e Modified Files: sql/test/leaks/Tests/check0_nogeom.stable.out Branch: Feb2013 Log Message: Ported changeset b7f36537c0ea to nogeom case. diffs (48 lines): diff --git a/sql/test/leaks/Tests/check0_nogeom.stable.out b/sql/test/leaks/Tests/check0_nogeom.stable.out --- a/sql/test/leaks/Tests/check0_nogeom.stable.out +++ b/sql/test/leaks/Tests/check0_nogeom.stable.out @@ -47,39 +47,31 @@ Ready. % .bbp,.bbp, .bbp # table_name % htype, ttype, count # name % clob,clob, bigint # type -% 3, 3, 4 # length +% 3, 3, 3 # length +[ oid, int, 0 ] +[ oid, int, 0 ] [ oid, int, 1 ] [ oid, int, 1 ] [ oid, int, 2 ] -[ oid, int, 8 ] -[ oid, int, 8 ] [ oid, int, 155 ] -[ oid, int, 1172] -[ oid, int, 3220] -[ oid, int, 3220] -[ oid, int, 3220] -[ oid, int, 3220] -[ oid, int, 3220] [ oid, lng, 1 ] [ oid, lng, 2 ] [ oid, str, 1 ] [ oid, str, 1 ] [ oid, str, 1 ] [ oid, str, 155 ] -[ oid, str, 3220] -[ oid, str, 3220] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; % .L1, .L2 # table_name % L1, L2 # name % char,wrd # type % 9, 3 # length -[ transient, 503 ] +[ transient, 511 ] #select 'persistent', count(*) from bbp() as bbp where kind like 'pers%'; % .L1, .L2 # table_name % L1, L2 # name % char,wrd # type % 10, 2 # length -[ persistent,20 ] +[ persistent,12 ] # 22:02:15 # 22:02:15 Done. ___ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Feb2013 - Approved after release of Feb2013-SP3.
Changeset: ee6f627a0bfe for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ee6f627a0bfe
Modified Files:
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: Feb2013
Log Message:
Approved after release of Feb2013-SP3.
diffs (36 lines):
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -19,14 +19,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
-Running database upgrade commands:
-create aggregate sys.stddev_samp(val WRD) returns DOUBLE external name
aggr.stdev;
-create aggregate sys.stddev_pop(val WRD) returns DOUBLE external name
aggr.stdevp;
-create aggregate sys.var_samp(val WRD) returns DOUBLE external name
aggr.variance;
-create aggregate sys.var_pop(val WRD) returns DOUBLE external name
aggr.variancep;
-create aggregate sys.median(val WRD) returns WRD external name aggr.median;
-create aggregate sys.corr(e1 WRD, e2 WRD) returns WRD external name
aggr.corr;
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('stddev_samp', 'stddev_pop', 'var_samp', 'var_pop',
'median', 'corr') and f.type = 3 and f.schema_id = s.id and s.name = 'sys');
# 15:38:36
# 15:38:36 /usr/bin/python2 upgrade.SQL.py upgrade
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -19,14 +19,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
-Running database upgrade commands:
-create aggregate sys.stddev_samp(val WRD) returns DOUBLE external name
aggr.stdev;
-create aggregate sys.stddev_pop(val WRD) returns DOUBLE external name
aggr.stdevp;
-create aggregate sys.var_samp(val WRD) returns DOUBLE external name
aggr.variance;
-create aggregate sys.var_pop(val WRD) returns DOUBLE external name
aggr.variancep;
-create aggregate sys.median(val WRD) returns WRD external name aggr.median;
-create aggregate sys.corr(e1 WRD, e2 WRD) returns WRD external name
aggr.corr;
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('stddev_samp', 'stddev_pop', 'var_samp', 'var_pop',
'median', 'corr') and f.type = 3 and f.schema_id = s.id and s.name = 'sys');
# 16:00:08
# 16:00:08 /usr/bin/python2 upgrade.SQL.py upgrade
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Merge with Feb2013 branch.
Changeset: b9a64f1f477d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b9a64f1f477d
Modified Files:
sql/test/leaks/Tests/check0_nogeom.stable.out
sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
sql/test/testdb-upgrade/Tests/upgrade.stable.out
Branch: default
Log Message:
Merge with Feb2013 branch.
diffs (84 lines):
diff --git a/sql/test/leaks/Tests/check0_nogeom.stable.out
b/sql/test/leaks/Tests/check0_nogeom.stable.out
--- a/sql/test/leaks/Tests/check0_nogeom.stable.out
+++ b/sql/test/leaks/Tests/check0_nogeom.stable.out
@@ -47,39 +47,31 @@ Ready.
% .bbp,.bbp, .bbp # table_name
% htype, ttype, count # name
% clob,clob, bigint # type
-% 3, 3, 4 # length
+% 3, 3, 3 # length
+[ oid, int, 0 ]
+[ oid, int, 0 ]
[ oid, int, 1 ]
[ oid, int, 1 ]
[ oid, int, 2 ]
-[ oid, int, 8 ]
-[ oid, int, 8 ]
[ oid, int, 135 ]
-[ oid, int, 1189]
-[ oid, int, 3234]
-[ oid, int, 3234]
-[ oid, int, 3234]
-[ oid, int, 3234]
-[ oid, int, 3234]
[ oid, lng, 1 ]
[ oid, lng, 2 ]
[ oid, str, 1 ]
[ oid, str, 1 ]
[ oid, str, 1 ]
[ oid, str, 135 ]
-[ oid, str, 3234]
-[ oid, str, 3234]
#select 'transient', count(*) from bbp() as bbp where kind like 'tran%';
% .L1, .L2 # table_name
% L1, L2 # name
% char,wrd # type
% 9, 3 # length
-[ transient, 355 ]
+[ transient, 365 ]
#select 'persistent', count(*) from bbp() as bbp where kind like 'pers%';
% .L1, .L2 # table_name
% L1, L2 # name
% char,wrd # type
% 10, 2 # length
-[ persistent,20 ]
+[ persistent,12 ]
# 22:02:15
# 22:02:15 Done.
diff --git a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade-chain/Tests/upgrade.stable.out
@@ -19,14 +19,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
-Running database upgrade commands:
-create aggregate sys.stddev_samp(val WRD) returns DOUBLE external name
aggr.stdev;
-create aggregate sys.stddev_pop(val WRD) returns DOUBLE external name
aggr.stdevp;
-create aggregate sys.var_samp(val WRD) returns DOUBLE external name
aggr.variance;
-create aggregate sys.var_pop(val WRD) returns DOUBLE external name
aggr.variancep;
-create aggregate sys.median(val WRD) returns WRD external name aggr.median;
-create aggregate sys.corr(e1 WRD, e2 WRD) returns WRD external name
aggr.corr;
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('stddev_samp', 'stddev_pop', 'var_samp', 'var_pop',
'median', 'corr') and f.type = 3 and f.schema_id = s.id and s.name = 'sys');
Running database upgrade commands:
set schema sys;
diff --git a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
--- a/sql/test/testdb-upgrade/Tests/upgrade.stable.out
+++ b/sql/test/testdb-upgrade/Tests/upgrade.stable.out
@@ -19,14 +19,6 @@ stdout of test 'upgrade` in directory 's
# MonetDB/SQL module loaded
Ready.
-Running database upgrade commands:
-create aggregate sys.stddev_samp(val WRD) returns DOUBLE external name
aggr.stdev;
-create aggregate sys.stddev_pop(val WRD) returns DOUBLE external name
aggr.stdevp;
-create aggregate sys.var_samp(val WRD) returns DOUBLE external name
aggr.variance;
-create aggregate sys.var_pop(val WRD) returns DOUBLE external name
aggr.variancep;
-create aggregate sys.median(val WRD) returns WRD external name aggr.median;
-create aggregate sys.corr(e1 WRD, e2 WRD) returns WRD external name
aggr.corr;
-insert into sys.systemfunctions (select f.id from sys.functions f, sys.schemas
s where f.name in ('stddev_samp', 'stddev_pop', 'var_samp', 'var_pop',
'median', 'corr') and f.type = 3 and f.schema_id = s.id and s.name = 'sys');
Running database upgrade commands:
set schema sys;
___
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: Feb2013 - propagated changeset 2a53b540e596 to nogeom v...
Changeset: 4d0fb5ba518b for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4d0fb5ba518b Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out Branch: Feb2013 Log Message: propagated changeset 2a53b540e596 to nogeom version diffs (11 lines): diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out @@ -60,7 +60,6 @@ Ready. [ 5859,storagemodelinput,2000, NULL, 0, true, 0, false, 0 ] [ 5900,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(indices) as indices,\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, 0 ] [ 5922,systemfunctions, 2000, NULL, 0, true, 0, false, 0 ] -[ 6031,r,2000, NULL, 0, false, 0, false, 0 ] # 18:53:13 # 18:53:13 Done. ___ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: default - Approved output after recent changes
Changeset: 09e912ec79be for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=09e912ec79be Modified Files: sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.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_nogeom.stable.out sql/test/leaks/Tests/select1_nogeom.stable.out sql/test/leaks/Tests/select2_nogeom.stable.out sql/test/leaks/Tests/temp1_nogeom.stable.out sql/test/leaks/Tests/temp2_nogeom.stable.out sql/test/leaks/Tests/temp3_nogeom.stable.out sql/test/mapi/Tests/php_monetdb.stable.out sql/test/mapi/Tests/php_monetdb_nogeom.stable.out Branch: default Log Message: Approved output after recent changes diffs (truncated from 1047 to 300 lines): diff --git a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out --- a/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out +++ b/sql/test/BugTracker/Tests/set_sql_debug_64__breaking_the_DB.SF-1906287.stable.out @@ -35,7 +35,7 @@ stdout of test 'set_sql_debug_64__breaki % name,fullname, default_schema # name % varchar, varchar,int # type % 9, 10, 4 # length -[ skyserver, sky server, 7720] +[ skyserver, sky server, 7733] #alter user skyserver set schema sys; #drop schema sky; #drop user skyserver; diff --git a/sql/test/leaks/Tests/check1.stable.out b/sql/test/leaks/Tests/check1.stable.out --- a/sql/test/leaks/Tests/check1.stable.out +++ b/sql/test/leaks/Tests/check1.stable.out @@ -34,8 +34,8 @@ Ready. [ oid, bit, 69 ] [ oid, bit, 69 ] [ oid, bit, 393 ] -[ oid, bit, 1229] -[ oid, bit, 1229] +[ oid, bit, 1232] +[ oid, bit, 1232] [ oid, int, 0 ] [ oid, int, 0 ] [ oid, int, 0 ] @@ -72,12 +72,12 @@ Ready. [ oid, int, 19 ] [ oid, int, 19 ] [ oid, int, 19 ] -[ oid, int, 43 ] -[ oid, int, 43 ] -[ oid, int, 43 ] -[ oid, int, 43 ] -[ oid, int, 43 ] -[ oid, int, 43 ] +[ oid, int, 44 ] +[ oid, int, 44 ] +[ oid, int, 44 ] +[ oid, int, 44 ] +[ oid, int, 44 ] +[ oid, int, 44 ] [ oid, int, 69 ] [ oid, int, 69 ] [ oid, int, 135 ] @@ -88,15 +88,15 @@ Ready. [ oid, int, 393 ] [ oid, int, 393 ] [ oid, int, 393 ] -[ oid, int, 1229] -[ oid, int, 1229] -[ oid, int, 1229] -[ oid, int, 1229] -[ oid, int, 3341] -[ oid, int, 3341] -[ oid, int, 3341] -[ oid, int, 3341] -[ oid, int, 3341] +[ oid, int, 1232] +[ oid, int, 1232] +[ oid, int, 1232] +[ oid, int, 1232] +[ oid, int, 3347] +[ oid, int, 3347] +[ oid, int, 3347] +[ oid, int, 3347] +[ oid, int, 3347] [ oid, lng, 0 ] [ oid, lng, 0 ] [ oid, lng, 0 ] @@ -157,8 +157,8 @@ Ready. [ oid, str, 1 ] [ oid, str, 2 ] [ oid, str, 3 ] -[ oid, str, 43 ] -[ oid, str, 43 ] +[ oid, str, 44 ] +[ oid, str, 44 ] [ oid, str, 69 ] [ oid, str, 69 ] [ oid, str, 135 ] @@ -166,11 +166,11 @@ Ready. [ oid, str, 393 ] [ oid, str, 393 ] [ oid, str, 393 ] -[ oid, str, 1229] -[ oid, str, 1229] -[ oid, str, 1229] -[ oid, str, 3341] -[ oid, str, 3341] +[ oid, str, 1232] +[ oid, str, 1232] +[ oid, str, 1232] +[ oid, str, 3347] +[ oid, str, 3347] #select 'transient', count(*) from bbp() as bbp where kind like 'tran%'; % .L1, .L2 # table_name % L1, L2 # name diff --git a/sql/test/leaks/Tests/check1_nogeom.stable.out b/sql/test/leaks/Tests/check1_nogeom.stable.out --- a/sql/test/leaks/Tests/check1_nogeom.stable.out +++ b/sql/test/leaks/Tests/check1_nogeom.stable.out @@ -34,8 +34,8 @@ Ready. [ oid, bit, 69 ] [ oid, bit, 69 ] [ oid, bit, 393 ] -[ oid, bit,
MonetDB: default - re-aligned _nogeom output with standard output
Changeset: 881a7cff5500 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=881a7cff5500 Modified Files: sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err 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/Tests/systemfunctions_nogeom.stable.out sql/test/Tests/trace_nogeom.stable.out Branch: default Log Message: re-aligned _nogeom output with standard output diffs (176 lines): diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090.stable.err @@ -32,8 +32,7 @@ stderr of test 'predicate_select.Bug-309 MAPI = (monetdb) /var/tmp/mtest-5096/.s.monetdb.39165 QUERY = select name, schema_id, query, type, system, commit_action, readonly, temporary from tables where name; - - +ERROR = !conversion of string 'systemfunctions' to type bit failed. # 18:53:13 # 18:53:13 Done. diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.err @@ -30,8 +30,8 @@ stderr of test 'predicate_select.Bug-309 # 18:53:13 mclient -lsql -ftest -Eutf-8 -i -e --host=niels --port=32323 # 18:53:13 -MAPI = (monetdb) /var/tmp/mtest-30433/.s.monetdb.30902 -QUERY = select * from tables where name; +MAPI = (monetdb) /var/tmp/mtest-5096/.s.monetdb.39165 +QUERY = select name, schema_id, query, type, system, commit_action, readonly, temporary from tables where name; ERROR = !conversion of string 'systemfunctions' to type bit failed. # 18:53:13 diff --git a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out --- a/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out +++ b/sql/test/BugTracker-2012/Tests/predicate_select.Bug-3090_nogeom.stable.out @@ -23,50 +23,49 @@ Ready. # 18:53:13 mclient -lsql -ftest -Eutf-8 -i -e --host=niels --port=32323 # 18:53:13 -#select * from tables where 1; -% .tables, .tables,.tables,.tables,.tables, .tables,.tables,.tables,.tables # table_name -% id, name, schema_id, query, type, system, commit_action, readonly, temporary # name -% int, varchar,int,varchar,smallint, boolean, smallint, boolean,tinyint # type -% 4, 17, 4, 496,1, 5, 1, 5, 1 # length -[ 2001,schemas, 2000, NULL, 0, true, 0, false, 0 ] -[ 2006,types,2000, NULL, 0, true, 0, false, 0 ] -[ 2015,functions,2000, NULL, 0, true, 0, false, 0 ] -[ 2024,args, 2000, NULL, 0, true, 0, false, 0 ] -[ 2032,sequences,2000, NULL, 0, true, 0, false, 0 ] -[ 2042,dependencies, 2000, NULL, 0, true, 0, false, 0 ] -[ 2046,connections, 2000, NULL, 0, true, 0, false, 0 ] -[ 2055,_tables, 2000, NULL, 0, true, 0, false, 0 ] -[ 2064,_columns, 2000, NULL, 0, true, 0, false, 0 ] -[ 2075,keys, 2000, NULL, 0, true, 0, false, 0 ] -[ 2082,idxs, 2000, NULL, 0, true, 0, false, 0 ] -[ 2087,triggers, 2000, NULL, 0, true, 0, false, 0 ] -[ 2098,objects, 2000, NULL, 0, true, 0, false, 0 ] -[ 2103,_tables, 2102, NULL, 0, true, 2, false, 0 ] -[ 2112,_columns, 2102, NULL, 0, true, 2, false, 0 ] -[ 2123,keys, 2102, NULL, 0, true, 2, false, 0 ] -[ 2130,idxs, 2102, NULL, 0, true, 2, false, 0 ] -[ 2135,triggers, 2102, NULL, 0, true, 2, false, 0 ] -[ 2146,objects, 2102, NULL, 0, true, 2, false, 0 ] -[ 5062,tables, 2000, SELECT * FROM (SELECT p.*, 0 AS \temporary\ FROM \sys\.\_tables\ AS p UNION ALL SELECT t.*, 1 AS \temporary\ FROM \tmp\.\_tables\ AS t) AS tables where tables.type 2;,1, true, 0, false, 0 ] -[ 5072,columns, 2000, SELECT * FROM (SELECT p.*
MonetDB: default - approved new error message after changeset 31...
Changeset: edd2b2cb6abf for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=edd2b2cb6abf Modified Files: sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err Branch: default Log Message: approved new error message after changeset 3141fb18f4de see also changeset 46eed8e7fef4 diffs (16 lines): diff --git a/sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err b/sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err --- a/sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err +++ b/sql/test/BugTracker-2012/Tests/table_function_with_column_subselects.Bug-3172.stable.err @@ -27,9 +27,10 @@ stderr of test 'table_function_with_colu # 13:48:49 mclient -lsql -ftest -Eutf-8 -i -e --host=niels --port=32735 # 13:48:49 -MAPI = (monetdb) /var/tmp/mtest-10750/.s.monetdb.31766 +MAPI = (monetdb) /var/tmp/mtest-14412/.s.monetdb.30345 QUERY = select * from x((select id from _tables), (select schema_id from _tables)); -ERROR = !TypeException:user.s2_1[45]:'mal.multiplex' undefined in: (_60:bat[:oid,:int], _63:bat[:oid,:int]) := mal.multiplex(_61:str, _62:str, _49:bat[:oid,:int], _55:bat[:oid,:int]) +ERROR = !TypeException:user.s2_1[115]:'sql.x' undefined in: _215:any := sql.x(_211:int, _213:int) +!TypeException:user.s2_1[117]:'bat.insert' undefined in: _218:any := bat.insert(_206:bat[:oid,:int], _216:oid, _215:any) !program contains errors # 13:48:49 ___ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
MonetDB: rdf - Add options for running schema exploration phase ...
Changeset: 559c5c5cd126 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=559c5c5cd126
Modified Files:
monetdb5/extras/rdf/rdfschema.c
monetdb5/extras/rdf/rdfschema.h
monetdb5/extras/rdf/rdfschema.mal
sql/backends/monet5/sql.mx
sql/scripts/30_rdf.sql
Branch: rdf
Log Message:
Add options for running schema exploration phase only (i.e., without creating
cstables and views).
diffs (129 lines):
diff --git a/monetdb5/extras/rdf/rdfschema.c b/monetdb5/extras/rdf/rdfschema.c
--- a/monetdb5/extras/rdf/rdfschema.c
+++ b/monetdb5/extras/rdf/rdfschema.c
@@ -3661,7 +3661,7 @@ str RDFdistTriplesToCSs(int *ret, bat *s
#endif /* CSTYPE_TABLE == 1 */
str
-RDFreorganize(int *ret, CStableStat *cstablestat, bat *sbatid, bat *pbatid,
bat *obatid, bat *mapbatid, int *freqThreshold){
+RDFreorganize(int *ret, CStableStat *cstablestat, bat *sbatid, bat *pbatid,
bat *obatid, bat *mapbatid, int *freqThreshold, int *mode){
CSset *freqCSset; /* Set of frequent CSs */
oid *subjCSMap = NULL; /* Store the corresponding CS
Id for each subject */
@@ -3692,6 +3692,12 @@ RDFreorganize(int *ret, CStableStat *cst
if (RDFextractCSwithTypes(ret, sbatid, pbatid, obatid, mapbatid,
freqThreshold, freqCSset,subjCSMap, maxCSoid, subjdefaultMap) !=
MAL_SUCCEED){
throw(RDF, rdf.RDFreorganize, Problem in extracting CSs);
}
+
+ if (*mode == EXPLOREONLY){
+ printf(Only explore the schema information \n);
+ freeCSset(freqCSset);
+ return MAL_SUCCEED;
+ }
printf(Start re-organizing triple store for BUNFMT CSs \n,
maxCSoid);
diff --git a/monetdb5/extras/rdf/rdfschema.h b/monetdb5/extras/rdf/rdfschema.h
--- a/monetdb5/extras/rdf/rdfschema.h
+++ b/monetdb5/extras/rdf/rdfschema.h
@@ -35,7 +35,10 @@ rdf_export str
RDFextractCSwithTypes(int *ret, bat *sbatid, bat *pbatid, bat *obatid, bat
*mapbatid, int *freqThreshold, void *freqCSset, oid **subjCSMap, oid *maxCSoid,
char **subjdefaultMap);
-
+typedef enum{
+ EXPLOREONLY,
+ REORGANIZE
+} ExpMode;
typedef enum {
@@ -208,7 +211,7 @@ rdf_export str
RDFdistTriplesToCSs(int *ret, bat *sbatid, bat *pbatid, bat *obatid, PropStat*
propStat, CStableStat *cstablestat, oid* lastSubjId, oid* lastSubjIdEx);
rdf_export str
-RDFreorganize(int *ret, CStableStat *cstablestat, bat *sbatid, bat *pbatid,
bat *obatid, bat *mapbatid, int *freqThreshold);
+RDFreorganize(int *ret, CStableStat *cstablestat, bat *sbatid, bat *pbatid,
bat *obatid, bat *mapbatid, int *freqThreshold, int *mode);
rdf_export void
freeCStableStat(CStableStat *cstablestat);
diff --git a/monetdb5/extras/rdf/rdfschema.mal
b/monetdb5/extras/rdf/rdfschema.mal
--- a/monetdb5/extras/rdf/rdfschema.mal
+++ b/monetdb5/extras/rdf/rdfschema.mal
@@ -35,7 +35,7 @@ address RDFextractCSwithTypes
comment Extract Characteristic sets from SPO table. While extracting CSs,
detect the object type;
#TODO: The list of parameters for this function is not correct any more sice
it has been changed for the fucntion in sql.mx
-command rdfreorganize( sbat:bat[:any_1,:oid], pbat:bat[:any_2,:oid],
obat:bat[:any_3,:oid], mbat:bat[:any_4,:str], freqThreshold:int ) :void
+command rdfreorganize( sbat:bat[:any_1,:oid], pbat:bat[:any_2,:oid],
obat:bat[:any_3,:oid], mbat:bat[:any_4,:str], freqThreshold:int, mode:int) :void
address RDFreorganize
comment Re-organize RDF triple store using the characteristic sets;
diff --git a/sql/backends/monet5/sql.mx b/sql/backends/monet5/sql.mx
--- a/sql/backends/monet5/sql.mx
+++ b/sql/backends/monet5/sql.mx
@@ -1274,7 +1274,7 @@ permutations of SPO and a mapping) in th
rdf.graph We can then query with SQL queries the RDF triple storeby quering
tables gid_spo, gid_pso etc., where gid is looked up in rdf.graph
-pattern rdfreorganize (schema:str, table:str, threshold:int)
+pattern rdfreorganize (schema:str, table:str, threshold:int, expmode:int)
address SQLrdfreorganize
comment This procedure call a function from rdf module to extract the
relational schema
from rdf triples. Then, do re-organizing the rdf triples table by clustering
according
@@ -7592,6 +7592,7 @@ SQLrdfreorganize(Client cntxt, MalBlkPtr
str *schema = (str *) getArgReference(stk,pci,1);
str *tbname = (str *) getArgReference(stk,pci,2);
int *threshold = (int *) getArgReference(stk,pci,3);
+ int *mode = (int *) getArgReference(stk,pci,4);
sql_schema *sch;
int ret = 0;
CStableStat *cstablestat;
@@ -7625,9 +7626,18 @@ SQLrdfreorganize(Client cntxt, MalBlkPtr
cstablestat = (CStableStat *) malloc (sizeof (CStableStat));
rethrow(sql.rdfreorganize, msg, RDFreorganize(ret, cstablestat,
sbat-batCacheid, pbat-batCacheid,
-
MonetDB: default - BugTracker-2008: run test table_update.SF-208...
Changeset: 4626030371d3 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4626030371d3 Modified Files: sql/test/BugTracker-2008/Tests/All Branch: default Log Message: BugTracker-2008: run test table_update.SF-2080207 last; it (now) asserts (only) with single-threaded server: mserver5: ...gdk/gdk_join.c:895: mergejoin: Assertion `prev != v' failed. diffs (16 lines): diff --git a/sql/test/BugTracker-2008/Tests/All b/sql/test/BugTracker-2008/Tests/All --- a/sql/test/BugTracker-2008/Tests/All +++ b/sql/test/BugTracker-2008/Tests/All @@ -19,7 +19,6 @@ year_overflow_bug.SF-2075133 select_not_wrong_result.SF-2080151 select_in_wrong_result.SF-2080168 select_between_wrong_result.SF-2080189 -table_update.SF-2080207 constraint_with_schemas.SF-2080219 groupby_with_NULL.SF-2155606 invalid_qualified_column_name.SF-2183288 @@ -40,3 +39,4 @@ OOM_query.SF-2457195 copy-format.SF-2468513 copy-count.SF-2485215 About_CHAR.SF-2075268 +table_update.SF-2080207 ___ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list
