---

Ajay Kannan · Ajay Kannan · commit 582b1330e4c5 · 2015-11-23T19:38:37.000-08:00
yaml --- r: 2513 b: refs/heads/update-datastore c: 8808c54 h: refs/heads/master i: 2511: d2b14c4
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/gh-pages: 4e0561bb4504bf647db669a14417b2b2c87ba45d
 refs/heads/bigquery: 762fa5830e6c398c0396177e3e7fd243bd62cfc3
 refs/heads/pubsub-alpha: 1a0e970f265af871e02274085b9662b3fe29058b
 refs/heads/resource-manager: ebf4adc5ee835cd2086c4ac5b4e78d01a5a005a7
-refs/heads/update-datastore: d8a61590089bbaa0619b4c8d8491fb5f55028806
+refs/heads/update-datastore: 8808c54c09a1d80060d8ea804164dc26ee4ce229
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
 refs/tags/v0.0.10: 207ebd2a3472fddee69fe1298eb90429e3306efd
 refs/tags/v0.0.11: ffbfba48a6426ff63c08ff2117e58681f251fbf2
diff --git a/branches/update-datastore/gcloud-java-datastore/README.md b/branches/update-datastore/gcloud-java-datastore/README.md
@@ -128,6 +128,8 @@ while (results.hasNext()) {
 }
 ```
 
+Cloud Datastore relies on indexing to run queries. Indexing is turned on by default for most types of properties. To read more about indexing, see the [Cloud Datastore Index Configuration documentation](https://cloud.google.com/datastore/docs/tools/indexconfig).
+
 #### Complete source code
 
 Here we put together all the code shown above into one program.  This program assumes that you are running on Compute Engine or from your own desktop. To run this example on App Engine, simply move the code from the main method to your application's servlet class.
diff --git a/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java b/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/Query.java
@@ -35,6 +35,10 @@
  * A Google Cloud Datastore query.
  * For usage examples see {@link GqlQuery} and {@link StructuredQuery}.
  *
+ * Note that queries require proper indexing. See
+ * <a href="https://cloud.google.com/datastore/docs/tools/indexconfig">
+ * Cloud Datastore Index Configuration</a> for help configuring indexes.
+ *
  * @param <V> the type of the values returned by this query.
  * @see <a href="https://cloud.google.com/datastore/docs/concepts/queries">Datastore Queries</a>
  */
diff --git a/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java b/branches/update-datastore/gcloud-java-datastore/src/main/java/com/google/gcloud/spi/DefaultDatastoreRpc.java
@@ -42,7 +42,9 @@
 import org.json.JSONTokener;
 
 import java.net.InetAddress;
+import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.UnknownHostException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -93,7 +95,7 @@ private static boolean isLocalHost(String host) {
         }
         InetAddress hostAddr = InetAddress.getByName(new URL(normalizedHost).getHost());
         return hostAddr.isAnyLocalAddress() || hostAddr.isLoopbackAddress();
-      } catch (Exception e) {
+      } catch (UnknownHostException | MalformedURLException e) {
         // ignore
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,8 @@ while (results.hasNext()) {`
`128`	`128`	`}`
`129`	`129`	```
`130`	`130`
	`131`	`+Cloud Datastore relies on indexing to run queries. Indexing is turned on by default for most types of properties. To read more about indexing, see the [Cloud Datastore Index Configuration documentation](https://cloud.google.com/datastore/docs/tools/indexconfig).`
	`132`	`+`
`131`	`133`	`#### Complete source code`
`132`	`134`
`133`	`135`	`Here we put together all the code shown above into one program. This program assumes that you are running on Compute Engine or from your own desktop. To run this example on App Engine, simply move the code from the main method to your application's servlet class.`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,9 @@`
`42`	`42`	`import org.json.JSONTokener;`
`43`	`43`
`44`	`44`	`import java.net.InetAddress;`
	`45`	`+import java.net.MalformedURLException;`
`45`	`46`	`import java.net.URL;`
	`47`	`+import java.net.UnknownHostException;`
`46`	`48`	`import java.util.HashMap;`
`47`	`49`	`import java.util.Map;`
`48`	`50`
`@@ -93,7 +95,7 @@ private static boolean isLocalHost(String host) {`
`93`	`95`	`}`
`94`	`96`	`InetAddress hostAddr = InetAddress.getByName(new URL(normalizedHost).getHost());`
`95`	`97`	`return hostAddr.isAnyLocalAddress() \|\| hostAddr.isLoopbackAddress();`
`96`		`- } catch (Exception e) {`
	`98`	`+ } catch (UnknownHostException \| MalformedURLException e) {`
`97`	`99`	`// ignore`
`98`	`100`	`}`
`99`	`101`	`}`