You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vxquery.apache.org by pr...@apache.org on 2014/05/30 01:57:23 UTC
[1/4] git commit: Updated the collection path in the queries to run
from the VXQuery root.
Repository: incubator-vxquery
Updated Branches:
refs/heads/prestonc/benchmark 443532ff6 -> 304c61eed
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/prestonc/benchmark
Commit: 9c0c1b21cf43408367140213c2466138cf0e0d2d
Parents: 443532f
Author: Preston Carman <pr...@apache.org>
Authored: Thu May 29 16:51:32 2014 -0700
Committer: Preston Carman <pr...@apache.org>
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
[2/4] git commit: A few little clean up items.
Posted by pr...@apache.org.
A few little clean up items.
- Removing unused code.
- Commented out a broken rewrite rule. (temporary)
- More consistent code.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/4b01e4b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/4b01e4b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/4b01e4b4
Branch: refs/heads/prestonc/benchmark
Commit: 4b01e4b4955f0ceb4a06638aa215bfcd904565b9
Parents: 9c0c1b2
Author: Preston Carman <pr...@apache.org>
Authored: Thu May 29 16:55:36 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu May 29 16:55:36 2014 -0700
----------------------------------------------------------------------
vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java | 6 ------
.../org/apache/vxquery/compiler/rewriter/RewriteRuleset.java | 2 +-
.../apache/vxquery/xmlquery/translator/XMLQueryTranslator.java | 4 ++--
3 files changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/4b01e4b4/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
----------------------------------------------------------------------
diff --git a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
index 94efba2..02697e9 100644
--- a/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
+++ b/vxquery-cli/src/main/java/org/apache/vxquery/cli/VXQuery.java
@@ -374,12 +374,6 @@ public class VXQuery {
ccConfig.clusterNetIpAddress = "127.0.0.1";
ccConfig.clusterNetPort = 39001;
ccConfig.profileDumpPeriod = 10000;
- File outDir = new File("target/ClusterController");
- outDir.mkdirs();
- File ccRoot = File.createTempFile(VXQuery.class.getName(), ".data", outDir);
- ccRoot.delete();
- ccRoot.mkdir();
- ccConfig.ccRoot = ccRoot.getAbsolutePath();
cc = new ClusterControllerService(ccConfig);
cc.start();
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/4b01e4b4/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
index ab0d535..f1d41d8 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/compiler/rewriter/RewriteRuleset.java
@@ -138,7 +138,7 @@ public class RewriteRuleset {
normalization.add(new RemoveUnusedAssignAndAggregateRule());
// Find assign for scalar aggregate function.
- normalization.add(new ConvertAssignToAggregateRule());
+ // normalization.add(new ConvertAssignToAggregateRule());
// Use two step aggregate operators if possible.
normalization.add(new IntroduceTwoStepAggregateRule());
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/4b01e4b4/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
index dad7485..3afb9a3 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlquery/translator/XMLQueryTranslator.java
@@ -1538,8 +1538,8 @@ public class XMLQueryTranslator {
SequenceType forVarType = SequenceType.create(AnyItemType.INSTANCE, Quantifier.QUANT_ONE);
XQueryVariable forVar = new XQueryVariable(XMLQueryCompilerConstants.DOT_VAR_NAME, forVarType, forLVar);
tCtx.varScope.registerVariable(forVar);
- XQueryVariable posVar = new XQueryVariable(XMLQueryCompilerConstants.POS_VAR_NAME, SequenceType.create(
- BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE), posLVar);
+ SequenceType posVarType = SequenceType.create(BuiltinTypeRegistry.XS_INTEGER, Quantifier.QUANT_ONE);
+ XQueryVariable posVar = new XQueryVariable(XMLQueryCompilerConstants.POS_VAR_NAME, posVarType, posLVar);
tCtx.varScope.registerVariable(posVar);
unnest.getInputs().add(mutable(tCtx.op));
tCtx.op = unnest;
[3/4] git commit: Adding a INFO logging notice for reading in a XML
file.
Posted by pr...@apache.org.
Adding a INFO logging notice for reading in a XML file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/811d723b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/811d723b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/811d723b
Branch: refs/heads/prestonc/benchmark
Commit: 811d723bfc6271e503a84ea868cb6b1ae73e9f57
Parents: 4b01e4b
Author: Preston Carman <pr...@apache.org>
Authored: Thu May 29 16:56:24 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu May 29 16:56:24 2014 -0700
----------------------------------------------------------------------
.../VXQueryCollectionOperatorDescriptor.java | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/811d723b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
index a9c7255..560967a 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/metadata/VXQueryCollectionOperatorDescriptor.java
@@ -18,14 +18,14 @@ package org.apache.vxquery.metadata;
import java.io.File;
import java.nio.ByteBuffer;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.filefilter.TrueFileFilter;
import org.apache.vxquery.context.DynamicContext;
-import org.apache.vxquery.types.SequenceType;
import org.apache.vxquery.xmlparser.ITreeNodeIdProvider;
import org.apache.vxquery.xmlparser.TreeNodeIdProvider;
import org.apache.vxquery.xmlparser.XMLParser;
@@ -48,6 +48,7 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO
private short totalDataSources;
private String[] collectionPartitions;
private List<Integer> childSeq;
+ protected static final Logger LOGGER = Logger.getLogger(VXQueryCollectionOperatorDescriptor.class.getName());
public VXQueryCollectionOperatorDescriptor(IOperatorDescriptorRegistry spec, VXQueryCollectionDataSource ds,
RecordDescriptor rDesc) {
@@ -96,12 +97,16 @@ public class VXQueryCollectionOperatorDescriptor extends AbstractSingleActivityO
Iterator<File> it = FileUtils.iterateFiles(collectionDirectory, new VXQueryIOFileFilter(),
TrueFileFilter.INSTANCE);
while (it.hasNext()) {
- parser.parseOutElements(it.next(), writer, fta, t);
+ File xmlDocument = it.next();
+ if (LOGGER.isLoggable(Level.INFO)) {
+ LOGGER.info("Starting to read XML document: " + xmlDocument.getAbsolutePath());
+ }
+ parser.parseOutElements(xmlDocument, writer, fta, t);
}
}
} else {
- throw new HyracksDataException(
- "Invalid directory parameter passed to collection (VXQueryCollectionOperatorDescriptor.nextFrame).");
+ throw new HyracksDataException("Invalid directory parameter ("
+ + collectionDirectory.getAbsolutePath() + ") passed to collection.");
}
}
[4/4] git commit: Found a memory leak that was left over from new
method for reading large files.
Posted by pr...@apache.org.
Found a memory leak that was left over from new method for reading large files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/304c61ee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/304c61ee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/304c61ee
Branch: refs/heads/prestonc/benchmark
Commit: 304c61eedd33506699d3071834db72c289595e2b
Parents: 811d723
Author: Preston Carman <pr...@apache.org>
Authored: Thu May 29 16:57:07 2014 -0700
Committer: Preston Carman <pr...@apache.org>
Committed: Thu May 29 16:57:07 2014 -0700
----------------------------------------------------------------------
.../org/apache/vxquery/xmlparser/SAXContentHandler.java | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/304c61ee/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
index bd1a354..53e0cda 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/xmlparser/SAXContentHandler.java
@@ -181,7 +181,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
flushText();
ElementNodeBuilder enb = enbStack.remove(enbStack.size() - 1);
enb.endChildrenChunk();
- endChildInParent(enb);
+ endChildInParent(enb, foundFirstNonSkippedElement());
freeENB(enb);
endElementChildPathStep();
} catch (IOException e) {
@@ -496,7 +496,13 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
}
private void endChildInParent(AbstractNodeBuilder anb) throws IOException {
- if (enbStack.isEmpty()) {
+ endChildInParent(anb, false);
+ }
+
+ private void endChildInParent(AbstractNodeBuilder anb, boolean endNewElement) throws IOException {
+ if (endNewElement) {
+ anb.finish();
+ } else if (enbStack.isEmpty()) {
docb.endChild(anb);
} else {
peekENBStackTop().endChild(anb);
@@ -509,7 +515,7 @@ public class SAXContentHandler implements ContentHandler, LexicalHandler {
FrameUtils.flushFrame(frame, writer);
appender.reset(frame, true);
if (!addNodeToTupleAppender(result, t)) {
- throw new HyracksDataException("Could not write frame (SAXContentHandler.addNodeToTuple).");
+ throw new HyracksDataException("Could not write frame.");
}
}
}