From 2911023228a615317666176e78864b96cb7a75bc Mon Sep 17 00:00:00 2001
From: Jason Tedor <jason@tedor.me>
Date: Mon, 7 Mar 2016 11:31:01 -0500
Subject: [PATCH] [elasticsearch] Fix Elasticsearch name
This commit fixes the Elasticsearch name throughout the YCSB benchmark
project from "ElasticSearch" to "Elasticsearch".
---
bin/ycsb | 2 +-
elasticsearch/pom.xml | 2 +-
...cSearchClient.java => ElasticsearchClient.java} | 12 ++++++------
...lientTest.java => ElasticsearchClientTest.java} | 14 +++++++-------
4 files changed, 15 insertions(+), 15 deletions(-)
rename elasticsearch/src/main/java/com/yahoo/ycsb/db/{ElasticSearchClient.java => ElasticsearchClient.java} (97%)
rename elasticsearch/src/test/java/com/yahoo/ycsb/db/{ElasticSearchClientTest.java => ElasticsearchClientTest.java} (91%)
diff --git a/bin/ycsb b/bin/ycsb
index b731a45f..16c5a82a 100755
--- a/bin/ycsb
+++ b/bin/ycsb
@@ -59,7 +59,7 @@ DATABASES = {
"cassandra2-cql": "com.yahoo.ycsb.db.CassandraCQLClient",
"couchbase" : "com.yahoo.ycsb.db.CouchbaseClient",
"dynamodb" : "com.yahoo.ycsb.db.DynamoDBClient",
- "elasticsearch": "com.yahoo.ycsb.db.ElasticSearchClient",
+ "elasticsearch": "com.yahoo.ycsb.db.ElasticsearchClient",
"geode" : "com.yahoo.ycsb.db.GeodeClient",
"googledatastore" : "com.yahoo.ycsb.db.GoogleDatastoreClient",
"hbase094" : "com.yahoo.ycsb.db.HBaseClient",
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index a39f0435..be79a65f 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -26,7 +26,7 @@ LICENSE file.
</parent>
<artifactId>elasticsearch-binding</artifactId>
- <name>ElasticSearch Binding</name>
+ <name>Elasticsearch Binding</name>
<packaging>jar</packaging>
<properties>
<elasticsearch-version>2.1.1</elasticsearch-version>
diff --git a/elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java b/elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticsearchClient.java
similarity index 97%
rename from elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java
rename to elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticsearchClient.java
index 4e88c19b..1d79e3c2 100644
--- a/elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticSearchClient.java
+++ b/elasticsearch/src/main/java/com/yahoo/ycsb/db/ElasticsearchClient.java
@@ -51,7 +51,7 @@ import java.util.Set;
import java.util.Vector;
/**
- * ElasticSearch client for YCSB framework.
+ * Elasticsearch client for YCSB framework.
*
* <p>
* Default properties to set:
@@ -65,7 +65,7 @@ import java.util.Vector;
* @author Sharmarke Aden
*
*/
-public class ElasticSearchClient extends DB {
+public class ElasticsearchClient extends DB {
public static final String DEFAULT_CLUSTER_NAME = "es.ycsb.cluster";
public static final String DEFAULT_INDEX_KEY = "es.ycsb";
@@ -105,10 +105,10 @@ public class ElasticSearchClient extends DB {
// add it to the settings file (will overwrite the defaults).
settings.put(props);
System.out.println(
- "ElasticSearch starting node = " + settings.get("cluster.name"));
+ "Elasticsearch starting node = " + settings.get("cluster.name"));
System.out
- .println("ElasticSearch node data path = " + settings.get("path.data"));
- System.out.println("ElasticSearch Remote Mode = " + remoteMode);
+ .println("Elasticsearch node data path = " + settings.get("path.data"));
+ System.out.println("Elasticsearch Remote Mode = " + remoteMode);
// Remote mode support for connecting to remote elasticsearch cluster
if (remoteMode) {
settings.put("client.transport.sniff", true)
@@ -119,7 +119,7 @@ public class ElasticSearchClient extends DB {
String[] nodeList =
props.getProperty("elasticsearch.hosts.list", DEFAULT_REMOTE_HOST)
.split(",");
- System.out.println("ElasticSearch Remote Hosts = "
+ System.out.println("Elasticsearch Remote Hosts = "
+ props.getProperty("elasticsearch.hosts.list", DEFAULT_REMOTE_HOST));
TransportClient tClient = TransportClient.builder()
.settings(settings).build();
diff --git a/elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticSearchClientTest.java b/elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java
similarity index 91%
rename from elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticSearchClientTest.java
rename to elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java
index cc559c7f..1a80cca3 100644
--- a/elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticSearchClientTest.java
+++ b/elasticsearch/src/test/java/com/yahoo/ycsb/db/ElasticsearchClientTest.java
@@ -42,9 +42,9 @@ import java.util.Vector;
*
* @author saden
*/
-public class ElasticSearchClientTest {
+public class ElasticsearchClientTest {
- protected final static ElasticSearchClient instance = new ElasticSearchClient();
+ protected final static ElasticsearchClient instance = new ElasticsearchClient();
protected final static HashMap<String, ByteIterator> MOCK_DATA;
protected final static String MOCK_TABLE = "MOCK_TABLE";
protected final static String MOCK_KEY0 = "0";
@@ -81,7 +81,7 @@ public class ElasticSearchClientTest {
}
/**
- * Test of insert method, of class ElasticSearchClient.
+ * Test of insert method, of class ElasticsearchClient.
*/
@Test
public void testInsert() {
@@ -91,7 +91,7 @@ public class ElasticSearchClientTest {
}
/**
- * Test of delete method, of class ElasticSearchClient.
+ * Test of delete method, of class ElasticsearchClient.
*/
@Test
public void testDelete() {
@@ -101,7 +101,7 @@ public class ElasticSearchClientTest {
}
/**
- * Test of read method, of class ElasticSearchClient.
+ * Test of read method, of class ElasticsearchClient.
*/
@Test
public void testRead() {
@@ -113,7 +113,7 @@ public class ElasticSearchClientTest {
}
/**
- * Test of update method, of class ElasticSearchClient.
+ * Test of update method, of class ElasticsearchClient.
*/
@Test
public void testUpdate() {
@@ -139,7 +139,7 @@ public class ElasticSearchClientTest {
}
/**
- * Test of scan method, of class ElasticSearchClient.
+ * Test of scan method, of class ElasticsearchClient.
*/
@Test
public void testScan() {
--
GitLab