diff --git a/azure/README.md b/azuretablestorage/README.md
similarity index 68%
rename from azure/README.md
rename to azuretablestorage/README.md
index 9ddb87fb94c8091e7fbfb420753dcbf34b8776e1..96c01281f5a9db4793b5fee7287be5633d706f6c 100644
--- a/azure/README.md
+++ b/azuretablestorage/README.md
@@ -1,5 +1,5 @@
<!--
-Copyright (c) 2012 - 2016 YCSB contributors. All rights reserved.
+Copyright (c) 2016 YCSB contributors. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you
may not use this file except in compliance with the License. You
@@ -30,7 +30,7 @@ Git clone YCSB and compile:
git clone http://github.com/brianfrankcooper/YCSB.git
cd YCSB
- mvn -pl com.yahoo.ycsb:azure-binding -am clean package
+ mvn -pl com.yahoo.ycsb:azuretablestorage-binding -am clean package
### 4. Provide Azure Storage parameters
@@ -41,17 +41,17 @@ Set the account name and access key.
Or, you can set configs with the shell command, EG:
- ./bin/ycsb load azure -s -P workloads/workloada -p azure.account=YourAccountName -p azure.key=YourAccessKey > outputLoad.txt
+ ./bin/ycsb load azuretablestorage -s -P workloads/workloada -p azure.account=YourAccountName -p azure.key=YourAccessKey > outputLoad.txt
### 5. Load data and run tests
Load the data:
- ./bin/ycsb load azure -s -P workloads/workloada -p azure.account=YourAccountName -p azure.key=YourAccessKey > outputLoad.txt
+ ./bin/ycsb load azuretablestorage -s -P workloads/workloada -p azure.account=YourAccountName -p azure.key=YourAccessKey > outputLoad.txt
Run the workload test:
- ./bin/ycsb run azure -s -P workloads/workloada -p azure.account=YourAccountName -p azure.key=YourAccessKey > outputRun.txt
+ ./bin/ycsb run azuretablestorage -s -P workloads/workloada -p azure.account=YourAccountName -p azure.key=YourAccessKey > outputRun.txt
### 6. Optional Azure Storage parameters
@@ -67,7 +67,7 @@ Run the workload test:
For Azure stack WOSS.
EG:
- ./bin/ycsb load azure -s -P workloads/workloada -p azure.account=YourAccountName -p azure.key=YourAccessKey -p azure.batchsize=100 -p azure.protocol=http
+ ./bin/ycsb load azuretablestorage -s -P workloads/workloada -p azure.account=YourAccountName -p azure.key=YourAccessKey -p azure.batchsize=100 -p azure.protocol=http
diff --git a/azure/pom.xml b/azuretablestorage/pom.xml
similarity index 87%
rename from azure/pom.xml
rename to azuretablestorage/pom.xml
index d3f2346b216f475b1aa4964f4f4fd8fa57c9e287..52a89b9783d8426a562068ce2a210a364bf57f4c 100644
--- a/azure/pom.xml
+++ b/azuretablestorage/pom.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-Copyright (c) 2015-2016 YCSB contributors. All rights reserved.
+Copyright (c) 2016 YCSB contributors. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License"); you
may not use this file except in compliance with the License. You
@@ -26,8 +26,8 @@ LICENSE file.
<relativePath>../binding-parent</relativePath>
</parent>
- <artifactId>azure-binding</artifactId>
- <name>Azure Binding</name>
+ <artifactId>azuretablestorage-binding</artifactId>
+ <name>Azure table storage Binding</name>
<packaging>jar</packaging>
<dependencies>
@@ -40,7 +40,7 @@ LICENSE file.
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-storage</artifactId>
- <version>${azure.version}</version>
+ <version>${azurestorage.version}</version>
</dependency>
</dependencies>
</project>
diff --git a/azure/src/main/java/com/yahoo/ycsb/db/AzureClient.java b/azuretablestorage/src/main/java/com/yahoo/ycsb/db/azuretablestorage/AzureClient.java
similarity index 99%
rename from azure/src/main/java/com/yahoo/ycsb/db/AzureClient.java
rename to azuretablestorage/src/main/java/com/yahoo/ycsb/db/azuretablestorage/AzureClient.java
index 8df4299e41a03632c75d4debce9b3c2e5505cd6a..87b2a208fb2d6aa9860da3c685e0411e7f3b337e 100644
--- a/azure/src/main/java/com/yahoo/ycsb/db/AzureClient.java
+++ b/azuretablestorage/src/main/java/com/yahoo/ycsb/db/azuretablestorage/AzureClient.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2013 - 2016 YCSB contributors. All rights reserved.
+ * Copyright (c) 2016 YCSB contributors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You
@@ -15,7 +15,7 @@
* LICENSE file.
*/
-package com.yahoo.ycsb.db;
+package com.yahoo.ycsb.db.azuretablestorage;
import com.microsoft.azure.storage.CloudStorageAccount;
import com.microsoft.azure.storage.table.CloudTable;
diff --git a/azure/src/main/java/com/yahoo/ycsb/db/package-info.java b/azuretablestorage/src/main/java/com/yahoo/ycsb/db/azuretablestorage/package-info.java
similarity index 73%
rename from azure/src/main/java/com/yahoo/ycsb/db/package-info.java
rename to azuretablestorage/src/main/java/com/yahoo/ycsb/db/azuretablestorage/package-info.java
index d1bf90412761b1742de1c35b1068e05c92460337..ea7b7490dc7ba59dd5d1ec85df67de67ce50ffa4 100644
--- a/azure/src/main/java/com/yahoo/ycsb/db/package-info.java
+++ b/azuretablestorage/src/main/java/com/yahoo/ycsb/db/azuretablestorage/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015 - 2016 YCSB contributors. All rights reserved.
+ * Copyright (c) 2016 YCSB contributors. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you
* may not use this file except in compliance with the License. You
@@ -16,7 +16,7 @@
*/
/**
- * The YCSB binding for <a href="http://www.couchbase.com/">Couchbase</a>.
+ * The YCSB binding for <a href="https://azure.microsoft.com/en-us/services/storage/">Azure table Storage</a>.
*/
-package com.yahoo.ycsb.db;
+package com.yahoo.ycsb.db.azuretablestorage;
diff --git a/bin/bindings.properties b/bin/bindings.properties
index c856c08dfc60518956a2745ddff0f130a98f4c4a..9afdc436aa35c28c7b1a53ba21a059fafd44b86d 100644
--- a/bin/bindings.properties
+++ b/bin/bindings.properties
@@ -29,7 +29,7 @@ accumulo:com.yahoo.ycsb.db.accumulo.AccumuloClient
aerospike:com.yahoo.ycsb.db.AerospikeClient
asynchbase:com.yahoo.ycsb.db.AsyncHBaseClient
arangodb:com.yahoo.ycsb.db.ArangoDBClient
-azure:com.yahoo.ycsb.db.AzureClient
+azuretablestorage:com.yahoo.ycsb.db.azuretablestorage.AzureClient
basic:com.yahoo.ycsb.BasicDB
cassandra-cql:com.yahoo.ycsb.db.CassandraCQLClient
cassandra2-cql:com.yahoo.ycsb.db.CassandraCQLClient
diff --git a/pom.xml b/pom.xml
index 307f3419cf025bfb2ffacf417a869d3bab54169b..dc8c245c94092e9fe7cd14809baa85b80f73466d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@ LICENSE file.
<aerospike.version>3.1.2</aerospike.version>
<solr.version>5.4.0</solr.version>
<arangodb.version>2.7.3</arangodb.version>
- <azure.version>4.0.0</azure.version>
+ <azurestorage.version>4.0.0</azurestorage.version>
</properties>
<modules>
@@ -108,7 +108,7 @@ LICENSE file.
<module>aerospike</module>
<module>arangodb</module>
<module>asynchbase</module>
- <module>azure</module>
+ <module>azuretablestorage</module>
<module>cassandra</module>
<module>couchbase</module>
<module>couchbase2</module>