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 2015/04/01 20:35:02 UTC
[01/12] vxquery git commit: enforce JDK 7
Repository: vxquery
Updated Branches:
refs/heads/prestonc/xmark 2b2dd22ea -> c4008e7f9
enforce JDK 7
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/6ec07026
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/6ec07026
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/6ec07026
Branch: refs/heads/prestonc/xmark
Commit: 6ec0702640ed7f531be9599cffaaa35a84f9d2d5
Parents: 42a5952
Author: Till Westmann <we...@gmail.com>
Authored: Sun Mar 1 15:23:54 2015 -0800
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:53 2015 -0700
----------------------------------------------------------------------
pom.xml | 24 ++++++++++++++++++++++--
1 file changed, 22 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/6ec07026/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b4a15d..8c6f21b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -378,11 +378,31 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.7</source>
+ <target>1.7</target>
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>1.7.0</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<createChecksum>true</createChecksum>
[04/12] vxquery git commit: [maven-release-plugin] prepare for next
development iteration
Posted by pr...@apache.org.
[maven-release-plugin] prepare for next development iteration
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/f7bd3491
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/f7bd3491
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/f7bd3491
Branch: refs/heads/prestonc/xmark
Commit: f7bd3491e0019d2cf8589ca0feba1e825ac1a1ae
Parents: 26ab38f
Author: Eldon Carman <ec...@ucr.edu>
Authored: Mon Mar 2 16:58:33 2015 -0800
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
pom.xml | 4 ++--
vxquery-benchmark/pom.xml | 2 +-
vxquery-cli/pom.xml | 4 ++--
vxquery-core/pom.xml | 2 +-
vxquery-server/pom.xml | 4 ++--
vxquery-xtest/pom.xml | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f7bd3491/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2719aa5..1862890 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5</version>
+ <version>0.6-SNAPSHOT</version>
<packaging>pom</packaging>
<name>VXQuery</name>
<description>A Versatile XQuery Processor</description>
@@ -50,7 +50,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/vxquery.git</url>
- <tag>apache-vxquery-0.5</tag>
+ <tag>HEAD</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f7bd3491/vxquery-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/pom.xml b/vxquery-benchmark/pom.xml
index 08e7156..81feaf8 100644
--- a/vxquery-benchmark/pom.xml
+++ b/vxquery-benchmark/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5</version>
+ <version>0.6-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f7bd3491/vxquery-cli/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index 7cb74be..620a4a8 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5</version>
+ <version>0.6-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-cli</artifactId>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.5</version>
+ <version>0.6-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f7bd3491/vxquery-core/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index 6b63e87..968e5c7 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5</version>
+ <version>0.6-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-core</artifactId>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f7bd3491/vxquery-server/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index 4cdf6f8..4d5d9a1 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5</version>
+ <version>0.6-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-server</artifactId>
@@ -142,7 +142,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.5</version>
+ <version>0.6-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/f7bd3491/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index 8edd7b0..3b6474b 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5</version>
+ <version>0.6-SNAPSHOT</version>
</parent>
<artifactId>apache-vxquery-xtest</artifactId>
@@ -123,7 +123,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.5</version>
+ <version>0.6-SNAPSHOT</version>
</dependency>
<dependency>
[11/12] vxquery git commit: Update for double conversion using JDK.
Posted by pr...@apache.org.
Update for double conversion using JDK.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/c4008e7f
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/c4008e7f
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/c4008e7f
Branch: refs/heads/prestonc/xmark
Commit: c4008e7f9fd42a2fd1b04919c5e10cd981ff3455
Parents: 054369a
Author: Eldon Carman <ec...@ucr.edu>
Authored: Tue Mar 31 13:37:23 2015 -0700
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
src/site/apt/join_the_community.apt | 61 -------
.../functions/cast/CastToDoubleOperation.java | 171 +++----------------
2 files changed, 28 insertions(+), 204 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/c4008e7f/src/site/apt/join_the_community.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/join_the_community.apt b/src/site/apt/join_the_community.apt
deleted file mode 100644
index 75c6b07..0000000
--- a/src/site/apt/join_the_community.apt
+++ /dev/null
@@ -1,61 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one or more
-~~ contributor license agreements. See the NOTICE file distributed with
-~~ this work for additional information regarding copyright ownership.
-~~ The ASF licenses this file to You under the Apache License, Version 2.0
-~~ (the "License"); you may not use this file except in compliance with
-~~ the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing, software
-~~ distributed under the License is distributed on an "AS IS" BASIS,
-~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~~ See the License for the specific language governing permissions and
-~~ limitations under the License.
-
-Joining the Apache VXQuery Community
-
- The following steps are here to help new Apache VXQuery developer get up to speed.
- These steps will connect you with the community and give you a place to start.
-
-* Community Member
-
- * Sign up for the mailing list: dev@vxquery.apache.org
-
- * Download the latest release and run a few queries.
-
- * {{{http://vxquery.apache.org/user_installation.html}Installation instructions}}.
-
- * {{{http://vxquery.apache.org/user_query.html}Execute a query}}.
-
- * If you want more information on XQuery:
-
- * Go through the {{{http://www.w3schools.com/xquery/}W3Schools XQuery tutorial}}.
-
- * Review the {{{http://www.w3.org/TR/xquery/}XQuery specification}}.
-
-* Developer
-
- * Go through the community member steps.
-
- * Setup your eclipse development environment.
-
- * {{{http://vxquery.apache.org/development_eclipse_setup.html}Setup instructions}}.
-
- * XQuery has a test suite to verify XQuery specifications.
-
- * Run the test suite for XQTS.
-
- * {{{http://vxquery.apache.org/user_running_tests.html}Testing instructions}}.
-
- * Review the test structure.
-
- * Code is found in the "VXQuery XTest" module.
-
- * Review open issues for the project.
-
- * {{{http://vxquery.apache.org/issue-tracking.html}Issues list}}.
-
-
-
-
http://git-wip-us.apache.org/repos/asf/vxquery/blob/c4008e7f/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java
index 499c1d3..13bb1f0 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDoubleOperation.java
@@ -37,13 +37,6 @@ import edu.uci.ics.hyracks.data.std.primitive.ShortPointable;
import edu.uci.ics.hyracks.data.std.primitive.UTF8StringPointable;
public class CastToDoubleOperation extends AbstractCastToOperation {
- /*
- * All the positive powers of 10 that can be represented exactly in float.
- */
- private static final double powersOf10[] = { 1.0e0, 1.0e1, 1.0e2, 1.0e3, 1.0e4, 1.0e5, 1.0e6, 1.0e7, 1.0e8, 1.0e9,
- 1.0e10, 1.0e11, 1.0e12, 1.0e13, 1.0e14, 1.0e15, 1.0e16, 1.0e17, 1.0e18, 1.0e19, 1.0e20, 1.0e21, 1.0e22 };
- private static final double powersOf2[] = { 1.0e16d, 1.0e32f, 1.0e64, 1.0e128, 1.0e256 };
-
@Override
public void convertBoolean(BooleanPointable boolp, DataOutput dOut) throws SystemException, IOException {
double value = (boolp.getBoolean() ? 1 : 0);
@@ -73,30 +66,24 @@ public class CastToDoubleOperation extends AbstractCastToOperation {
@Override
public void convertInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- double value = longp.doubleValue();
- dOut.write(ValueTag.XS_DOUBLE_TAG);
- dOut.writeDouble(value);
+ writeIntegerAsDouble(longp, dOut);
}
@Override
public void convertString(UTF8StringPointable stringp, DataOutput dOut) throws SystemException, IOException {
ICharacterIterator charIterator = new UTF8StringCharacterIterator(stringp);
charIterator.reset();
- short decimalPlace = 0;
- long value = 0;
double valueDouble;
- boolean pastDecimal = false, negativeValue = false;
+ boolean negativeValue = false;
int c = ICharacterIterator.EOS_CHAR;
int c2 = ICharacterIterator.EOS_CHAR;
int c3 = ICharacterIterator.EOS_CHAR;
- long limit = -Long.MAX_VALUE;
// Check sign.
c = charIterator.next();
if (c == Character.valueOf('-')) {
negativeValue = true;
c = charIterator.next();
- limit = Long.MIN_VALUE;
}
// Check the special cases.
if (c == Character.valueOf('I') || c == Character.valueOf('N')) {
@@ -105,128 +92,26 @@ public class CastToDoubleOperation extends AbstractCastToOperation {
if (charIterator.next() != ICharacterIterator.EOS_CHAR) {
throw new SystemException(ErrorCode.FORG0001);
} else if (c == Character.valueOf('I') && c2 == Character.valueOf('N') && c3 == Character.valueOf('F')) {
- valueDouble = Double.NEGATIVE_INFINITY;
+ valueDouble = Double.POSITIVE_INFINITY;
} else if (c == Character.valueOf('N') && c2 == Character.valueOf('a') && c3 == Character.valueOf('N')) {
valueDouble = Double.NaN;
} else {
throw new SystemException(ErrorCode.FORG0001);
}
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
+ dOut.writeDouble((negativeValue ? -valueDouble : valueDouble));
} else {
- // Read in the number.
- do {
- if (Character.isDigit(c)) {
- if (value < limit / 10 + Character.getNumericValue(c)) {
- throw new SystemException(ErrorCode.FOCA0006);
- }
- value = value * 10 - Character.getNumericValue(c);
- if (pastDecimal) {
- decimalPlace--;
- }
- } else if (c == Character.valueOf('.') && pastDecimal == false) {
- pastDecimal = true;
- } else if (c == Character.valueOf('E') || c == Character.valueOf('e')) {
- break;
- } else {
- throw new SystemException(ErrorCode.FORG0001);
- }
- } while ((c = charIterator.next()) != ICharacterIterator.EOS_CHAR);
-
- // Parse the exponent.
- if (c == Character.valueOf('E') || c == Character.valueOf('e')) {
- int moveOffset = 0;
- boolean negativeOffset = false;
- // Check for the negative sign.
- c = charIterator.next();
- if (c == Character.valueOf('-')) {
- negativeOffset = true;
- c = charIterator.next();
- }
- // Process the numeric value.
- do {
- if (Character.isDigit(c)) {
- moveOffset = moveOffset * 10 + Character.getNumericValue(c);
- } else {
- throw new SystemException(ErrorCode.FORG0001);
- }
- } while ((c = charIterator.next()) != ICharacterIterator.EOS_CHAR);
- if (moveOffset > 324 || moveOffset < -324) {
- throw new SystemException(ErrorCode.FOCA0006);
- }
- decimalPlace += (negativeOffset ? -moveOffset : moveOffset);
- }
-
- /*
- * The following conditions to create the floating point value is using known valid float values.
- * In addition, each one only needs one or two operations to get the float value, further minimizing
- * possible errors. (Not perfect, but pretty good.)
- */
- valueDouble = (double) value;
- if (decimalPlace == 0 || valueDouble == 0.0f) {
- // No modification required to float value.
- } else if (decimalPlace >= 0) {
- if (decimalPlace <= 16) {
- valueDouble *= powersOf10[decimalPlace];
- } else {
- // Multiply the value based on the exponent binary.
- if ((decimalPlace & 15) != 0) {
- valueDouble *= powersOf10[decimalPlace & 15];
- }
- if ((decimalPlace >>= 4) != 0) {
- int j;
- for (j = 0; decimalPlace > 1; j++, decimalPlace >>= 1) {
- if ((decimalPlace & 1) != 0)
- valueDouble *= powersOf2[j];
- }
- // Handle the last cast for infinity and max value.
- double t = valueDouble * powersOf2[j];
- if (Double.isInfinite(t)) {
- // Overflow
- t = valueDouble / 2.0;
- t *= powersOf2[j];
- if (Double.isInfinite(t)) {
- valueDouble = Double.POSITIVE_INFINITY;
- }
- t = -Double.MAX_VALUE;
- }
- valueDouble = t;
- }
- }
- } else {
- if (decimalPlace >= -16) {
- valueDouble /= powersOf10[-decimalPlace];
- } else {
- if ((decimalPlace & 15) != 0) {
- valueDouble /= powersOf10[decimalPlace & 15];
- }
- if ((decimalPlace >>= 4) != 0) {
- int j;
- for (j = 0; decimalPlace > 1; j++, decimalPlace >>= 1) {
- if ((decimalPlace & 1) != 0)
- valueDouble /= powersOf2[j];
- }
- // Handle the last cast for zero and min value.
- double t = valueDouble / powersOf2[j];
- if (t == 0.0) {
- // Underflow.
- t = valueDouble * 2.0;
- t /= powersOf2[j];
- if (t == 0.0) {
- valueDouble = 0.0;
- }
- t = Double.MIN_VALUE;
- }
- valueDouble = t;
- }
- }
+ // We create an object to keep the conversion algorithm simple and improve precision.
+ // While a better solution may be available this will hold us over until then.
+ StringBuilder sb = new StringBuilder();
+ stringp.toString(sb);
+ try {
+ valueDouble = Double.parseDouble(sb.toString());
+ } catch (NumberFormatException e) {
+ throw new SystemException(ErrorCode.FORG0001);
}
-
- }
-
- dOut.write(ValueTag.XS_DOUBLE_TAG);
- if (valueDouble == 0.0) {
- dOut.writeDouble((negativeValue ? -0.0 : 0.0));
- } else {
- dOut.writeDouble((negativeValue ? valueDouble : -valueDouble));
+ dOut.write(ValueTag.XS_DOUBLE_TAG);
+ dOut.writeDouble(valueDouble);
}
}
@@ -239,54 +124,54 @@ public class CastToDoubleOperation extends AbstractCastToOperation {
* Derived Datatypes
*/
public void convertByte(BytePointable bytep, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(bytep, dOut);
+ writeIntegerAsDouble(bytep, dOut);
}
public void convertInt(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(intp, dOut);
+ writeIntegerAsDouble(intp, dOut);
}
public void convertLong(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(longp, dOut);
+ writeIntegerAsDouble(longp, dOut);
}
public void convertNegativeInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(longp, dOut);
+ writeIntegerAsDouble(longp, dOut);
}
public void convertNonNegativeInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(longp, dOut);
+ writeIntegerAsDouble(longp, dOut);
}
public void convertNonPositiveInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(longp, dOut);
+ writeIntegerAsDouble(longp, dOut);
}
public void convertPositiveInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(longp, dOut);
+ writeIntegerAsDouble(longp, dOut);
}
public void convertShort(ShortPointable shortp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(shortp, dOut);
+ writeIntegerAsDouble(shortp, dOut);
}
public void convertUnsignedByte(ShortPointable shortp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(shortp, dOut);
+ writeIntegerAsDouble(shortp, dOut);
}
public void convertUnsignedInt(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(longp, dOut);
+ writeIntegerAsDouble(longp, dOut);
}
public void convertUnsignedLong(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(longp, dOut);
+ writeIntegerAsDouble(longp, dOut);
}
public void convertUnsignedShort(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
- writeDoubleValue(intp, dOut);
+ writeIntegerAsDouble(intp, dOut);
}
- private void writeDoubleValue(INumeric numericp, DataOutput dOut) throws SystemException, IOException {
+ private void writeIntegerAsDouble(INumeric numericp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DOUBLE_TAG);
dOut.writeDouble(numericp.doubleValue());
}
[02/12] vxquery git commit: Updated the site release instructions and
added missing license header.
Posted by pr...@apache.org.
Updated the site release instructions and added missing license header.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/42a59522
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/42a59522
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/42a59522
Branch: refs/heads/prestonc/xmark
Commit: 42a595225b4c9a9eb3fbb7e0be22da203d8c7b84
Parents: 2b2dd22
Author: Eldon Carman <ec...@ucr.edu>
Authored: Sun Mar 1 08:36:39 2015 -0800
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:53 2015 -0700
----------------------------------------------------------------------
src/site/apt/release.apt | 24 +++++++++--
src/site/site.xml | 2 +-
.../other_systems/saxon/count_sensor.xq | 17 ++++++++
.../other_systems/saxon/count_station.xq | 17 ++++++++
.../noaa-ghcn-daily/other_systems/saxon/q00.xq | 17 ++++++++
.../noaa-ghcn-daily/other_systems/saxon/q01.xq | 17 ++++++++
.../noaa-ghcn-daily/other_systems/saxon/q02.xq | 17 ++++++++
.../noaa-ghcn-daily/other_systems/saxon/q03.xq | 17 ++++++++
.../other_systems/saxon/q04_count_sensor.xq | 17 ++++++++
.../other_systems/saxon/q04_count_station.xq | 17 ++++++++
.../other_systems/saxon/q05_count_sensor.xq | 17 ++++++++
.../other_systems/saxon/q05_count_station.xq | 17 ++++++++
.../other_systems/saxon/q06_count_sensor.xq | 17 ++++++++
.../other_systems/saxon/q06_count_station.xq | 17 ++++++++
.../noaa-ghcn-daily/other_systems/saxon/q07.xq | 17 ++++++++
.../other_systems/saxon/q07_count_tmax.xq | 17 ++++++++
.../other_systems/saxon/q07_count_tmin.xq | 17 ++++++++
.../scripts/benchmark_logging.properties | 44 ++++++++------------
18 files changed, 294 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/src/site/apt/release.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/release.apt b/src/site/apt/release.apt
index a934381..6071b8e 100644
--- a/src/site/apt/release.apt
+++ b/src/site/apt/release.apt
@@ -44,12 +44,14 @@ $ svn co https://dist.apache.org/repos/dist/release/vxquery dist
$ svn co https://svn.apache.org/repos/asf/vxquery/site
---
+ * create a code signing key with the Apache {{{http://www.apache.org/dev/openpgp.html#generate-key}instructions}} and example settings
+
* add your key to the <<<KEYS>>> file
Change into the <<<dist>>> directory and run
---
-(gpg --list-sigs <your name> && gpg2 --armor --export <your name>) >> KEYS
+(gpg2 --list-sigs <your name> && gpg2 --armor --export <your name>) >> KEYS
---
and then check the new <<<KEYS>>> file into svn
@@ -69,21 +71,29 @@ $ svn ci -m "add [YOUR NAME]'s key to KEYS file"
* for the upload to the nexus repository
---
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+ http://maven.apache.org/xsd/settings-1.0.0.xsd">
+...
<servers>
+ ...
<!-- To publish a snapshot of some part of Maven -->
<server>
<id>apache.snapshots.https</id>
<username>[YOUR APACHE LDAP USERNAME]</username>
- <password>[YOUR APACHE LDAP PASSWORD] (encrypted)</password>
+ <password>[YOUR APACHE LDAP PASSWORD (encrypted)]</password>
</server>
<!-- To stage a release of some part of Maven -->
<server>
<id>apache.releases.https</id>
<username>[YOUR APACHE LDAP USERNAME]</username>
- <password>[YOUR APACHE LDAP PASSWORD] (encrypted)</password>
+ <password>[YOUR APACHE LDAP PASSWORD (encrypted)]</password>
</server>
...
</servers>
+...
+</settings>
---
* to sign the artifacts
@@ -101,6 +111,10 @@ $ svn ci -m "add [YOUR NAME]'s key to KEYS file"
---
* Download Apache Rat from {{{https://creadur.apache.org/rat/download_rat.cgi}https://creadur.apache.org/rat/download_rat.cgi}}.
+
+ * Add your ssh key to {{{https://id.apache.org}id.apache.org}} (required to create a website on {{{https://people.apache.org}people.apache.org}}).
+
+ * Login and update your profile details.
* Each time steps
@@ -143,6 +157,8 @@ $ mvn release:perform
* send out <<<[VOTE]>>> e-mail on dev@vxquery.apache.org
+ * {{{http://mail-archives.apache.org/mod_mbox/vxquery-dev/201409.mbox/%3CCAGZxfJUZDczuZR5jQResE4B7%2Bv4QQgwMpAd%2B-_Kt-U_RjCyReA%40mail.gmail.com%3E}example e-mail}}
+
* after successful vote promote staging repository {{{https://repository.apache.org/}https://repository.apache.org/}}
* add new source artifacts (archive + signature + hashes) to svn {{{https://dist.apache.org/repos/dist/release/vxquery}https://dist.apache.org/repos/dist/release/vxquery}} and remove old release dirctory
@@ -169,6 +185,8 @@ $ cd -
* wait a few days for the mirroring of the release artifacts
* send <<<[ANNOUNCE]>>> e-mail to announce@apache.org and dev@vxquery.apache.org
+
+ * {{{http://mail-archives.apache.org/mod_mbox/www-announce/201405.mbox/%3C537AD473.9080505@apache.org%3E}example e-mail}}
* References
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 9f41540..78e6651 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -78,7 +78,7 @@ limitations under the License.
name="Eclipse Setup"
href="development_eclipse_setup.html" />
<item
- name="Release steps"
+ name="Release Steps"
href="release.html" />
<item
name="Update Local Git XQTS Results"
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_sensor.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_sensor.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_sensor.xq
index 1e8e312..3418d32 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_sensor.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_sensor.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Join Query :)
(: Count all the weather sensor readings available. :)
count(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_station.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_station.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_station.xq
index fe6ec8f..bd63bb2 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_station.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/count_station.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Join Query :)
(: Count all the weather stations available. :)
count(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q00.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q00.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q00.xq
index 09c5b79..ac23dba 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q00.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q00.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(:
XQuery Filter Query
-------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q01.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q01.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q01.xq
index 39d7e20..019d738 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q01.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q01.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Filter Query :)
(: Find all reading for hurricane force wind warning or extreme wind warning. :)
(: The warnings occur when the wind speed (AWND) exceeds 110 mph (49.1744 :)
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q02.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q02.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q02.xq
index 3fb0975..b0ec839 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q02.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q02.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(:
XQuery Aggregate Query
----------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q03.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q03.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q03.xq
index cda344a..57981f9 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q03.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q03.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Aggregate Query :)
(: Find the highest recorded temperature (TMAX) in Celsius. :)
fn:max(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_sensor.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_sensor.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_sensor.xq
index 6c927a4..828c239 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_sensor.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_sensor.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Join Query :)
(: Count all the weather sensor readings on 1976-07-04. :)
count(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_station.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_station.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_station.xq
index 957aec0..4230cd8 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_station.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q04_count_station.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Join Query :)
(: Count all the weather stations for King county. :)
count(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_sensor.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_sensor.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_sensor.xq
index 4ac353b..2287c22 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_sensor.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_sensor.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Join Aggregate Query :)
(: Count all sensor readings for TMIN in 2001. :)
count(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_station.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_station.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_station.xq
index 4349805..0fa8e30 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_station.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q05_count_station.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Join Aggregate Query :)
(: Count all stations in the state of Oregon. :)
count(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_sensor.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_sensor.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_sensor.xq
index 5ca3329..9539f4b 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_sensor.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_sensor.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
count(
let $sensor_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/sensors/?select=*.xml;recurse=yes"
for $r in collection($sensor_collection)/root/dataCollection/data
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_station.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_station.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_station.xq
index ef1e732..ee2511f 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_station.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q06_count_station.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
count(
let $station_collection := "../../../../../../../weather_data/dataset-tiny-local/data_links/local_speed_up/d0_p1_i0/stations/?select=*.xml;recurse=yes"
for $s in collection($station_collection)/root/stationCollection/station
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07.xq
index 35e5ea2..49b95bf 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Join Aggregate Query :)
(: Self join with all sensor readings after the year 2000. :)
fn:avg(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmax.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmax.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmax.xq
index 3245746..1b5ce16 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmax.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmax.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Join Query :)
(: Find the all the records for TMAX. :)
count(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmin.xq
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmin.xq b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmin.xq
index 6fcd276..0af9cad 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmin.xq
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/other_systems/saxon/q07_count_tmin.xq
@@ -1,3 +1,20 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
(: XQuery Join Query :)
(: Find the all the records for TMIN. :)
count(
http://git-wip-us.apache.org/repos/asf/vxquery/blob/42a59522/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
index 2745a12..ca3c79a 100644
--- a/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
+++ b/vxquery-benchmark/src/main/resources/noaa-ghcn-daily/scripts/benchmark_logging.properties
@@ -1,42 +1,32 @@
-# Properties file which configures the operation of the JDK
-# logging facility.
-
-# The system will look for this config file, first using
-# a System property specified at startup:
-#
-# >java -Djava.util.logging.config.file=myLoggingConfigFilePath
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
#
-# If this property is not specified, then the config file is
-# retrieved from its default location at:
+# http://www.apache.org/licenses/LICENSE-2.0
#
-# JDK_HOME/jre/lib/logging.properties
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License. :)
-# Global logging properties.
-# ------------------------------------------
-# The set of handlers to be loaded upon startup.
-# Comma-separated list of class names.
-# (? LogManager docs say no comma here, but JDK example has comma.)
-handlers=java.util.logging.ConsoleHandler
+# This properties file sets the logging output for the benchmark tests.
-# Default global logging level.
-# Loggers and Handlers may override this level
+# Global Settings
+handlers=java.util.logging.ConsoleHandler
.level=WARNING
# Loggers
-# ------------------------------------------
-# Loggers are usually attached to packages.
-# Here, the level for each package is specified.
-# The global level is used by default, so levels
-# specified here simply act as an override.
-#edu.uci.ics.hyracks.dataflow.std.join.level=ALL
edu.uci.ics.hyracks.dataflow.std.join.OptimizedHybridHashJoinOperatorDescriptor.level=ALL
# Handlers
-# -----------------------------------------
# --- ConsoleHandler ---
-# Override of global logging level
java.util.logging.ConsoleHandler.level=SEVERE
-#java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
[12/12] vxquery git commit: Copied recent site changes back to master.
Posted by pr...@apache.org.
Copied recent site changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/563c6b73
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/563c6b73
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/563c6b73
Branch: refs/heads/prestonc/xmark
Commit: 563c6b73f58aaa947cc06e48016d9c29361b826b
Parents: 7310632
Author: Eldon Carman <ec...@ucr.edu>
Authored: Thu Mar 5 19:41:55 2015 -0800
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
src/site/apt/developer_get_started.apt | 41 +++++++++++++++++++++++++++++
src/site/apt/development_release.apt | 14 +++++++++-
src/site/apt/user_get_started.apt | 35 ++++++++++++++++++++++++
src/site/site.xml | 9 ++++---
4 files changed, 95 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/563c6b73/src/site/apt/developer_get_started.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/developer_get_started.apt b/src/site/apt/developer_get_started.apt
new file mode 100644
index 0000000..7a93d66
--- /dev/null
+++ b/src/site/apt/developer_get_started.apt
@@ -0,0 +1,41 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one or more
+~~ contributor license agreements. See the NOTICE file distributed with
+~~ this work for additional information regarding copyright ownership.
+~~ The ASF licenses this file to You under the Apache License, Version 2.0
+~~ (the "License"); you may not use this file except in compliance with
+~~ the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "AS IS" BASIS,
+~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~~ See the License for the specific language governing permissions and
+~~ limitations under the License.
+
+Get Started as a VXQuery Developer
+
+ The following steps outline how to get up to speed with VXQuery developer community.
+ These steps will connect you with the community and give you a place to start with developing for VXQuery.
+
+ * Go through the community member steps.
+
+ * {{{http://vxquery.apache.org/user_get_started.html}Community steps}}.
+
+ * Setup your eclipse development environment.
+
+ * {{{http://vxquery.apache.org/development_eclipse_setup.html}Setup instructions}}.
+
+ * XQuery has a test suite to verify XQuery specifications.
+
+ * Run the test suite for XQTS.
+
+ * {{{http://vxquery.apache.org/user_running_tests.html}Testing instructions}}.
+
+ * Review the test structure.
+
+ * Code is found in the "VXQuery XTest" module.
+
+ * Review open issues for the project.
+
+ * {{{http://vxquery.apache.org/issue-tracking.html}Issues list}}.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/563c6b73/src/site/apt/development_release.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_release.apt b/src/site/apt/development_release.apt
index 6071b8e..5c0d83a 100644
--- a/src/site/apt/development_release.apt
+++ b/src/site/apt/development_release.apt
@@ -153,13 +153,25 @@ $ mvn release:perform
* close the staging repository at {{{https://repository.apache.org/}https://repository.apache.org/}}
+ * Log into the website and look at the "Staging Repositories".
+
+ * Find the VXQuery repository and click the "close" button.
+
+ * Add a message: "Apache VXQuery X.Y-rc#"
+
* check that the artifacts are available in the repository
* send out <<<[VOTE]>>> e-mail on dev@vxquery.apache.org
* {{{http://mail-archives.apache.org/mod_mbox/vxquery-dev/201409.mbox/%3CCAGZxfJUZDczuZR5jQResE4B7%2Bv4QQgwMpAd%2B-_Kt-U_RjCyReA%40mail.gmail.com%3E}example e-mail}}
- * after successful vote promote staging repository {{{https://repository.apache.org/}https://repository.apache.org/}}
+ * after successful vote release staging repository {{{https://repository.apache.org/}https://repository.apache.org/}}
+
+ * Log into the website and look at the "Staging Repositories".
+
+ * Find the VXQuery repository and click the "release" button.
+
+ * Add a message: "Apache VXQuery X.Y Release"
* add new source artifacts (archive + signature + hashes) to svn {{{https://dist.apache.org/repos/dist/release/vxquery}https://dist.apache.org/repos/dist/release/vxquery}} and remove old release dirctory
http://git-wip-us.apache.org/repos/asf/vxquery/blob/563c6b73/src/site/apt/user_get_started.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_get_started.apt b/src/site/apt/user_get_started.apt
new file mode 100644
index 0000000..f84c5e2
--- /dev/null
+++ b/src/site/apt/user_get_started.apt
@@ -0,0 +1,35 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one or more
+~~ contributor license agreements. See the NOTICE file distributed with
+~~ this work for additional information regarding copyright ownership.
+~~ The ASF licenses this file to You under the Apache License, Version 2.0
+~~ (the "License"); you may not use this file except in compliance with
+~~ the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "AS IS" BASIS,
+~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~~ See the License for the specific language governing permissions and
+~~ limitations under the License.
+
+Get Started with the VXQuery Community
+
+ The following steps outline how to get involved with Apache VXQuery community.
+ These steps will connect you with the community and give you a place to start with XQuery.
+
+ * Sign up for the dev mailing list.
+
+ * {{{http://vxquery.apache.org/mail-lists.html}Mailing list}}
+
+ * Download the latest release and run a few queries.
+
+ * {{{http://vxquery.apache.org/user_installation.html}Installation instructions}}.
+
+ * {{{http://vxquery.apache.org/user_query.html}Execute a query}}.
+
+ * If you want more information on XQuery:
+
+ * Go through the {{{http://www.w3schools.com/xquery/}W3Schools XQuery tutorial}}.
+
+ * Review the {{{http://www.w3.org/TR/xquery/}XQuery specification}}.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/563c6b73/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index fab70dc..3d10b94 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -53,13 +53,13 @@ limitations under the License.
<item
name="Download"
href="http://www.apache.org/dyn/closer.cgi/vxquery/" />
- <item
- name="Join the Community"
- href="join_the_community.html" />
</menu>
<menu name="For Users">
<item
+ name="Get Started"
+ href="user_get_started.html" />
+ <item
name="Installation"
href="user_installation.html" />
<item
@@ -72,6 +72,9 @@ limitations under the License.
<menu name="For Developers">
<item
+ name="Get Started"
+ href="developer_get_started.html" />
+ <item
name="Data Handling"
href="development_data_handling.html" />
<item
[08/12] vxquery git commit: Patch for VXQUERY-66 from Shivani Mall.
Posted by pr...@apache.org.
Patch for VXQUERY-66 from Shivani Mall.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/90ee8b8f
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/90ee8b8f
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/90ee8b8f
Branch: refs/heads/prestonc/xmark
Commit: 90ee8b8ffcfcc0f5eb682fae90f1d54e0fd22e05
Parents: 563c6b7
Author: Eldon Carman <ec...@ucr.edu>
Authored: Thu Mar 26 21:32:26 2015 -0700
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
.../functions/cast/CastToDecimalOperation.java | 43 ++++++++++++--------
.../functions/numeric/FnCeilingOperation.java | 6 ++-
.../functions/numeric/FnFloorOperation.java | 6 ++-
...FnRoundHalfToEvenScalarEvaluatorFactory.java | 25 ++++++++----
.../functions/numeric/FnRoundOperation.java | 2 +-
.../GhcndRecords/Partition-1/q03_records-1.txt | 3 ++
.../GhcndRecords/Partition-1/q03_records-2.txt | 3 ++
.../GhcndRecords/Partition-1/q03_records-3.txt | 3 ++
.../GhcndRecords/Partition-1/q03_records-4.txt | 3 ++
.../GhcndRecords/Partition-1/q03_records-5.txt | 3 ++
.../ExpectedTestResults/Numerics/fn_floor.txt | 8 ++++
.../Numerics/fn_round-half-to-even.txt | 16 ++++++++
.../ExpectedTestResults/Numerics/fn_round.txt | 8 ++++
.../Queries/XQuery/Numerics/fn_floor.xq | 22 ++++++++++
.../XQuery/Numerics/fn_round-half-to-even.xq | 39 ++++++++++++++++++
.../Queries/XQuery/Numerics/fn_round.xq | 22 ++++++++++
.../FunctionsAndOperatorsOnNumericsQueries.xml | 15 +++++++
.../cat/GhcndRecordsPartition1Queries.xml | 5 +++
18 files changed, 202 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java
index fde37b2..03a1e14 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToDecimalOperation.java
@@ -89,9 +89,7 @@ public class CastToDecimalOperation extends AbstractCastToOperation {
@Override
public void convertInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- dOut.write(ValueTag.XS_DECIMAL_TAG);
- dOut.write((byte) 0);
- dOut.writeLong(longp.getLong());
+ writeIntegerAsDecimal(longp, dOut);
}
@Override
@@ -179,57 +177,66 @@ public class CastToDecimalOperation extends AbstractCastToOperation {
* Derived Datatypes
*/
public void convertByte(BytePointable bytep, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(bytep, dOut);
+ writeIntegerAsDecimal(bytep, dOut);
}
public void convertInt(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(intp, dOut);
+ writeIntegerAsDecimal(intp, dOut);
}
public void convertLong(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(longp, dOut);
+ writeIntegerAsDecimal(longp, dOut);
}
public void convertNegativeInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(longp, dOut);
+ writeIntegerAsDecimal(longp, dOut);
}
public void convertNonNegativeInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(longp, dOut);
+ writeIntegerAsDecimal(longp, dOut);
}
public void convertNonPositiveInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(longp, dOut);
+ writeIntegerAsDecimal(longp, dOut);
}
public void convertPositiveInteger(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(longp, dOut);
+ writeIntegerAsDecimal(longp, dOut);
}
public void convertShort(ShortPointable shortp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(shortp, dOut);
+ writeIntegerAsDecimal(shortp, dOut);
}
public void convertUnsignedByte(ShortPointable shortp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(shortp, dOut);
+ writeIntegerAsDecimal(shortp, dOut);
}
public void convertUnsignedInt(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(longp, dOut);
+ writeIntegerAsDecimal(longp, dOut);
}
public void convertUnsignedLong(LongPointable longp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(longp, dOut);
+ writeIntegerAsDecimal(longp, dOut);
}
public void convertUnsignedShort(IntegerPointable intp, DataOutput dOut) throws SystemException, IOException {
- writeDecimalValue(intp, dOut);
+ writeIntegerAsDecimal(intp, dOut);
}
- private void writeDecimalValue(INumeric numericp, DataOutput dOut) throws SystemException, IOException {
+ private void writeIntegerAsDecimal(INumeric numericp, DataOutput dOut) throws SystemException, IOException {
+ byte decimalPlace = 0;
+ long value = numericp.longValue();
+
+ // Normalize the value and take off trailing zeros.
+ while (value != 0 && value % 10 == 0) {
+ value /= 10;
+ --decimalPlace;
+ }
+
dOut.write(ValueTag.XS_DECIMAL_TAG);
- dOut.write((byte) 0);
- dOut.writeLong(numericp.longValue());
+ dOut.write(decimalPlace);
+ dOut.writeLong(value);
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
index d7579e1..5916348 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnCeilingOperation.java
@@ -33,7 +33,11 @@ public class FnCeilingOperation extends AbstractNumericOperation {
public void operateDecimal(XSDecimalPointable decp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.write(0);
- dOut.writeLong((long) Math.ceil(decp.doubleValue()));
+ if (decp.getDecimalValue() > 0 && decp.getDecimalPlace() > 0) {
+ dOut.writeLong((long) (decp.getBeforeDecimalPlace()) + 1);
+ } else {
+ dOut.writeLong((long) (decp.getBeforeDecimalPlace()));
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
index a8675e7..6bdeeec 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnFloorOperation.java
@@ -33,7 +33,11 @@ public class FnFloorOperation extends AbstractNumericOperation {
public void operateDecimal(XSDecimalPointable decp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.write(0);
- dOut.writeLong(decp.getBeforeDecimalPlace());
+ if (decp.getDecimalValue() < 0 && decp.getDecimalPlace() > 0) {
+ dOut.writeLong((long) (decp.getBeforeDecimalPlace()) - 1);
+ } else {
+ dOut.writeLong((long) (decp.getBeforeDecimalPlace()));
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java
index 0ec2aa4..fbb07ab 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundHalfToEvenScalarEvaluatorFactory.java
@@ -99,28 +99,35 @@ public class FnRoundHalfToEvenScalarEvaluatorFactory extends AbstractTaggedValue
return;
}
break;
-
}
} catch (Exception e) {
throw new SystemException(ErrorCode.SYSE0001, e);
}
-
// Prepare input.
try {
getDecimalPointable(tp, tvp1);
} catch (IOException e) {
throw new SystemException(ErrorCode.SYSE0001, e);
}
-
// Perform rounding on decimal value.
- // TODO round half to the nearest even number.
- long decimalPlace = tp.decp.getDecimalPlace();
- if ((precision - decimalPlace) < 0) {
- long decimalValue = tp.decp.getDecimalValue();
- decimalValue = (long) (decimalValue / Math.pow(10, -(precision - decimalPlace)));
+ byte decimalPlace = tp.decp.getDecimalPlace();
+ long decimalValue = tp.decp.getDecimalValue();
+ long newValue;
+ //check if the input needs to rounded to even or normally
+ if (decimalPlace - precision == 1 && (Math.abs(decimalValue) % 10 == 5)) {
+ newValue = decimalValue / 10;
+ if (!(newValue % 2 == 0)) {
+ if (newValue > 0) {
+ newValue += 1;
+ } else {
+ newValue -= 1;
+ }
+ }
+ tp.decp.setDecimal(newValue, (byte) precision);
+ } else if ((precision - decimalPlace) < 0) {
+ decimalValue = (long) Math.round(decimalValue / Math.pow(10, -(precision - decimalPlace)));
tp.decp.setDecimal(decimalValue, (byte) precision);
}
-
// Return result.
try {
switch (tvp1.getTag()) {
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
index 90e5156..28ff1c4 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/numeric/FnRoundOperation.java
@@ -33,7 +33,7 @@ public class FnRoundOperation extends AbstractNumericOperation {
public void operateDecimal(XSDecimalPointable decp, DataOutput dOut) throws SystemException, IOException {
dOut.write(ValueTag.XS_DECIMAL_TAG);
dOut.write(0);
- dOut.writeLong(Math.round(decp.doubleValue()));
+ dOut.writeLong((long) (decp.getBeforeDecimalPlaceRounded()));
}
@Override
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-1.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-1.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-1.txt
new file mode 100644
index 0000000..b1db973
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-1.txt
@@ -0,0 +1,3 @@
+<value>33</value>
+<value>32</value>
+<value>31</value>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-2.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-2.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-2.txt
new file mode 100644
index 0000000..d93567e
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-2.txt
@@ -0,0 +1,3 @@
+<value>33</value>
+<value>31</value>
+<value>32</value>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-3.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-3.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-3.txt
new file mode 100644
index 0000000..2ab8764
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-3.txt
@@ -0,0 +1,3 @@
+<value>32</value>
+<value>33</value>
+<value>31</value>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-4.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-4.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-4.txt
new file mode 100644
index 0000000..d1d6bb7
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-4.txt
@@ -0,0 +1,3 @@
+<value>32</value>
+<value>31</value>
+<value>33</value>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-5.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-5.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-5.txt
new file mode 100644
index 0000000..2044b18
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/GhcndRecords/Partition-1/q03_records-5.txt
@@ -0,0 +1,3 @@
+<value>31</value>
+<value>33</value>
+<value>32</value>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_floor.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_floor.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_floor.txt
new file mode 100644
index 0000000..194ba86
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_floor.txt
@@ -0,0 +1,8 @@
+5
+5
+5
+5
+-6
+-5
+-6
+-6
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_round-half-to-even.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_round-half-to-even.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_round-half-to-even.txt
new file mode 100644
index 0000000..c3d7781
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_round-half-to-even.txt
@@ -0,0 +1,16 @@
+5.2
+5
+5.2
+5.2
+-5.2
+-5
+-5.2
+-5.2
+400
+400
+400
+400
+500
+500
+500
+500
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_round.txt
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_round.txt b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_round.txt
new file mode 100644
index 0000000..063f1da
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/ExpectedTestResults/Numerics/fn_round.txt
@@ -0,0 +1,8 @@
+6
+5
+6
+6
+-5
+-5
+-6
+-5
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_floor.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_floor.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_floor.xq
new file mode 100644
index 0000000..a48d0e6
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_floor.xq
@@ -0,0 +1,22 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery fn:floor :)
+(
+ fn:floor(xs:decimal(5.5)), fn:floor(xs:integer(5)), fn:floor(xs:float(5.5)), fn:floor(xs:double(5.5)),
+ fn:floor(xs:decimal(-5.5)), fn:floor(xs:integer(-5)), fn:floor(xs:float(-5.5)), fn:floor(xs:double(-5.5))
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_round-half-to-even.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_round-half-to-even.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_round-half-to-even.xq
new file mode 100644
index 0000000..79c9064
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_round-half-to-even.xq
@@ -0,0 +1,39 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery fn:round-half-to-even :)
+(
+ fn:round-half-to-even(xs:decimal(5.15), 1),
+ fn:round-half-to-even(xs:integer(5), 1),
+ fn:round-half-to-even(xs:float(5.15), 1),
+ fn:round-half-to-even(xs:double(5.15), 1),
+
+ fn:round-half-to-even(xs:decimal(-5.15), 1),
+ fn:round-half-to-even(xs:integer(-5), 1),
+ fn:round-half-to-even(xs:float(-5.15), 1),
+ fn:round-half-to-even(xs:double(-5.15), 1),
+
+ fn:round-half-to-even(xs:decimal(450), -2),
+ fn:round-half-to-even(xs:integer(450), -2),
+ fn:round-half-to-even(xs:float(450), -2),
+ fn:round-half-to-even(xs:double(450), -2),
+
+ fn:round-half-to-even(xs:decimal(460), -2),
+ fn:round-half-to-even(xs:integer(460), -2),
+ fn:round-half-to-even(xs:float(460), -2),
+ fn:round-half-to-even(xs:double(460), -2)
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_round.xq
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_round.xq b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_round.xq
new file mode 100644
index 0000000..7bded3a
--- /dev/null
+++ b/vxquery-xtest/src/test/resources/Queries/XQuery/Numerics/fn_round.xq
@@ -0,0 +1,22 @@
+(: Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License. :)
+
+(: XQuery fn:round :)
+(
+ fn:round(xs:decimal(5.5)), fn:round(xs:integer(5)), fn:round(xs:float(5.5)), fn:round(xs:double(5.5)),
+ fn:round(xs:decimal(-5.5)), fn:round(xs:integer(-5)), fn:floor(xs:float(-5.5)), fn:round(xs:double(-5.5))
+)
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml b/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
index 4b6555d..aacc9ea 100644
--- a/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
+++ b/vxquery-xtest/src/test/resources/cat/FunctionsAndOperatorsOnNumericsQueries.xml
@@ -30,4 +30,19 @@
<query name="fn_ceiling" date="2015-01-05"/>
<output-file compare="Text">fn_ceiling.txt</output-file>
</test-case>
+ <test-case name="functions-and-operators-on-numerics-fn_round-half-to-even" FilePath="Numerics/" Creator="Shivani Mall">
+ <description>Query for fn:round-half-to-even with all numeric types.</description>
+ <query name="fn_round-half-to-even" date="2015-02-25"/>
+ <output-file compare="Text">fn_round-half-to-even.txt</output-file>
+ </test-case>
+ <test-case name="functions-and-operators-on-numerics-fn_round" FilePath="Numerics/" Creator="Shivani Mall">
+ <description>Query for fn:round with all numeric types.</description>
+ <query name="fn_round" date="2015-02-25"/>
+ <output-file compare="Text">fn_round.txt</output-file>
+ </test-case>
+ <test-case name="functions-and-operators-on-numerics-fn_floor" FilePath="Numerics/" Creator="Shivani Mall">
+ <description>Query for fn:floor with all numeric types.</description>
+ <query name="fn_floor" date="2015-02-25"/>
+ <output-file compare="Text">fn_floor.txt</output-file>
+ </test-case>
</test-group>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/vxquery/blob/90ee8b8f/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
index 65ca953..f55153c 100644
--- a/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
+++ b/vxquery-xtest/src/test/resources/cat/GhcndRecordsPartition1Queries.xml
@@ -29,6 +29,11 @@
<description>Count records returned for q03 from the weather benchmark with 1 partition.</description>
<query name="q03_records" date="2014-04-01"/>
<output-file compare="Text">q03_records.txt</output-file>
+ <output-file compare="Text">q03_records-1.txt</output-file>
+ <output-file compare="Text">q03_records-2.txt</output-file>
+ <output-file compare="Text">q03_records-3.txt</output-file>
+ <output-file compare="Text">q03_records-4.txt</output-file>
+ <output-file compare="Text">q03_records-5.txt</output-file>
</test-case>
<test-case name="ghcnd-records-partition-1-q05" FilePath="GhcndRecords/Partition-1/" Creator="Preston Carman">
<description>Count records returned for q05 from the weather benchmark with 1 partition.</description>
[10/12] vxquery git commit: Fixed a few bugs with documentation and
bad arguments.
Posted by pr...@apache.org.
Fixed a few bugs with documentation and bad arguments.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/054369a6
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/054369a6
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/054369a6
Branch: refs/heads/prestonc/xmark
Commit: 054369a634bdbad59980dc6a3a0bb41a1ae9209d
Parents: 90ee8b8
Author: Eldon Carman <ec...@ucr.edu>
Authored: Fri Mar 27 13:24:41 2015 -0700
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
src/site/apt/user_running_tests.apt | 10 +++++-----
.../runtime/functions/cast/CastToStringOperation.java | 1 +
.../apache/vxquery/xtest/AbstractTestCaseFactory.java | 12 ++++++++----
3 files changed, 14 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/054369a6/src/site/apt/user_running_tests.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt
index d10bd7e..d5e97b2 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -72,11 +72,11 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/src/test
To run the complete XQTS on VXQuery.
* Create a folder to hold the XQTS.
- If you use "vxquery-xtest/test-suite/xqts", then maven will utilize the XQTS to verify VXQuery's passing functions during the build process.
+ If you use "vxquery-xtest/test-suites/xqts", then maven will utilize the XQTS to verify VXQuery's passing functions during the build process.
----------------------------------------
-$ mkdir -p vxquery-xtest/test-suite
-$ cd vxquery-xtest/test-suite
+$ mkdir -p vxquery-xtest/test-suites
+$ cd vxquery-xtest/test-suites
----------------------------------------
* Get the archive {{{http://dev.w3.org/2006/xquery-test-suite/PublicPagesStagingArea/XQTS_1_0_3.zip}XQTS_1_0_3.zip}} (e.g. using wget),
@@ -103,7 +103,7 @@ $ cd ../..
* run the tests, and
----------------------------------------
-sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suite/xqts/XQTSCatalog.xml -htmlreport /tmp/full_report.html
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -htmlreport /tmp/full_report.html
----------------------------------------
* view the results at {{{file:///tmp/full_report.html}file:///tmp/full_report.html}}.
@@ -118,7 +118,7 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-sui
* run the tests, and
----------------------------------------
-sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suite/xqts/XQTSCatalog.xml -htmlreport /tmp/previous_report.html -previous-test-results vxquery-xtest/results/xqts.txt
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-suites/xqts/XQTSCatalog.xml -htmlreport /tmp/previous_report.html -previous-test-results vxquery-xtest/results/xqts.txt
----------------------------------------
* view the results at {{{file:///tmp/previous_report.html}file:///tmp/previous_report.html}}.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/054369a6/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
----------------------------------------------------------------------
diff --git a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
index 90c6218..3cbcd5b 100644
--- a/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
+++ b/vxquery-core/src/main/java/org/apache/vxquery/runtime/functions/cast/CastToStringOperation.java
@@ -69,6 +69,7 @@ public class CastToStringOperation extends AbstractCastToOperation {
@Override
public void convertBase64Binary(XSBinaryPointable binaryp, DataOutput dOut) throws SystemException, IOException {
baaos.reset();
+ @SuppressWarnings("resource")
Base64OutputStream b64os = new Base64OutputStream(baaos, true);
b64os.write(binaryp.getByteArray(), binaryp.getStartOffset() + 2, binaryp.getLength() - 2);
http://git-wip-us.apache.org/repos/asf/vxquery/blob/054369a6/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
----------------------------------------------------------------------
diff --git a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
index 31e45d7..5bcfd6b 100644
--- a/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
+++ b/vxquery-xtest/src/main/java/org/apache/vxquery/xtest/AbstractTestCaseFactory.java
@@ -117,9 +117,13 @@ public abstract class AbstractTestCaseFactory {
+ new File(url.getFile()).getCanonicalPath().substring(currPathLen));
}
});
- FileReader characterStream = new FileReader(catalog);
- parser.parse(new InputSource(characterStream));
- characterStream.close();
+ try {
+ FileReader characterStream = new FileReader(catalog);
+ parser.parse(new InputSource(characterStream));
+ characterStream.close();
+ } catch (FileNotFoundException e) {
+ System.err.println("Test Catalog has not been found: " + catalog.getAbsolutePath());
+ }
return count;
}
@@ -131,7 +135,7 @@ public abstract class AbstractTestCaseFactory {
}
return toSubmit;
}
-
+
protected abstract void submit(TestCase tc);
protected class Handler implements ContentHandler {
[05/12] vxquery git commit: Added a join the community link with
instructions on basic steps.
Posted by pr...@apache.org.
Added a join the community link with instructions on basic steps.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/73106328
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/73106328
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/73106328
Branch: refs/heads/prestonc/xmark
Commit: 73106328761c3faaec04e015455e65551318b7e4
Parents: f7bd349
Author: Eldon Carman <ec...@ucr.edu>
Authored: Thu Mar 5 16:02:43 2015 -0800
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
src/site/apt/development_eclipse_setup.apt | 4 +
src/site/apt/development_release.apt | 205 ++++++++++++++++++++++++
src/site/apt/join_the_community.apt | 61 +++++++
src/site/apt/release.apt | 205 ------------------------
src/site/site.xml | 5 +-
5 files changed, 274 insertions(+), 206 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/73106328/src/site/apt/development_eclipse_setup.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_eclipse_setup.apt b/src/site/apt/development_eclipse_setup.apt
index cf259b3..14b30bd 100644
--- a/src/site/apt/development_eclipse_setup.apt
+++ b/src/site/apt/development_eclipse_setup.apt
@@ -20,11 +20,15 @@ Eclipse Setup
* Installation
+ * Install Java Development Kit (JDK) 1.7 or Later
+
* Install Classic Eclipse
Follow the instruction for eclipse on from {{{http://www.eclipse.org}www.eclipse.org}} for
the "Classic" eclipse version.
+ * Install Apache Maven
+
* Install Maven Integration (m2e)
VXQuery uses {{{http://maven.apache.org/}Maven}} to define external libraries and build instructions.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/73106328/src/site/apt/development_release.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/development_release.apt b/src/site/apt/development_release.apt
new file mode 100644
index 0000000..6071b8e
--- /dev/null
+++ b/src/site/apt/development_release.apt
@@ -0,0 +1,205 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one or more
+~~ contributor license agreements. See the NOTICE file distributed with
+~~ this work for additional information regarding copyright ownership.
+~~ The ASF licenses this file to You under the Apache License, Version 2.0
+~~ (the "License"); you may not use this file except in compliance with
+~~ the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "AS IS" BASIS,
+~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~~ See the License for the specific language governing permissions and
+~~ limitations under the License.
+
+Releasing Apache VXQuery\x99
+
+* One time steps
+
+ * set up directory structure
+
+ There usually are 3 directories at the same level
+
+ * the source directory <<<vxquery>>>,
+
+ * the <<<site>>> directory, and
+
+ * the distribution directory <<<dist>>>.
+
+ The source directory is version-controlled by <<<git>>>, the other two
+ are version controlled by <<<svn>>>.
+ While the source directory and the distribution directory can have
+ arbitrary names and locations, the <<<site>>> directory has to be called
+ <<<site>>> and it needs to be at the same level as the source directory
+ to enable site deployment.
+
+ Assuming that the source directory is available one can create the
+ directory structure by going to the directory that contains the
+ source directory and checking out the distribution and site
+ directories:
+
+---
+$ svn co https://dist.apache.org/repos/dist/release/vxquery dist
+$ svn co https://svn.apache.org/repos/asf/vxquery/site
+---
+
+ * create a code signing key with the Apache {{{http://www.apache.org/dev/openpgp.html#generate-key}instructions}} and example settings
+
+ * add your key to the <<<KEYS>>> file
+
+ Change into the <<<dist>>> directory and run
+
+---
+(gpg2 --list-sigs <your name> && gpg2 --armor --export <your name>) >> KEYS
+---
+
+ and then check the new <<<KEYS>>> file into svn
+
+---
+$ svn ci -m "add [YOUR NAME]'s key to KEYS file"
+---
+
+ * create an encrypted version of your Apache LDAP password for the nexus repository at {{{https://repository.apache.org/}https://repository.apache.org/}}
+
+ Follow the steps in the {{{http://maven.apache.org/guides/mini/guide-encryption.html}Password Encryption}}
+ guide to encrypt a master password and to encrypt your Apache LDAP password.
+ (It's nicer if you have maven > 3.2.1 to do this.)
+
+ * add to <<<~/.m2/settings.xml>>>
+
+ * for the upload to the nexus repository
+
+---
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+ http://maven.apache.org/xsd/settings-1.0.0.xsd">
+...
+ <servers>
+ ...
+ <!-- To publish a snapshot of some part of Maven -->
+ <server>
+ <id>apache.snapshots.https</id>
+ <username>[YOUR APACHE LDAP USERNAME]</username>
+ <password>[YOUR APACHE LDAP PASSWORD (encrypted)]</password>
+ </server>
+ <!-- To stage a release of some part of Maven -->
+ <server>
+ <id>apache.releases.https</id>
+ <username>[YOUR APACHE LDAP USERNAME]</username>
+ <password>[YOUR APACHE LDAP PASSWORD (encrypted)]</password>
+ </server>
+ ...
+ </servers>
+...
+</settings>
+---
+
+ * to sign the artifacts
+
+---
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <properties>
+ <gpg.executable>gpg2</gpg.executable>
+ <gpg.passphrase>...</gpg.passphrase>
+ </properties>
+ </profile>
+ </profiles>
+---
+
+ * Download Apache Rat from {{{https://creadur.apache.org/rat/download_rat.cgi}https://creadur.apache.org/rat/download_rat.cgi}}.
+
+ * Add your ssh key to {{{https://id.apache.org}id.apache.org}} (required to create a website on {{{https://people.apache.org}people.apache.org}}).
+
+ * Login and update your profile details.
+
+* Each time steps
+
+ * clean up
+
+---
+$ mvn clean
+---
+
+ * run rat (always do this on a clean source folder):
+
+---
+$ java -jar ~/Downloads/apache-rat-0.11/apache-rat-0.11.jar -d . -E .rat-excludes
+---
+
+ * test your setup
+
+---
+$ mvn install -Papache-release
+---
+
+ * dry run of the release process
+
+---
+$ mvn release:prepare -DdryRun=true
+---
+
+ * check (and fix) the content of the <<<LICENSE>>> and <<<NOTICE>>> files (especially the date) and the copyright dates in changed files
+
+ * release to the staging repository
+
+---
+$ mvn release:prepare
+$ mvn release:perform
+---
+
+ * close the staging repository at {{{https://repository.apache.org/}https://repository.apache.org/}}
+
+ * check that the artifacts are available in the repository
+
+ * send out <<<[VOTE]>>> e-mail on dev@vxquery.apache.org
+
+ * {{{http://mail-archives.apache.org/mod_mbox/vxquery-dev/201409.mbox/%3CCAGZxfJUZDczuZR5jQResE4B7%2Bv4QQgwMpAd%2B-_Kt-U_RjCyReA%40mail.gmail.com%3E}example e-mail}}
+
+ * after successful vote promote staging repository {{{https://repository.apache.org/}https://repository.apache.org/}}
+
+ * add new source artifacts (archive + signature + hashes) to svn {{{https://dist.apache.org/repos/dist/release/vxquery}https://dist.apache.org/repos/dist/release/vxquery}} and remove old release dirctory
+
+ * commit changes to svn
+
+ * update the <<<site>>> branch in git from the from the release-tag
+
+ * build a new site and deploy it to <<<../site>>>
+
+---
+$ mvn site site:deploy
+---
+
+ * submit the site to svn
+
+---
+$ cd ../site
+$ svn st | awk '/\?/ { print $2 }' | xargs svn add # add all new files
+$ svn ci -m"updated site"
+$ cd -
+---
+
+ * wait a few days for the mirroring of the release artifacts
+
+ * send <<<[ANNOUNCE]>>> e-mail to announce@apache.org and dev@vxquery.apache.org
+
+ * {{{http://mail-archives.apache.org/mod_mbox/www-announce/201405.mbox/%3C537AD473.9080505@apache.org%3E}example e-mail}}
+
+* References
+
+ * {{{https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven}How To Generate PGP Signatures With Maven}}
+
+ * {{{https://www.apache.org/dev/publishing-maven-artifacts.html}Publishing Maven Artifacts}}
+
+~~ * Handling issues
+~~
+~~ ** Undo release plugin:
+~~
+~~ ---
+~~ $ svn merge -r 1526098:1524606 https://svn.apache.org/repos/asf/vxquery/branches/vxquery_0_2_staging
+~~ $ svn del -m "re-releasing build" https://svn.apache.org/repos/asf/vxquery/tags/apache-vxquery-0.2-incubating
+~~ ---
+
http://git-wip-us.apache.org/repos/asf/vxquery/blob/73106328/src/site/apt/join_the_community.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/join_the_community.apt b/src/site/apt/join_the_community.apt
new file mode 100644
index 0000000..75c6b07
--- /dev/null
+++ b/src/site/apt/join_the_community.apt
@@ -0,0 +1,61 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one or more
+~~ contributor license agreements. See the NOTICE file distributed with
+~~ this work for additional information regarding copyright ownership.
+~~ The ASF licenses this file to You under the Apache License, Version 2.0
+~~ (the "License"); you may not use this file except in compliance with
+~~ the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing, software
+~~ distributed under the License is distributed on an "AS IS" BASIS,
+~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+~~ See the License for the specific language governing permissions and
+~~ limitations under the License.
+
+Joining the Apache VXQuery Community
+
+ The following steps are here to help new Apache VXQuery developer get up to speed.
+ These steps will connect you with the community and give you a place to start.
+
+* Community Member
+
+ * Sign up for the mailing list: dev@vxquery.apache.org
+
+ * Download the latest release and run a few queries.
+
+ * {{{http://vxquery.apache.org/user_installation.html}Installation instructions}}.
+
+ * {{{http://vxquery.apache.org/user_query.html}Execute a query}}.
+
+ * If you want more information on XQuery:
+
+ * Go through the {{{http://www.w3schools.com/xquery/}W3Schools XQuery tutorial}}.
+
+ * Review the {{{http://www.w3.org/TR/xquery/}XQuery specification}}.
+
+* Developer
+
+ * Go through the community member steps.
+
+ * Setup your eclipse development environment.
+
+ * {{{http://vxquery.apache.org/development_eclipse_setup.html}Setup instructions}}.
+
+ * XQuery has a test suite to verify XQuery specifications.
+
+ * Run the test suite for XQTS.
+
+ * {{{http://vxquery.apache.org/user_running_tests.html}Testing instructions}}.
+
+ * Review the test structure.
+
+ * Code is found in the "VXQuery XTest" module.
+
+ * Review open issues for the project.
+
+ * {{{http://vxquery.apache.org/issue-tracking.html}Issues list}}.
+
+
+
+
http://git-wip-us.apache.org/repos/asf/vxquery/blob/73106328/src/site/apt/release.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/release.apt b/src/site/apt/release.apt
deleted file mode 100644
index 6071b8e..0000000
--- a/src/site/apt/release.apt
+++ /dev/null
@@ -1,205 +0,0 @@
-~~ Licensed to the Apache Software Foundation (ASF) under one or more
-~~ contributor license agreements. See the NOTICE file distributed with
-~~ this work for additional information regarding copyright ownership.
-~~ The ASF licenses this file to You under the Apache License, Version 2.0
-~~ (the "License"); you may not use this file except in compliance with
-~~ the License. You may obtain a copy of the License at
-~~
-~~ http://www.apache.org/licenses/LICENSE-2.0
-~~
-~~ Unless required by applicable law or agreed to in writing, software
-~~ distributed under the License is distributed on an "AS IS" BASIS,
-~~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-~~ See the License for the specific language governing permissions and
-~~ limitations under the License.
-
-Releasing Apache VXQuery\x99
-
-* One time steps
-
- * set up directory structure
-
- There usually are 3 directories at the same level
-
- * the source directory <<<vxquery>>>,
-
- * the <<<site>>> directory, and
-
- * the distribution directory <<<dist>>>.
-
- The source directory is version-controlled by <<<git>>>, the other two
- are version controlled by <<<svn>>>.
- While the source directory and the distribution directory can have
- arbitrary names and locations, the <<<site>>> directory has to be called
- <<<site>>> and it needs to be at the same level as the source directory
- to enable site deployment.
-
- Assuming that the source directory is available one can create the
- directory structure by going to the directory that contains the
- source directory and checking out the distribution and site
- directories:
-
----
-$ svn co https://dist.apache.org/repos/dist/release/vxquery dist
-$ svn co https://svn.apache.org/repos/asf/vxquery/site
----
-
- * create a code signing key with the Apache {{{http://www.apache.org/dev/openpgp.html#generate-key}instructions}} and example settings
-
- * add your key to the <<<KEYS>>> file
-
- Change into the <<<dist>>> directory and run
-
----
-(gpg2 --list-sigs <your name> && gpg2 --armor --export <your name>) >> KEYS
----
-
- and then check the new <<<KEYS>>> file into svn
-
----
-$ svn ci -m "add [YOUR NAME]'s key to KEYS file"
----
-
- * create an encrypted version of your Apache LDAP password for the nexus repository at {{{https://repository.apache.org/}https://repository.apache.org/}}
-
- Follow the steps in the {{{http://maven.apache.org/guides/mini/guide-encryption.html}Password Encryption}}
- guide to encrypt a master password and to encrypt your Apache LDAP password.
- (It's nicer if you have maven > 3.2.1 to do this.)
-
- * add to <<<~/.m2/settings.xml>>>
-
- * for the upload to the nexus repository
-
----
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
- http://maven.apache.org/xsd/settings-1.0.0.xsd">
-...
- <servers>
- ...
- <!-- To publish a snapshot of some part of Maven -->
- <server>
- <id>apache.snapshots.https</id>
- <username>[YOUR APACHE LDAP USERNAME]</username>
- <password>[YOUR APACHE LDAP PASSWORD (encrypted)]</password>
- </server>
- <!-- To stage a release of some part of Maven -->
- <server>
- <id>apache.releases.https</id>
- <username>[YOUR APACHE LDAP USERNAME]</username>
- <password>[YOUR APACHE LDAP PASSWORD (encrypted)]</password>
- </server>
- ...
- </servers>
-...
-</settings>
----
-
- * to sign the artifacts
-
----
- <profiles>
- <profile>
- <id>apache-release</id>
- <properties>
- <gpg.executable>gpg2</gpg.executable>
- <gpg.passphrase>...</gpg.passphrase>
- </properties>
- </profile>
- </profiles>
----
-
- * Download Apache Rat from {{{https://creadur.apache.org/rat/download_rat.cgi}https://creadur.apache.org/rat/download_rat.cgi}}.
-
- * Add your ssh key to {{{https://id.apache.org}id.apache.org}} (required to create a website on {{{https://people.apache.org}people.apache.org}}).
-
- * Login and update your profile details.
-
-* Each time steps
-
- * clean up
-
----
-$ mvn clean
----
-
- * run rat (always do this on a clean source folder):
-
----
-$ java -jar ~/Downloads/apache-rat-0.11/apache-rat-0.11.jar -d . -E .rat-excludes
----
-
- * test your setup
-
----
-$ mvn install -Papache-release
----
-
- * dry run of the release process
-
----
-$ mvn release:prepare -DdryRun=true
----
-
- * check (and fix) the content of the <<<LICENSE>>> and <<<NOTICE>>> files (especially the date) and the copyright dates in changed files
-
- * release to the staging repository
-
----
-$ mvn release:prepare
-$ mvn release:perform
----
-
- * close the staging repository at {{{https://repository.apache.org/}https://repository.apache.org/}}
-
- * check that the artifacts are available in the repository
-
- * send out <<<[VOTE]>>> e-mail on dev@vxquery.apache.org
-
- * {{{http://mail-archives.apache.org/mod_mbox/vxquery-dev/201409.mbox/%3CCAGZxfJUZDczuZR5jQResE4B7%2Bv4QQgwMpAd%2B-_Kt-U_RjCyReA%40mail.gmail.com%3E}example e-mail}}
-
- * after successful vote promote staging repository {{{https://repository.apache.org/}https://repository.apache.org/}}
-
- * add new source artifacts (archive + signature + hashes) to svn {{{https://dist.apache.org/repos/dist/release/vxquery}https://dist.apache.org/repos/dist/release/vxquery}} and remove old release dirctory
-
- * commit changes to svn
-
- * update the <<<site>>> branch in git from the from the release-tag
-
- * build a new site and deploy it to <<<../site>>>
-
----
-$ mvn site site:deploy
----
-
- * submit the site to svn
-
----
-$ cd ../site
-$ svn st | awk '/\?/ { print $2 }' | xargs svn add # add all new files
-$ svn ci -m"updated site"
-$ cd -
----
-
- * wait a few days for the mirroring of the release artifacts
-
- * send <<<[ANNOUNCE]>>> e-mail to announce@apache.org and dev@vxquery.apache.org
-
- * {{{http://mail-archives.apache.org/mod_mbox/www-announce/201405.mbox/%3C537AD473.9080505@apache.org%3E}example e-mail}}
-
-* References
-
- * {{{https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven}How To Generate PGP Signatures With Maven}}
-
- * {{{https://www.apache.org/dev/publishing-maven-artifacts.html}Publishing Maven Artifacts}}
-
-~~ * Handling issues
-~~
-~~ ** Undo release plugin:
-~~
-~~ ---
-~~ $ svn merge -r 1526098:1524606 https://svn.apache.org/repos/asf/vxquery/branches/vxquery_0_2_staging
-~~ $ svn del -m "re-releasing build" https://svn.apache.org/repos/asf/vxquery/tags/apache-vxquery-0.2-incubating
-~~ ---
-
http://git-wip-us.apache.org/repos/asf/vxquery/blob/73106328/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 430945a..fab70dc 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -53,6 +53,9 @@ limitations under the License.
<item
name="Download"
href="http://www.apache.org/dyn/closer.cgi/vxquery/" />
+ <item
+ name="Join the Community"
+ href="join_the_community.html" />
</menu>
<menu name="For Users">
@@ -79,7 +82,7 @@ limitations under the License.
href="development_eclipse_setup.html" />
<item
name="Release Steps"
- href="release.html" />
+ href="development_release.html" />
<item
name="Update Local Git XQTS Results"
href="development_update_xqts_results.html" />
[07/12] vxquery git commit: [maven-release-plugin] rollback the
release of apache-vxquery-0.5
Posted by pr...@apache.org.
[maven-release-plugin] rollback the release of apache-vxquery-0.5
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/50394de0
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/50394de0
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/50394de0
Branch: refs/heads/prestonc/xmark
Commit: 50394de092e70a52f340cc1c211d753cb0912e32
Parents: bb3aea4
Author: Eldon Carman <ec...@ucr.edu>
Authored: Mon Mar 2 16:31:17 2015 -0800
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
pom.xml | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/50394de0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 8c6f21b..5b4a15d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -378,31 +378,11 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>enforce-java</id>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <requireJavaVersion>
- <version>1.7.0</version>
- </requireJavaVersion>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-install-plugin</artifactId>
<configuration>
<createChecksum>true</createChecksum>
[09/12] vxquery git commit: Updated years in NOTICE.
Posted by pr...@apache.org.
Updated years in NOTICE.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/d7e7e067
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/d7e7e067
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/d7e7e067
Branch: refs/heads/prestonc/xmark
Commit: d7e7e0670d5113598e6287fdcc8baf9a9c488280
Parents: 50394de
Author: Eldon Carman <ec...@ucr.edu>
Authored: Mon Mar 2 16:35:44 2015 -0800
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
NOTICE | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/d7e7e067/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index a520fd2..d105749 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache VXQuery
-Copyright 2009-2014 The Apache Software Foundation
+Copyright 2009-2015 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
[06/12] vxquery git commit: A few more site edits for running tests.
Posted by pr...@apache.org.
A few more site edits for running tests.
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/bb3aea48
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/bb3aea48
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/bb3aea48
Branch: refs/heads/prestonc/xmark
Commit: bb3aea48bd3fb8a4e1c778581300f523d0b8195d
Parents: 6ec0702
Author: Eldon Carman <ec...@ucr.edu>
Authored: Mon Mar 2 10:35:36 2015 -0800
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
src/site/apt/user_running_tests.apt | 12 ++++++++++--
src/site/site.xml | 4 ++--
2 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/bb3aea48/src/site/apt/user_running_tests.apt
----------------------------------------------------------------------
diff --git a/src/site/apt/user_running_tests.apt b/src/site/apt/user_running_tests.apt
index d87de9e..d10bd7e 100644
--- a/src/site/apt/user_running_tests.apt
+++ b/src/site/apt/user_running_tests.apt
@@ -63,8 +63,10 @@ JAVA_OPTS="-Xmx1024m -Djava.util.logging.config.file=/path/to/logging.properties
The VXQuery test suite focuses on parallel processing tests used in our weather benchmark.
----------------------------------------
-sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/src/test/resources/VXQueryCatalog.xml -htmlreport /tmp/full_report.html
+sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/src/test/resources/VXQueryCatalog.xml -htmlreport /tmp/vxquery_report.html
----------------------------------------
+
+ * view the results at {{{file:///tmp/vxquery_report.html}file:///tmp/vxquery_report.html}}.
* XQTS (XQuery Test Suite)
To run the complete XQTS on VXQuery.
@@ -92,6 +94,12 @@ $ unzip ../XQTS_1_0_3.zip
$ cd ..
----------------------------------------
+ * go back to the project root,
+
+----------------------------------------
+$ cd ../..
+----------------------------------------
+
* run the tests, and
----------------------------------------
@@ -100,7 +108,7 @@ sh ./vxquery-xtest/target/appassembler/bin/xtest -catalog vxquery-xtest/test-sui
* view the results at {{{file:///tmp/full_report.html}file:///tmp/full_report.html}}.
- * Add JAVA_OPTS for additional java parameters.
+ * Optional: Add JAVA_OPTS for additional java parameters.
* XQTS (XQuery Test Suite) Option 2
The following command will run the XQTS for test that are known to pass in VXQuery.
http://git-wip-us.apache.org/repos/asf/vxquery/blob/bb3aea48/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 78e6651..430945a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -83,9 +83,9 @@ limitations under the License.
<item
name="Update Local Git XQTS Results"
href="development_update_xqts_results.html" />
- <item
+ <!-- <item
name="XQuery Benchmarks"
- href="development_benchmarks.html" />
+ href="development_benchmarks.html" /> -->
</menu>
<menu ref="reports" />
[03/12] vxquery git commit: [maven-release-plugin] prepare release
apache-vxquery-0.5
Posted by pr...@apache.org.
[maven-release-plugin] prepare release apache-vxquery-0.5
Project: http://git-wip-us.apache.org/repos/asf/vxquery/repo
Commit: http://git-wip-us.apache.org/repos/asf/vxquery/commit/26ab38f6
Tree: http://git-wip-us.apache.org/repos/asf/vxquery/tree/26ab38f6
Diff: http://git-wip-us.apache.org/repos/asf/vxquery/diff/26ab38f6
Branch: refs/heads/prestonc/xmark
Commit: 26ab38f65b11f525577b68f1db4313dfaf114491
Parents: d7e7e06
Author: Eldon Carman <ec...@ucr.edu>
Authored: Mon Mar 2 16:58:30 2015 -0800
Committer: Eldon Carman <ec...@ucr.edu>
Committed: Wed Apr 1 11:34:54 2015 -0700
----------------------------------------------------------------------
pom.xml | 9 +++-----
vxquery-benchmark/pom.xml | 7 ++-----
vxquery-cli/pom.xml | 9 +++-----
vxquery-core/pom.xml | 47 +++++++++++-------------------------------
vxquery-server/pom.xml | 9 +++-----
vxquery-xtest/pom.xml | 9 +++-----
6 files changed, 26 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/vxquery/blob/26ab38f6/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5b4a15d..2719aa5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,10 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
@@ -29,7 +26,7 @@
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
<packaging>pom</packaging>
<name>VXQuery</name>
<description>A Versatile XQuery Processor</description>
@@ -53,7 +50,7 @@
<connection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</connection>
<developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/vxquery.git</developerConnection>
<url>https://git-wip-us.apache.org/repos/asf/vxquery.git</url>
- <tag>HEAD</tag>
+ <tag>apache-vxquery-0.5</tag>
</scm>
<issueManagement>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/26ab38f6/vxquery-benchmark/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-benchmark/pom.xml b/vxquery-benchmark/pom.xml
index 5abc500..08e7156 100644
--- a/vxquery-benchmark/pom.xml
+++ b/vxquery-benchmark/pom.xml
@@ -14,16 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
</parent>
<artifactId>apache-vxquery-benchmark</artifactId>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/26ab38f6/vxquery-cli/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-cli/pom.xml b/vxquery-cli/pom.xml
index b5144d1..7cb74be 100644
--- a/vxquery-cli/pom.xml
+++ b/vxquery-cli/pom.xml
@@ -14,16 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
</parent>
<artifactId>apache-vxquery-cli</artifactId>
@@ -86,7 +83,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
<scope>compile</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/26ab38f6/vxquery-core/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-core/pom.xml b/vxquery-core/pom.xml
index dc278ed..6b63e87 100644
--- a/vxquery-core/pom.xml
+++ b/vxquery-core/pom.xml
@@ -14,16 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
</parent>
<artifactId>apache-vxquery-core</artifactId>
@@ -65,21 +62,11 @@
<phase>generate-sources</phase>
<configuration>
<target>
- <ant
- antfile="build-xslt.xml"
- target="build">
- <property
- name="build.gen-src.dir"
- value="${project.build.directory}/generated-sources/main/java" />
- <property
- name="src.code.dir"
- value="${basedir}/src/main/java" />
- <property
- name="xslt.dir"
- value="${basedir}/src/main/xslt" />
- <property
- name="classpath.xslt"
- refid="maven.compile.classpath" />
+ <ant antfile="build-xslt.xml" target="build">
+ <property name="build.gen-src.dir" value="${project.build.directory}/generated-sources/main/java" />
+ <property name="src.code.dir" value="${basedir}/src/main/java" />
+ <property name="xslt.dir" value="${basedir}/src/main/xslt" />
+ <property name="classpath.xslt" refid="maven.compile.classpath" />
</ant>
</target>
</configuration>
@@ -92,21 +79,11 @@
<phase>pre-site</phase>
<configuration>
<target>
- <ant
- antfile="build-site.xml"
- target="build">
- <property
- name="build.gen-site.dir"
- value="${project.build.directory}/generated-site/apt" />
- <property
- name="src.code.dir"
- value="${basedir}/src/main/java" />
- <property
- name="xslt.dir"
- value="${basedir}/src/main/xslt" />
- <property
- name="classpath.xslt"
- refid="maven.compile.classpath" />
+ <ant antfile="build-site.xml" target="build">
+ <property name="build.gen-site.dir" value="${project.build.directory}/generated-site/apt" />
+ <property name="src.code.dir" value="${basedir}/src/main/java" />
+ <property name="xslt.dir" value="${basedir}/src/main/xslt" />
+ <property name="classpath.xslt" refid="maven.compile.classpath" />
</ant>
</target>
</configuration>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/26ab38f6/vxquery-server/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-server/pom.xml b/vxquery-server/pom.xml
index 995fa46..4cdf6f8 100644
--- a/vxquery-server/pom.xml
+++ b/vxquery-server/pom.xml
@@ -14,16 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
</parent>
<artifactId>apache-vxquery-server</artifactId>
@@ -145,7 +142,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/vxquery/blob/26ab38f6/vxquery-xtest/pom.xml
----------------------------------------------------------------------
diff --git a/vxquery-xtest/pom.xml b/vxquery-xtest/pom.xml
index a34bcee..8edd7b0 100644
--- a/vxquery-xtest/pom.xml
+++ b/vxquery-xtest/pom.xml
@@ -14,16 +14,13 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
</parent>
<artifactId>apache-vxquery-xtest</artifactId>
@@ -126,7 +123,7 @@
<dependency>
<groupId>org.apache.vxquery</groupId>
<artifactId>apache-vxquery-core</artifactId>
- <version>0.5-SNAPSHOT</version>
+ <version>0.5</version>
</dependency>
<dependency>