You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@calcite.apache.org by jh...@apache.org on 2014/07/04 09:32:34 UTC
git commit: [OPTIQ-305] Unit Test Failure on release candidates
Repository: incubator-optiq
Updated Branches:
refs/heads/master f12be8141 -> 69b3a5347
[OPTIQ-305] Unit Test Failure on release candidates
Project: http://git-wip-us.apache.org/repos/asf/incubator-optiq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-optiq/commit/69b3a534
Tree: http://git-wip-us.apache.org/repos/asf/incubator-optiq/tree/69b3a534
Diff: http://git-wip-us.apache.org/repos/asf/incubator-optiq/diff/69b3a534
Branch: refs/heads/master
Commit: 69b3a5347a59339d5fad0448976985d0a09b5f85
Parents: f12be81
Author: Julian Hyde <ju...@gmail.com>
Authored: Fri Jul 4 00:19:07 2014 -0700
Committer: Julian Hyde <ju...@gmail.com>
Committed: Fri Jul 4 00:19:38 2014 -0700
----------------------------------------------------------------------
.../net/hydromatic/avatica/DriverVersion.java | 39 ++++++++++++++------
.../net/hydromatic/optiq/test/JdbcTest.java | 32 ++++++++--------
pom.xml | 2 -
3 files changed, 42 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/69b3a534/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.java
----------------------------------------------------------------------
diff --git a/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.java b/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.java
index a2a5436..63049c4 100644
--- a/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.java
+++ b/avatica/src/main/java/net/hydromatic/avatica/DriverVersion.java
@@ -109,18 +109,33 @@ public class DriverVersion {
productVersion = properties.getProperty("product.version");
jdbcCompliant =
Boolean.valueOf(properties.getProperty("jdbc.compliant"));
- majorVersion =
- Integer.valueOf(
- properties.getProperty("driver.version.major"));
- minorVersion =
- Integer.valueOf(
- properties.getProperty("driver.version.minor"));
- databaseMajorVersion =
- Integer.valueOf(
- properties.getProperty("database.version.major"));
- databaseMinorVersion =
- Integer.valueOf(
- properties.getProperty("database.version.minor"));
+ String[] s = driverVersion.replaceAll("-.*$", "").split("\\.");
+ final int major = Integer.valueOf(s[0]);
+ final int minor = Integer.valueOf(s[1]);
+ try {
+ majorVersion =
+ Integer.valueOf(properties.getProperty("driver.version.major"));
+ } catch (NumberFormatException e) {
+ majorVersion = major;
+ }
+ try {
+ minorVersion =
+ Integer.valueOf(properties.getProperty("driver.version.minor"));
+ } catch (NumberFormatException e) {
+ minorVersion = minor;
+ }
+ try {
+ databaseMajorVersion =
+ Integer.valueOf(properties.getProperty("database.version.major"));
+ } catch (NumberFormatException e) {
+ databaseMajorVersion = major;
+ }
+ try {
+ databaseMinorVersion =
+ Integer.valueOf(properties.getProperty("database.version.minor"));
+ } catch (NumberFormatException e) {
+ databaseMinorVersion = minor;
+ }
}
} catch (IOException e) {
e.printStackTrace();
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/69b3a534/core/src/test/java/net/hydromatic/optiq/test/JdbcTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/net/hydromatic/optiq/test/JdbcTest.java b/core/src/test/java/net/hydromatic/optiq/test/JdbcTest.java
index 5f9d7b6..6ae7b16 100644
--- a/core/src/test/java/net/hydromatic/optiq/test/JdbcTest.java
+++ b/core/src/test/java/net/hydromatic/optiq/test/JdbcTest.java
@@ -773,23 +773,21 @@ public class JdbcTest {
// version is stored in pom.xml; major and minor version are
// stored in net-hydromatic-optiq-jdbc.properties, but derived from
// version.major and version.minor in pom.xml.
- if (!driverVersion.endsWith("-SNAPSHOT")) {
- assertTrue(driverVersion.startsWith("0."));
- String[] split = driverVersion.split("\\.");
- assertTrue(split.length >= 2);
- final String majorMinor = driverMajorVersion + "." + driverMinorVersion;
- assertTrue(driverVersion.equals(majorMinor)
- || driverVersion.startsWith(majorMinor + "."));
- }
- if (!databaseProductVersion.endsWith("-SNAPSHOT")) {
- assertTrue(databaseProductVersion.startsWith("0."));
- String[] split = databaseProductVersion.split("\\.");
- assertTrue(split.length >= 2);
- final String majorMinor =
- databaseMajorVersion + "." + databaseMinorVersion;
- assertTrue(databaseProductVersion.equals(majorMinor)
- || databaseProductVersion.startsWith(majorMinor + "."));
- }
+ assertTrue(driverVersion.startsWith("0."));
+ String[] split = driverVersion.split("\\.");
+ assertTrue(split.length >= 2);
+ String majorMinor = driverMajorVersion + "." + driverMinorVersion;
+ assertTrue(driverVersion.equals(majorMinor)
+ || driverVersion.startsWith(majorMinor + ".")
+ || driverVersion.startsWith(majorMinor + "-"));
+
+ assertTrue(databaseProductVersion.startsWith("0."));
+ split = databaseProductVersion.split("\\.");
+ assertTrue(split.length >= 2);
+ majorMinor = databaseMajorVersion + "." + databaseMinorVersion;
+ assertTrue(databaseProductVersion.equals(majorMinor)
+ || databaseProductVersion.startsWith(majorMinor + ".")
+ || databaseProductVersion.startsWith(majorMinor + "-"));
connection.close();
}
http://git-wip-us.apache.org/repos/asf/incubator-optiq/blob/69b3a534/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 45e35fe..b616198 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,8 +51,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<top.dir>${project.basedir}</top.dir>
- <version.major>0</version.major>
- <version.minor>6</version.minor>
</properties>
<!-- Environment settings. -->