Merge pull request #1760 from krishnamoorthy-r/krishraj-dev

Add support for running YCSB with the experimental Host.

Author: suraj-pasuparthy

cloudspanner/README.md

@@ -87,7 +87,7 @@ If you wish to load a large database, you can run YCSB on multiple client VMs in
 * Split the key range evenly between client VMs;
 * Use few threads on each client VM, so that each individual commit request contains keys which are (close to) consecutive, and would thus likely address a single split; this also helps avoid overloading the servers.
 
-The idea is that we have a number of 'write heads' which are all writing to different parts of the database (and thus talking to different servers), but each individual head is writing its own data (more or less) in order. See the [best practices page](https://cloud.google.com/spanner/docs/best-practices#loading_data) for further details.
+The idea is that we have a number of 'write heads' which are all writing to different parts of the database (and thus talking to different servers), but each individual head is writing its own data (more or less) in order. See the [best practices page](https://cloud.google.com/spanner/docs/bulk-loading) for further details.
 
 ### 6. Run a Workload
 

cloudspanner/src/main/java/site/ycsb/db/cloudspanner/CloudSpannerClient.java

@@ -17,6 +17,7 @@
 package site.ycsb.db.cloudspanner;
 
 import com.google.common.base.Joiner;
+import com.google.cloud.NoCredentials;
 import com.google.cloud.spanner.DatabaseId;
 import com.google.cloud.spanner.DatabaseClient;
 import com.google.cloud.spanner.Key;
@@ -32,6 +33,7 @@
 import com.google.cloud.spanner.Struct;
 import com.google.cloud.spanner.StructReader;
 import com.google.cloud.spanner.TimestampBound;
+import io.grpc.ManagedChannelBuilder;
 import site.ycsb.ByteIterator;
 import site.ycsb.Client;
 import site.ycsb.DB;
@@ -100,6 +102,15 @@ private CloudSpannerProperties() {}
      * Number of Cloud Spanner client channels to use. It's recommended to leave this to be the default value.
      */
     static final String NUM_CHANNELS = "cloudspanner.channels";
+    /**
+     * Use plain text for communication.
+     */
+    static final String USE_PLAINTEXT = "cloudspanner.useplaintext";
+    
+    /**
+     * Connect to Experimental host instead of cloud spanner API.
+     */
+    static final String EXPERIMENTAL_HOST="cloudspanner.experimentalhost";    
   }
 
   private static int fieldCount;
@@ -167,6 +178,18 @@ private static Spanner getSpanner(Properties properties, String host, String pro
     if (numChannels != null) {
       optionsBuilder.setNumChannels(Integer.parseInt(numChannels));
     }
+    boolean usePlaintext = Boolean.parseBoolean(properties.getProperty(CloudSpannerProperties.USE_PLAINTEXT));
+    if (usePlaintext) {
+      optionsBuilder.setChannelConfigurator(ManagedChannelBuilder::usePlaintext);
+      //Disable credentials and built in metrics when plaintext is used.
+      optionsBuilder.setCredentials(NoCredentials.getInstance());
+      optionsBuilder.setBuiltInMetricsEnabled(false);
+    }
+    String experimentalHost = properties.getProperty(CloudSpannerProperties.EXPERIMENTAL_HOST);
+    if (experimentalHost != null) {
+      optionsBuilder.setExperimentalHost(experimentalHost);
+    }
+
     spanner = optionsBuilder.build().getService();
     Runtime.getRuntime().addShutdownHook(new Thread("spannerShutdown") {
         @Override

pom.xml

@@ -118,7 +118,7 @@ LICENSE file.
     <azurecosmos.version>4.8.0</azurecosmos.version>
     <azurestorage.version>4.0.0</azurestorage.version>
     <cassandra.cql.version>3.0.0</cassandra.cql.version>
-    <cloudspanner.version>6.71.0</cloudspanner.version>
+    <cloudspanner.version>6.91.1</cloudspanner.version>
     <couchbase.version>1.4.10</couchbase.version>
 		<couchbase2.version>2.3.1</couchbase2.version>
 		<crail.version>1.1-incubating</crail.version>