Repository: incubator-vxquery
Updated Branches:
  refs/heads/master 64f6eb91e -> 04ac20d12


Change queries to use a value comparison.


Project: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/commit/1ea5f1a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/tree/1ea5f1a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-vxquery/diff/1ea5f1a6

Branch: refs/heads/master
Commit: 1ea5f1a6badef5daed45fc6ac9d087ee08517f0e
Parents: 64f6eb9
Author: Preston Carman <[email protected]>
Authored: Thu Feb 13 09:27:56 2014 -0800
Committer: Preston Carman <[email protected]>
Committed: Thu Feb 13 09:27:56 2014 -0800

----------------------------------------------------------------------
 .../src/main/resources/noaa-ghcn-daily/queries/q00.xq              | 2 +-
 .../src/main/resources/noaa-ghcn-daily/queries/q01.xq              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/1ea5f1a6/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq
index 119b957..8a639dd 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q00.xq
@@ -5,7 +5,7 @@ let $collection := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
 for $r in collection($collection)/dataCollection/data
 let $date := xs:date(fn:substring(xs:string(fn:data($r/date)), 0, 11))
 where $r/station eq "GHCND:ASN00008113" 
-    and fn:year-from-date($date) >= (2003) 
+    and fn:year-from-date($date) ge 2003
     and fn:month-from-date($date) eq 12 
     and fn:day-from-date($date) eq 25
 return $r
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-vxquery/blob/1ea5f1a6/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq
----------------------------------------------------------------------
diff --git 
a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq 
b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq
index ab0b2ab..93bfbbb 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/queries/q01.xq
@@ -4,5 +4,5 @@
 (: meters per second). (Wind value is in tenth of a meter per second)         
:)
 let $collection := "/tmp/1.0_partition_ghcnd_all_xml/sensors"
 for $r in collection($collection)/dataCollection/data
-where $r/dataType eq "AWND" and $r/value > 491.744
+where $r/dataType eq "AWND" and xs:decimal(fn:data($r/value)) gt 491.744
 return $r
\ No newline at end of file

Reply via email to