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/06/23 01:47:56 UTC
incubator-usergrid git commit: Changed test slightly but still broken
because... The format of the file changed! Yes not its a Json line format
that will no longer be pretty printed.
Repository: incubator-usergrid
Updated Branches:
refs/heads/MigrationTool 103cb3b12 -> 0ee180864
Changed test slightly but still broken because...
The format of the file changed! Yes not its a Json line format that will no longer be pretty printed.
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0ee18086
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0ee18086
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0ee18086
Branch: refs/heads/MigrationTool
Commit: 0ee1808641a65733d53278e793c2f2e1f17a57a9
Parents: 103cb3b
Author: GERey <gr...@apigee.com>
Authored: Mon Jun 22 16:47:54 2015 -0700
Committer: GERey <gr...@apigee.com>
Committed: Mon Jun 22 16:47:54 2015 -0700
----------------------------------------------------------------------
.../org/apache/usergrid/tools/Migration.java | 68 ++------------------
.../apache/usergrid/tools/MigrationTest.java | 2 +-
2 files changed, 8 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ee18086/stack/tools/src/main/java/org/apache/usergrid/tools/Migration.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/Migration.java b/stack/tools/src/main/java/org/apache/usergrid/tools/Migration.java
index b8d9bf3..cb2b353 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/Migration.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/Migration.java
@@ -32,6 +32,7 @@ import org.apache.usergrid.persistence.entities.Application;
import org.apache.usergrid.utils.JsonUtils;
import org.apache.usergrid.utils.StringUtils;
import org.codehaus.jackson.JsonGenerator;
+import org.codehaus.jackson.util.MinimalPrettyPrinter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -101,7 +102,7 @@ public class Migration extends ExportingToolBase {
return;
}
} else {
- readThreadCount = 1;
+ readThreadCount = 20;
}
// start write queue worker
@@ -243,7 +244,6 @@ public class Migration extends ExportingToolBase {
addCollectionsToTask( task, entity );
addDictionariesToTask( task, entity );
addConnectionsToTask( task, entity );
- // addOrganizationsToTask( task, entity );
writeQueue.add( task );
@@ -321,11 +321,6 @@ public class Migration extends ExportingToolBase {
}
}
-
- private void addOrganizationsToTask(AdminUserWriteTask task, Entity entity) throws Exception {
- task.orgNamesByUuid = managementService.getOrganizationsForAdminUser( entity.getUuid() );
- }
-
public void setDone(boolean done) {
this.done = done;
}
@@ -360,7 +355,8 @@ public class Migration extends ExportingToolBase {
// write one JSON file for management application users
JsonGenerator usersFile =
getJsonGenerator( createOutputFile( ADMIN_USERS_PREFIX, em.getApplication().getName() ) );
- usersFile.writeStartArray();
+ usersFile.setPrettyPrinter( new MinimalPrettyPrinter( "" ) );
+ //usersFile.writeStartArray();
int count = 0;
@@ -384,7 +380,8 @@ public class Migration extends ExportingToolBase {
saveDictionaries( usersFile, task );
usersFile.writeEndObject();
-
+ //usersFile.writeRaw( '}' );
+ usersFile.writeRaw( '\n' );
logger.debug("Exported user {}", task.adminUser.getProperty( "email" ));
count++;
@@ -398,38 +395,12 @@ public class Migration extends ExportingToolBase {
}
}
- usersFile.writeEndArray();
+ // usersFile.writeEndArray();
usersFile.close();
logger.info("Exported TOTAL {} admin users", count);
}
-
- private void saveCollections( JsonGenerator jg, AdminUserWriteTask task ) throws Exception {
-
- jg.writeFieldName( task.adminUser.getUuid().toString() );
- jg.writeStartObject();
-
- for (String collectionName : task.collectionsByName.keySet() ) {
-
- jg.writeFieldName( collectionName );
- jg.writeStartArray();
-
- List<UUID> entityIds = task.collectionsByName.get( collectionName );
-
- if ((entityIds != null) && !entityIds.isEmpty()) {
- for (UUID childEntityUUID : entityIds) {
- jg.writeObject( childEntityUUID.toString() );
- }
- }
-
- jg.writeEndArray();
- }
-
- jg.writeEndObject();
- }
-
-
private void saveDictionaries( JsonGenerator jg, AdminUserWriteTask task ) throws Exception {
jg.writeFieldName( "dictionaries" );
@@ -482,31 +453,6 @@ public class Migration extends ExportingToolBase {
jg.writeEndObject();
}
-
- private void saveOrganizations( JsonGenerator jg, AdminUserWriteTask task ) throws Exception {
-
- final BiMap<UUID, String> orgs = task.orgNamesByUuid;
-
- jg.writeFieldName( "organizations" );
-
- jg.writeStartArray();
-
- for (UUID uuid : orgs.keySet()) {
-
- jg.writeStartObject();
-
- jg.writeFieldName( "uuid" );
- jg.writeObject( uuid );
-
- jg.writeFieldName( "name" );
- jg.writeObject( orgs.get( uuid ) );
-
- jg.writeEndObject();
- }
-
- jg.writeEndArray();
- }
-
public void setDone(boolean done) {
this.done = done;
}
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0ee18086/stack/tools/src/test/java/org/apache/usergrid/tools/MigrationTest.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/test/java/org/apache/usergrid/tools/MigrationTest.java b/stack/tools/src/test/java/org/apache/usergrid/tools/MigrationTest.java
index 0bac0a4..db6bd98 100644
--- a/stack/tools/src/test/java/org/apache/usergrid/tools/MigrationTest.java
+++ b/stack/tools/src/test/java/org/apache/usergrid/tools/MigrationTest.java
@@ -120,7 +120,7 @@ public class MigrationTest {
ObjectMapper mapper = new ObjectMapper();
JsonNode node = mapper.readTree( adminUsersFile );
- assertTrue( node.isArray() );
+ // assertTrue( node.isArray() );
// does file contain our two admin users?