You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2015/06/12 23:01:10 UTC
[17/23] incubator-usergrid git commit: add cluster name
add cluster name
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/18b99b21
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/18b99b21
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/18b99b21
Branch: refs/heads/USERGRID-744
Commit: 18b99b21dc078bc34426b8d57a0a40b35cdb8e3c
Parents: b92bdb0
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jun 12 10:43:29 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jun 12 10:43:29 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/index/CoreIndexFig.java | 7 +++----
.../index/ManagementIndexLocationStrategy.java | 5 ++++-
.../apache/usergrid/persistence/core/guicyfig/ClusterFig.java | 3 +--
.../usergrid/persistence/index/IndexLocationStrategy.java | 4 +---
.../usergrid/persistence/index/impl/TestIndexIdentifier.java | 4 ++++
5 files changed, 13 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18b99b21/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java
index 3dc6961..29d807e 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/CoreIndexFig.java
@@ -28,7 +28,6 @@ import org.safehaus.guicyfig.Key;
*/
public interface CoreIndexFig extends GuicyFig {
- String MANAGEMENT_APP_NAME = "management";
String ELASTICSEARCH_MANAGEMENT_NUMBER_OF_SHARDS = "elasticsearch.management_number_shards";
String ELASTICSEARCH_MANAGEMENT_NUMBER_OF_REPLICAS = "elasticsearch.management_number_replicas";
@@ -41,9 +40,9 @@ public interface CoreIndexFig extends GuicyFig {
@Key( ELASTICSEARCH_MANAGEMENT_NUMBER_OF_REPLICAS )
int getManagementNumberOfReplicas();
- default String getManagementAppIndexName(){
- return MANAGEMENT_APP_NAME;
- }
+ @Default( "management" )
+ @Key( "elasticsearch.managment_index" )
+ String getManagementAppIndexName();
@Default( "5" )
@Key( "elasticsearch.index_bucket_count" )
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18b99b21/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
index 79b14ca..545bc8a 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ManagementIndexLocationStrategy.java
@@ -58,7 +58,10 @@ class ManagementIndexLocationStrategy implements IndexLocationStrategy {
public String getIndexRootName() {
return indexName;
}
-
+ @Override
+ public String getIndexBucketName() {
+ return getIndexRootName();
+ }
@Override
public ApplicationScope getApplicationScope() {
return applicationScope;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18b99b21/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guicyfig/ClusterFig.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guicyfig/ClusterFig.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guicyfig/ClusterFig.java
index 7e612b8..a0c3f38 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guicyfig/ClusterFig.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guicyfig/ClusterFig.java
@@ -32,7 +32,6 @@ public interface ClusterFig extends GuicyFig{
@Default( "ug" )
@Key( "elasticsearch.index_prefix" ) //"usergrid.cluster_name"
- String getClusterNameInternal();
- default String getClusterName(){return getClusterNameInternal().toLowerCase();}
+ String getClusterName();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18b99b21/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
index cd565ae..3cea7b1 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/IndexLocationStrategy.java
@@ -37,9 +37,7 @@ public interface IndexLocationStrategy {
String getIndexRootName();
- default String getIndexBucketName() {
- return getIndexRootName();
- }
+ String getIndexBucketName() ;
/**
* return unique string
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/18b99b21/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java
index 5019348..c059287 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/TestIndexIdentifier.java
@@ -51,6 +51,10 @@ public class TestIndexIdentifier implements IndexLocationStrategy {
//check for repetition
return keyspaceName;
}
+ @Override
+ public String getIndexBucketName() {
+ return getIndexRootName();
+ }
/**
* Get the alias name