You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/06/12 19:04:42 UTC
[1/3] incubator-usergrid git commit: add cluster name
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-dev 3f0b0a60f -> d57374b8f
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/b92bdb0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b92bdb0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b92bdb0c
Branch: refs/heads/two-dot-o-dev
Commit: b92bdb0cccc53994b5aa95f58e0cfcf89a567838
Parents: 3f0b0a6
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jun 12 10:33:06 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jun 12 10:33:06 2015 -0600
----------------------------------------------------------------------
.../apache/usergrid/corepersistence/index/CoreIndexFig.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b92bdb0c/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 90a3191..3dc6961 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,6 +28,7 @@ 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";
@@ -40,9 +41,9 @@ public interface CoreIndexFig extends GuicyFig {
@Key( ELASTICSEARCH_MANAGEMENT_NUMBER_OF_REPLICAS )
int getManagementNumberOfReplicas();
- @Default( "usergrid_management" )
- @Key( "elasticsearch.managment_index" )
- String getManagementAppIndexName();
+ default String getManagementAppIndexName(){
+ return MANAGEMENT_APP_NAME;
+ }
@Default( "5" )
@Key( "elasticsearch.index_bucket_count" )
[3/3] incubator-usergrid git commit: gix tests
Posted by sf...@apache.org.
gix tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/d57374b8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/d57374b8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/d57374b8
Branch: refs/heads/two-dot-o-dev
Commit: d57374b8f5ac22bdb0db50f0c13f6c18acf34725
Parents: 18b99b2
Author: Shawn Feldman <sf...@apache.org>
Authored: Fri Jun 12 11:04:33 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Fri Jun 12 11:04:33 2015 -0600
----------------------------------------------------------------------
.../usergrid/corepersistence/CpEntityManager.java | 2 +-
.../apache/usergrid/persistence/EntityManager.java | 2 +-
.../usergrid/persistence/index/EntityIndex.java | 2 +-
.../persistence/index/impl/EsEntityIndexImpl.java | 16 ++++++++--------
.../persistence/index/impl/EntityIndexTest.java | 4 ++--
.../org/apache/usergrid/rest/IndexResource.java | 2 +-
6 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d57374b8/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
index 36d55a3..6184616 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
@@ -2897,7 +2897,7 @@ public class CpEntityManager implements EntityManager {
@Override
- public void addIndex(final Optional<String> newIndexName,final int shards,final int replicas, final String writeConsistency){
+ public void addIndex(final String newIndexName,final int shards,final int replicas, final String writeConsistency){
managerCache.getEntityIndex(applicationScope).addIndex( newIndexName, shards, replicas, writeConsistency);
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d57374b8/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java
index a9df0ca..c4a77ac 100644
--- a/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/persistence/EntityManager.java
@@ -726,7 +726,7 @@ public interface EntityManager {
* @param replicas number of replicas
* @param writeConsistency only "one, quorum, or all"
*/
- void addIndex(final Optional<String> newIndexName,final int shards,final int replicas, final String writeConsistency);
+ void addIndex(final String newIndexName,final int shards,final int replicas, final String writeConsistency);
IndexRefreshCommand.IndexRefreshCommandInfo refreshIndex();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d57374b8/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
index f19d38e..7fa2f07 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/EntityIndex.java
@@ -45,7 +45,7 @@ public interface EntityIndex extends CPManager {
* @param writeConsistency
*/
void addIndex(
- final Optional<String> indexSuffix,
+ final String indexSuffix,
final int shards,
final int replicas,
final String writeConsistency
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d57374b8/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 675a575..09e864f 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
@@ -159,7 +159,7 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
final int numberOfReplicas = indexLocationStrategy.getNumberOfReplicas();
if (shouldInitialize()) {
- addIndex( Optional.absent(), numberOfShards, numberOfReplicas, indexFig.getWriteConsistencyLevel() );
+ addIndex( indexLocationStrategy.getIndexBucketName(), numberOfShards, numberOfReplicas, indexFig.getWriteConsistencyLevel() );
}
}
@@ -168,19 +168,19 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
* @return
*/
private boolean shouldInitialize() {
- String[] reads = getIndexes();
- return reads.length==0;
+ String[] writes = getIndexes(AliasType.Write);
+ return writes.length==0;
}
@Override
- public void addIndex(final Optional<String> indexNameOverride,
+ public void addIndex(final String indexName,
final int numberOfShards,
final int numberOfReplicas,
final String writeConsistency
) {
try {
//get index name with bucket attached
- final String indexName = indexNameOverride.or( indexLocationStrategy.getIndexBucketName() ) ;
+ Preconditions.checkNotNull(indexName,"must have an indexname");
//Create index
try {
@@ -219,7 +219,7 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
//We do NOT want to create an alias if the index already exists, we'll overwrite the indexes that
//may have been set via other administrative endpoint
- addAlias();
+ addAlias(indexName);
testNewIndex();
@@ -230,11 +230,11 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
}
}
- private void addAlias() {
+ private void addAlias(String indexName) {
Timer.Context timer = updateAliasTimer.time();
try {
Boolean isAck;
- String indexName = indexLocationStrategy.getIndexRootName();
+
final AdminClient adminClient = esProvider.getClient().admin();
String[] indexNames = getIndexes(AliasType.Write);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d57374b8/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
index a2ce50e..9154382 100644
--- a/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
+++ b/stack/corepersistence/queryindex/src/test/java/org/apache/usergrid/persistence/index/impl/EntityIndexTest.java
@@ -246,7 +246,7 @@ public class EntityIndexTest extends BaseIT {
testQueries(searchEdge, searchTypes);
- entityIndex.addIndex(Optional.of(UUID.randomUUID()+"_v2"), 1, 0, "one");
+ entityIndex.addIndex(UUID.randomUUID()+"_v2", 1, 0, "one");
insertJsonBlob( entityType, searchEdge, "/sample-large.json", 101, 100);
@@ -270,7 +270,7 @@ public class EntityIndexTest extends BaseIT {
insertJsonBlob( entityType, searchEdge, "/sample-large.json", 1, 0 );
- entityIndex.addIndex(Optional.of(UUID.randomUUID()+ "v2"), 1, 0, "one" );
+ entityIndex.addIndex(UUID.randomUUID()+ "v2", 1, 0, "one" );
entityIndex.refreshAsync().toBlocking().first();
insertJsonBlob( entityType, searchEdge, "/sample-large.json", 1, 1 );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/d57374b8/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java b/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
index 81c94ae..1a801f1 100644
--- a/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
+++ b/stack/rest/src/main/java/org/apache/usergrid/rest/IndexResource.java
@@ -249,7 +249,7 @@ public class IndexResource extends AbstractContextResource {
}
EntityManager em = emf.getEntityManager(appId);
- em.addIndex(Optional.of(config.get("indexSuffix").toString()), (int) config.get("shards"),
+ em.addIndex(config.get("indexSuffix").toString(), (int) config.get("shards"),
(int) config.get("replicas"), (String) config.get("writeConsistency"));
response.setAction( "Add index to alias" );
[2/3] incubator-usergrid git commit: add cluster name
Posted by sf...@apache.org.
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/two-dot-o-dev
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