From 4f1e1576397e08eb26413b76108d0c03eb6bbefd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Xavier=20L=C3=A9aut=C3=A9?= <xavier@metamarkets.com>
Date: Wed, 14 May 2014 16:58:41 -0700
Subject: [PATCH] pass through errors from computes in DirectDruidClient

---
 .../io/druid/query/QueryInterruptedException.java   | 13 ++++++++++++-
 .../java/io/druid/client/DirectDruidClient.java     |  8 +++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/processing/src/main/java/io/druid/query/QueryInterruptedException.java b/processing/src/main/java/io/druid/query/QueryInterruptedException.java
index 7b889ef5f2d..00676918dcf 100644
--- a/processing/src/main/java/io/druid/query/QueryInterruptedException.java
+++ b/processing/src/main/java/io/druid/query/QueryInterruptedException.java
@@ -19,13 +19,17 @@
 
 package io.druid.query;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class QueryInterruptedException extends RuntimeException
 {
   public QueryInterruptedException() {
     super();
   }
 
-  public QueryInterruptedException(String message)
+  @JsonCreator
+  public QueryInterruptedException(@JsonProperty("error") String message)
   {
     super(message);
   }
@@ -34,4 +38,11 @@ public class QueryInterruptedException extends RuntimeException
   {
     super(cause);
   }
+
+  @JsonProperty("error")
+  @Override
+  public String getMessage()
+  {
+    return super.getMessage();
+  }
 }
diff --git a/server/src/main/java/io/druid/client/DirectDruidClient.java b/server/src/main/java/io/druid/client/DirectDruidClient.java
index ae994d1cda7..c08cd9e2bd4 100644
--- a/server/src/main/java/io/druid/client/DirectDruidClient.java
+++ b/server/src/main/java/io/druid/client/DirectDruidClient.java
@@ -45,6 +45,7 @@ import com.metamx.http.client.response.ClientResponse;
 import com.metamx.http.client.response.InputStreamResponseHandler;
 import io.druid.query.BySegmentResultValueClass;
 import io.druid.query.Query;
+import io.druid.query.QueryInterruptedException;
 import io.druid.query.QueryRunner;
 import io.druid.query.QueryToolChest;
 import io.druid.query.QueryToolChestWarehouse;
@@ -283,7 +284,12 @@ public class DirectDruidClient<T> implements QueryRunner<T>
       if (jp == null) {
         try {
           jp = objectMapper.getFactory().createParser(future.get());
-          if (jp.nextToken() != JsonToken.START_ARRAY) {
+          final JsonToken nextToken = jp.nextToken();
+          if (nextToken == JsonToken.START_OBJECT) {
+            QueryInterruptedException e = jp.getCodec().readValue(jp, QueryInterruptedException.class);
+            throw e;
+          }
+          else if (nextToken != JsonToken.START_ARRAY) {
             throw new IAE("Next token wasn't a START_ARRAY, was[%s] from url [%s]", jp.getCurrentToken(), url);
           } else {
             jp.nextToken();