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/08/12 22:38:52 UTC
git commit: Removed character check line now that it is not being
returned in the collection name. Reduced the load of testExportOrganization
so that it won't take as along or crash the embedded cassandra instance.
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o 2b2533063 -> 5e07501bb
Removed character check line now that it is not being returned in the collection name.
Reduced the load of testExportOrganization so that it won't take as along or crash the embedded cassandra instance.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/5e07501b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/5e07501b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/5e07501b
Branch: refs/heads/two-dot-o
Commit: 5e07501bb7691ea27e0e6b333ee7c9cd8e9bce28
Parents: 2b25330
Author: grey <gr...@apigee.com>
Authored: Mon Aug 11 09:40:09 2014 -0700
Committer: grey <gr...@apigee.com>
Committed: Mon Aug 11 09:40:09 2014 -0700
----------------------------------------------------------------------
.../apache/usergrid/management/export/ExportServiceImpl.java | 1 -
.../apache/usergrid/management/cassandra/ExportServiceIT.java | 5 ++---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5e07501b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
----------------------------------------------------------------------
diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
index 9b1c42d..42329b5 100644
--- a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
+++ b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java
@@ -577,7 +577,6 @@ public class ExportServiceImpl implements ExportService {
jg.writeStartArray();
for ( String collectionName : metadata.keySet() ) {
- collectionName = collectionName.substring( 0, collectionName.indexOf( "|" ) );
if ( collectionName.equals( "exports" ) ) {
continue;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/5e07501b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
----------------------------------------------------------------------
diff --git a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
index eaaa76f..af1193d 100644
--- a/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
+++ b/stack/services/src/test/java/org/apache/usergrid/management/cassandra/ExportServiceIT.java
@@ -569,8 +569,7 @@ public class ExportServiceIT {
@Test
public void testExportOneOrganization() throws Exception {
- //File f = new File( "exportOneOrganization.json" );
- int entitiesToCreate = 123;
+ int entitiesToCreate = 20;
File f = null;
@@ -603,7 +602,7 @@ public class ExportServiceIT {
//creates 100s of organizations with some entities in each one to make sure we don't actually apply it
OrganizationInfo orgMade = null;
ApplicationInfo appMade = null;
- for ( int i = 0; i < 100; i++ ) {
+ for ( int i = 0; i < 10; i++ ) {
orgMade = setup.getMgmtSvc().createOrganization( "superboss" + i, adminUser, true );
appMade = setup.getMgmtSvc().createApplication( orgMade.getUuid(), "superapp" + i );