Changeset: c7dcbf20ba31 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c7dcbf20ba31
Modified Files:
gdk/gdk_utils.c
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
Branch: Jan2014
Log Message:
add missing GDK env variables to internal environment (GDK{key,val} BATs)
in addition to other GDK environment variables incl. gdk_mmap_pagesize,
we also add gdk_mmap_minsize, gdk_mem_maxsize, gdk_vm_maxsize
diffs (100 lines):
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -1084,6 +1084,18 @@ GDKinit(opt *set, int setlen)
GDKsetenv("gdk_dbname", p + 1);
#endif
}
+ if (GDKgetenv("gdk_vm_maxsize") == NULL) {
+ snprintf(buf, sizeof(buf), SZFMT, GDK_vm_maxsize);
+ GDKsetenv("gdk_vm_maxsize", buf);
+ }
+ if (GDKgetenv("gdk_mem_maxsize") == NULL) {
+ snprintf(buf, sizeof(buf), SZFMT, GDK_mem_maxsize);
+ GDKsetenv("gdk_mem_maxsize", buf);
+ }
+ if (GDKgetenv("gdk_mmap_minsize") == NULL) {
+ snprintf(buf, sizeof(buf), SZFMT, GDK_mmap_minsize);
+ GDKsetenv("gdk_mmap_minsize", buf);
+ }
if (GDKgetenv("gdk_mmap_pagesize") == NULL) {
snprintf(buf, sizeof(buf), SZFMT, GDK_mmap_pagesize);
GDKsetenv("gdk_mmap_pagesize", buf);
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err
@@ -12,7 +12,7 @@ stderr of test 'select_from_env.SF-12407
MAPI = (monetdb) /var/tmp/mtest-28498/.s.monetdb.30263
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !cardinality violation (20>1)
+ERROR = !cardinality violation (23>1)
# 13:22:15 >
# 13:22:15 > Done.
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.err.Windows
@@ -12,7 +12,7 @@ stderr of test 'select_from_env.SF-12407
MAPI = (monetdb) /var/tmp/mtest-28498/.s.monetdb.30263
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !cardinality violation (19>1)
+ERROR = !cardinality violation (22>1)
# 13:22:15 >
# 13:22:15 > Done.
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out
@@ -31,8 +31,11 @@ Ready.
[ "gdk_dbname" ]
[ "gdk_dbpath" ]
[ "gdk_debug" ]
+[ "gdk_mem_maxsize" ]
+[ "gdk_mmap_minsize" ]
[ "gdk_mmap_pagesize" ]
[ "gdk_nr_threads" ]
+[ "gdk_vm_maxsize" ]
[ "gdk_vmtrim" ]
[ "mal_listing" ]
[ "mapi_autosense" ]
diff --git
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
---
a/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
+++
b/sql/test/BugDay_2005-12-19_2.9.3/Tests/select_from_env.SF-1240701.1242164.stable.out.Windows
@@ -31,8 +31,11 @@ Ready.
[ "gdk_dbname" ]
[ "gdk_dbpath" ]
[ "gdk_debug" ]
+[ "gdk_mem_maxsize" ]
+[ "gdk_mmap_minsize" ]
[ "gdk_mmap_pagesize" ]
[ "gdk_nr_threads" ]
+[ "gdk_vm_maxsize" ]
[ "gdk_vmtrim" ]
[ "mal_listing" ]
[ "mapi_autosense" ]
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
--- a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
+++ b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err
@@ -82,7 +82,7 @@ stderr of test 'cardinality_violation.SF
MAPI = (monetdb) /var/tmp/mtest-28498/.s.monetdb.30263
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !cardinality violation (20>1)
+ERROR = !cardinality violation (23>1)
MAPI = (monetdb) /var/tmp/mtest-28498/.s.monetdb.30263
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
ERROR = !cardinality violation (418>1)
diff --git
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
---
a/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
+++
b/sql/test/BugTracker/Tests/cardinality_violation.SF-1240701.stable.err.Windows
@@ -82,7 +82,7 @@ stderr of test 'cardinality_violation.SF
MAPI = (monetdb) /var/tmp/mtest-28498/.s.monetdb.30263
QUERY = select * from env() as env where name = ( select 'prefix' from env()
as env );
-ERROR = !cardinality violation (19>1)
+ERROR = !cardinality violation (22>1)
MAPI = (monetdb) /var/tmp/mtest-28498/.s.monetdb.30263
QUERY = select * from columns where name = (select columns.name from _tables,
columns where _tables.id = columns.table_id);
ERROR = !cardinality violation (418>1)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
