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/04/21 17:55:15 UTC
[06/16] incubator-usergrid git commit: Merge remote-tracking branch
'origin/two-dot-o-dev' into USERGRID-541
Merge remote-tracking branch 'origin/two-dot-o-dev' into USERGRID-541
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/48d8060e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/48d8060e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/48d8060e
Branch: refs/heads/USERGRID-578
Commit: 48d8060e8642e7fb5333f6d65b2ba90b1a5ec292
Parents: 745f355 8f592dd
Author: Todd Nine <tn...@apigee.com>
Authored: Fri Apr 17 15:31:25 2015 -0600
Committer: Todd Nine <tn...@apigee.com>
Committed: Fri Apr 17 15:31:25 2015 -0600
----------------------------------------------------------------------
portal/index-template.html | 2 +-
portal/js/data/data-controller.js | 58 +++++++++-
portal/js/data/data.html | 36 +++++-
portal/js/global/ug-service.js | 30 ++++-
portal/js/login/login-controller.js | 15 ++-
.../corepersistence/CpEntityManagerFactory.java | 7 +-
.../persistence/EntityManagerFactory.java | 6 +-
.../DuplicateUniquePropertyExistsException.java | 2 +-
.../usergrid/persistence/index/EntityIndex.java | 2 +-
.../persistence/index/IndexRefreshCommand.java | 23 +++-
.../impl/EsApplicationEntityIndexImpl.java | 2 +-
.../index/impl/EsEntityIndexImpl.java | 2 +-
.../index/impl/IndexRefreshCommandImpl.java | 24 ++--
.../src/test/resources/dynamic-test.properties | 2 +-
stack/pom.xml | 12 +-
stack/rest/pom.xml | 16 ++-
.../org/apache/usergrid/rest/IndexResource.java | 4 +-
.../org/apache/usergrid/rest/RootResource.java | 11 +-
.../rest/test/resource2point0/README.md | 111 +++++++++++++++++++
.../resource2point0/endpoints/RootResource.java | 1 +
.../security/providers/AbstractProvider.java | 6 +
.../providers/PingIdentityProvider.java | 14 ++-
.../services/AbstractCollectionService.java | 2 +-
23 files changed, 333 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48d8060e/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManagerFactory.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48d8060e/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsApplicationEntityIndexImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48d8060e/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/EsEntityIndexImpl.java
index 961ddd2,c80f80d..fcfba15
--- 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
@@@ -320,10 -346,10 +320,10 @@@ public class EsEntityIndexImpl implemen
- public Observable<Boolean> refreshAsync() {
+ public Observable<IndexRefreshCommand.IndexRefreshCommandInfo> refreshAsync() {
refreshIndexMeter.mark();
- BetterFuture future = indexBatchBufferProducer.put(new IndexIdentifierImpl.IndexOperationMessage());
+ BetterFuture future = producer.put(new IndexOperationMessage());
future.get();
return indexRefreshCommand.execute();
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/48d8060e/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java
index 5052ddf,804de51..07150bb
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexRefreshCommandImpl.java
@@@ -143,22 -145,24 +145,24 @@@ public class IndexRefreshCommandImpl im
return future.doOnNext( found -> {
- if ( !found ) {
- logger.error( "Couldn't find record during refresh uuid" + uuid );
+ if ( !found.hasFinished() ) {
+ logger.error(String.format("Couldn't find record during refresh uuid: {} took ms:{} ", uuid, found.getExecutionTime()));
+ }else{
+ logger.info(String.format("found record during refresh uuid: {} took ms:{} ", uuid, found.getExecutionTime()));
}
- } ).doOnCompleted( () -> {
+ } ).doOnCompleted(() -> {
//clean up our data
- String[] aliases = indexCache.getIndexes( alias, AliasedEntityIndex.AliasType.Read );
+ String[] aliases = indexCache.getIndexes(alias, AliasedEntityIndex.AliasType.Read);
DeIndexRequest deIndexRequest =
- new DeIndexRequest( aliases, appScope, edge, entity.getId(), entity.getVersion() );
+ new DeIndexRequest(aliases, appScope, edge, entity.getId(), entity.getVersion());
//delete the item
- IndexIdentifierImpl.IndexOperationMessage indexOperationMessage =
- new IndexIdentifierImpl.IndexOperationMessage();
- indexOperationMessage.addDeIndexRequest(deIndexRequest);
- producer.put(indexOperationMessage);
+ IndexOperationMessage indexOperationMessage =
+ new IndexOperationMessage();
+ indexOperationMessage.addDeIndexRequest( deIndexRequest );
+ producer.put( indexOperationMessage );
refreshTimer.stop();
- } );
+ });
}
}