You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/12/16 16:00:14 UTC
[44/50] incubator-usergrid git commit: Remove write-delay from
iterating query tests and, instead,
decrease the number of threads used to process tasks.
Remove write-delay from iterating query tests and, instead, decrease the number of threads used to process tasks.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a290e0d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a290e0d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a290e0d6
Branch: refs/heads/no-source-in-es
Commit: a290e0d6b9d72befef6b50fcb313a5c6d4055557
Parents: afe52d4
Author: Dave Johnson <dm...@apigee.com>
Authored: Wed Dec 10 14:03:11 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Wed Dec 10 14:03:11 2014 -0500
----------------------------------------------------------------------
stack/core/.test-tdoe-5thread.log.swp | Bin 0 -> 28672 bytes
.../corepersistence/CpRelationManager.java | 2 --
.../migration/GraphShardVersionMigrationIT.java | 5 ++---
.../query/AbstractIteratingQueryIT.java | 2 +-
.../test/resources/usergrid-custom-test.properties | 3 +++
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a290e0d6/stack/core/.test-tdoe-5thread.log.swp
----------------------------------------------------------------------
diff --git a/stack/core/.test-tdoe-5thread.log.swp b/stack/core/.test-tdoe-5thread.log.swp
new file mode 100644
index 0000000..dccd541
Binary files /dev/null and b/stack/core/.test-tdoe-5thread.log.swp differ
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a290e0d6/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 135688e..5039a41 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
@@ -60,8 +60,6 @@ import org.apache.usergrid.persistence.cassandra.index.IndexBucketScanner;
import org.apache.usergrid.persistence.cassandra.index.IndexScanner;
import org.apache.usergrid.persistence.cassandra.index.NoOpIndexScanner;
import org.apache.usergrid.persistence.collection.CollectionScope;
-import org.apache.usergrid.persistence.collection.EntityCollectionManager;
-import org.apache.usergrid.persistence.collection.impl.CollectionScopeImpl;
import org.apache.usergrid.persistence.core.scope.ApplicationScope;
import org.apache.usergrid.persistence.entities.Group;
import org.apache.usergrid.persistence.entities.User;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a290e0d6/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java
index 3ab9f63..f287047 100644
--- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/GraphShardVersionMigrationIT.java
@@ -28,7 +28,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.apache.usergrid.AbstractCoreIT;
-import org.apache.usergrid.CoreApplication;
import org.apache.usergrid.corepersistence.CpSetup;
import org.apache.usergrid.corepersistence.EntityWriteHelper;
import org.apache.usergrid.corepersistence.ManagerCache;
@@ -37,11 +36,9 @@ import org.apache.usergrid.persistence.EntityManager;
import org.apache.usergrid.persistence.core.migration.data.DataMigrationManager;
import org.apache.usergrid.persistence.core.migration.data.DataMigrationManagerImpl;
import org.apache.usergrid.persistence.core.migration.data.MigrationInfoSerialization;
-import org.apache.usergrid.persistence.core.migration.schema.MigrationException;
import org.apache.usergrid.persistence.graph.GraphManager;
import org.apache.usergrid.persistence.graph.impl.SimpleSearchEdgeType;
import org.apache.usergrid.persistence.model.entity.Id;
-import org.apache.usergrid.persistence.model.util.UUIDGenerator;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
@@ -52,6 +49,7 @@ import rx.functions.Action1;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.junit.Ignore;
public class GraphShardVersionMigrationIT extends AbstractCoreIT {
@@ -83,6 +81,7 @@ public class GraphShardVersionMigrationIT extends AbstractCoreIT {
@Test
+ @Ignore("Ignored awaiting fix for USERGRID-268")
public void testIdMapping() throws Throwable {
assertEquals( "version 2 expected", 2, graphShardVersionMigration.getVersion() );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a290e0d6/stack/core/src/test/java/org/apache/usergrid/persistence/query/AbstractIteratingQueryIT.java
----------------------------------------------------------------------
diff --git a/stack/core/src/test/java/org/apache/usergrid/persistence/query/AbstractIteratingQueryIT.java b/stack/core/src/test/java/org/apache/usergrid/persistence/query/AbstractIteratingQueryIT.java
index d8f31ff..e4eb1c5 100644
--- a/stack/core/src/test/java/org/apache/usergrid/persistence/query/AbstractIteratingQueryIT.java
+++ b/stack/core/src/test/java/org/apache/usergrid/persistence/query/AbstractIteratingQueryIT.java
@@ -7,7 +7,7 @@
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
- *
+*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a290e0d6/stack/core/src/test/resources/usergrid-custom-test.properties
----------------------------------------------------------------------
diff --git a/stack/core/src/test/resources/usergrid-custom-test.properties b/stack/core/src/test/resources/usergrid-custom-test.properties
index a1ff5b2..d093ca8 100644
--- a/stack/core/src/test/resources/usergrid-custom-test.properties
+++ b/stack/core/src/test/resources/usergrid-custom-test.properties
@@ -20,3 +20,6 @@ cassandra.timeout=2000
cassandra.connections=1000
hystrix.threadpool.graph_user.coreSize=50
hystrix.threadpool.graph_async.coreSize=50
+
+collection.task.pool.threadsize=8
+collection.task.pool.queuesize=8