You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/03/19 02:20:51 UTC
[4/9] git commit: Changes to get non-embedded ElasticSearch working.
Changes to get non-embedded ElasticSearch working.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6979ae6b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6979ae6b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6979ae6b
Branch: refs/heads/asyncqueue
Commit: 6979ae6bfc0acbbc936abfd0c7a8bed657e75948
Parents: 3e6e7e8
Author: Dave Johnson <dm...@apigee.com>
Authored: Sat Mar 15 11:34:04 2014 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Sat Mar 15 11:34:04 2014 -0400
----------------------------------------------------------------------
.../serialization/SerializationFig.java | 5 ++
.../usergrid/persistence/index/IndexFig.java | 8 +--
.../index/impl/EsEntityCollectionIndex.java | 3 +-
.../persistence/index/impl/EsProvider.java | 53 +++++++++++---------
.../index/legacy/EntityManagerFacade.java | 1 -
.../src/test/resources/dynamic-test.properties | 2 +-
.../src/test/resources/usergrid-CHOP.properties | 5 +-
.../src/test/resources/usergrid-UNIT.properties | 2 +-
8 files changed, 44 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6979ae6b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java
index e24d6a9..d2793e4 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/serialization/SerializationFig.java
@@ -12,6 +12,11 @@ import org.safehaus.guicyfig.Key;
*/
@FigSingleton
public interface SerializationFig extends GuicyFig {
+
+ /**
+ * Time to live timeout in seconds.
+ * @return Timeout in seconds.
+ */
@Key( "collection.stage.transient.timeout" )
@Default( "60" )
int getTimeout();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6979ae6b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java
index 7b6f318..5fb11e6 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexFig.java
@@ -31,13 +31,13 @@ public interface IndexFig extends GuicyFig {
public static final String ELASTICSEARCH_PORT = "elasticsearch.port";
- public static final String ELASTICSEARCH_INDEXNAME = "elasticsearch.indexname";
+ public static final String ELASTICSEARCH_INDEXNAME = "elasticsearch.index_name";
public static final String ELASTICSEARCH_EMBEDDED = "elasticsearch.embedded";
- public static final String QUERY_CURSOR_TIMEOUT_MINUTES = "elasticsearch.cursor-timeout.minutes";
+ public static final String QUERY_CURSOR_TIMEOUT_MINUTES = "elasticsearch.cursor_timeout.minutes";
- public static final String ELASTICSEARCH_FORCE_REFRESH = "elasticsearch.force-refresh";
+ public static final String ELASTICSEARCH_FORCE_REFRESH = "elasticsearch.force_refresh";
public static final String QUERY_LIMIT_DEFAULT = "index.query.limit.default";
@@ -57,7 +57,7 @@ public interface IndexFig extends GuicyFig {
@Key( QUERY_CURSOR_TIMEOUT_MINUTES )
int getQueryCursorTimeout();
- @Default( "true" )
+ @Default( "false" )
@Key( ELASTICSEARCH_EMBEDDED )
boolean isEmbedded();
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6979ae6b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
index 2de269d..4d750a7 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityCollectionIndex.java
@@ -69,6 +69,7 @@ import org.elasticsearch.search.sort.SortOrder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
/**
* Implements index using ElasticSearch Java API and Core Persistence Collections.
*/
@@ -361,7 +362,7 @@ public class EsEntityCollectionIndex implements EntityCollectionIndex {
LocationField locField = (LocationField) f;
Map<String, Object> locMap = new HashMap<String, Object>();
- // field names lat and lon triggerl ElasticSearch geo location
+ // field names lat and lon trigger ElasticSearch geo location
locMap.put("lat", locField.getValue().getLatitude());
locMap.put("lon", locField.getValue().getLongtitude());
entityMap.put(field.getName() + GEO_SUFFIX, locMap);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6979ae6b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
index 5e5ba44..2393b36 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsProvider.java
@@ -32,65 +32,68 @@ import org.elasticsearch.node.NodeBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Provides access to ElasticSearch client.
*/
@Singleton
public class EsProvider {
- private static final Logger log = LoggerFactory.getLogger( EsProvider.class );
+
+ private static final Logger log = LoggerFactory.getLogger(EsProvider.class);
private final IndexFig indexFig;
private static Client client;
@Inject
- public EsProvider( IndexFig fig ) {
+ public EsProvider(IndexFig fig) {
this.indexFig = fig;
}
public synchronized Client getClient() {
- if ( client == null ) {
- client = getClient( indexFig );
- }
- return client;
+ if (client == null) {
+ client = getClient(indexFig);
+ }
+ return client;
}
- public static synchronized Client getClient( IndexFig fig ) {
+ public static synchronized Client getClient(IndexFig fig) {
- if ( client == null ) {
+ if (client == null) {
Client newClient = null;
- if ( fig.isEmbedded() ) {
+ if (fig.isEmbedded()) {
log.info("--------------------------------");
log.info("Starting embedded ElasticSearch");
log.info("--------------------------------");
- int port = AvailablePortFinder.getNextAvailable( 2000 );
+ int port = AvailablePortFinder.getNextAvailable(2000);
Settings settings = ImmutableSettings.settingsBuilder()
- .put( "node.http.enabled", true )
- .put( "transport.tcp.port", port )
- .put( "path.logs", "target/elasticsearch/logs_" + port )
- .put( "path.data", "target/elasticsearch/data_" + port )
- .put( "gateway.type", "none" )
- .put( "index.store.type", "memory" )
- .put( "index.number_of_shards", 1 )
- .put( "index.number_of_replicas", 1 ).build();
-
- Node node = NodeBuilder.nodeBuilder().local( true ).settings( settings ).node();
+ .put("node.http.enabled", true)
+ .put("transport.tcp.port", port)
+ .put("path.logs", "target/elasticsearch/logs_" + port)
+ .put("path.data", "target/elasticsearch/data_" + port)
+ .put("gateway.type", "none")
+ .put("index.store.type", "memory")
+ .put("index.number_of_shards", 1)
+ .put("index.number_of_replicas", 1).build();
+
+ Node node = NodeBuilder.nodeBuilder().local(true).settings(settings).node();
newClient = node.client();
-
+
} else { // build client that connects to all hosts
log.info("--------------------------------");
log.info("Creating ElasticSearch client");
log.info("--------------------------------");
- TransportClient transportClient = new TransportClient();
- for ( String host : fig.getHosts().split(",") ) {
+ Settings settings = ImmutableSettings.settingsBuilder()
+ .put("cluster.name", fig.getIndexName() ).build();
+
+ TransportClient transportClient = new TransportClient(settings);
+ for (String host : fig.getHosts().split(",")) {
transportClient.addTransportAddress(
- new InetSocketTransportAddress( host, fig.getPort() ));
+ new InetSocketTransportAddress(host.trim(), fig.getPort()));
}
newClient = transportClient;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6979ae6b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/legacy/EntityManagerFacade.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/legacy/EntityManagerFacade.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/legacy/EntityManagerFacade.java
index de1b9b6..5e57ace 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/legacy/EntityManagerFacade.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/legacy/EntityManagerFacade.java
@@ -15,7 +15,6 @@
* copyright in this work, please see the NOTICE file in the top level
* directory of this distribution.
*/
-
package org.apache.usergrid.persistence.index.legacy;
import org.apache.usergrid.utils.EntityBuilder;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6979ae6b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties
index 8d3ee42..1f8cb99 100644
--- a/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties
+++ b/stack/corepersistence/queryindex/src/test/resources/dynamic-test.properties
@@ -11,6 +11,6 @@ cassandra.timeout=5000
index.query.limit.default=10
elasticsearch.indexname=Usergrid
elasticsearch.embedded=true
-elasticsearch.force-refresh=true
+elasticsearch.force-refresh=false
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6979ae6b/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties b/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties
index f25632e..7c3e0c9 100644
--- a/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties
+++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-CHOP.properties
@@ -11,6 +11,7 @@ collections.keyspace=Usergrid_Collections
cassandra.timeout=5000
index.query.limit.default=10
+
elasticsearch.indexname=usergrid
-elasticsearch.embedded=true
-elasticsearch.force-refresh=true
+elasticsearch.embedded=false
+elasticsearch.force_refresh=false
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6979ae6b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
index 34e5f62..828dca7 100644
--- a/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
+++ b/stack/corepersistence/queryindex/src/test/resources/usergrid-UNIT.properties
@@ -14,5 +14,5 @@ collection.stage.transient.timeout=60
collections.keyspace.strategy.class=org.apache.cassandra.locator.SimpleStrategy
index.query.limit.default=1000
-elasticsearch.indexname=usergrid
+elasticsearch.index_name=usergrid
elasticsearch.embedded=true