Fixes issues found during review
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/0d4dd116 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/0d4dd116 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/0d4dd116 Branch: refs/heads/USERGRID-933 Commit: 0d4dd1161e0ffacbfe056de205da0860652b0e17 Parents: 901d7c6 Author: Todd Nine <tn...@apigee.com> Authored: Thu Sep 17 17:10:24 2015 -0600 Committer: Todd Nine <tn...@apigee.com> Committed: Thu Sep 17 17:10:24 2015 -0600 ---------------------------------------------------------------------- .../usergrid/corepersistence/CoreModule.java | 6 ------ .../migration/DeDupConnectionDataMigration.java | 22 ++++++++++---------- .../DeDupConnectionDataMigrationTest.java | 7 ++++--- .../core/astyanax/MultiRowColumnIterator.java | 2 +- .../persistence/graph/GraphManagerIT.java | 6 +++--- 5 files changed, 19 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/0d4dd116/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java index 11707be..486aa6f 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/CoreModule.java @@ -190,12 +190,6 @@ public class CoreModule extends AbstractModule { bind( StatusService.class ).to( StatusServiceImpl.class ); - /** - * Install migration services - */ - - //migrations - //we want to make sure our generics are retained, so we use a typeliteral } http://git-wip-us.apache.org/repos/asf/usergrid/blob/0d4dd116/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigration.java ---------------------------------------------------------------------- diff --git a/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigration.java b/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigration.java index f65864a..bec8d6c 100644 --- a/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigration.java +++ b/stack/core/src/main/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigration.java @@ -56,24 +56,23 @@ public class DeDupConnectionDataMigration implements DataMigration { observer.start(); - connectionService.deDupeConnections( allApplicationsObservable.getData() ).reduce( 0l, (count, deDuped) ->{ + connectionService.deDupeConnections( allApplicationsObservable.getData() ).reduce( 0l, ( count, deDuped ) -> { - final long newCount = count+1; + final long newCount = count + 1; /** * Update our progress observer */ - if(newCount % UPDATE_COUNT == 0){ + if ( newCount % UPDATE_COUNT == 0 ) { logger.info( "De duped {} edges", newCount ); - observer.update( migrationVersion, String.format("De duped %d edges", newCount) ); + observer.update( migrationVersion, String.format( "De duped %d edges", newCount ) ); } return newCount; - - }).doOnNext( total -> { - logger.info("Completed de-duping {} edges", total ); - observer.complete();; - }).subscribe(); + } ).doOnNext( total -> { + logger.info( "Completed de-duping {} edges", total ); + observer.complete(); + } ).subscribe(); return migrationVersion; @@ -82,12 +81,13 @@ public class DeDupConnectionDataMigration implements DataMigration { @Override public boolean supports( final int currentVersion ) { - return currentVersion == getMaxVersion() - 1; + return currentVersion <= getMaxVersion() - 1; } @Override public int getMaxVersion() { - return 1; + //needs to be 2 b/c our obsolete EntityTypeMappingMigration was 1 + return 2; } } http://git-wip-us.apache.org/repos/asf/usergrid/blob/0d4dd116/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigrationTest.java ---------------------------------------------------------------------- diff --git a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigrationTest.java b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigrationTest.java index c84ad2b..aad6259 100644 --- a/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigrationTest.java +++ b/stack/core/src/test/java/org/apache/usergrid/corepersistence/migration/DeDupConnectionDataMigrationTest.java @@ -49,8 +49,6 @@ public class DeDupConnectionDataMigrationTest { public void testVersion() { //mock up an initial system state - final int version = 0; - final ConnectionService connectionService = mock( ConnectionService.class ); final AllApplicationsObservable allApplicationsObservable = mock( AllApplicationsObservable.class ); @@ -60,7 +58,10 @@ public class DeDupConnectionDataMigrationTest { new DeDupConnectionDataMigration( connectionService, allApplicationsObservable ); - assertTrue( plugin.supports( version ) ); + //anything less than 2 should be supported + assertTrue( plugin.supports( 0 ) ); + + assertTrue( plugin.supports( 1 ) ); assertFalse( plugin.supports( plugin.getMaxVersion() ) ); } http://git-wip-us.apache.org/repos/asf/usergrid/blob/0d4dd116/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java index 16249ae..667992c 100644 --- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java +++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/astyanax/MultiRowColumnIterator.java @@ -201,7 +201,7 @@ public class MultiRowColumnIterator<R, C, T> implements Iterator<T> { final List<T> mergedResults; if ( containsSingleRowOnly( result ) ) { - mergedResults = singleRowResult( result ); + mergedResults = singleRowResult( result ); } else { mergedResults = mergeResults( result, selectSize ); http://git-wip-us.apache.org/repos/asf/usergrid/blob/0d4dd116/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java ---------------------------------------------------------------------- diff --git a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java index eaded15..eda3a02 100644 --- a/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java +++ b/stack/corepersistence/graph/src/test/java/org/apache/usergrid/persistence/graph/GraphManagerIT.java @@ -2339,15 +2339,15 @@ public class GraphManagerIT { //write 3 edges with 3 different timestamp final Edge edge1 = createEdge( sourceId, "test", target, 1, false ); - gm.writeEdge( edge1 ).toBlocking().last(); + gm.writeEdge( edge1 ).subscribe(); final Edge edge2 = createEdge( sourceId, "test", target, 2, false ); - gm.writeEdge( edge2 ).toBlocking().last(); + gm.writeEdge( edge2 ).subscribe(); final Edge edge3 = createEdge( sourceId, "test", target, 3, false ); - gm.writeEdge( edge3 ).toBlocking().last(); + gm.writeEdge( edge3 ).subscribe(); //now test retrieving it
