Changeset: 6acbf14b23fa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6acbf14b23fa
Modified Files:
MonetDB/src/gdk/gdk_bbp.mx
sql/src/test/Skyserver/Tests/Skyserver.SQL.py
Branch: default
Log Message:
Merge with Jun2010 branch.
diffs (270 lines):
diff -r 2a0d92bb79cd -r 6acbf14b23fa MonetDB/src/gdk/gdk_bbp.mx
--- a/MonetDB/src/gdk/gdk_bbp.mx Mon Aug 16 15:23:38 2010 +0200
+++ b/MonetDB/src/gdk/gdk_bbp.mx Mon Aug 16 17:53:58 2010 +0200
@@ -153,16 +153,16 @@
#include "gdk_storage.h"
@}
@-
-The BBP has now a fixed address, so re-allocation due to a growing BBP
+The BBP has a fixed address, so re-allocation due to a growing BBP
caused by one thread does not disturb reads to the old entries by another.
This is implemented using anonymous virtual memory; extensions on the same
address are guaranteed because a large non-committed VM area is requested
-initially. New slots in the BBP are found at O(1) by keeping a freelist
+initially. New slots in the BBP are found in O(1) by keeping a freelist
that uses the 'next' field in the BBPrec records.
@{
@c
BBPrec *BBP = NULL; /* fixed base VM address of BBP array */
-bat BBPmaxsize = BBPMAXSIZE; /* size of non-commited VM BBP array */
+bat BBPmaxsize = BBPMAXSIZE; /* size of non-committed VM BBP array */
bat BBPlimit = 0; /* current committed VM BBP array */
bat BBPsize = 0; /* current used size of BBP array */
@@ -478,7 +478,7 @@
recover_dir(int direxists)
{
if (direxists) {
- /* just try; don't care about these nonvital files */
+ /* just try; don't care about these non-vital files */
GDKunlink(BATDIR, "BBP", "bak");
GDKmove(BATDIR, "BBP", "dir", BATDIR, "BBP", "bak");
}
@@ -492,7 +492,7 @@
/* Convert the old-style string heap to the new style.
This function must be called at the end of BBPinit(), just before
"normal processing" starts. All errors that happen during the
- conversion are fatal. This function is "save" in the sense that
+ conversion are fatal. This function is "safe" in the sense that
when it is interrupted, recovery will just start over. No
permanent changes are made to the database until all string heaps
have been converted, and then the changes are made atomically.
diff -r 2a0d92bb79cd -r 6acbf14b23fa
sql/src/test/Skyserver/Tests/Skyserver.SQL.py
--- a/sql/src/test/Skyserver/Tests/Skyserver.SQL.py Mon Aug 16 15:23:38
2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver.SQL.py Mon Aug 16 17:53:58
2010 +0200
@@ -6,56 +6,77 @@
passwd = 'skyserver'
dir = os.getenv('TSTSRCDIR')
sys.stdout.write('Create User\n')
- clt = process.client('sql', args = [os.path.join(dir,
'..','create_user.sql')], stdout = process.PIPE)
+ sys.stderr.write('Create User\n')
+ clt = process.client('sql', args = [os.path.join(dir,
'..','create_user.sql')], stdout = process.PIPE, stderr = process.PIPE)
out,err = clt.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('tables\n')
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE)
+ sys.stderr.write('tables\n')
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout =
process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout =
process.PIPE, stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_tables.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_tables.sql')], stdout = process.PIPE, stderr
= process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
sql = open(os.path.join(dir, '..',
'Skyserver_import.sql')).read().replace('DATA',os.path.join(dir,'..','microsky').replace('\\','\\\\'))
out,err = clt1.communicate(sql)
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_constraints.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_constraints.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('views\n')
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_views.sql')], stdout = process.PIPE)
+ sys.stderr.write('views\n')
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_views.sql')], stdout = process.PIPE, stderr
= process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('functions\n')
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_functions.sql')], stdout = process.PIPE)
+ sys.stderr.write('functions\n')
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_functions.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('Cleanup\n')
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropFunctions.sql')], stdout = process.PIPE)
+ sys.stderr.write('Cleanup\n')
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropFunctions.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout =
process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout =
process.PIPE, stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropViews.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropViews.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropConstraints.sql')], stdout =
process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropConstraints.sql')], stdout =
process.PIPE, stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropTables.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropTables.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('Remove User\n')
- clt = process.client('sql', args = [os.path.join(dir,
'..','drop_user.sql')], stdout = process.PIPE)
+ sys.stderr.write('Remove User\n')
+ clt = process.client('sql', args = [os.path.join(dir,
'..','drop_user.sql')], stdout = process.PIPE, stderr = process.PIPE)
out,err = clt.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
main()
diff -r 2a0d92bb79cd -r 6acbf14b23fa
sql/src/test/Skyserver/Tests/Skyserver.stable.err
--- a/sql/src/test/Skyserver/Tests/Skyserver.stable.err Mon Aug 16 15:23:38
2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver.stable.err Mon Aug 16 17:53:58
2010 +0200
@@ -10,6 +10,12 @@
# 18:20:19 > Mtimeout -timeout 60 ./Skyserver.SQL Skyserver
# 18:20:19 >
+Create User
+tables
+views
+functions
+Cleanup
+Remove User
# 18:20:22 >
# 18:20:22 > Done.
diff -r 2a0d92bb79cd -r 6acbf14b23fa
sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py
--- a/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py Mon Aug 16 15:23:38
2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver_v6.SQL.py Mon Aug 16 17:53:58
2010 +0200
@@ -6,59 +6,81 @@
passwd = 'skyserver'
dir = os.getenv('TSTSRCDIR')
sys.stdout.write('Create User\n')
- clt = process.client('sql', args = [os.path.join(dir,
'..','create_user.sql')], stdout = process.PIPE)
+ sys.stderr.write('Create User\n')
+ clt = process.client('sql', args = [os.path.join(dir,
'..','create_user.sql')], stdout = process.PIPE, stderr = process.PIPE)
out,err = clt.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('tables\n')
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE)
+ sys.stderr.write('tables\n')
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','math.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','cache.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','cache.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout =
process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','..','..','sql','skyserver.sql')], stdout =
process.PIPE, stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_tables_v6.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_tables_v6.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, stdin =
process.PIPE, stdout = process.PIPE, stderr = process.PIPE)
sql = open(os.path.join(dir, '..',
'Skyserver_import_v6.sql')).read().replace('DATA_DIR',os.path.join(dir,'..','microsky_v6').replace('\\','\\\\'))
out,err = clt1.communicate(sql)
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_constraints_v6.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_constraints_v6.sql')], stdout =
process.PIPE, stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('views\n')
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_views_v6.sql')], stdout = process.PIPE)
+ sys.stderr.write('views\n')
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_views_v6.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('functions\n')
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_functions_v6.sql')], stdout = process.PIPE)
+ sys.stderr.write('functions\n')
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_functions_v6.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('Cleanup\n')
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropFunctions_v6.sql')], stdout =
process.PIPE)
+ sys.stderr.write('Cleanup\n')
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropFunctions_v6.sql')], stdout =
process.PIPE, stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout =
process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMs_functions.sql')], stdout =
process.PIPE, stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropMath.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropViews_v6.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropViews_v6.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropConstraints_v6.sql')], stdout =
process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropConstraints_v6.sql')], stdout =
process.PIPE, stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
- clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropTables_v6.sql')], stdout = process.PIPE)
+ sys.stderr.write(err)
+ clt1 = process.client('sql', user = user, passwd = passwd, args =
[os.path.join(dir, '..','Skyserver_dropTables_v6.sql')], stdout = process.PIPE,
stderr = process.PIPE)
out,err = clt1.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
sys.stdout.write('Remove User\n')
- clt = process.client('sql', args = [os.path.join(dir,
'..','drop_user.sql')], stdout = process.PIPE)
+ sys.stderr.write('Remove User\n')
+ clt = process.client('sql', args = [os.path.join(dir,
'..','drop_user.sql')], stdout = process.PIPE, stderr = process.PIPE)
out,err = clt.communicate()
sys.stdout.write(out)
+ sys.stderr.write(err)
main()
diff -r 2a0d92bb79cd -r 6acbf14b23fa
sql/src/test/Skyserver/Tests/Skyserver_v6.stable.err
--- a/sql/src/test/Skyserver/Tests/Skyserver_v6.stable.err Mon Aug 16
15:23:38 2010 +0200
+++ b/sql/src/test/Skyserver/Tests/Skyserver_v6.stable.err Mon Aug 16
17:53:58 2010 +0200
@@ -12,6 +12,12 @@
# 16:41:17 > /usr/bin/python Skyserver_v6.SQL.py Skyserver_v6
# 16:41:17 >
+Create User
+tables
+views
+functions
+Cleanup
+Remove User
# 16:41:20 >
# 16:41:20 > Done.
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
