Repository: calcite Updated Branches: refs/heads/master 47c49c9c6 -> 37a83b102
Remove calls to Throwables.propagate (deprecated in Guava-20 and higher) Project: http://git-wip-us.apache.org/repos/asf/calcite/repo Commit: http://git-wip-us.apache.org/repos/asf/calcite/commit/37a83b10 Tree: http://git-wip-us.apache.org/repos/asf/calcite/tree/37a83b10 Diff: http://git-wip-us.apache.org/repos/asf/calcite/diff/37a83b10 Branch: refs/heads/master Commit: 37a83b10293d80f3d3b89df8027d0311d2f95cfa Parents: 9ee4eda Author: Julian Hyde <jh...@apache.org> Authored: Thu Feb 22 15:45:10 2018 -0800 Committer: Julian Hyde <jh...@apache.org> Committed: Thu Feb 22 18:18:37 2018 -0800 ---------------------------------------------------------------------- .../apache/calcite/adapter/druid/DruidConnectionImpl.java | 5 ++--- .../java/org/apache/calcite/adapter/druid/DruidQuery.java | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/calcite/blob/37a83b10/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java ---------------------------------------------------------------------- diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java index 40883bf..6d57438 100644 --- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java +++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidConnectionImpl.java @@ -38,7 +38,6 @@ import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.type.CollectionType; import com.google.common.base.Preconditions; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -345,7 +344,7 @@ class DruidConnectionImpl implements DruidConnection { synchronized (UTC_TIMESTAMP_FORMAT) { // synchronized block to avoid race condition try { - //First try to pars as Timestamp with timezone. + // First try to parse as Timestamp with timezone. rowBuilder .set(fieldPos, UTC_TIMESTAMP_FORMAT.parse(parser.getText()).getTime()); } catch (ParseException e) { @@ -355,7 +354,7 @@ class DruidConnectionImpl implements DruidConnection { .set(fieldPos, TIMESTAMP_FORMAT.parse(parser.getText()).getTime()); } catch (ParseException e2) { // unknown format should not happen - Throwables.propagate(e2); + throw new RuntimeException(e2); } } } http://git-wip-us.apache.org/repos/asf/calcite/blob/37a83b10/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java ---------------------------------------------------------------------- diff --git a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java index 0d84b46..a7a3668 100644 --- a/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java +++ b/druid/src/main/java/org/apache/calcite/adapter/druid/DruidQuery.java @@ -70,7 +70,6 @@ import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.base.Predicate; import com.google.common.base.Strings; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Iterables; @@ -1212,7 +1211,7 @@ public class DruidQuery extends AbstractRelNode implements BindableRel { generator.writeEndObject(); generator.close(); } catch (IOException e) { - Throwables.propagate(e); + throw new RuntimeException(e); } return sw.toString(); } @@ -1259,7 +1258,7 @@ public class DruidQuery extends AbstractRelNode implements BindableRel { generator.writeEndObject(); generator.close(); } catch (IOException e) { - Throwables.propagate(e); + throw new RuntimeException(e); } return sw.toString(); } @@ -1291,7 +1290,7 @@ public class DruidQuery extends AbstractRelNode implements BindableRel { generator.writeEndObject(); generator.close(); } catch (IOException e) { - Throwables.propagate(e); + throw new RuntimeException(e); } return sw.toString(); } @@ -1346,7 +1345,7 @@ public class DruidQuery extends AbstractRelNode implements BindableRel { generator.writeEndObject(); generator.close(); } catch (IOException e) { - Throwables.propagate(e); + throw new RuntimeException(e); } return sw.toString(); }
