---

ajkannan · ajkannan · commit eee92bcd1ec5 · 2016-01-21T09:24:05.000-08:00
yaml --- r: 2185 b: refs/heads/pubsub-alpha c: 9fba603 h: refs/heads/master i: 2183: cc34e4f
diff --git a/[refs] b/[refs]
@@ -3,7 +3,7 @@ refs/heads/master: 689bbb466df4b2d5d2483d6edb8ac5c7c7f7c6fa
 refs/heads/travis: e21ee7b88a5edc3f3d8c71f90c3fc32abf7e8dd6
 refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
-refs/heads/pubsub-alpha: 3026e77428e35d47f2e68541849082710394a8c8
+refs/heads/pubsub-alpha: 9fba6035e3f21f90848b12c35a2115cb30bccbb6
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
 refs/heads/update-datastore: 482954f2c5055231e5b3122ea91d2ba00ce8187c
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java b/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/BigQueryException.java
@@ -16,6 +16,8 @@
 
 package com.google.gcloud.bigquery;
 
+import com.google.api.client.googleapis.json.GoogleJsonError;
+import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.common.collect.ImmutableSet;
 import com.google.gcloud.BaseServiceException;
 import com.google.gcloud.RetryHelper.RetryHelperException;
@@ -53,7 +55,16 @@ public BigQueryException(int code, String message, BigQueryError error) {
 
   public BigQueryException(IOException exception) {
     super(exception, true);
-    this.error = null;
+    BigQueryError bigqueryError = null;
+    if (exception instanceof GoogleJsonResponseException) {
+      GoogleJsonError error = ((GoogleJsonResponseException) exception).getDetails();
+      if (error != null && error.getErrors() != null  && !error.getErrors().isEmpty()) {
+        GoogleJsonError.ErrorInfo errorInfo = error.getErrors().get(0);
+        bigqueryError = new BigQueryError(errorInfo.getReason(), errorInfo.getLocation(),
+            errorInfo.getMessage(), (String) error.get("debugInfo"));
+      }
+    }
+    this.error = bigqueryError;
   }
 
   /**
diff --git a/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java b/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ExternalTableInfo.java
@@ -21,6 +21,8 @@
 import com.google.api.services.bigquery.model.Table;
 import com.google.common.base.MoreObjects.ToStringHelper;
 
+import java.util.Objects;
+
 /**
  * Google BigQuery External Table information. BigQuery's external tables are tables whose data
  * reside outside of BigQuery but can be queried as normal BigQuery tables. External tables are
@@ -103,6 +105,17 @@ ToStringHelper toStringHelper() {
     return super.toStringHelper().add("configuration", configuration);
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ExternalTableInfo
+        && Objects.equals(toPb(), ((ExternalTableInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), configuration);
+  }
+
   @Override
   Table toPb() {
     Table tablePb = super.toPb();
diff --git a/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java b/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/TableInfo.java
@@ -213,6 +213,16 @@ ToStringHelper toStringHelper() {
         .add("streamingBuffer", streamingBuffer);
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof TableInfo && Objects.equals(toPb(), ((TableInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), location, streamingBuffer);
+  }
+
   @Override
   Table toPb() {
     Table tablePb = super.toPb();
diff --git a/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java b/branches/pubsub-alpha/gcloud-java-bigquery/src/main/java/com/google/gcloud/bigquery/ViewInfo.java
@@ -25,6 +25,7 @@
 import com.google.common.collect.Lists;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * Google BigQuery View Table information. BigQuery's views are logical views, not materialized
@@ -143,6 +144,16 @@ ToStringHelper toStringHelper() {
         .add("userDefinedFunctions", userDefinedFunctions);
   }
 
+  @Override
+  public boolean equals(Object obj) {
+    return obj instanceof ViewInfo && Objects.equals(toPb(), ((ViewInfo) obj).toPb());
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), query, userDefinedFunctions);
+  }
+
   @Override
   Table toPb() {
     Table tablePb = super.toPb();
