Changeset: 068ce77a7a47 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=068ce77a7a47
Modified Files:
gdk/gdk_storage.c
monetdb5/mal/Tests/tst025.stable.out
monetdb5/mal/Tests/tst032.stable.out
monetdb5/mal/Tests/tst033.stable.out
monetdb5/mal/Tests/tst034.stable.out
monetdb5/mal/Tests/tst201.stable.out
monetdb5/mal/Tests/tst810.stable.out
monetdb5/modules/mal/Tests/batpartition.stable.out
monetdb5/modules/mal/Tests/iterator03.stable.out
monetdb5/modules/mal/Tests/mapi01.stable.out
monetdb5/modules/mal/Tests/mapi07.stable.out
monetdb5/modules/mal/Tests/partition.stable.out
monetdb5/modules/mal/Tests/tokenizer00.stable.out
monetdb5/modules/mal/mal_io.c
monetdb5/tests/gdkTests/Tests/scanselect.stable.out
Branch: default
Log Message:
Use VIEWcombine instead of BATmark to print head columns.
This way we get the true contents of the head columns, even if they
are (still) ugly.
diffs (truncated from 384 to 300 lines):
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -1067,11 +1067,10 @@ BATprintf(stream *s, BAT *b)
BAT *argv[2];
gdk_return ret = GDK_FAIL;
- argv[0] = BATmark(b, 0);
+ argv[0] = VIEWcombine(b);
argv[1] = b;
if (argv[0] && argv[1]) {
BATroles(argv[0], NULL, b->hident);
- BATroles(argv[1], NULL, b->tident);
ret = BATprintcolumns(s, 2, argv);
}
if (argv[0])
diff --git a/monetdb5/mal/Tests/tst025.stable.out
b/monetdb5/mal/Tests/tst025.stable.out
--- a/monetdb5/mal/Tests/tst025.stable.out
+++ b/monetdb5/mal/Tests/tst025.stable.out
@@ -50,7 +50,7 @@ end user.main;
# void int # type
#--------------------------#
[ 0@0, 5140046 ]
-[ 1@0, 5645862 ]
+[ 2@0, 5645862 ]
#--------------------------#
# t t # name
# void int # type
diff --git a/monetdb5/mal/Tests/tst032.stable.out
b/monetdb5/mal/Tests/tst032.stable.out
--- a/monetdb5/mal/Tests/tst032.stable.out
+++ b/monetdb5/mal/Tests/tst032.stable.out
@@ -57,7 +57,7 @@ end user.main;
# oid int # type
#--------------------------#
[ 0@0, 0 ]
-[ 1@0, 2 ]
+[ 2@0, 2 ]
# 22:30:08 >
# 22:30:08 > Done.
diff --git a/monetdb5/mal/Tests/tst033.stable.out
b/monetdb5/mal/Tests/tst033.stable.out
--- a/monetdb5/mal/Tests/tst033.stable.out
+++ b/monetdb5/mal/Tests/tst033.stable.out
@@ -64,13 +64,13 @@ end user.main;
# t t # name
# void int # type
#--------------------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
+[ 1@0, 1 ]
+[ 2@0, 2 ]
#--------------------------#
# t t # name
# void int # type
#--------------------------#
-[ 0@0, 1 ]
+[ 1@0, 1 ]
# 07:58:41 >
# 07:58:41 > Done.
diff --git a/monetdb5/mal/Tests/tst034.stable.out
b/monetdb5/mal/Tests/tst034.stable.out
--- a/monetdb5/mal/Tests/tst034.stable.out
+++ b/monetdb5/mal/Tests/tst034.stable.out
@@ -77,13 +77,13 @@ select 5 [1]
# t t # name
# void int # type
#--------------------------#
-[ 0@0, 1 ]
-[ 1@0, 2 ]
+[ 1@0, 1 ]
+[ 2@0, 2 ]
#--------------------------#
# t t # name
# void int # type
#--------------------------#
-[ 0@0, 1 ]
+[ 1@0, 1 ]
# 22:30:08 >
# 22:30:08 > Done.
diff --git a/monetdb5/mal/Tests/tst201.stable.out
b/monetdb5/mal/Tests/tst201.stable.out
--- a/monetdb5/mal/Tests/tst201.stable.out
+++ b/monetdb5/mal/Tests/tst201.stable.out
@@ -87,10 +87,10 @@ end user.main;
# h t # name
# oid str # type
#--------------------------#
-[ 0@0, "" ]
+[ 10@0, "" ]
[ 1@0, "quick" ]
[ 2@0, "brown" ]
-[ 3@0, nil ]
+[ 11@0, nil ]
[ 4@0, "jumps" ]
[ 5@0, "over" ]
[ 6@0, "lazy" ]
@@ -101,49 +101,49 @@ end user.main;
# t h # name
# void str # type
#--------------------------#
-[ 0@0, "brown" ]
+[ 2@0, "brown" ]
#--------------------------#
# t h # name
# void str # type
#--------------------------#
-[ 0@0, "" ]
-[ 1@0, nil ]
-[ 2@0, "dog" ]
-[ 3@0, nil ]
-[ 4@0, "fox" ]
-[ 5@0, "the" ]
-[ 6@0, "." ]
+[ 10@0, "" ]
+[ 11@0, nil ]
+[ 7@0, "dog" ]
+[ 8@0, nil ]
+[ 12@0, "fox" ]
+[ 13@0, "the" ]
+[ 14@0, "." ]
#--------------------------#
# t t # name
# void str # type
#--------------------------#
-[ 0@0, "" ]
+[ 10@0, "" ]
[ 1@0, "quick" ]
[ 2@0, "brown" ]
-[ 3@0, nil ]
+[ 11@0, nil ]
[ 4@0, "jumps" ]
[ 5@0, "over" ]
[ 6@0, "lazy" ]
[ 7@0, "dog" ]
[ 8@0, nil ]
-[ 9@0, "fox" ]
-[ 10@0, "the" ]
-[ 11@0, "." ]
+[ 12@0, "fox" ]
+[ 13@0, "the" ]
+[ 14@0, "." ]
#--------------------------#
# t t # name
# void str # type
#--------------------------#
-[ 0@0, "fox" ]
+[ 12@0, "fox" ]
#--------------------------#
# h t # name
# oid str # type
#--------------------------#
-[ 0@0, "fox" ]
+[ 12@0, "fox" ]
#--------------------------#
# h t # name
# oid str # type
#--------------------------#
-[ 0@0, "fox" ]
+[ 12@0, "fox" ]
#--------------------------#
# h t # name
# oid str # type
diff --git a/monetdb5/mal/Tests/tst810.stable.out
b/monetdb5/mal/Tests/tst810.stable.out
--- a/monetdb5/mal/Tests/tst810.stable.out
+++ b/monetdb5/mal/Tests/tst810.stable.out
@@ -59,11 +59,11 @@ end user.main;
# t h # name
# void int # type
#--------------------------#
-[ 0@0, 5 ]
-[ 1@0, 6 ]
-[ 2@0, 7 ]
-[ 3@0, 8 ]
-[ 4@0, 9 ]
+[ 4@0, 5 ]
+[ 5@0, 6 ]
+[ 6@0, 7 ]
+[ 7@0, 8 ]
+[ 8@0, 9 ]
# 16:18:09 >
# 16:18:09 > "Done."
diff --git a/monetdb5/modules/mal/Tests/batpartition.stable.out
b/monetdb5/modules/mal/Tests/batpartition.stable.out
--- a/monetdb5/modules/mal/Tests/batpartition.stable.out
+++ b/monetdb5/modules/mal/Tests/batpartition.stable.out
@@ -56,11 +56,11 @@ end user.main;
# h t # name
# void lng # type
#--------------------------#
-[ 0@0, 5 ]
-[ 1@0, 6 ]
-[ 2@0, 7 ]
-[ 3@0, 8 ]
-[ 4@0, 9 ]
+[ 5@0, 5 ]
+[ 6@0, 6 ]
+[ 7@0, 7 ]
+[ 8@0, 8 ]
+[ 9@0, 9 ]
#--------------------------#
# t t # name
# void lng # type
@@ -71,22 +71,22 @@ end user.main;
# h t # name
# void lng # type
#--------------------------#
-[ 0@0, 2 ]
-[ 1@0, 3 ]
-[ 2@0, 4 ]
+[ 2@0, 2 ]
+[ 3@0, 3 ]
+[ 4@0, 4 ]
#--------------------------#
# t t # name
# void lng # type
#--------------------------#
-[ 0@0, 5 ]
-[ 1@0, 6 ]
+[ 5@0, 5 ]
+[ 6@0, 6 ]
#--------------------------#
# h t # name
# void lng # type
#--------------------------#
-[ 0@0, 7 ]
-[ 1@0, 8 ]
-[ 2@0, 9 ]
+[ 7@0, 7 ]
+[ 8@0, 8 ]
+[ 9@0, 9 ]
# 23:04:04 >
# 23:04:04 > "Done."
diff --git a/monetdb5/modules/mal/Tests/iterator03.stable.out
b/monetdb5/modules/mal/Tests/iterator03.stable.out
--- a/monetdb5/modules/mal/Tests/iterator03.stable.out
+++ b/monetdb5/modules/mal/Tests/iterator03.stable.out
@@ -64,15 +64,15 @@ end user.main;
# t t # name
# void url # type
#--------------------------#
-[ 0@0, "http://www.educ.uva.nl/schoolweb/rocloka.htm"; ]
-[ 1@0, "http://www.nedstat.nl/cgi-bin/viewstat?name=Planetarium"; ]
-[ 2@0, "http://www.edgeonline.com/"; ]
+[ 3@0, "http://www.educ.uva.nl/schoolweb/rocloka.htm"; ]
+[ 4@0, "http://www.nedstat.nl/cgi-bin/viewstat?name=Planetarium"; ]
+[ 5@0, "http://www.edgeonline.com/"; ]
[ "next chunk" ]
#--------------------------#
# t t # name
# void url # type
#--------------------------#
-[ 0@0, "http://robotics.stanford.edu/icons/ " ]
+[ 6@0, "http://robotics.stanford.edu/icons/ " ]
# 00:03:53 >
# 00:03:53 > Done.
diff --git a/monetdb5/modules/mal/Tests/mapi01.stable.out
b/monetdb5/modules/mal/Tests/mapi01.stable.out
--- a/monetdb5/modules/mal/Tests/mapi01.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi01.stable.out
@@ -67,9 +67,9 @@ end user.main;
# t t # name
# void int # type
#--------------------------#
-[ 0@0, 5 ]
-[ 1@0, 6 ]
-[ 2@0, 7 ]
+[ 2@0, 5 ]
+[ 3@0, 6 ]
+[ 4@0, 7 ]
# 09:12:08 >
# 09:12:08 > Done.
diff --git a/monetdb5/modules/mal/Tests/mapi07.stable.out
b/monetdb5/modules/mal/Tests/mapi07.stable.out
--- a/monetdb5/modules/mal/Tests/mapi07.stable.out
+++ b/monetdb5/modules/mal/Tests/mapi07.stable.out
@@ -39,7 +39,7 @@ end user.main;
# t t # name
# void int # type
#--------------------------#
-[ 0@0, nil ]
+[ 2@0, nil ]
# 09:12:08 >
# 09:12:08 > Done.
diff --git a/monetdb5/modules/mal/Tests/partition.stable.out
b/monetdb5/modules/mal/Tests/partition.stable.out
--- a/monetdb5/modules/mal/Tests/partition.stable.out
+++ b/monetdb5/modules/mal/Tests/partition.stable.out
@@ -65,9 +65,9 @@ end user.tst;
# h t # name
# void int # type
#--------------------------#
-[ 0@0, 3 ]
-[ 1@0, 4 ]
-[ 2@0, 5 ]
+[ 2@0, 3 ]
+[ 3@0, 4 ]
+[ 4@0, 5 ]
#--------------------------#
# t t # name
# void int # type
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
