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/10 23:58:51 UTC
[1/2] incubator-usergrid git commit: USERGRID-739
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-739 [created] 0a4939ba3
USERGRID-739
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/3ea7c51d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/3ea7c51d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/3ea7c51d
Branch: refs/heads/USERGRID-739
Commit: 3ea7c51da958409202521df4d3c43683dea2368f
Parents: daedb92
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 10 15:58:20 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 10 15:58:20 2015 -0600
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 5 +++--
.../index/ApplicationIndexLocationStrategy.java | 22 +++++++-------------
.../index/ManagementIndexLocationStrategy.java | 18 +++++++---------
.../usergrid/persistence/EntityManager.java | 3 ++-
.../corepersistence/index/IndexNamingTest.java | 10 ++++-----
.../usergrid/persistence/index/EntityIndex.java | 6 +++---
.../index/IndexLocationStrategy.java | 5 ++---
.../index/impl/EsEntityIndexBatchImpl.java | 2 +-
.../index/impl/EsEntityIndexImpl.java | 18 ++++++++--------
.../persistence/index/impl/EntityIndexTest.java | 4 ++--
.../index/impl/TestIndexIdentifier.java | 11 ++++------
.../org/apache/usergrid/rest/IndexResource.java | 5 +++--
12 files changed, 49 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ea7c51d/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 7c44e0e..36d5ed3 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
@@ -34,6 +34,7 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.UUID;
+import com.google.common.base.Optional;
import org.apache.usergrid.corepersistence.index.IndexLocationStrategyFactory;
import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.IndexLocationStrategy;
@@ -2897,8 +2898,8 @@ public class CpEntityManager implements EntityManager {
@Override
- public void addIndex(final String indexSuffix,final int shards,final int replicas, final String writeConsistency){
- managerCache.getEntityIndex(applicationScope).addIndex( indexSuffix, shards, replicas, writeConsistency);
+ public void addIndex(final Optional<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/3ea7c51d/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
index 04bdf9b..8665b08 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/index/ApplicationIndexLocationStrategy.java
@@ -33,7 +33,7 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
private final CassandraFig cassandraFig;
private final IndexFig indexFig;
private final ApplicationScope applicationScope;
- private final String prefix;
+ private final String indexName;
private final IndexAlias alias;
public ApplicationIndexLocationStrategy(final CassandraFig cassandraFig,
@@ -43,12 +43,11 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
this.cassandraFig = cassandraFig;
this.indexFig = indexFig;
this.applicationScope = applicationScope;
- this.prefix = getPrefix();
- this.alias = new ApplicationIndexAlias(indexFig, applicationScope, prefix);
+ this.indexName = getPrefix(); //TODO: add hash buckets by app scope
+ this.alias = new ApplicationIndexAlias(indexFig, applicationScope, indexName);
}
private String getPrefix() {
- //TODO: add hash buckets by app scope
//remove usergrid
final String indexPrefixConfig = StringUtils.isNotEmpty(indexFig.getIndexPrefix())
? indexFig.getIndexPrefix().toLowerCase() ////use lowercase value
@@ -74,22 +73,17 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
/**
* Get index name, send in additional parameter to add incremental indexes
- * @param suffix
* @return
*/
@Override
- public String getIndex(String suffix) {
- if (suffix != null) {
- return prefix + "_" + suffix;
- } else {
- return prefix;
- }
+ public String getIndex() {
+ return indexName;
}
@Override
public String toString() {
- return "index id: "+prefix;
+ return "index id: "+indexName;
}
@Override
@@ -115,14 +109,14 @@ class ApplicationIndexLocationStrategy implements IndexLocationStrategy {
ApplicationIndexLocationStrategy that = (ApplicationIndexLocationStrategy) o;
if (!applicationScope.equals(that.applicationScope)) return false;
- return prefix.equals(that.prefix);
+ return indexName.equals(that.indexName);
}
@Override
public int hashCode() {
int result = applicationScope.hashCode();
- result = 31 * result + prefix.hashCode();
+ result = 31 * result + indexName.hashCode();
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ea7c51d/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 0bf674a..962605e 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
@@ -32,7 +32,7 @@ import org.apache.usergrid.utils.StringUtils;
* Strategy for getting the management index name
*/
class ManagementIndexLocationStrategy implements IndexLocationStrategy {
- private final String prefix;
+ private final String indexName;
private final IndexFig indexFig;
private final CoreIndexFig coreIndexFig;
private final IndexAlias alias;
@@ -43,8 +43,8 @@ class ManagementIndexLocationStrategy implements IndexLocationStrategy {
this.coreIndexFig = coreIndexFig;
this.applicationScope = CpNamingUtils.getApplicationScope( CpNamingUtils.getManagementApplicationId().getUuid());
//remove usergrid
- this.prefix = coreIndexFig.getManagementAppIndexName().toLowerCase(); ////use lowercase value
- this.alias = new ManagementIndexAlias(indexFig,prefix);
+ this.indexName = coreIndexFig.getManagementAppIndexName().toLowerCase(); ////use lowercase value
+ this.alias = new ManagementIndexAlias(indexFig,indexName);
}
@Override
public IndexAlias getAlias() {
@@ -52,12 +52,8 @@ class ManagementIndexLocationStrategy implements IndexLocationStrategy {
}
@Override
- public String getIndex(String suffix) {
- if (suffix != null) {
- return prefix + "_" + suffix;
- } else {
- return prefix;
- }
+ public String getIndex() {
+ return indexName;
}
@Override
@@ -83,14 +79,14 @@ class ManagementIndexLocationStrategy implements IndexLocationStrategy {
ManagementIndexLocationStrategy that = (ManagementIndexLocationStrategy) o;
if (!applicationScope.equals(that.applicationScope)) return false;
- return prefix.equals(that.prefix);
+ return indexName.equals(that.indexName);
}
@Override
public int hashCode() {
int result = applicationScope.hashCode();
- result = 31 * result + prefix.hashCode();
+ result = 31 * result + indexName.hashCode();
return result;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ea7c51d/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 3f088f2..a9df0ca 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
@@ -24,6 +24,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
+import com.google.common.base.Optional;
import org.apache.usergrid.persistence.Query.Level;
import org.apache.usergrid.persistence.cassandra.CassandraService;
import org.apache.usergrid.persistence.entities.Application;
@@ -725,7 +726,7 @@ public interface EntityManager {
* @param replicas number of replicas
* @param writeConsistency only "one, quorum, or all"
*/
- void addIndex(final String suffix,final int shards,final int replicas, final String writeConsistency);
+ void addIndex(final Optional<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/3ea7c51d/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
index 82fb154..ec49c79 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/index/IndexNamingTest.java
@@ -76,17 +76,17 @@ public class IndexNamingTest {
@Test
public void managementNaming(){
IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(managementApplicationScope);
- assertEquals(indexLocationStrategy.getIndex(null),managementLocationStrategy.getIndex(null));
- assertEquals(indexLocationStrategy.getIndex(null),indexProcessorFig.getManagementAppIndexName());
+ assertEquals(indexLocationStrategy.getIndex(),managementLocationStrategy.getIndex());
+ assertEquals(indexLocationStrategy.getIndex(),indexProcessorFig.getManagementAppIndexName());
}
@Test
public void applicationNaming(){
IndexLocationStrategy indexLocationStrategy = indexLocationStrategyFactory.getIndexLocationStrategy(applicationScope);
- assertEquals(indexLocationStrategy.getIndex(null),applicationLocationStrategy.getIndex(null));
+ assertEquals(indexLocationStrategy.getIndex(),applicationLocationStrategy.getIndex());
- assertTrue(indexLocationStrategy.getIndex(null).contains(indexFig.getIndexPrefix()));
- assertTrue(indexLocationStrategy.getIndex(null).contains(cassandraFig.getApplicationKeyspace().toLowerCase()));
+ assertTrue(indexLocationStrategy.getIndex().contains(indexFig.getIndexPrefix()));
+ assertTrue(indexLocationStrategy.getIndex().contains(cassandraFig.getApplicationKeyspace().toLowerCase()));
assertTrue(indexLocationStrategy.getAlias().getReadAlias().contains(applicationScope.getApplication().getUuid().toString().toLowerCase()));
assertTrue(indexLocationStrategy.getAlias().getWriteAlias().contains(applicationScope.getApplication().getUuid().toString().toLowerCase()));
assertTrue(indexLocationStrategy.getAlias().getWriteAlias().contains("write"));
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ea7c51d/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 dca7e13..e4b1d13 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
@@ -20,6 +20,7 @@
package org.apache.usergrid.persistence.index;
+import com.google.common.base.Optional;
import org.apache.usergrid.persistence.core.CPManager;
import org.apache.usergrid.persistence.core.util.Health;
import org.apache.usergrid.persistence.model.entity.Id;
@@ -43,7 +44,7 @@ public interface EntityIndex extends CPManager {
* @param replicas
* @param writeConsistency
*/
- void addIndex(final String indexSuffix, final int shards, final int replicas, final String writeConsistency);
+ void addIndex(final Optional<String> indexSuffix, final int shards, final int replicas, final String writeConsistency);
/**
* Refresh the index.
@@ -124,9 +125,8 @@ public interface EntityIndex extends CPManager {
/**
* Add alias to index, will remove old index from write alias
- * @param indexSuffix must be different than current index
*/
- void addAlias( final String indexSuffix );
+ void addAlias( );
/**
* type of alias
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ea7c51d/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 633a109..edfcaec 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
@@ -21,7 +21,7 @@ package org.apache.usergrid.persistence.index;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
/**
- * location strategy for index
+ * location strategy for index
*/
public interface IndexLocationStrategy {
/**
@@ -32,10 +32,9 @@ public interface IndexLocationStrategy {
/**
* get index name from suffix
- * @param suffix
* @return
*/
- String getIndex( String suffix );
+ String getIndex( );
/**
* return unique string
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ea7c51d/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
index 6b42c17..fce973b 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexBatchImpl.java
@@ -93,7 +93,7 @@ public class EsEntityIndexBatchImpl implements EntityIndexBatch {
String[] indexes = entityIndex.getUniqueIndexes();
//get the default index if no alias exists yet
if ( indexes == null || indexes.length == 0 ) {
- indexes = new String[] { indexIdentifier.getIndex( null ) };
+ indexes = new String[] { indexIdentifier.getIndex( ) };
}
if ( log.isDebugEnabled() ) {
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ea7c51d/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 e4fa6b6..17dcc9a 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
@@ -20,8 +20,8 @@ package org.apache.usergrid.persistence.index.impl;
import com.codahale.metrics.Meter;
import com.codahale.metrics.Timer;
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
+import com.google.common.base.*;
+import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.io.Resources;
import com.google.inject.Inject;
@@ -160,7 +160,7 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
final int numberOfReplicas = indexLocationStrategy.getNumberOfReplicas();
if (shouldInitialize()) {
- addIndex( null, numberOfShards, numberOfReplicas, indexFig.getWriteConsistencyLevel() );
+ addIndex( Optional.absent(), numberOfShards, numberOfReplicas, indexFig.getWriteConsistencyLevel() );
}
}
@@ -171,10 +171,10 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
}
@Override
- public void addIndex(final String indexSuffix,final int numberOfShards, final int numberOfReplicas, final String writeConsistency) {
+ public void addIndex(final com.google.common.base.Optional<String> indexNameOverride, final int numberOfShards, final int numberOfReplicas, final String writeConsistency) {
try {
//get index name with suffix attached
- String indexName = indexLocationStrategy.getIndex(indexSuffix);
+ final String indexName = indexNameOverride.or(indexLocationStrategy.getIndex()) ;
//Create index
try {
@@ -214,7 +214,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(indexSuffix);
+ addAlias();
@@ -229,11 +229,11 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
@Override
- public void addAlias(final String indexSuffix) {
+ public void addAlias() {
Timer.Context timer = updateAliasTimer.time();
try {
Boolean isAck;
- String indexName = indexLocationStrategy.getIndex(indexSuffix);
+ String indexName = indexLocationStrategy.getIndex();
final AdminClient adminClient = esProvider.getClient().admin();
String[] indexNames = getIndexes(AliasType.Write);
@@ -715,7 +715,7 @@ public class EsEntityIndexImpl implements EntityIndex,VersionedData {
try {
final ActionFuture<ClusterHealthResponse> future = esProvider.getClient().admin().cluster().health(
- new ClusterHealthRequest( new String[] { indexLocationStrategy.getIndex( null ) } ) );
+ new ClusterHealthRequest( new String[] { indexLocationStrategy.getIndex( ) } ) );
//only wait 2 seconds max
ClusterHealthResponse chr = future.actionGet(2000);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ea7c51d/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 d62e788..a2ce50e 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("v2", 1, 0, "one");
+ entityIndex.addIndex(Optional.of(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( "v2", 1, 0, "one" );
+ entityIndex.addIndex(Optional.of(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/3ea7c51d/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 babb3b1..39f6da0 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
@@ -68,16 +68,13 @@ public class TestIndexIdentifier implements IndexLocationStrategy {
/**
* Get index name, send in additional parameter to add incremental indexes
- * @param suffix
* @return
*/
@Override
- public String getIndex(String suffix) {
- if (suffix != null) {
- return prefix + "_" + suffix;
- } else {
- return prefix;
- }
+ public String getIndex() {
+
+ return prefix;
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/3ea7c51d/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 9b344b9..81c94ae 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
@@ -35,6 +35,7 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.UriInfo;
+import com.google.common.base.Optional;
import org.apache.usergrid.corepersistence.util.CpNamingUtils;
import org.apache.usergrid.persistence.EntityManager;
import org.slf4j.Logger;
@@ -248,8 +249,8 @@ public class IndexResource extends AbstractContextResource {
}
EntityManager em = emf.getEntityManager(appId);
- em.addIndex( config.get( "indexSuffix" ).toString(), ( int ) config.get( "shards" ),
- ( int ) config.get( "replicas" ), ( String ) config.get( "writeConsistency" ) );
+ em.addIndex(Optional.of(config.get("indexSuffix").toString()), (int) config.get("shards"),
+ (int) config.get("replicas"), (String) config.get("writeConsistency"));
response.setAction( "Add index to alias" );
return new JSONWithPadding( response, callback );
[2/2] incubator-usergrid git commit: Merge branch 'two-dot-o-dev' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Posted by sf...@apache.org.
Merge branch 'two-dot-o-dev' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0a4939ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0a4939ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0a4939ba
Branch: refs/heads/USERGRID-739
Commit: 0a4939ba3cec5519fd5f2ba7b87e3f81d08156f4
Parents: 3ea7c51 d66402d
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Jun 10 15:58:26 2015 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Jun 10 15:58:26 2015 -0600
----------------------------------------------------------------------
.../test/java/org/apache/usergrid/rest/IndexResourceIT.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------