You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by to...@apache.org on 2014/10/13 18:54:33 UTC
[1/2] git commit: Fixes problem with deleting connections
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o a1b77e9e4 -> 5aea7c17f
Fixes problem with deleting connections
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/83de8ae6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/83de8ae6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/83de8ae6
Branch: refs/heads/two-dot-o
Commit: 83de8ae6dd17d6391ab2a532ec5db587892dd5a1
Parents: 6306e2b
Author: Todd Nine <to...@apache.org>
Authored: Mon Oct 13 10:53:34 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Mon Oct 13 10:53:34 2014 -0600
----------------------------------------------------------------------
.../corepersistence/CpRelationManager.java | 2 ++
.../persistence/index/impl/IndexScopeImpl.java | 37 ++++++++++++++++++++
2 files changed, 39 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/83de8ae6/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
----------------------------------------------------------------------
diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
index 237fe01..49477e2 100644
--- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
+++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CpRelationManager.java
@@ -1256,6 +1256,8 @@ public class CpRelationManager implements RelationManager {
batch.deindex( allTypesIndexScope, targetEntity );
+ batch.execute();
+
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/83de8ae6/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexScopeImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexScopeImpl.java b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexScopeImpl.java
index 45cc8dd..2bf9bb4 100644
--- a/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexScopeImpl.java
+++ b/stack/corepersistence/queryindex/src/main/java/org/apache/usergrid/persistence/index/impl/IndexScopeImpl.java
@@ -48,4 +48,41 @@ public class IndexScopeImpl implements IndexScope {
}
+ @Override
+ public boolean equals( final Object o ) {
+ if ( this == o ) {
+ return true;
+ }
+ if ( !( o instanceof IndexScopeImpl ) ) {
+ return false;
+ }
+
+ final IndexScopeImpl that = ( IndexScopeImpl ) o;
+
+ if ( !ownerId.equals( that.ownerId ) ) {
+ return false;
+ }
+ if ( !type.equals( that.type ) ) {
+ return false;
+ }
+
+ return true;
+ }
+
+
+ @Override
+ public int hashCode() {
+ int result = ownerId.hashCode();
+ result = 31 * result + type.hashCode();
+ return result;
+ }
+
+
+ @Override
+ public String toString() {
+ return "IndexScopeImpl{" +
+ "ownerId=" + ownerId +
+ ", type='" + type + '\'' +
+ '}';
+ }
}
[2/2] git commit: Merge branch 'two-dot-o' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Posted by to...@apache.org.
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5aea7c17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5aea7c17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5aea7c17
Branch: refs/heads/two-dot-o
Commit: 5aea7c17f550d6749cb8305b2b2a330682359db3
Parents: 83de8ae a1b77e9
Author: Todd Nine <to...@apache.org>
Authored: Mon Oct 13 10:54:28 2014 -0600
Committer: Todd Nine <to...@apache.org>
Committed: Mon Oct 13 10:54:28 2014 -0600
----------------------------------------------------------------------
.../persistence/queue/impl/SQSQueueManagerImpl.java | 12 ++++++++++--
.../org/apache/usergrid/services/TestQueueManager.java | 4 +---
2 files changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------