You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by gr...@apache.org on 2015/02/26 00:17:20 UTC
[23/23] incubator-usergrid git commit: Merge branch
'USERGRID-273-indexbuffer' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
Merge branch 'USERGRID-273-indexbuffer' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into USERGRID-409
# By Shawn Feldman (12) and others
# Via Shawn Feldman (7) and others
* 'USERGRID-273-indexbuffer' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid:
remove synchronous calls
undo change
change config
Changes to allow us to fix the old tests that are broken because tests now share the same C* keyspace, and some fixes to the old ApplicationResourceIT.
add batching
Add futures to batch and refresh
Add batch of batches
Removes wait from progress observer, since this is no longer used.
Simple REST tests now working again with Tomcat embedded.
Add jackson-xc back in.
Add jackson-xc back in.
Fixes startup order bug.
add batches of batches
Moving back to embedded Tomcat instead of Arquillian.
removing future, moving around some initialization code
Back off of Arquillian for now.
add comments
add blocking queue
Adding metrics to cp
adding index buffer
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b61795dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b61795dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b61795dd
Branch: refs/heads/USERGRID-409
Commit: b61795dd31add0580b0606b10758829af04c7e84
Parents: 4be53fb 0fabb49
Author: grey <gr...@apigee.com>
Authored: Wed Feb 25 15:15:22 2015 -0800
Committer: grey <gr...@apigee.com>
Committed: Wed Feb 25 15:15:22 2015 -0800
----------------------------------------------------------------------
.../batch/service/JobSchedulerService.java | 2 +-
.../corepersistence/CpEntityManager.java | 4 +-
.../corepersistence/CpEntityManagerFactory.java | 7 +-
.../corepersistence/CpRelationManager.java | 6 +-
.../results/FilteringLoader.java | 42 ++--
.../apache/usergrid/metrics/MetricsFactory.java | 112 ----------
.../persistence/EntityManagerFactory.java | 5 -
.../main/resources/usergrid-core-context.xml | 4 +-
.../batch/job/AbstractSchedulerRuntimeIT.java | 2 +-
.../PerformanceEntityRebuildIndexTest.java | 13 +-
.../cassandra/EntityManagerFactoryImplIT.java | 5 -
stack/corepersistence/common/pom.xml | 12 ++
.../persistence/core/future/BetterFuture.java | 43 ++++
.../persistence/core/guice/CommonModule.java | 6 +-
.../core/metrics/MetricsFactory.java | 34 +++
.../core/metrics/MetricsFactoryImpl.java | 113 ++++++++++
.../persistence/core/metrics/MetricsFig.java | 33 +++
stack/corepersistence/pom.xml | 1 +
.../persistence/index/EntityIndexBatch.java | 33 +--
.../persistence/index/IndexBatchBuffer.java | 44 ++++
.../usergrid/persistence/index/IndexFig.java | 45 +++-
.../index/RequestBuilderContainer.java | 65 ++++++
.../persistence/index/guice/IndexModule.java | 12 +-
.../index/impl/EsEntityIndexBatchImpl.java | 126 +++--------
.../index/impl/EsEntityIndexImpl.java | 6 +-
.../index/impl/IndexBatchBufferImpl.java | 213 +++++++++++++++++++
.../index/impl/CorePerformanceIT.java | 44 ++--
.../impl/EntityConnectionIndexImplTest.java | 6 +-
.../persistence/index/impl/EntityIndexTest.java | 100 ++++++---
stack/pom.xml | 1 +
stack/rest/pom.xml | 134 ++++--------
.../org/apache/usergrid/rest/IndexResource.java | 27 +--
.../applications/ApplicationsResource.java | 20 +-
.../resources/usergrid-rest-deploy-context.xml | 2 +-
.../apache/usergrid/rest/AbstractRestIT.java | 188 ++++++++--------
.../java/org/apache/usergrid/rest/BasicIT.java | 66 +++---
.../java/org/apache/usergrid/rest/ITSetup.java | 57 +----
.../org/apache/usergrid/rest/SimplestTest.java | 35 +++
.../org/apache/usergrid/rest/TomcatRuntime.java | 192 +++++++++++++++++
.../applications/ApplicationResourceIT.java | 174 ++++++---------
.../rest/management/RegistrationIT.java | 9 +-
.../test/resource2point0/AbstractRestIT.java | 77 ++++---
.../resources/usergrid-deployment.properties | 111 ----------
.../resources/usergrid-rest-deploy-context.xml | 26 +++
.../usergrid/services/guice/ServiceModule.java | 2 -
.../notifications/NotificationsService.java | 4 +-
.../services/notifications/QueueJob.java | 6 +-
.../services/notifications/QueueListener.java | 6 +-
.../impl/ApplicationQueueManagerImpl.java | 2 +-
.../services/queues/ImportQueueListener.java | 7 +-
.../usergrid/services/queues/QueueListener.java | 7 +-
.../resources/usergrid-services-context.xml | 1 -
.../apns/NotificationsServiceIT.java | 2 +-
.../gcm/NotificationsServiceIT.java | 4 +-
54 files changed, 1387 insertions(+), 911 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b61795dd/stack/core/src/main/resources/usergrid-core-context.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/b61795dd/stack/core/src/test/java/org/apache/usergrid/persistence/cassandra/EntityManagerFactoryImplIT.java
----------------------------------------------------------------------