You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2015/02/10 19:06:48 UTC
incubator-usergrid git commit: moving dependencies to core persistence
Repository: incubator-usergrid
Updated Branches:
refs/heads/USERGRID-365 c38693716 -> 13aa17e4b
moving dependencies to core persistence
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/13aa17e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/13aa17e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/13aa17e4
Branch: refs/heads/USERGRID-365
Commit: 13aa17e4ba6ae509a3b706ea999c015ccc0c2b07
Parents: c386937
Author: Shawn Feldman <sf...@apache.org>
Authored: Tue Feb 10 11:06:30 2015 -0700
Committer: Shawn Feldman <sf...@apache.org>
Committed: Tue Feb 10 11:06:30 2015 -0700
----------------------------------------------------------------------
.../persistence/core/guice/CommonModule.java | 1 -
.../migration/data/DataMigrationManagerImpl.java | 18 ++++++++----------
.../data/DataMigrationManagerImplTest.java | 1 +
3 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/13aa17e4/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
index faa4e39..f2adee5 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/guice/CommonModule.java
@@ -66,7 +66,6 @@ public class CommonModule extends AbstractModule {
Multibinder<Migration> migrationBinding = Multibinder.newSetBinder( binder(), Migration.class );
migrationBinding.addBinding().to( Key.get( MigrationInfoSerialization.class ) );
-
bind( TimeService.class ).to( TimeServiceImpl.class );
bind( CassandraConfig.class ).to( CassandraConfigImpl.class );
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/13aa17e4/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
index 8ad3295..5b8920e 100644
--- a/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
+++ b/stack/corepersistence/common/src/main/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImpl.java
@@ -41,6 +41,7 @@ import com.google.common.cache.LoadingCache;
import com.google.inject.Inject;
import com.google.inject.Singleton;
import rx.Observable;
+import rx.functions.Action1;
import rx.functions.Func1;
@@ -128,10 +129,10 @@ public class DataMigrationManagerImpl implements DataMigrationManager {
final CassandraProgressObserver observer = new CassandraProgressObserver();
allEntitiesInSystemObservable.getAllEntitiesInSystem(1000)
- .map(
- new Func1<ApplicationEntityGroup, Long>() {
+ .doOnNext(
+ new Action1<ApplicationEntityGroup>() {
@Override
- public Long call(
+ public void call(
final ApplicationEntityGroup applicationEntityGroup) {
for (DataMigration migration : migrationsToRun.values()) {
@@ -143,21 +144,18 @@ public class DataMigrationManagerImpl implements DataMigrationManager {
observer.update(migrationVersion, "Starting migration");
-
//perform this migration, if it fails, short circuit
try {
- migration.migrate(applicationEntityGroup,observer);
+ migration.migrate(applicationEntityGroup, observer).toBlocking().last();
} catch (Throwable throwable) {
observer.failed(migrationVersion, "Exception thrown during migration", throwable);
-
LOG.error("Unable to migrate to version {}.", migrationVersion, throwable);
-
- return 0L;
+ return ;
}
//we had an unhandled exception or the migration failed, short circuit
if (observer.failed) {
- return 0L;
+ return ;
}
//set the version
@@ -168,7 +166,7 @@ public class DataMigrationManagerImpl implements DataMigrationManager {
//update the observer for progress so other nodes can see it
observer.update(migrationVersion, "Completed successfully");
}
- return 0L;
+ return ;
}
}).toBlocking().lastOrDefault(null);
;
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/13aa17e4/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImplTest.java b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImplTest.java
index 0a80cb7..8ce5d9f 100644
--- a/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImplTest.java
+++ b/stack/corepersistence/common/src/test/java/org/apache/usergrid/persistence/core/migration/data/DataMigrationManagerImplTest.java
@@ -52,6 +52,7 @@ public class DataMigrationManagerImplTest {
AllEntitiesInSystemObservable allEntitiesInSystemObservable = new AllEntitiesInSystemObservable() {
@Override
public Observable<ApplicationEntityGroup> getAllEntitiesInSystem(int bufferSize) {
+
return null;
}
};