Changeset: 843c4e5d6088 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=843c4e5d6088
Modified Files:
monetdb5/modules/atoms/Tests/xml10.mal
monetdb5/modules/atoms/Tests/xml10.stable.out
monetdb5/modules/atoms/batxml.c
Branch: default
Log Message:
Remove headless blocking test
diffs (111 lines):
diff --git a/monetdb5/modules/atoms/Tests/xml10.mal
b/monetdb5/modules/atoms/Tests/xml10.mal
--- a/monetdb5/modules/atoms/Tests/xml10.mal
+++ b/monetdb5/modules/atoms/Tests/xml10.mal
@@ -43,11 +43,7 @@ io.print(l);
ag:= xml.agg(te,g);
io.print(ag);
-gr:= bat.reverse(g);
-j2:= algebra.join(gr,ax);
-k2:=algebra.kunique(j2);
-io.print(k2);
-cc:= batxml.concat(k2,ag);
+cc:= batxml.concat(ax,te);
io.print(cc);
io.print("author construction");
ae:= batxml.element("author",cc);
diff --git a/monetdb5/modules/atoms/Tests/xml10.stable.out
b/monetdb5/modules/atoms/Tests/xml10.stable.out
--- a/monetdb5/modules/atoms/Tests/xml10.stable.out
+++ b/monetdb5/modules/atoms/Tests/xml10.stable.out
@@ -54,11 +54,7 @@ function user.main():void;
io.print(l);
ag := xml.agg(te,g);
io.print(ag);
- gr := bat.reverse(g);
- j2 := algebra.join(gr,ax);
- k2 := algebra.kunique(j2);
- io.print(k2);
- cc := batxml.concat(k2,ag);
+ cc := batxml.concat(ax,te);
io.print(cc);
io.print("author construction");
ae := batxml.element("author",cc);
@@ -89,28 +85,24 @@ end main;
#---------------------------------------------------------#
[ 0@0, <title>spring</title><title>summer</title> ]
[ 1@0, <title>autum</title> ]
-#-----------------#
-# h t # name
-# oid xml # type
-#-----------------#
-[ 0@0, john ]
-[ 1@0, marie ]
-#---------------------------------------------------------#
+#--------------------------#
# h t # name
-# oid xml # type
-#---------------------------------------------------------#
-[ 0@0, john<title>spring</title><title>summer</title> ]
-[ 1@0, marie<title>autum</title> ]
+# void xml # type
+#--------------------------#
+[ 0@0, john<title>spring</title> ]
+[ 1@0, john<title>summer</title> ]
+[ 2@0, marie<title>autum</title> ]
[ "author construction" ]
#---------------------------------------------------------------------------------#
# h t
# name
-# oid xml
# type
-#---------------------------------------------------------------------------------#
-[ 0@0, <author>john<title>spring</title><title>summer</title></author>
]
-[ 1@0, <author>marie<title>autum</title></author>
]
+# void xml # type
+#--------------------------#
+[ 0@0, <author>john<title>spring</title></author> ]
+[ 1@0, <author>john<title>summer</title></author> ]
+[ 2@0, <author>marie<title>autum</title></author> ]
[ "book construction" ]
-[
<author>john<title>spring</title><title>summer</title></author><author>marie<title>autum</title></author>
]
-[
<books><author>john<title>spring</title><title>summer</title></author><author>marie<title>autum</title></author></books>
]
+[
<author>john<title>spring</title></author><author>john<title>summer</title></author><author>marie<title>autum</title></author>
]
+[
<books><author>john<title>spring</title></author><author>john<title>summer</title></author><author>marie<title>autum</title></author></books>
]
# 23:09:29 >
# 23:09:29 > Done.
diff --git a/monetdb5/modules/atoms/batxml.c b/monetdb5/modules/atoms/batxml.c
--- a/monetdb5/modules/atoms/batxml.c
+++ b/monetdb5/modules/atoms/batxml.c
@@ -1158,7 +1158,7 @@ BATXMLagg3(bat *ret, const bat *bid, con
throw(MAL, "xml.agg", RUNTIME_OBJECT_MISSING);
}
- bn = BATnew(TYPE_oid, b->ttype, BATcount(e));
+ bn = BATnew(TYPE_void, b->ttype, BATcount(e));
if (bn == NULL) {
GDKfree(buf);
BBPunfix(b->batCacheid);
@@ -1167,6 +1167,7 @@ BATXMLagg3(bat *ret, const bat *bid, con
throw(MAL, "xml.agg", INTERNAL_OBJ_CREATE);
}
bn->T->nonil = 1;
+ BATseqbase(bn,0);
/* this will not work as it will corrupt the order of the column, ie
the order in which the data will be generated */
@@ -1276,7 +1277,7 @@ BATXMLagg(bat *ret, const bat *bid, cons
throw(MAL, "xml.agg", RUNTIME_OBJECT_MISSING);
}
- bn = BATnew(TYPE_oid, b->ttype, BATcount(g));
+ bn = BATnew(TYPE_void, b->ttype, BATcount(g));
if (bn == NULL) {
GDKfree(buf);
BBPunfix(b->batCacheid);
@@ -1284,6 +1285,7 @@ BATXMLagg(bat *ret, const bat *bid, cons
throw(MAL, "xml.agg", INTERNAL_OBJ_CREATE);
}
bn->T->nonil = 1;
+ BATseqbase(bn,0);
j = BATjoin(BATmirror(g), b, BUN_NONE);
BBPreleaseref(b->batCacheid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
