Author: challngr Date: Wed Sep 23 17:52:08 2015 New Revision: 1704907 URL: http://svn.apache.org/viewvc?rev=1704907&view=rev Log: UIMA-4577 Updates to database loader.
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbTester.java uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java?rev=1704907&r1=1704906&r2=1704907&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbLoader.java Wed Sep 23 17:52:08 2015 @@ -34,7 +34,6 @@ import java.util.concurrent.atomic.Atomi import org.apache.uima.ducc.common.Pair; import org.apache.uima.ducc.common.persistence.services.IStateServices; import org.apache.uima.ducc.common.utils.DuccLogger; -import org.apache.uima.ducc.common.utils.Utils; import org.apache.uima.ducc.common.utils.id.DuccId; import org.apache.uima.ducc.database.DbConstants.DbCategory; import org.apache.uima.ducc.transport.event.common.DuccWorkMap; @@ -450,7 +449,8 @@ public class DbLoader } } - void loadCheckpoint() + @SuppressWarnings("unchecked") + void loadCheckpoint() throws Exception { String methodName = "loadCheckpoint"; @@ -537,7 +537,7 @@ public class DbLoader if ( doregistry ) { ssd = new StateServicesDb(); ssd.init(logger); - if ( false ) loadServiceRegistry(serviceRegistry, false); + loadServiceRegistry(serviceRegistry, false); try { ssd.shutdown(); } catch ( Exception e ) { @@ -547,7 +547,7 @@ public class DbLoader // ---------- Load service registry history ssd = new StateServicesDb(); ssd.init(logger); - if ( false ) loadServiceRegistry(serviceRegistryHistory, true); + loadServiceRegistry(serviceRegistryHistory, true); } OGlobalConfiguration.USE_WAL.setValue(true); Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbTester.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbTester.java?rev=1704907&r1=1704906&r2=1704907&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbTester.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/DbTester.java Wed Sep 23 17:52:08 2015 @@ -381,7 +381,6 @@ public class DbTester // ---------- Load job history loadJobs(); - if ( true ) return; // ---------- Load reservation history loadReservations(); Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java?rev=1704907&r1=1704906&r2=1704907&view=diff ============================================================================== --- uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java (original) +++ uima/sandbox/uima-ducc/trunk/uima-ducc-database/src/main/java/org/apache/uima/ducc/database/HistoryManagerDb.java Wed Sep 23 17:52:08 2015 @@ -525,7 +525,7 @@ public class HistoryManagerDb private IDuccWorkReservation restoreReservationInternal(DbHandle h, OrientVertex v) throws Exception { - String methodName = "restoreReservationInternal"; + // String methodName = "restoreReservationInternal"; IDuccWorkReservation r = null; ODocument d = v.getRecord(); @@ -537,15 +537,15 @@ public class HistoryManagerDb r = g.fromJson(jo, DuccWorkReservation.class); - List<JdReservationBean> l = r.getJdReservationBeanList(); - if ( l != null ) { - for (JdReservationBean b : l ) { - ConcurrentHashMap<DuccId, SizeBytes> map = b.getMap(); + //List<JdReservationBean> l = r.getJdReservationBeanList(); + //if ( l != null ) { + //for (JdReservationBean b : l ) { + //ConcurrentHashMap<DuccId, SizeBytes> map = b.getMap(); //for ( DuccId k : map.keySet() ) { // logger.info(methodName, null, "REST ===> " + k.getFriendly() + " " + k.getUnique() + " : " + map.get(k)); //} - } - } + //} + //} IDuccReservationMap rm = r.getReservationMap(); // seems to get set by default when job is recovered Iterable<Edge> ed = v.getEdges(Direction.OUT, DbEdge.JpProcess.pname());