Changeset: 2c0d2e13167a for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=2c0d2e13167a Modified Files: sql/benchmarks/tpch/fileleak/Tests/delete_all.SQL.py sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out sql/benchmarks/tpch/fileleak/Tests/leaks.SQL.py sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out Branch: Feb2013 Log Message:
removed filename from output diffs (151 lines): diff --git a/sql/benchmarks/tpch/fileleak/Tests/delete_all.SQL.py b/sql/benchmarks/tpch/fileleak/Tests/delete_all.SQL.py --- a/sql/benchmarks/tpch/fileleak/Tests/delete_all.SQL.py +++ b/sql/benchmarks/tpch/fileleak/Tests/delete_all.SQL.py @@ -13,8 +13,9 @@ cursor = dbh.cursor(); cursor.execute('select p.*, "location", "count" from storage(), (select value from env() where name = \'gdk_dbpath\') as p where "table"=\'lineitem\';'); res = (cursor.fetchall()) for (dbpath, fn, count) in res: + f = fn fn = os.path.join(dbpath, 'bat', fn + '.tail'); - print(fn,os.path.getsize(fn), count) + print(f,os.path.getsize(fn), count) cursor.execute('delete from lineitem;'); @@ -24,5 +25,6 @@ print(cursor.fetchall()) cursor.execute('select p.*, "location", "count" from storage(), (select value from env() where name = \'gdk_dbpath\') as p where "table"=\'lineitem\';'); res = (cursor.fetchall()) for (dbpath, fn, count) in res: + f = fn fn = os.path.join(dbpath, 'bat', fn + '.tail'); - print(fn,os.path.getsize(fn), count) + print(f,os.path.getsize(fn), count) diff --git a/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out b/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out --- a/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out +++ b/sql/benchmarks/tpch/fileleak/Tests/delete_all.stable.out @@ -25,39 +25,39 @@ Ready. # 13:16:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e" "--host=/var/tmp/mtest-24961" "--port=30091" # 13:16:19 > -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1047.tail', 262144, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1050.tail', 262144, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1051.tail', 262144, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1052.tail', 262144, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1053.tail', 262144, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1054.tail', 524288, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1055.tail', 524288, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1056.tail', 524288, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1057.tail', 60175, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1060.tail', 60175, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1061.tail', 262144, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1062.tail', 262144, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1063.tail', 262144, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1064.tail', 60175, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1065.tail', 60175, 60175) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1066.tail', 262144, 60175) +(u'10/1047', 262144, 60175) +(u'10/1050', 262144, 60175) +(u'10/1051', 262144, 60175) +(u'10/1052', 262144, 60175) +(u'10/1053', 262144, 60175) +(u'10/1054', 524288, 60175) +(u'10/1055', 524288, 60175) +(u'10/1056', 524288, 60175) +(u'10/1057', 60175, 60175) +(u'10/1060', 60175, 60175) +(u'10/1061', 262144, 60175) +(u'10/1062', 262144, 60175) +(u'10/1063', 262144, 60175) +(u'10/1064', 60175, 60175) +(u'10/1065', 60175, 60175) +(u'10/1066', 262144, 60175) [(u'10/1047', 0), (u'10/1050', 0), (u'10/1051', 0), (u'10/1052', 0), (u'10/1053', 0), (u'10/1054', 0), (u'10/1055', 0), (u'10/1056', 0), (u'10/1057', 0), (u'10/1060', 0), (u'10/1061', 0), (u'10/1062', 0), (u'10/1063', 0), (u'10/1064', 0), (u'10/1065', 0), (u'10/1066', 0)] -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1047.tail', 262144, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1050.tail', 262144, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1051.tail', 262144, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1052.tail', 262144, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1053.tail', 262144, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1054.tail', 524288, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1055.tail', 524288, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1056.tail', 524288, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1057.tail', 60175, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1060.tail', 60175, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1061.tail', 262144, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1062.tail', 262144, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1063.tail', 262144, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1064.tail', 60175, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1065.tail', 60175, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1066.tail', 262144, 0) +(u'10/1047', 262144, 0) +(u'10/1050', 262144, 0) +(u'10/1051', 262144, 0) +(u'10/1052', 262144, 0) +(u'10/1053', 262144, 0) +(u'10/1054', 524288, 0) +(u'10/1055', 524288, 0) +(u'10/1056', 524288, 0) +(u'10/1057', 60175, 0) +(u'10/1060', 60175, 0) +(u'10/1061', 262144, 0) +(u'10/1062', 262144, 0) +(u'10/1063', 262144, 0) +(u'10/1064', 60175, 0) +(u'10/1065', 60175, 0) +(u'10/1066', 262144, 0) # 13:16:20 > # 13:16:20 > "Done." diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.SQL.py b/sql/benchmarks/tpch/fileleak/Tests/leaks.SQL.py --- a/sql/benchmarks/tpch/fileleak/Tests/leaks.SQL.py +++ b/sql/benchmarks/tpch/fileleak/Tests/leaks.SQL.py @@ -13,6 +13,7 @@ cursor = dbh.cursor(); cursor.execute('select p.*, "location", "count" from storage(), (select value from env() where name = \'gdk_dbpath\') as p where "table"=\'lineitem\';'); res = (cursor.fetchall()) for (dbpath, fn, count) in res: + f = fn fn = os.path.join(dbpath, 'bat', fn + '.tail'); - print(fn, os.path.getsize(fn) , count) + print(f, os.path.getsize(fn) , count) diff --git a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out --- a/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out +++ b/sql/benchmarks/tpch/fileleak/Tests/leaks.stable.out @@ -25,22 +25,22 @@ Ready. # 16:01:26 > "/usr/bin/python2" "leaks.SQL.py" "leaks" # 16:01:26 > -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1047.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1050.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1051.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1052.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1053.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1054.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1055.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1056.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1057.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1060.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1061.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1062.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1063.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1064.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1065.tail', 0, 0) -(u'/home/niels/scratch/rc-clean/Linux-x86_64/var/MonetDB/mTests_sql_benchmarks_tpch_fileleak/bat/10/1066.tail', 0, 0) +(u'10/1047', 0, 0) +(u'10/1050', 0, 0) +(u'10/1051', 0, 0) +(u'10/1052', 0, 0) +(u'10/1053', 0, 0) +(u'10/1054', 0, 0) +(u'10/1055', 0, 0) +(u'10/1056', 0, 0) +(u'10/1057', 0, 0) +(u'10/1060', 0, 0) +(u'10/1061', 0, 0) +(u'10/1062', 0, 0) +(u'10/1063', 0, 0) +(u'10/1064', 0, 0) +(u'10/1065', 0, 0) +(u'10/1066', 0, 0) # 16:01:26 > # 16:01:26 > "Done." _______________________________________________ checkin-list mailing list checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list