Updated the collection path in the queries to run from the VXQuery root.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/9c0c1b21 Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/9c0c1b21 Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/9c0c1b21 Branch: refs/heads/master Commit: 9c0c1b21cf43408367140213c2466138cf0e0d2d Parents: 443532f Author: Preston Carman <[email protected]> Authored: Thu May 29 16:51:32 2014 -0700 Committer: Preston Carman <[email protected]> Committed: Thu May 29 16:51:32 2014 -0700 ---------------------------------------------------------------------- vxquery-benchmark/src/main/resources/xmark/queries/q01.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q02.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q03.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q04.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q05.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q06.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q07.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q08.xq | 4 ++-- vxquery-benchmark/src/main/resources/xmark/queries/q09.xq | 6 +++--- vxquery-benchmark/src/main/resources/xmark/queries/q10.xq | 4 ++-- vxquery-benchmark/src/main/resources/xmark/queries/q11.xq | 4 ++-- vxquery-benchmark/src/main/resources/xmark/queries/q12.xq | 4 ++-- vxquery-benchmark/src/main/resources/xmark/queries/q13.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q14.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q15.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q16.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q17.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q18.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q19.xq | 2 +- vxquery-benchmark/src/main/resources/xmark/queries/q20.xq | 8 ++++---- 20 files changed, 29 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q01.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q01.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q01.xq index 5593fc0..bc9fbf6 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q01.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q01.xq @@ -17,7 +17,7 @@ (: XMark Query see README.md for full details. :) -let $collection := "../query/people/" +let $collection := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $b in collection($collection)/site/people/person where $b/@id = "person0" return $b/name/text() http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q02.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q02.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q02.xq index ca001f3..299de6d 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q02.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q02.xq @@ -17,6 +17,6 @@ (: XMark Query see README.md for full details. :) -let $collection := "../data/open_auctions/" +let $collection := "vxquery-benchmark/src/main/resources/xmark/data/open_auctions/" for $b in collection($collection)/site/open_auctions/open_auction return <increase>{$b/bidder[1]/increase/text()}</increase> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q03.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q03.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q03.xq index 92ca6ae..5488122 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q03.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q03.xq @@ -17,7 +17,7 @@ (: XMark Query see README.md for full details. :) -let $collection := "../data/open_auctions/" +let $collection := "vxquery-benchmark/src/main/resources/xmark/data/open_auctions/" for $b in collection($collection)/site/open_auctions/open_auction where zero-or-one($b/bidder[1]/increase/text()) * 2 <= $b/bidder[last()]/increase/text() return http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q04.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q04.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q04.xq index 04b7343..756db87 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q04.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q04.xq @@ -17,7 +17,7 @@ (: XMark Query see README.md for full details. :) -let $collection := "../data/open_auctions/" +let $collection := "vxquery-benchmark/src/main/resources/xmark/data/open_auctions/" for $b in collection($collection)/site/open_auctions/open_auction where some $pr1 in $b/bidder/personref[@person = "person20"], http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q05.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q05.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q05.xq index cf0da15..01d6dba 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q05.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q05.xq @@ -18,7 +18,7 @@ (: XMark Query see README.md for full details. :) count( - let $collection := "../data/closed_auctions/" + let $collection := "vxquery-benchmark/src/main/resources/xmark/data/closed_auctions/" for $i in collection($collection)/site/closed_auctions/closed_auction where $i/price/text() >= 40 return $i/price http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q06.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q06.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q06.xq index edcc69c..fc8f78d 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q06.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q06.xq @@ -17,6 +17,6 @@ (: XMark Query see README.md for full details. :) -let $collection := "../query/regions/" +let $collection := "vxquery-benchmark/src/main/resources/xmark/data/regions/" for $b in collection($collection)/site/regions return count($b/*/item) http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q07.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q07.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q07.xq index 9b5064c..f251a61 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q07.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q07.xq @@ -17,7 +17,7 @@ (: XMark Query see README.md for full details. :) -let $collection := "../data/" +let $collection := "vxquery-benchmark/src/main/resources/xmark/data/" for $p in collection($collection)/site return count($p//description) + count($p//annotation) + count($p//emailaddress) http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q08.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q08.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q08.xq index 7801d17..fe9b9ed 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q08.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q08.xq @@ -17,10 +17,10 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../data/people/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $p in collection($collection1)/site/people/person let $a := - let $collection2 := "../data/closed_auctions/" + let $collection2 := "vxquery-benchmark/src/main/resources/xmark/data/closed_auctions/" for $t in collection($collection2)/site/closed_auctions/closed_auction where $t/buyer/@person = $p/@id return $t http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q09.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q09.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q09.xq index 8a83ad3..db94097 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q09.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q09.xq @@ -17,15 +17,15 @@ (: XMark Query see README.md for full details. :) -let $collection3 := "../data/people/" +let $collection3 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $p in collection($collection3)/site/people/person let $a := - let $collection1 := "../data/closed_auctions/" + let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/closed_auctions/" for $t in collection($collection1)/site/closed_auctions/closed_auction where $p/@id = $t/buyer/@person return let $n := - let $collection2 := "../data/regions/" + let $collection2 := "vxquery-benchmark/src/main/resources/xmark/data/regions/" for $t2 in collection($collection2)/site/regions/europe/item where $t/itemref/@item = $t2/@id return $t2 http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q10.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q10.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q10.xq index 6e97d56..cd31444 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q10.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q10.xq @@ -17,10 +17,10 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../data/people/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $i in distinct-values(collection($collection1)/site/people/person/profile/interest/@category) let $p := - let $collection2 := "../data/people/" + let $collection2 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $t in collection($collection2)/site/people/person where $t/profile/interest/@category = $i return http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q11.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q11.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q11.xq index 69312d5..81cd15d 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q11.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q11.xq @@ -17,10 +17,10 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../data/people/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $p in collection($collection1)/site/people/person let $l := - let $collection2 := "../data/open_auctions/" + let $collection2 := "vxquery-benchmark/src/main/resources/xmark/data/open_auctions/" for $i in collection($collection2)/site/open_auctions/open_auction/initial where $p/profile/@income > 5000 * exactly-one($i/text()) return $i http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q12.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q12.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q12.xq index 065b43a..f3d7dc4 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q12.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q12.xq @@ -17,10 +17,10 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../query/people/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $p in collection($collection1)/site/people/person let $l := - let $collection2 := "../query/open_auctions/" + let $collection2 := "vxquery-benchmark/src/main/resources/xmark/data/open_auctions/" for $i in collection($collection2)/site/open_auctions/open_auction/initial where $p/profile/@income > 5000 * exactly-one($i/text()) return $i http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q13.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q13.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q13.xq index d398a6b..b06e8e6 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q13.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q13.xq @@ -17,6 +17,6 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../data/regions/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/regions/" for $i in collection($collection1)/site/regions/australia/item return <item name="{$i/name/text()}">{$i/description}</item> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q14.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q14.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q14.xq index b81f1d7..7d989a8 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q14.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q14.xq @@ -17,7 +17,7 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../data/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/" for $i in collection($collection1)/site//item where contains(string(exactly-one($i/description)), "gold") return $i/name/text() http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q15.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q15.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q15.xq index a6af47a..f6052d7 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q15.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q15.xq @@ -17,7 +17,7 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../data/closed_auctions/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/closed_auctions/" for $i in collection($collection1)/site/closed_auctions/closed_auction/annotation/description/parlist/ listitem/ parlist/ http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q16.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q16.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q16.xq index b9ecfdb..fa200bc 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q16.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q16.xq @@ -17,7 +17,7 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../data/closed_auctions/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/closed_auctions/" for $a in collection($collection1)/site/closed_auctions/closed_auction where not( http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q17.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q17.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q17.xq index 1d8240f..19a9988 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q17.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q17.xq @@ -17,7 +17,7 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../data/people/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $p in collection($collection1)/site/people/person where empty($p/homepage/text()) return <person name="{$p/name/text()}"/> http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q18.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q18.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q18.xq index 9320755..8ceaf49 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q18.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q18.xq @@ -23,6 +23,6 @@ declare function local:convert($v as xs:decimal?) as xs:decimal? 2.20371 * $v (: convert Dfl to Euro :) }; -let $collection1 := "../data/open_auctions/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/open_auctions/" for $i in collection($collection1)/site/open_auctions/open_auction return local:convert(zero-or-one($i/reserve)) http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q19.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q19.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q19.xq index 391e1e8..842ffa0 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q19.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q19.xq @@ -17,7 +17,7 @@ (: XMark Query see README.md for full details. :) -let $collection1 := "../data/regions/" +let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/regions/" for $b in collection($collection1)/site/regions/*/item let $k := $b/name/text() order by zero-or-one($b/location) ascending empty greatest http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/9c0c1b21/vxquery-benchmark/src/main/resources/xmark/queries/q20.xq ---------------------------------------------------------------------- diff --git a/vxquery-benchmark/src/main/resources/xmark/queries/q20.xq b/vxquery-benchmark/src/main/resources/xmark/queries/q20.xq index b673a7d..363dd31 100644 --- a/vxquery-benchmark/src/main/resources/xmark/queries/q20.xq +++ b/vxquery-benchmark/src/main/resources/xmark/queries/q20.xq @@ -21,7 +21,7 @@ <preferred> { count( - let $collection1 := "../data/people/" + let $collection1 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $b in collection($collection1)/site/people/person/profile[@income >= 100000] return $b ) @@ -30,7 +30,7 @@ <standard> { count( - let $collection2 := "../data/people/" + let $collection2 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $c in collection($collection2)/site/people/person/profile[@income < 100000 and @income >= 30000] return $c ) @@ -39,7 +39,7 @@ <challenge> { count( - let $collection3 := "../data/people/" + let $collection3 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $d in collection($collection3)/site/people/person/profile[@income < 30000] return $d ) @@ -48,7 +48,7 @@ <na> { count( - let $collection4 := "../data/people/" + let $collection4 := "vxquery-benchmark/src/main/resources/xmark/data/people/" for $p in collection($collection4)/site/people/person where empty($p/profile/@income) return $p
