Author: echatellier Date: 2010-06-17 14:56:46 +0200 (Thu, 17 Jun 2010) New Revision: 130 Url: http://nuiton.org/repositories/revision/wikitty/130 Log: Fix syncEngin scanning. Now scan only wikity id to be migrated during restore. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-15 15:23:54 UTC (rev 129) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-17 12:56:46 UTC (rev 130) @@ -856,7 +856,7 @@ } @Override - public UpdateResponse syncEngin(String securityToken) { + public UpdateResponse syncEngin(final String securityToken) { final WikittyTransaction transaction = new WikittyTransaction(); try { final int numberForCommit = 1000; @@ -873,7 +873,8 @@ int count = 0; @Override - public void scan(Wikitty wikitty) { + public void scan(String wikittyId) { + Wikitty wikitty = restore(securityToken, transaction, wikittyId); Date deleteDate = wikitty.getDeleteDate(); if(deleteDate == null) { count ++; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-06-15 15:23:54 UTC (rev 129) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-06-17 12:56:46 UTC (rev 130) @@ -120,7 +120,7 @@ public void scanWikitties(WikittyTransaction transaction, Scanner scanner) { Collection<Wikitty> all = wikitties.values(); for (Wikitty wikitty : all) { - scanner.scan(wikitty); + scanner.scan(wikitty.getId()); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java 2010-06-15 15:23:54 UTC (rev 129) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java 2010-06-17 12:56:46 UTC (rev 130) @@ -94,7 +94,7 @@ * Call each time wikitty is scan. */ public static interface Scanner { - void scan(Wikitty wikitty); + void scan(String wikittyId); } /** Modified: trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java =================================================================== --- trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java 2010-06-15 15:23:54 UTC (rev 129) +++ trunk/wikitty-hbase-impl/src/main/java/org/nuiton/wikitty/hbase/WikittyStorageHBase.java 2010-06-17 12:56:46 UTC (rev 130) @@ -288,8 +288,9 @@ Result row = resultScanner.next(); while(row != null) { - Wikitty wikitty = constructWikitty(transaction, row); - scanner.scan(wikitty); + //Wikitty wikitty = constructWikitty(transaction, row); + String id = Bytes.toString(row.getValue(F_ADMIN, Q_ID)); + scanner.scan(id); row = resultScanner.next(); } } catch (IOException eee) { Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-06-15 15:23:54 UTC (rev 129) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-06-17 12:56:46 UTC (rev 130) @@ -437,8 +437,8 @@ while (resultSet.next()) { String id = resultSet.getString(COL_ID); - Wikitty wikitty = restore(transaction, id); - scanner.scan(wikitty); + //Wikitty wikitty = restore(transaction, id); + scanner.scan(id); } } catch (SQLException eee) { throw new WikittyException(eee); Modified: trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java =================================================================== --- trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java 2010-06-15 15:23:54 UTC (rev 129) +++ trunk/wikitty-jpa-impl/src/main/java/org/nuiton/wikitty/jpa/WikittyStorageJPA.java 2010-06-17 12:56:46 UTC (rev 130) @@ -208,7 +208,7 @@ Iterator<Wikitty> iterator = results.iterator(); while (iterator.hasNext()) { Wikitty wikitty = iterator.next(); - scanner.scan(wikitty); + scanner.scan(wikitty.getId()); } }