From 6a326e6e8413fae35fb8b8c41d0616eca079e85b Mon Sep 17 00:00:00 2001 From: Utz Westermann Date: Fri, 26 May 2017 13:18:51 +0200 Subject: [PATCH 1/2] Maven artifact release 0.8.5 --- pom.xml | 4 ++-- schedoscope-conf/pom.xml | 2 +- schedoscope-core/pom.xml | 2 +- schedoscope-export/pom.xml | 2 +- .../jdbc/outputformat/JdbcOutputWritable.java | 15 ++++++++++++++- schedoscope-metascope/pom.xml | 2 +- schedoscope-transformation-oozie/pom.xml | 2 +- schedoscope-transformation-pig/pom.xml | 2 +- schedoscope-transformation-shell/pom.xml | 2 +- schedoscope-transformation-spark/pom.xml | 2 +- schedoscope-tutorial/pom.xml | 2 +- 11 files changed, 25 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index f19778496..4fd2c42c6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 schedoscope schedoscope-suite - 0.8.5-SNAPSHOT + 0.8.5 pom Schedoscope Suite A wrapper building all modules of the Schedoscope project @@ -25,7 +25,7 @@ 1.1.0 1.2.5 1.2.3 - 0.8.5-SNAPSHOT + 0.8.5 diff --git a/schedoscope-conf/pom.xml b/schedoscope-conf/pom.xml index 1fe2f6a35..92917d895 100644 --- a/schedoscope-conf/pom.xml +++ b/schedoscope-conf/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5-SNAPSHOT + 0.8.5 diff --git a/schedoscope-core/pom.xml b/schedoscope-core/pom.xml index 0832579cd..f3f489d74 100644 --- a/schedoscope-core/pom.xml +++ b/schedoscope-core/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5-SNAPSHOT + 0.8.5 diff --git a/schedoscope-export/pom.xml b/schedoscope-export/pom.xml index ea37622ce..fee4c354a 100644 --- a/schedoscope-export/pom.xml +++ b/schedoscope-export/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5-SNAPSHOT + 0.8.5 diff --git a/schedoscope-export/src/main/java/org/schedoscope/export/jdbc/outputformat/JdbcOutputWritable.java b/schedoscope-export/src/main/java/org/schedoscope/export/jdbc/outputformat/JdbcOutputWritable.java index c24b32b65..6c557ae34 100644 --- a/schedoscope-export/src/main/java/org/schedoscope/export/jdbc/outputformat/JdbcOutputWritable.java +++ b/schedoscope-export/src/main/java/org/schedoscope/export/jdbc/outputformat/JdbcOutputWritable.java @@ -45,6 +45,7 @@ public class JdbcOutputWritable implements Writable, DBWritable { private static final String STRING = "string"; private static final String DOUBLE = "double"; + private static final String FLOAT = "float"; private static final String BOOLEAN = "boolean"; private static final String INTEGER = "int"; private static final String LONG = "long"; @@ -103,6 +104,14 @@ public void write(PreparedStatement ps) throws SQLException { } else { ps.setNull(i + 1, Types.DOUBLE); } + } else if (type.equals(JdbcOutputWritable.FLOAT)) { + if (!record.get(i).getRight().equals("NULL")) { + ps.setDouble(i + 1, + Double.parseDouble(record.get(i).getRight())); + } else { + ps.setNull(i + 1, Types.FLOAT); + } + } else if (type.equals(JdbcOutputWritable.BOOLEAN)) { if (!record.get(i).getRight().equals("NULL")) { ps.setBoolean(i + 1, @@ -132,9 +141,13 @@ public void write(PreparedStatement ps) throws SQLException { ps.setString(i + 1, record.get(i).getRight()); } } - } catch (NumberFormatException n) { + } catch ( + NumberFormatException n) + + { n.printStackTrace(); } + } @Override diff --git a/schedoscope-metascope/pom.xml b/schedoscope-metascope/pom.xml index 1d72869f1..ef108f119 100644 --- a/schedoscope-metascope/pom.xml +++ b/schedoscope-metascope/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5-SNAPSHOT + 0.8.5 diff --git a/schedoscope-transformation-oozie/pom.xml b/schedoscope-transformation-oozie/pom.xml index 217f37f04..1fd79a06d 100644 --- a/schedoscope-transformation-oozie/pom.xml +++ b/schedoscope-transformation-oozie/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5-SNAPSHOT + 0.8.5 diff --git a/schedoscope-transformation-pig/pom.xml b/schedoscope-transformation-pig/pom.xml index b0ddda2d7..6beae0156 100644 --- a/schedoscope-transformation-pig/pom.xml +++ b/schedoscope-transformation-pig/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5-SNAPSHOT + 0.8.5 diff --git a/schedoscope-transformation-shell/pom.xml b/schedoscope-transformation-shell/pom.xml index d5e2897a6..87bbc931a 100644 --- a/schedoscope-transformation-shell/pom.xml +++ b/schedoscope-transformation-shell/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5-SNAPSHOT + 0.8.5 diff --git a/schedoscope-transformation-spark/pom.xml b/schedoscope-transformation-spark/pom.xml index b244ec9a1..c11495e2a 100644 --- a/schedoscope-transformation-spark/pom.xml +++ b/schedoscope-transformation-spark/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5-SNAPSHOT + 0.8.5 diff --git a/schedoscope-tutorial/pom.xml b/schedoscope-tutorial/pom.xml index af3280998..c83acca3a 100644 --- a/schedoscope-tutorial/pom.xml +++ b/schedoscope-tutorial/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5-SNAPSHOT + 0.8.5 From 6c2c37fdcef6112d7d73160bcc5e779475d40239 Mon Sep 17 00:00:00 2001 From: Utz Westermann Date: Fri, 26 May 2017 13:25:51 +0200 Subject: [PATCH 2/2] On to 0.8.6-SNAPSHOT --- pom.xml | 4 ++-- schedoscope-conf/pom.xml | 2 +- schedoscope-core/pom.xml | 2 +- schedoscope-export/pom.xml | 2 +- schedoscope-metascope/pom.xml | 2 +- schedoscope-transformation-oozie/pom.xml | 2 +- schedoscope-transformation-pig/pom.xml | 2 +- schedoscope-transformation-shell/pom.xml | 2 +- schedoscope-transformation-spark/pom.xml | 2 +- schedoscope-tutorial/pom.xml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 4fd2c42c6..733b63e5b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 schedoscope schedoscope-suite - 0.8.5 + 0.8.6-SNAPSHOT pom Schedoscope Suite A wrapper building all modules of the Schedoscope project @@ -25,7 +25,7 @@ 1.1.0 1.2.5 1.2.3 - 0.8.5 + 0.8.6-SNAPSHOT diff --git a/schedoscope-conf/pom.xml b/schedoscope-conf/pom.xml index 92917d895..7c1e4084a 100644 --- a/schedoscope-conf/pom.xml +++ b/schedoscope-conf/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5 + 0.8.6-SNAPSHOT diff --git a/schedoscope-core/pom.xml b/schedoscope-core/pom.xml index f3f489d74..b51342fae 100644 --- a/schedoscope-core/pom.xml +++ b/schedoscope-core/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5 + 0.8.6-SNAPSHOT diff --git a/schedoscope-export/pom.xml b/schedoscope-export/pom.xml index fee4c354a..48ca61791 100644 --- a/schedoscope-export/pom.xml +++ b/schedoscope-export/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5 + 0.8.6-SNAPSHOT diff --git a/schedoscope-metascope/pom.xml b/schedoscope-metascope/pom.xml index ef108f119..ff21145c1 100644 --- a/schedoscope-metascope/pom.xml +++ b/schedoscope-metascope/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5 + 0.8.6-SNAPSHOT diff --git a/schedoscope-transformation-oozie/pom.xml b/schedoscope-transformation-oozie/pom.xml index 1fd79a06d..25d10936f 100644 --- a/schedoscope-transformation-oozie/pom.xml +++ b/schedoscope-transformation-oozie/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5 + 0.8.6-SNAPSHOT diff --git a/schedoscope-transformation-pig/pom.xml b/schedoscope-transformation-pig/pom.xml index 6beae0156..09de716ee 100644 --- a/schedoscope-transformation-pig/pom.xml +++ b/schedoscope-transformation-pig/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5 + 0.8.6-SNAPSHOT diff --git a/schedoscope-transformation-shell/pom.xml b/schedoscope-transformation-shell/pom.xml index 87bbc931a..cfbfbe464 100644 --- a/schedoscope-transformation-shell/pom.xml +++ b/schedoscope-transformation-shell/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5 + 0.8.6-SNAPSHOT diff --git a/schedoscope-transformation-spark/pom.xml b/schedoscope-transformation-spark/pom.xml index c11495e2a..e8739a65c 100644 --- a/schedoscope-transformation-spark/pom.xml +++ b/schedoscope-transformation-spark/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5 + 0.8.6-SNAPSHOT diff --git a/schedoscope-tutorial/pom.xml b/schedoscope-tutorial/pom.xml index c83acca3a..bfec9a607 100644 --- a/schedoscope-tutorial/pom.xml +++ b/schedoscope-tutorial/pom.xml @@ -9,7 +9,7 @@ schedoscope-suite schedoscope - 0.8.5 + 0.8.6-SNAPSHOT