Changeset: 79d8ebe3b76b for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=79d8ebe3b76b
Modified Files:
sql/test/wlcr/Tests/wlc01.py
sql/test/wlcr/Tests/wlc100.py
sql/test/wlcr/Tests/wlc20.py
sql/test/wlcr/Tests/wlc21.py
sql/test/wlcr/Tests/wlc30.py
sql/test/wlcr/Tests/wlc40.py
sql/test/wlcr/Tests/wlc50.py
sql/test/wlcr/Tests/wlc70.py
sql/test/wlcr/Tests/wlr01.py
sql/test/wlcr/Tests/wlr01.stable.out
sql/test/wlcr/Tests/wlr100.py
sql/test/wlcr/Tests/wlr100.stable.out
sql/test/wlcr/Tests/wlr20.py
sql/test/wlcr/Tests/wlr20.stable.out
sql/test/wlcr/Tests/wlr30.py
sql/test/wlcr/Tests/wlr30.stable.out
sql/test/wlcr/Tests/wlr40.py
sql/test/wlcr/Tests/wlr50.py
sql/test/wlcr/Tests/wlr50.stable.out
sql/test/wlcr/Tests/wlr70.py
sql/test/wlcr/Tests/wlr70.stable.out
Branch: default
Log Message:
Also dump the files in the wlr tests
diffs (truncated from 681 to 300 lines):
diff --git a/sql/test/wlcr/Tests/wlc01.py b/sql/test/wlcr/Tests/wlc01.py
--- a/sql/test/wlcr/Tests/wlc01.py
+++ b/sql/test/wlcr/Tests/wlc01.py
@@ -15,7 +15,6 @@ if not tstdb or not dbfarm:
#clean up first
dbname = tstdb
-dbnameclone = tstdb + '-clone'
s = process.server(dbname = dbname, stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE)
@@ -38,7 +37,7 @@ sys.stderr.write(cerr)
def listfiles(path):
for f in os.listdir(path):
- if f.find('wlc') >= 0 and f != 'wlc_logs':
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
file = path + os.path.sep + f
sys.stdout.write(file + "\n")
try:
diff --git a/sql/test/wlcr/Tests/wlc100.py b/sql/test/wlcr/Tests/wlc100.py
--- a/sql/test/wlcr/Tests/wlc100.py
+++ b/sql/test/wlcr/Tests/wlc100.py
@@ -34,7 +34,7 @@ sys.stderr.write(cerr)
def listfiles(path):
for f in os.listdir(path):
- if f.find('wlc') >= 0 and f != 'wlc_logs':
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
file = path + os.path.sep + f
sys.stdout.write(file + "\n")
try:
diff --git a/sql/test/wlcr/Tests/wlc20.py b/sql/test/wlcr/Tests/wlc20.py
--- a/sql/test/wlcr/Tests/wlc20.py
+++ b/sql/test/wlcr/Tests/wlc20.py
@@ -33,7 +33,7 @@ sys.stderr.write(cerr)
def listfiles(path):
for f in os.listdir(path):
- if f.find('wlc') >= 0 and f != 'wlc_logs':
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
file = path + os.path.sep + f
sys.stdout.write(file + "\n")
try:
diff --git a/sql/test/wlcr/Tests/wlc21.py b/sql/test/wlcr/Tests/wlc21.py
--- a/sql/test/wlcr/Tests/wlc21.py
+++ b/sql/test/wlcr/Tests/wlc21.py
@@ -33,7 +33,7 @@ sys.stderr.write(cerr)
def listfiles(path):
for f in os.listdir(path):
- if f.find('wlc') >= 0 and f != 'wlc_logs':
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
file = path + os.path.sep + f
sys.stdout.write(file + "\n")
try:
diff --git a/sql/test/wlcr/Tests/wlc30.py b/sql/test/wlcr/Tests/wlc30.py
--- a/sql/test/wlcr/Tests/wlc30.py
+++ b/sql/test/wlcr/Tests/wlc30.py
@@ -34,7 +34,7 @@ sys.stderr.write(cerr)
def listfiles(path):
for f in os.listdir(path):
- if f.find('wlc') >= 0 and f != 'wlc_logs':
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
file = path + os.path.sep + f
sys.stdout.write(file + "\n")
try:
diff --git a/sql/test/wlcr/Tests/wlc40.py b/sql/test/wlcr/Tests/wlc40.py
--- a/sql/test/wlcr/Tests/wlc40.py
+++ b/sql/test/wlcr/Tests/wlc40.py
@@ -34,7 +34,7 @@ sys.stderr.write(cerr)
def listfiles(path):
for f in os.listdir(path):
- if f.find('wlc') >= 0 and f != 'wlc_logs':
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
file = path + os.path.sep + f
sys.stdout.write(file + "\n")
try:
diff --git a/sql/test/wlcr/Tests/wlc50.py b/sql/test/wlcr/Tests/wlc50.py
--- a/sql/test/wlcr/Tests/wlc50.py
+++ b/sql/test/wlcr/Tests/wlc50.py
@@ -33,7 +33,7 @@ sys.stderr.write(cerr)
def listfiles(path):
for f in os.listdir(path):
- if f.find('wlc') >= 0 and f != 'wlc_logs':
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
file = path + os.path.sep + f
sys.stdout.write(file + "\n")
try:
diff --git a/sql/test/wlcr/Tests/wlc70.py b/sql/test/wlcr/Tests/wlc70.py
--- a/sql/test/wlcr/Tests/wlc70.py
+++ b/sql/test/wlcr/Tests/wlc70.py
@@ -15,7 +15,6 @@ if not tstdb or not dbfarm:
#clean up first
dbname = tstdb
-dbnameclone = tstdb + '-clone'
s = process.server(dbname = dbname, stdin = process.PIPE, stdout =
process.PIPE, stderr = process.PIPE)
@@ -37,7 +36,7 @@ sys.stderr.write(cerr)
def listfiles(path):
for f in os.listdir(path):
- if f.find('wlc') >= 0 and f != 'wlc_logs':
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
file = path + os.path.sep + f
sys.stdout.write(file + "\n")
try:
diff --git a/sql/test/wlcr/Tests/wlr01.py b/sql/test/wlcr/Tests/wlr01.py
--- a/sql/test/wlcr/Tests/wlr01.py
+++ b/sql/test/wlcr/Tests/wlr01.py
@@ -44,3 +44,22 @@ sys.stdout.write(cout)
#sys.stderr.write(merr)
sys.stderr.write(serr)
sys.stderr.write(cerr)
+
+def listfiles(path):
+ for f in os.listdir(path):
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
+ file = path + os.path.sep + f
+ sys.stdout.write(file + "\n")
+ try:
+ x = open(file)
+ s = x.read()
+ lines = s.split('\n')
+ for l in lines:
+ sys.stdout.write('#' + l + '\n')
+ x.close()
+ except IOError:
+ sys.stderr.write('Failure to read file ' + file + '\n')
+
+listfiles(dbfarm + os.path.sep + tstdb)
+listfiles(dbfarm + os.path.sep + tstdb + os.path.sep + 'wlc_logs')
+
diff --git a/sql/test/wlcr/Tests/wlr01.stable.out
b/sql/test/wlcr/Tests/wlr01.stable.out
--- a/sql/test/wlcr/Tests/wlr01.stable.out
+++ b/sql/test/wlcr/Tests/wlr01.stable.out
@@ -65,6 +65,26 @@ stdout of test 'wlr01` in directory 'sql
% i, s # name
% int, clob # type
% 1, 0 # length
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc.config
+#logs=/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/
+#id=2
+#write=2019-08-14T12:11:18.000
+#state=1
+#batches=2
+#beat=0
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000001
+# wlr.transaction(1:lng, "2019-08-14T12:11:18.000":str, "monetdb":str);
+# wlr.action("insert into tmp values(1,\\'hello\\'), (2,\\'world\\');":str);
+# wlr.append("sys":str, "tmp":str, "i":str, 1:int, 2:int);
+# wlr.append("sys":str, "tmp":str, "s":str, "hello":str, "world":str);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000000
+# wlr.transaction(0:lng, "2019-08-14T12:11:18.000":str, "monetdb":str);
+# wlr.catalog("create table tmp(i int, s string);":str);
+# wlr.commit();
+#
# 21:37:59 >
# 21:37:59 > "Done."
diff --git a/sql/test/wlcr/Tests/wlr100.py b/sql/test/wlcr/Tests/wlr100.py
--- a/sql/test/wlcr/Tests/wlr100.py
+++ b/sql/test/wlcr/Tests/wlr100.py
@@ -44,3 +44,22 @@ sys.stdout.write(cout)
#sys.stderr.write(merr)
sys.stderr.write(serr)
sys.stderr.write(cerr)
+
+def listfiles(path):
+ for f in os.listdir(path):
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
+ file = path + os.path.sep + f
+ sys.stdout.write(file + "\n")
+ try:
+ x = open(file)
+ s = x.read()
+ lines = s.split('\n')
+ for l in lines:
+ sys.stdout.write('#' + l + '\n')
+ x.close()
+ except IOError:
+ sys.stderr.write('Failure to read file ' + file + '\n')
+
+listfiles(dbfarm + os.path.sep + tstdb)
+listfiles(dbfarm + os.path.sep + tstdb + os.path.sep + 'wlc_logs')
+
diff --git a/sql/test/wlcr/Tests/wlr100.stable.out
b/sql/test/wlcr/Tests/wlr100.stable.out
--- a/sql/test/wlcr/Tests/wlr100.stable.out
+++ b/sql/test/wlcr/Tests/wlr100.stable.out
@@ -28,6 +28,81 @@ stdout of test 'wlr100` in directory 'sq
% i, s # name
% int, clob # type
% 1, 0 # length
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc.config
+#logs=/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/
+#id=10
+#write=2019-08-14T12:11:30.000
+#state=2
+#batches=10
+#beat=0
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000008
+# wlr.transaction(8:lng, "2019-08-14T12:11:30.000":str, "monetdb":str);
+# wlr.catalog("create table tmp70(i int, s string);":str);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000004
+# wlr.transaction(4:lng, "2019-08-14T12:11:24.000":str, "monetdb":str);
+# wlr.action("update tmp set i = 3 where i = 1;":str);
+# wlr.update("sys":str, "tmp":str, "i":str, 0@0:oid, 3:int);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000003
+# wlr.transaction(3:lng, "2019-08-14T12:11:21.000":str, "monetdb":str);
+# wlr.action("insert into tmp values(5,\\'red\\'),(6,\\'fox\\');":str);
+# wlr.append("sys":str, "tmp":str, "i":str, 5:int, 6:int);
+# wlr.append("sys":str, "tmp":str, "s":str, "red":str, "fox":str);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000009
+# wlr.transaction(9:lng, "2019-08-14T12:11:30.000":str, "monetdb":str);
+# wlr.action("insert into tmp70 values(1,\\'hello\\'),
(2,\\'world\\');":str);
+# wlr.append("sys":str, "tmp70":str, "i":str, 1:int, 2:int);
+# wlr.append("sys":str, "tmp70":str, "s":str, "hello":str, "world":str);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000007
+# wlr.transaction(7:lng, "2019-08-14T12:11:28.000":str, "monetdb":str);
+# wlr.action("delete from tmp;":str);
+# wlr.clear_table("sys":str, "tmp":str);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000001
+# wlr.transaction(1:lng, "2019-08-14T12:11:18.000":str, "monetdb":str);
+# wlr.action("insert into tmp values(1,\\'hello\\'), (2,\\'world\\');":str);
+# wlr.append("sys":str, "tmp":str, "i":str, 1:int, 2:int);
+# wlr.append("sys":str, "tmp":str, "s":str, "hello":str, "world":str);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000005
+# wlr.transaction(5:lng, "2019-08-14T12:11:24.000":str, "monetdb":str);
+# wlr.action("update tmp set s = \\'blah\\';":str);
+# wlr.update("sys":str, "tmp":str, "s":str, 0@0:oid, "blah":str);
+# wlr.update("sys":str, "tmp":str, "s":str, 1@0:oid, "blah":str);
+# wlr.update("sys":str, "tmp":str, "s":str, 2@0:oid, "blah":str);
+# wlr.update("sys":str, "tmp":str, "s":str, 3@0:oid, "blah":str);
+# wlr.update("sys":str, "tmp":str, "s":str, 4@0:oid, "blah":str);
+# wlr.update("sys":str, "tmp":str, "s":str, 5@0:oid, "blah":str);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000006
+# wlr.transaction(6:lng, "2019-08-14T12:11:26.000":str, "monetdb":str);
+# wlr.action("delete from tmp where i < 4;":str);
+# wlr.delete("sys":str, "tmp":str, 0@0:oid, 0@0:oid, 0@0:oid);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000002
+# wlr.transaction(2:lng, "2019-08-14T12:11:19.000":str, "monetdb":str);
+# wlr.action("insert into tmp values(3,\\'blah\\'),(4,\\'bloh\\');":str);
+# wlr.append("sys":str, "tmp":str, "i":str, 3:int, 4:int);
+# wlr.append("sys":str, "tmp":str, "s":str, "blah":str, "bloh":str);
+# wlr.commit();
+#
+/export/scratch1/mk/branches/default//Linux/var/MonetDB/mTests_sql_test_wlcr/wlc_logs/mTests_sql_test_wlcr_000000000000
+# wlr.transaction(0:lng, "2019-08-14T12:11:18.000":str, "monetdb":str);
+# wlr.catalog("create table tmp(i int, s string);":str);
+# wlr.commit();
+#
# 21:26:05 >
# 21:26:05 > "Done."
diff --git a/sql/test/wlcr/Tests/wlr20.py b/sql/test/wlcr/Tests/wlr20.py
--- a/sql/test/wlcr/Tests/wlr20.py
+++ b/sql/test/wlcr/Tests/wlr20.py
@@ -49,3 +49,22 @@ sys.stdout.write(cout)
#sys.stderr.write(merr)
sys.stderr.write(serr)
sys.stderr.write(cerr)
+
+def listfiles(path):
+ for f in os.listdir(path):
+ if (f.find('wlc') >= 0 or f.find('wlr') >=0 ) and f != 'wlc_logs':
+ file = path + os.path.sep + f
+ sys.stdout.write(file + "\n")
+ try:
+ x = open(file)
+ s = x.read()
+ lines = s.split('\n')
+ for l in lines:
+ sys.stdout.write('#' + l + '\n')
+ x.close()
+ except IOError:
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
