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 2014/10/22 23:05:46 UTC
[1/4] git commit: Merge remote-tracking branch 'origin/two-dot-o'
into two-dot-o-events
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o-events 6ca862fa5 -> 4474ca91d
Merge remote-tracking branch 'origin/two-dot-o' into two-dot-o-events
* origin/two-dot-o: (32 commits)
Fixes bug with lifecycle manager cache lazy loading
taking extra line out
fix bug if you have other devices
Fixes issue with setup not creating indexes correctly
notifications test fix
changing to uuid
fixing query to all
fix service
real tests for devices, BA
register devices
adding collections test
fix device removal, remove devices
adding device deletion
change queue name
fixing queue prefix name
change queuename
Fixed UUID lookup bug
Moved index create to be on new application entity manager
Removed obsolete tests.
Fixes problem with deleting connections
...
Conflicts:
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/38f65982
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/38f65982
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/38f65982
Branch: refs/heads/two-dot-o-events
Commit: 38f659822989926a6f52aee2556906e433f704f5
Parents: d9ace9e 9da529b
Author: grey <gr...@apigee.com>
Authored: Thu Oct 16 13:14:21 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Thu Oct 16 13:14:21 2014 -0700
----------------------------------------------------------------------
.../corepersistence/CpEntityManager.java | 130 ++++------
.../corepersistence/CpEntityManagerFactory.java | 41 +---
.../corepersistence/CpRelationManager.java | 29 ++-
.../usergrid/corepersistence/CpSetup.java | 3 +
.../usergrid/corepersistence/CpVisitor.java | 8 +-
.../usergrid/corepersistence/CpWalker.java | 149 +++---------
.../HybridEntityManagerFactory.java | 10 -
.../corepersistence/results/EntityVerifier.java | 3 +-
.../results/FilteringLoader.java | 74 +++---
.../corepersistence/results/ResultsLoader.java | 11 +-
.../results/VersionVerifier.java | 5 +-
.../usergrid/persistence/EntityManager.java | 3 -
.../persistence/EntityManagerFactory.java | 4 -
.../cassandra/EntityManagerFactoryImpl.java | 10 -
.../cassandra/EntityManagerImpl.java | 7 +-
.../usergrid/batch/job/SchedulerRuntime8IT.java | 3 +
.../corepersistence/StaleIndexCleanupTest.java | 2 +
.../PerformanceEntityRebuildIndexTest.java | 2 +
.../PerformanceEntityRepersistTest.java | 240 -------------------
.../query/AbstractIteratingQueryIT.java | 3 +
.../impl/EntityCollectionManagerImpl.java | 36 +--
.../mvcc/stage/write/WriteCommit.java | 2 +-
.../collection/mvcc/stage/write/WriteStart.java | 7 +-
.../serialization/impl/FieldSerializer.java | 3 +-
.../MvccEntitySerializationStrategyImpl.java | 2 +-
.../UniqueValueSerializationStrategyImpl.java | 6 +-
.../collection/EntityCollectionManagerIT.java | 139 +++++++++--
...niqueValueSerializationStrategyImplTest.java | 63 ++++-
.../index/impl/EsEntityIndexBatchImpl.java | 2 +-
.../persistence/index/impl/IndexScopeImpl.java | 37 +++
.../queue/impl/SQSQueueManagerImpl.java | 14 +-
stack/pom.xml | 4 +-
.../apache/usergrid/rest/SystemResource.java | 30 ++-
.../usergrid/services/ServiceManager.java | 7 +-
.../services/devices/DevicesService.java | 55 ++++-
.../notifications/ApplicationQueueManager.java | 5 +-
.../notifications/NotificationsService.java | 7 +-
.../services/notifications/QueueListener.java | 2 +-
.../services/users/devices/DevicesService.java | 33 +++
.../cassandra/ManagementServiceIT.java | 2 +-
.../usergrid/services/TestQueueManager.java | 4 +-
.../AbstractServiceNotificationIT.java | 6 +-
.../notifications/NotifiersServiceIT.java | 1 +
.../apns/NotificationsServiceIT.java | 176 +++++++-------
.../gcm/NotificationsServiceIT.java | 164 ++-----------
.../src/test/resources/log4j.properties | 4 +
.../org/apache/usergrid/tools/RepersistAll.java | 98 --------
47 files changed, 675 insertions(+), 971 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/38f65982/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpEntityManager.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/38f65982/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --cc stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index 7b96d38,9f3c1ea..4aaa1d8
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@@ -330,23 -325,24 +330,23 @@@ public class EntityCollectionManagerImp
@Override
- public Observable<VersionSet> getLatestVersion( final Collection<Id> entityIds ) {
--
- return Observable.create( new Observable.OnSubscribe<VersionSet>() {
-
- @Override
- public void call( final Subscriber<? super VersionSet> subscriber ) {
- try {
- final VersionSet logEntries = mvccLogEntrySerializationStrategy.load( collectionScope, entityIds,
- UUIDGenerator.newTimeUUID() );
-
- subscriber.onNext( logEntries );
- subscriber.onCompleted();
- }
- catch ( Exception e ) {
- subscriber.onError( e );
- }
- }
- } );
+ public Observable<VersionSet> getLatestVersion(final Collection<Id> entityIds) {
+
+ return Observable.create(new Observable.OnSubscribe<VersionSet>() {
+
+ @Override
+ public void call(final Subscriber<? super VersionSet> subscriber) {
+ try {
+ final VersionSet logEntries = mvccLogEntrySerializationStrategy
+ .load(collectionScope, entityIds, UUIDGenerator.newTimeUUID());
+
+ subscriber.onNext(logEntries);
+ subscriber.onCompleted();
+
+ } catch (Exception e) {
+ subscriber.onError(e);
+ }
+ }
+ });
}
}
[3/4] git commit: Fixed issues surrounding EntityDeletedImpl and
EntityVersionDeletedImpl.
Posted by gr...@apache.org.
Fixed issues surrounding EntityDeletedImpl and EntityVersionDeletedImpl.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/31e2061a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/31e2061a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/31e2061a
Branch: refs/heads/two-dot-o-events
Commit: 31e2061add13c157251b8a4d401bab6bc2652c8b
Parents: fa26627
Author: grey <gr...@apigee.com>
Authored: Mon Oct 20 13:10:55 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Oct 20 13:10:55 2014 -0700
----------------------------------------------------------------------
.../events/EntityDeletedImpl.java | 5 ++---
.../events/EntityVersionDeletedImpl.java | 20 +++++++++++++++++---
2 files changed, 19 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/31e2061a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java
index bd21dc3..bb30c8c 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityDeletedImpl.java
@@ -48,10 +48,9 @@ import org.slf4j.LoggerFactory;
public class EntityDeletedImpl implements EntityDeleted {
private static final Logger logger = LoggerFactory.getLogger( EntityDeletedImpl.class );
- private final EntityIndexBatch entityIndex;
- public EntityDeletedImpl(EntityIndexBatch entityIndex){
- this.entityIndex = entityIndex;
+ public EntityDeletedImpl(){
+
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/31e2061a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java
index b1edc62..56011a0 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/events/EntityVersionDeletedImpl.java
@@ -18,10 +18,14 @@
package org.apache.usergrid.corepersistence.events;
+import org.apache.usergrid.corepersistence.CpEntityManagerFactory;
+import org.apache.usergrid.corepersistence.CpSetup;
+import org.apache.usergrid.persistence.EntityManagerFactory;
import org.apache.usergrid.persistence.collection.CollectionScope;
import org.apache.usergrid.persistence.collection.MvccEntity;
import org.apache.usergrid.persistence.collection.event.EntityVersionDeleted;
import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
+import org.apache.usergrid.persistence.index.EntityIndex;
import org.apache.usergrid.persistence.index.EntityIndexBatch;
import org.apache.usergrid.persistence.index.IndexScope;
import org.apache.usergrid.persistence.index.impl.IndexScopeImpl;
@@ -32,23 +36,33 @@ import rx.schedulers.Schedulers;
import java.util.List;
+import com.google.inject.Inject;
+
/**
* Purge old entity versions
*/
public class EntityVersionDeletedImpl implements EntityVersionDeleted{
- private final EntityIndexBatch entityIndexBatch;
private final SerializationFig serializationFig;
- public EntityVersionDeletedImpl(EntityIndexBatch entityIndexBatch, SerializationFig fig){
- this.entityIndexBatch = entityIndexBatch;
+ @Inject
+ public EntityVersionDeletedImpl(SerializationFig fig){
this.serializationFig = fig;
}
@Override
public void versionDeleted(
final CollectionScope scope, final Id entityId, final List<MvccEntity> entityVersions) {
+
+ CpEntityManagerFactory emf = (CpEntityManagerFactory)
+ CpSetup.getInjector().getInstance( EntityManagerFactory.class );
+
+ final EntityIndex ei = emf.getManagerCache().getEntityIndex(scope);
+
+ final EntityIndexBatch entityIndexBatch = ei.createBatch();
+
+
final IndexScope indexScope = new IndexScopeImpl(
new SimpleId(scope.getOwner().getUuid(),scope.getOwner().getType()),
scope.getName()
[4/4] git commit: Fixed spelling. Changed factory to take in
collectionScope. Fixed and added in wiring for EntityEvents. Added list
support in the module.
Posted by gr...@apache.org.
Fixed spelling.
Changed factory to take in collectionScope.
Fixed and added in wiring for EntityEvents.
Added list support in the module.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/4474ca91
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/4474ca91
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/4474ca91
Branch: refs/heads/two-dot-o-events
Commit: 4474ca91dace7c14d780986d02ea8c8ef0a90620
Parents: 31e2061
Author: grey <gr...@apigee.com>
Authored: Wed Oct 22 14:04:34 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Wed Oct 22 14:04:34 2014 -0700
----------------------------------------------------------------------
.../collection/EntityDeletedFactory.java | 2 +-
.../collection/EntityVersionCleanupFactory.java | 6 ++--
.../collection/guice/CollectionModule.java | 36 +++++++++++++++++++-
.../collection/impl/CollectionScopeImpl.java | 4 ++-
.../impl/EntityCollectionManagerImpl.java | 2 +-
.../collection/impl/EntityDeletedTask.java | 2 +-
.../impl/EntityVersionCleanupTask.java | 4 ++-
7 files changed, 46 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4474ca91/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java
index 13b1f1a..5d6cecb 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityDeletedFactory.java
@@ -26,7 +26,7 @@ import org.apache.usergrid.persistence.model.entity.Id;
import java.util.UUID;
/**
- * Creats EntityDeletedTask instances
+ * Creates EntityDeletedTask instances
*/
public interface EntityDeletedFactory {
public EntityDeletedTask getTask( final Id entityId, final UUID version );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4474ca91/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityVersionCleanupFactory.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityVersionCleanupFactory.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityVersionCleanupFactory.java
index 606f394..c349070 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityVersionCleanupFactory.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/EntityVersionCleanupFactory.java
@@ -18,15 +18,13 @@
package org.apache.usergrid.persistence.collection;
-import com.google.inject.assistedinject.Assisted;
-import org.apache.usergrid.persistence.collection.event.EntityVersionDeleted;
+
import org.apache.usergrid.persistence.collection.impl.EntityVersionCleanupTask;
import org.apache.usergrid.persistence.model.entity.Id;
-import java.util.List;
import java.util.UUID;
public interface EntityVersionCleanupFactory {
- public EntityVersionCleanupTask getTask( final Id entityId, final UUID version );
+ public EntityVersionCleanupTask getTask( final CollectionScope scope, final Id entityId, final UUID version );
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4474ca91/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
index 8015ca9..c2f5d0d 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
@@ -18,11 +18,22 @@
package org.apache.usergrid.persistence.collection.guice;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
import org.safehaus.guicyfig.GuicyFigModule;
+import org.apache.usergrid.persistence.collection.CollectionScope;
import org.apache.usergrid.persistence.collection.EntityCollectionManager;
import org.apache.usergrid.persistence.collection.EntityCollectionManagerFactory;
import org.apache.usergrid.persistence.collection.EntityCollectionManagerSync;
+import org.apache.usergrid.persistence.collection.EntityVersionCleanupFactory;
+import org.apache.usergrid.persistence.collection.event.EntityDeleted;
+import org.apache.usergrid.persistence.collection.event.EntityVersionCreated;
+import org.apache.usergrid.persistence.collection.event.EntityVersionDeleted;
+import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
import org.apache.usergrid.persistence.collection.impl.EntityCollectionManagerImpl;
import org.apache.usergrid.persistence.collection.impl.EntityCollectionManagerSyncImpl;
import org.apache.usergrid.persistence.collection.mvcc.MvccLogEntrySerializationStrategy;
@@ -30,11 +41,14 @@ import org.apache.usergrid.persistence.collection.mvcc.changelog.ChangeLogGenera
import org.apache.usergrid.persistence.collection.mvcc.changelog.ChangeLogGeneratorImpl;
import org.apache.usergrid.persistence.collection.MvccEntity;
import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
+import org.apache.usergrid.persistence.collection.serialization.impl.MvccEntitySerializationStrategyImpl;
+import org.apache.usergrid.persistence.collection.serialization.impl.MvccLogEntrySerializationStrategyImpl;
import org.apache.usergrid.persistence.collection.serialization.impl.UniqueValueSerializationStrategyImpl;
import org.apache.usergrid.persistence.collection.mvcc.stage.write.WriteStart;
import org.apache.usergrid.persistence.collection.serialization.SerializationFig;
import org.apache.usergrid.persistence.collection.serialization.impl.SerializationModule;
import org.apache.usergrid.persistence.collection.service.impl.ServiceModule;
+import org.apache.usergrid.persistence.core.migration.Migration;
import org.apache.usergrid.persistence.core.task.NamedTaskExecutorImpl;
import org.apache.usergrid.persistence.core.task.TaskExecutor;
@@ -43,7 +57,9 @@ import com.google.inject.Inject;
import com.google.inject.Provides;
import com.google.inject.Singleton;
import com.google.inject.assistedinject.FactoryModuleBuilder;
-
+import com.google.inject.multibindings.Multibinder;
+import java.util.List;
+import com.sun.tracing.dtrace.ModuleAttributes;
/**
@@ -63,18 +79,36 @@ public class CollectionModule extends AbstractModule {
install( new SerializationModule() );
install( new ServiceModule() );
+ install ( new FactoryModuleBuilder()
+ .build( EntityVersionCleanupFactory.class ));
+
+ //bind empty list. including modules can add impelmentations
+ Multibinder.newSetBinder( binder(), EntityVersionDeleted.class );
+ Multibinder.newSetBinder( binder(), EntityVersionCreated.class );
+ Multibinder.newSetBinder( binder(), EntityDeleted.class );
+
+
// create a guice factor for getting our collection manager
install( new FactoryModuleBuilder()
.implement( EntityCollectionManager.class, EntityCollectionManagerImpl.class )
.implement( EntityCollectionManagerSync.class, EntityCollectionManagerSyncImpl.class )
.build( EntityCollectionManagerFactory.class ) );
+
+ //bind( EntityVersionDeleted.class).to( org.apache.usergrid.corepersistence.events.EntityVersionDeletedImpl.class );
bind( UniqueValueSerializationStrategy.class ).to( UniqueValueSerializationStrategyImpl.class );
bind( ChangeLogGenerator.class).to( ChangeLogGeneratorImpl.class);
}
+
+ @Provides
+ public List<EntityVersionDeleted> emptySetInitialization(){
+ return Collections.EMPTY_LIST;
+
+ }
+
@Provides
@Singleton
@Inject
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4474ca91/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/CollectionScopeImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/CollectionScopeImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/CollectionScopeImpl.java
index 9e96230..958cc70 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/CollectionScopeImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/CollectionScopeImpl.java
@@ -24,6 +24,8 @@ import org.apache.usergrid.persistence.collection.mvcc.entity.MvccValidationUtil
import org.apache.usergrid.persistence.core.scope.ApplicationScopeImpl;
import org.apache.usergrid.persistence.model.entity.Id;
+import com.google.inject.Inject;
+
/**
* Simple impl of hte collection context
@@ -34,7 +36,7 @@ public class CollectionScopeImpl extends ApplicationScopeImpl implements Collect
private final Id ownerId;
private final String name;
-
+ @Inject
public CollectionScopeImpl( final Id applicationId, final Id ownerId, final String name ) {
super( applicationId );
this.ownerId = ownerId;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4474ca91/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index 4aaa1d8..baa13b7 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@ -171,7 +171,7 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
@Override
public void call(final Entity entity) {
//TODO fire a task here
- taskExecutor.submit(entityVersionCleanupFactory.getTask(entityId,entity.getVersion()));
+ taskExecutor.submit(entityVersionCleanupFactory.getTask(collectionScope, entityId,entity.getVersion()));
//post-processing to come later. leave it empty for now.
}
}).doOnError(rollback);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4474ca91/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java
index f113900..a082039 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityDeletedTask.java
@@ -87,7 +87,7 @@ public class EntityDeletedTask implements Task<Void> {
@Override
public Void call() throws Exception {
- entityVersionCleanupFactory.getTask(entityId,version).call();
+ entityVersionCleanupFactory.getTask(collectionScope,entityId,version).call();
fireEvents();
final MutationBatch entityDelete = entitySerializationStrategy.delete(collectionScope, entityId, version);
final MutationBatch logDelete = logEntrySerializationStrategy.delete(collectionScope, entityId, version);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/4474ca91/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityVersionCleanupTask.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityVersionCleanupTask.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityVersionCleanupTask.java
index e518fb5..0a46773 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityVersionCleanupTask.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityVersionCleanupTask.java
@@ -20,6 +20,7 @@ package org.apache.usergrid.persistence.collection.impl;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
import com.google.inject.Inject;
@@ -81,7 +82,7 @@ public class EntityVersionCleanupTask implements Task<Void> {
final MvccEntitySerializationStrategy entitySerializationStrategy,
final UniqueValueSerializationStrategy uniqueValueSerializationStrategy,
final Keyspace keyspace,
- final CollectionScope scope,
+ @Assisted final CollectionScope scope,
final List<EntityVersionDeleted> listeners,
@Assisted final Id entityId,@Assisted final UUID version ) {
@@ -208,6 +209,7 @@ public class EntityVersionCleanupTask implements Task<Void> {
if ( listenerSize == 1 ) {
listeners.get( 0 ).versionDeleted( scope, entityId, versions );
+ //listeners.iterator().next().versionDeleted( scope,entityId,versions );
return;
}
[2/4] git commit: Merge branch 'two-dot-o-events' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into
two-dot-o-events
Posted by gr...@apache.org.
Merge branch 'two-dot-o-events' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o-events
# By Todd Nine (30) and others
# Via amuramoto (12) and others
* 'two-dot-o-events' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid: (53 commits)
More complete implementation of EntityDeletedImpl, see the TODO item in there for next steps.
Move event handlers under corepersistence package
Fixes cassandra heap
Fixes cassandra heap
Removed tokens and using vnodes
Changed health check to 10 seconds
Fixes issue with AWS props location
change access key logic
Fixed source execution order
add graphite
Fixes raid configuration to mount ephemeral drives in autoscaling instances
add comments for all devices query
removing all devices hack
Fix syntax for installation and configure to use smtp
Fixes graphite installation
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Fix some issues found during testing.
fixing dependency tree for httpcomponents
Added kopf and bigdesk to elasticsearch
Fixes missing env variable for graphite server
...
Conflicts:
stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/fa266278
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/fa266278
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/fa266278
Branch: refs/heads/two-dot-o-events
Commit: fa2662788e062003d1653e05a30872978a61cd6f
Parents: 38f6598 6ca862f
Author: grey <gr...@apigee.com>
Authored: Mon Oct 20 11:02:46 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Oct 20 11:02:46 2014 -0700
----------------------------------------------------------------------
stack/awscluster/pom.xml | 2 +-
stack/awscluster/src/main/cql/create_locks.cql | 24 +-
.../awscluster/src/main/cql/create_usergrid.cql | 80 +-
.../main/cql/create_usergrid_applications.cql | 411 +----
.../main/dist/init_instance/create_keyspaces.sh | 28 +-
.../src/main/dist/init_instance/create_raid0.sh | 19 +-
.../dist/init_instance/create_raid0_2disks.sh | 54 -
.../src/main/dist/init_instance/init_cass.sh | 70 -
.../main/dist/init_instance/init_db_server.sh | 11 +-
.../main/dist/init_instance/init_es_server.sh | 67 +
.../dist/init_instance/init_graphite_server.sh | 11 +-
.../main/dist/init_instance/init_rest_server.sh | 24 +
.../dist/init_instance/install_cassandra.sh | 6 +-
.../dist/init_instance/install_elasticsearch.sh | 22 +-
.../init_instance/install_opscenter_agent.sh | 1 +
.../main/dist/init_instance/install_yourkit.sh | 6 +-
.../src/main/groovy/configure_cassandra.groovy | 26 +-
.../main/groovy/configure_elasticsearch.groovy | 26 +-
.../src/main/groovy/configure_usergrid.groovy | 22 +-
.../src/main/groovy/tag_instance.groovy | 10 +-
stack/awscluster/ugcluster-cf.json | 345 ++++-
stack/core/pom.xml | 21 -
.../corepersistence/CpEntityManager.java | 199 +--
.../corepersistence/CpEntityManagerFactory.java | 40 +-
.../corepersistence/CpRelationManager.java | 1427 ++++++++----------
.../usergrid/corepersistence/CpVisitor.java | 11 +-
.../usergrid/corepersistence/CpWalker.java | 155 +-
.../usergrid/corepersistence/GuiceModule.java | 4 +-
.../events/EntityDeletedImpl.java | 136 ++
.../events/EntityVersionDeletedImpl.java | 70 +
.../usergrid/event/EntityDeletedImpl.java | 54 -
.../event/EntityVersionDeletedImpl.java | 71 -
.../apache/usergrid/metrics/MetricsFactory.java | 21 +-
.../usergrid/persistence/EntityManager.java | 2 +-
.../persistence/EntityManagerFactory.java | 8 +-
.../org/apache/usergrid/CoreApplication.java | 1 -
.../PerformanceEntityRebuildIndexTest.java | 38 +-
stack/corepersistence/common/pom.xml | 13 +-
stack/corepersistence/pom.xml | 1 +
.../index/impl/EsEntityIndexImpl.java | 146 +-
.../persistence/index/impl/EsProvider.java | 21 +-
stack/corepersistence/queue/pom.xml | 8 +-
.../queue/impl/SQSQueueManagerImpl.java | 11 +-
stack/pom.xml | 29 +-
.../apache/usergrid/rest/SystemResource.java | 50 +-
stack/rest/src/main/webapp/WEB-INF/web.xml | 2 +-
.../usergrid/rest/management/AccessTokenIT.java | 381 ++---
.../notifications/NotificationsService.java | 4 +-
.../AbstractServiceNotificationIT.java | 4 -
49 files changed, 2050 insertions(+), 2143 deletions(-)
----------------------------------------------------------------------