- Wikitty-commits - mailman.cloud.codelutin.com

r726 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 23 Feb '11

23 Feb '11

Author: bpoussin Date: 2011-02-23 16:18:43 +0100 (Wed, 23 Feb 2011) New Revision: 726 Url: http://nuiton.org/repositories/revision/wikitty/726 Log: add TimeLog for store and delete method Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-23 15:03:43 UTC (rev 725) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-23 15:18:43 UTC (rev 726) @@ -62,6 +62,7 @@ import java.io.File; import java.util.Collections; import org.nuiton.util.ApplicationConfig; +import org.nuiton.util.TimeLog; import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; @@ -79,7 +80,8 @@ public class WikittySearchEngineSolr implements WikittySearchEngine { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittySearchEngineSolr.class); + final static private Log log = LogFactory.getLog(WikittySearchEngineSolr.class); + final static private TimeLog timeLog = new TimeLog(WikittySearchEngineSolr.class); /** solr server */ protected SolrServer solrServer; @@ -154,6 +156,7 @@ @Override public void store(WikittyTransaction transaction, Collection<Wikitty> wikitties, boolean force) { + long startTime = TimeLog.getTime(); try { solrResource.init(); @@ -335,6 +338,8 @@ } catch (Exception eee) { throw new WikittyException("Can't store wikitty", eee); } + timeLog.log(startTime, "store", String.format( + "nb %s in force mode %s", wikitties.size(), force)); } /** @@ -357,6 +362,7 @@ */ @Override public void delete(WikittyTransaction transaction, Collection<String> ids) throws WikittyException { + long startTime = TimeLog.getTime(); try { solrResource.init(); @@ -470,6 +476,9 @@ } catch (Exception eee) { throw new WikittyException("Can't delete wikitty in index", eee); } + timeLog.log(startTime, "delete", String.format( + "nb %s", ids.size())); + } /** @@ -606,6 +615,9 @@ for (Object id : treeNodeParents) { doc.addField(TREENODE_ATTACHED + treeNodeId, id); } + } else { + // FIXME, il faut tout de meme creer le document + // avec seulement l'id et l'indexation arbre } } }

1 0

r725 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org 23 Feb '11

23 Feb '11

Author: bpoussin Date: 2011-02-23 16:03:43 +0100 (Wed, 23 Feb 2011) New Revision: 725 Url: http://nuiton.org/repositories/revision/wikitty/725 Log: commit transaction avec statistic request Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2011-02-23 14:58:46 UTC (rev 724) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2011-02-23 15:03:43 UTC (rev 725) @@ -949,6 +949,14 @@ WikittyStorage.DataStatistic stat = getWikittyStorage().getDataStatistic(tx); final long max = stat.getActiveWikitties(); + if (txBeginHere) { + tx.commit(); + } + if (!tx.isStarted()) { + tx.begin(); + txBeginHere = true; + } + log.info("Reindexation 0%"); getWikittyStorage().scanWikitties(tx, new WikittyStorage.Scanner() { long lastPurcent = -1;

1 0

r724 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org 23 Feb '11

23 Feb '11

Author: echatellier Date: 2011-02-23 15:58:46 +0100 (Wed, 23 Feb 2011) New Revision: 724 Url: http://nuiton.org/repositories/revision/wikitty/724 Log: Fix catch Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-02-23 14:42:12 UTC (rev 723) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-02-23 14:58:46 UTC (rev 724) @@ -318,10 +318,12 @@ public static void closeQuietly(Connection connection) { try { if (connection != null) { + // delegate close can throw NPE + // so this is necessary to catch all Exceptions connection.close(); } - } catch (SQLException e) { - log.error("SQLException while closing connection", e); + } catch (Exception e) { + log.error("Exception while closing connection", e); } }

1 0

r723 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org 23 Feb '11

23 Feb '11

Author: bpoussin Date: 2011-02-23 15:42:12 +0100 (Wed, 23 Feb 2011) New Revision: 723 Url: http://nuiton.org/repositories/revision/wikitty/723 Log: close only if connection is not null Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-02-23 12:26:47 UTC (rev 722) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-02-23 14:42:12 UTC (rev 723) @@ -317,7 +317,9 @@ */ public static void closeQuietly(Connection connection) { try { - connection.close(); + if (connection != null) { + connection.close(); + } } catch (SQLException e) { log.error("SQLException while closing connection", e); }

1 0

r722 - in trunk/wikitty-solr-impl/src: main/java/org/nuiton/wikitty/storage/solr test/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 23 Feb '11

23 Feb '11

Author: bpoussin Date: 2011-02-23 13:26:47 +0100 (Wed, 23 Feb 2011) New Revision: 722 Url: http://nuiton.org/repositories/revision/wikitty/722 Log: trace time of all solr query (if log level ask it) Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2011-02-23 12:15:14 UTC (rev 721) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2011-02-23 12:26:47 UTC (rev 722) @@ -162,6 +162,7 @@ * * @param id TreeNode id * @param attId attachment id + * @since 3.0.5 */ public void add(String id, String attId) { if (attId != null) { @@ -189,6 +190,7 @@ * * @param doc TreeNode document representation * @param restriction la liste accepte de wikitty a ajouter + * @since 3.0.5 */ public void add(SolrDocument doc, Set<String> restriction) { String id = (String)doc.getFieldValue(WikittySolrConstant.SOLR_ID); Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-02-23 12:15:14 UTC (rev 721) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2011-02-23 12:26:47 UTC (rev 722) @@ -204,7 +204,7 @@ query.setRows(MAX_SUBQUERY_RESULT); QueryResponse resp = null; try { - resp = solr.query(query); + resp = SolrUtil.executeQuery(solr, query); } catch (SolrServerException e) { throw new WikittyException("Unable to execute associative query on " + associated.getElement().getName(), e); } Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2011-02-23 12:15:14 UTC (rev 721) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2011-02-23 12:26:47 UTC (rev 722) @@ -41,6 +41,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; +import org.nuiton.util.TimeLog; import org.nuiton.wikitty.entities.WikittyTreeNode; import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.SOLR_ID; @@ -64,7 +65,8 @@ public class SolrUtil { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SolrUtil.class); + final static private Log log = LogFactory.getLog(SolrUtil.class); + final static private TimeLog timeLog = new TimeLog(SolrUtil.class); /** * Recherche tous les TreeNode auquel appartient en Attachment l'objet passe @@ -167,7 +169,7 @@ request += ")"; SolrQuery query = new SolrQuery(request); - QueryResponse response = solrServer.query(query); + QueryResponse response = executeQuery(solrServer, query); SolrDocumentList results = response.getResults(); for (SolrDocument doc : results) { String id = (String) doc.getFieldValue(SOLR_ID); @@ -181,6 +183,27 @@ } /** + * Execute SolrQuery on specified SolrServer and return the result + * + * @param solrServer + * @param query + * @return + * @throws SolrServerException + */ + static public QueryResponse executeQuery(SolrServer solrServer, SolrQuery query) + throws SolrServerException { + long start = TimeLog.getTime(); + QueryResponse result = solrServer.query(query); + + long numGet = result.getResults().size(); + long numfound = result.getResults().getNumFound(); + timeLog.log(start, "executeQuery", String.format( + "nb result %s/%s query was '%s'", numGet, numfound, query)); + + return result; + } + + /** * if you change this method, change * {@link TypeFieldModifer#convertToField(org.nuiton.wikitty.services.WikittyTransaction, java.lang.String)} * too Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-23 12:15:14 UTC (rev 721) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-23 12:26:47 UTC (rev 722) @@ -688,7 +688,7 @@ if(log.isDebugEnabled()) { log.debug(String.format("Try to execute query %s", query)); } - QueryResponse resp = solrServer.query(query); + QueryResponse resp = SolrUtil.executeQuery(solrServer, query); SolrDocumentList solrResults = resp.getResults(); Map<String, List<FacetTopic>> facets = new HashMap<String, List<FacetTopic>>(); @@ -778,7 +778,7 @@ String queryString = restriction2Solr.toSolr( treeCriteria.getRestriction(), solrServer); SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString); - QueryResponse resp = solrServer.query(query); + QueryResponse resp = SolrUtil.executeQuery(solrServer, query); SolrDocumentList solrResults = resp.getResults(); Map<String, Integer> counts = new HashMap<String, Integer>(); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java 2011-02-23 12:15:14 UTC (rev 721) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java 2011-02-23 12:26:47 UTC (rev 722) @@ -30,21 +30,15 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.apache.solr.client.solrj.SolrQuery; import org.apache.solr.client.solrj.SolrServer; import org.apache.solr.client.solrj.SolrServerException; import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; -import org.apache.solr.client.solrj.response.QueryResponse; import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrDocumentList; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.core.CoreContainer; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.nuiton.wikitty.storage.solr.SolrUtil; -import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; -import org.nuiton.wikitty.storage.solr.WikittySolrConstant; /** * Test behaviour SolrServer embedded.

1 0

r721 - in trunk: . wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 23 Feb '11

23 Feb '11

Author: bpoussin Date: 2011-02-23 13:15:14 +0100 (Wed, 23 Feb 2011) New Revision: 721 Url: http://nuiton.org/repositories/revision/wikitty/721 Log: use new TimeLog class to replace TimeTrace Modified: trunk/pom.xml trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-23 10:01:28 UTC (rev 720) +++ trunk/pom.xml 2011-02-23 12:15:14 UTC (rev 721) @@ -508,7 +508,7 @@  <eugeneVersion>2.3.1</eugeneVersion> - <nuitonUtilsVersion>2.0</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1-SNAPSHOT</nuitonUtilsVersion> <nuitonI18nVersion>2.2</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-02-23 10:01:28 UTC (rev 720) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2011-02-23 12:15:14 UTC (rev 721) @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; -import org.nuiton.util.TimeTrace; +import org.nuiton.util.TimeLog; import org.nuiton.wikitty.entities.BusinessEntity; import org.nuiton.wikitty.entities.BusinessEntityImpl; import org.nuiton.wikitty.entities.Wikitty; @@ -69,10 +69,9 @@ public class WikittyProxy { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyProxy.class); + final static private Log log = LogFactory.getLog(WikittyProxy.class); + final static private TimeLog timeLog = new TimeLog(WikittyProxy.class); - static protected TimeTrace timeTrace = new TimeTrace(); - /** Delegated wikitty service. */ protected WikittyServiceEnhanced wikittyService; @@ -95,8 +94,8 @@ WIKITTY_PROXY_TIME_TO_LOG_INFO.getKey()); long timeToLogWarn = config.getOptionAsInt(WikittyConfig.WikittyOption. WIKITTY_PROXY_TIME_TO_LOG_WARN.getKey()); - timeTrace.setTimeToLogInfo(timeToLogInfo); - timeTrace.setTimeToLogWarn(timeToLogWarn); + timeLog.setTimeToLogInfo(timeToLogInfo); + timeLog.setTimeToLogWarn(timeToLogWarn); } } @@ -115,27 +114,27 @@ setWikittyService(wikittyService); } - static public TimeTrace getTimeTrace() { - return timeTrace; + static public TimeLog getTimeTrace() { + return timeLog; } - static public Map<String, TimeTrace.CallStat> getCallCount() { - return timeTrace.getCallCount(); + static public Map<String, TimeLog.CallStat> getCallCount() { + return timeLog.getCallCount(); } public void login(String login, String password) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); String result = wikittyService.login(login, password); setSecurityToken(result); - timeTrace.add(start, "login"); + timeLog.log(start, "login"); } public void logout() { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); wikittyService.logout(securityToken); - timeTrace.add(start, "logout"); + timeLog.log(start, "logout"); } public String getSecurityToken() { @@ -163,11 +162,11 @@ * @return new instance of object wanted */ public <E extends BusinessEntity> E cast(BusinessEntity source, Class<E> target) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); E result = WikittyUtil.newInstance( securityToken, wikittyService, target, ((BusinessEntityImpl)source).getWikitty()); - timeTrace.add(start, "cast"); + timeLog.log(start, "cast"); return result; } @@ -178,12 +177,12 @@ } public Wikitty store(Wikitty w) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); WikittyEvent resp = wikittyService.store(securityToken, w); // update object resp.update(w); - timeTrace.add(start, "store"); + timeLog.log(start, "store"); return w; } @@ -196,7 +195,7 @@ * @return updated objects list */ public <E extends BusinessEntity> List<E> store(List<E> objets) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); // prepare data to send to service List<Wikitty> wikitties = new ArrayList<Wikitty>(objets.size()); for (E e : objets) { @@ -212,12 +211,12 @@ resp.update(w); } - timeTrace.add(start, "store<list>"); + timeLog.log(start, "store<list>"); return objets; } public List<Wikitty> storeWikitty(List<Wikitty> wikitties) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); // call the service with Wikitty WikittyEvent resp = wikittyService.store(securityToken, wikitties); @@ -227,7 +226,7 @@ resp.update(w); } - timeTrace.add(start, "storeWikitty<list>"); + timeLog.log(start, "storeWikitty<list>"); return wikitties; } @@ -243,7 +242,7 @@ */ public <E extends BusinessEntity> E restore(Class<E> clazz, String id, boolean checkExtension) { try { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); E result = null; if (id != null) { HashSet<String> extNames = null; @@ -274,7 +273,7 @@ } } - timeTrace.add(start, "restore<Business>"); + timeLog.log(start, "restore<Business>"); return result; } catch (SecurityException eee) { throw eee; @@ -290,13 +289,13 @@ * @return wikitty entity with specified id or {@code null} if entity can't be found */ public Wikitty restore(String id) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); Wikitty result = null; if (id != null) { result = wikittyService.restore(securityToken, id); } - timeTrace.add(start, "restore"); + timeLog.log(start, "restore"); return result; } @@ -320,11 +319,11 @@ * @return wikitty entity with specified id or {@code null} if entity can't be found */ public List<Wikitty> restore(List<String> id) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); List<Wikitty> result = wikittyService.restore(securityToken, id); - timeTrace.add(start, "restoreWikitty<list>"); + timeLog.log(start, "restoreWikitty<list>"); return result; } @@ -341,7 +340,7 @@ */ public <E extends BusinessEntity> List<E> restore( Class<E> clazz, List<String> id, boolean checkExtension) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); List<Wikitty> wikitties = wikittyService.restore(securityToken, id); List<E> result = new ArrayList<E>(); @@ -375,7 +374,7 @@ result.add(dto); } - timeTrace.add(start, "restore<list>"); + timeLog.log(start, "restore<list>"); return result; } @@ -385,30 +384,30 @@ } public void delete(String id) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); wikittyService.delete(securityToken, id); - timeTrace.add(start, "delete"); + timeLog.log(start, "delete"); } public <E extends BusinessEntity> void delete(E object) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); if (object != null) { String id = object.getWikittyId(); wikittyService.delete(securityToken, id); } - timeTrace.add(start, "delete(BusinessEntity)"); + timeLog.log(start, "delete(BusinessEntity)"); } public void delete(Collection<String> ids) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); wikittyService.delete(securityToken, ids); - timeTrace.add(start, "delete<list>"); + timeLog.log(start, "delete<list>"); } public <E extends BusinessEntity> void delete(List<E> objets) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); // prepare data to send to service List<String> ids = new ArrayList<String>(objets.size()); @@ -422,7 +421,7 @@ // call the service with Wikitty wikittyService.delete(securityToken, ids); - timeTrace.add(start, "delete<list<BusinessEntity>>"); + timeLog.log(start, "delete<list<BusinessEntity>>"); } /** @@ -436,7 +435,7 @@ */ public <E extends BusinessEntityImpl> PagedResult<E> findAllByExample(E e, int firstIndex, int endIndex, String ... fieldFacet ) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); Criteria criteria = Search.query(e.getWikitty()).criteria() .setFirstIndex(firstIndex).setEndIndex(endIndex) @@ -449,7 +448,7 @@ PagedResult<E> result = (PagedResult<E>)pagedResult.cast( this, e.getClass(), true); - timeTrace.add(start, "findAllByExample<limit>"); + timeLog.log(start, "findAllByExample<limit>"); return result; } @@ -460,7 +459,7 @@ * @return */ public <E extends BusinessEntityImpl> E findByExample(E e) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); Criteria criteria = Search.query(e.getWikitty()).criteria(); String id = wikittyService.findByCriteria(securityToken, criteria); @@ -471,7 +470,7 @@ securityToken, wikittyService, e.getClass(), w); } - timeTrace.add(start, "findByExample"); + timeLog.log(start, "findByExample"); return result; } @@ -487,7 +486,7 @@ */ public <E extends BusinessEntity> PagedResult<E> findAllByCriteria( Class<E> clazz, Criteria criteria) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); // newInstance only return BusinessEntityWikittyImpl BusinessEntityImpl sample = @@ -543,24 +542,24 @@ PagedResult<E> result = (PagedResult<E>)pagedResult.cast( this, sample.getClass(), true); - timeTrace.add(start, "findAllByCriteria<Business>"); + timeLog.log(start, "findAllByCriteria<Business>"); return result; } public PagedResult<Wikitty> findAllByCriteria(Criteria criteria) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); PagedResult<String> resultId = wikittyService.findAllByCriteria(securityToken, criteria); PagedResult<Wikitty> result = resultId.cast(securityToken, wikittyService); - timeTrace.add(start, "findAllByCriteria"); + timeLog.log(start, "findAllByCriteria"); return result; } public PagedResult<String> findAllIdByCriteria(Criteria criteria) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); PagedResult<String> result = wikittyService.findAllByCriteria(securityToken, criteria); - timeTrace.add(start, "findAllByCriteria"); + timeLog.log(start, "findAllByCriteria"); return result; } @@ -583,7 +582,7 @@ */ public TreeNodeResult<Wikitty> findTreeNode( String wikittyId, int depth, boolean count, Criteria filter) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); TreeNodeResult<String> resultId = wikittyService.findTreeNode( securityToken, wikittyId, depth, count, filter); @@ -603,7 +602,7 @@ resultId.acceptVisitor(convertVisitor); TreeNodeResult<Wikitty> result = convertVisitor.getTree(); - timeTrace.add(start, "findTreeNode<Wikitty>"); + timeLog.log(start, "findTreeNode<Wikitty>"); return result; } @@ -626,7 +625,7 @@ public <E extends BusinessEntity> TreeNodeResult<E> findTreeNode( Class<E> clazz, String wikittyId, int depth, boolean count, Criteria filter) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); TreeNodeResult<String> resultId = wikittyService.findTreeNode( securityToken, wikittyId, depth, count, filter); @@ -646,7 +645,7 @@ resultId.acceptVisitor(convertVisitor); TreeNodeResult<E> result = convertVisitor.getTree(); - timeTrace.add(start, "findTreeNode"); + timeLog.log(start, "findTreeNode"); return result; } @@ -771,16 +770,16 @@ */ public TreeNodeResult<String> findAllIdTreeNode( String wikittyId, int depth, boolean count, Criteria filter) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); TreeNodeResult<String> result = wikittyService.findTreeNode( securityToken, wikittyId, depth, count, filter); - timeTrace.add(start, "findAllIdTreeNode"); + timeLog.log(start, "findAllIdTreeNode"); return result; } public <E extends BusinessEntity> E findByCriteria(Class<E> clazz, Criteria criteria) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); BusinessEntityImpl sample = (BusinessEntityImpl)WikittyUtil.newInstance(clazz); @@ -796,15 +795,15 @@ E result = WikittyUtil.newInstance( securityToken, wikittyService, clazz, w); - timeTrace.add(start, "findByCriteria<Business>"); + timeLog.log(start, "findByCriteria<Business>"); return result; } public Wikitty findByCriteria(Criteria criteria) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); String id = wikittyService.findByCriteria(securityToken, criteria); Wikitty wikitty = wikittyService.restore(securityToken, id); - timeTrace.add(start, "findByCriteria"); + timeLog.log(start, "findByCriteria"); return wikitty; } @@ -815,10 +814,10 @@ * @return {@true} if at least one node has been deleted */ public WikittyEvent deleteTree(String treeNodeId) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); WikittyEvent result = wikittyService.deleteTree(securityToken,treeNodeId); - timeTrace.add(start, "deleteTree"); + timeLog.log(start, "deleteTree"); return result; } @@ -836,13 +835,13 @@ @Deprecated public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode( Class<E> clazz, String wikittyId, Criteria filter) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); TreeNodeResult<E> tree = findTreeNode(clazz, wikittyId, 0, true, filter); Map.Entry<E, Integer> result = new SimpleEntry<E, Integer>( tree.getObject(), tree.getAttCount()); - timeTrace.add(start, "restoreNode"); + timeLog.log(start, "restoreNode"); return result; } @@ -879,7 +878,7 @@ @Deprecated public <E extends BusinessEntity> Map<E, Integer> findTreeNode( Class<E> clazz, String wikittyId, Criteria filter) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); TreeNodeResult<E> tree = findTreeNode(clazz, wikittyId, 1, true, filter); @@ -888,7 +887,7 @@ result.put(child.getObject(), child.getAttCount()); } - timeTrace.add(start, "findTreeNode"); + timeLog.log(start, "findTreeNode"); return result; } @@ -907,17 +906,17 @@ } public Wikitty restoreVersion(String wikittyId, String version) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); Wikitty result = wikittyService.restoreVersion( securityToken, wikittyId, version); - timeTrace.add(start, "restoreVersion"); + timeLog.log(start, "restoreVersion"); return result; } public <E extends BusinessEntity> boolean hasType(Class<E> clazz, String wikittyId) { try { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); boolean result = true; @@ -943,7 +942,7 @@ } } - timeTrace.add(start, "hasType"); + timeLog.log(start, "hasType"); return result; } catch (SecurityException eee) { throw eee; @@ -960,11 +959,11 @@ * @return update response */ public WikittyEvent storeExtension(WikittyExtension ext) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); WikittyEvent response = wikittyService.storeExtension(securityToken, ext); - timeTrace.add(start, "storeExtension"); + timeLog.log(start, "storeExtension"); return response; } @@ -975,11 +974,11 @@ * @return update response */ public WikittyEvent storeExtension(Collection<WikittyExtension> exts) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); WikittyEvent response = wikittyService.storeExtension(securityToken, exts); - timeTrace.add(start, "storeExtension<list>"); + timeLog.log(start, "storeExtension<list>"); return response; } @@ -990,10 +989,10 @@ * @return the corresponding object, exception if no such object found. */ public WikittyExtension restoreExtension(String extensionId) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); WikittyExtension extension = wikittyService.restoreExtension(securityToken, extensionId); - timeTrace.add(start, "restoreExtension"); + timeLog.log(start, "restoreExtension"); return extension; } @@ -1004,25 +1003,25 @@ * @return the corresponding object, exception if no such object found. */ public WikittyExtension restoreExtensionLastVersion(String extensionName) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); WikittyExtension extension = wikittyService.restoreExtensionLastVersion(securityToken, extensionName); - timeTrace.add(start, "restoreExtensionLastVersion"); + timeLog.log(start, "restoreExtensionLastVersion"); return extension; } public void deleteExtension(String extName) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); wikittyService.deleteExtension(securityToken, extName); - timeTrace.add(start, "deleteExtension"); + timeLog.log(start, "deleteExtension"); } public void deleteExtension(Collection<String> extNames) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); wikittyService.deleteExtension(securityToken, extNames); - timeTrace.add(start, "deleteExtension<list>"); + timeLog.log(start, "deleteExtension<list>"); } /** @@ -1031,10 +1030,10 @@ * @return extension id list */ public List<String> getAllExtensionIds() { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); List<String> result = wikittyService.getAllExtensionIds(securityToken); - timeTrace.add(start, "getAllExtensionIds"); + timeLog.log(start, "getAllExtensionIds"); return result; } @@ -1046,10 +1045,10 @@ * @return extensions */ public List<String> getAllExtensionsRequires(String extensionName) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); List<String> result = wikittyService.getAllExtensionsRequires(securityToken, extensionName); - timeTrace.add(start, "getAllExtensionsRequires"); + timeLog.log(start, "getAllExtensionsRequires"); return result; } @@ -1058,10 +1057,10 @@ * This operation should be disabled in production environment. */ public WikittyEvent clear() { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); WikittyEvent result = wikittyService.clear(securityToken); - timeTrace.add(start, "clear"); + timeLog.log(start, "clear"); return result; } @@ -1070,10 +1069,10 @@ * reindex all object. */ public void syncSearchEngine() { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); wikittyService.syncSearchEngine(securityToken); - timeTrace.add(start, "syncSearchEngine"); + timeLog.log(start, "syncSearchEngine"); } /** @@ -1082,10 +1081,10 @@ * @return the wikitty encapsulated */ public Wikitty getWikitty(BusinessEntity entity){ - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); Wikitty result = WikittyUtil.getWikitty(wikittyService, securityToken, entity); - timeTrace.add(start, "getWikitty"); + timeLog.log(start, "getWikitty"); return result; } @@ -1096,7 +1095,7 @@ * @return true is the logged in user is in the group */ public boolean isMember(String groupName) { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); boolean result = false; WikittyUser user = getLoggedInUser(); @@ -1114,7 +1113,7 @@ user.getWikittyId(), group.getId()); } - timeTrace.add(start, "isMember"); + timeLog.log(start, "isMember"); return result; } @@ -1124,14 +1123,14 @@ * @return the logged in #WikittyUser */ public WikittyUser getLoggedInUser() { - long start = TimeTrace.getTime(); + long start = TimeLog.getTime(); String userId = WikittySecurityUtil.getUserForToken(wikittyService, securityToken); WikittyUser user = restore(WikittyUser.class, userId); - timeTrace.add(start, "getLoggedInUser"); + timeLog.log(start, "getLoggedInUser"); return user; }

1 0

r720 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org 23 Feb '11

23 Feb '11

Author: echatellier Date: 2011-02-23 11:01:28 +0100 (Wed, 23 Feb 2011) New Revision: 720 Url: http://nuiton.org/repositories/revision/wikitty/720 Log: Fix exception text Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 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 2011-02-22 18:57:43 UTC (rev 719) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2011-02-23 10:01:28 UTC (rev 720) @@ -475,7 +475,7 @@ scanner.scan(id); } } catch (SQLException eee) { - throw new WikittyException("Can't scan wall wikitty", eee); + throw new WikittyException("Can't scan whole wikitty", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); }

1 0

r719 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/services wikitty-api/src/main/java/org/nuiton/wikitty/storage wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc wikitty-jdbc-impl/src/main/resources
by bpoussin＠users.nuiton.org 22 Feb '11

22 Feb '11

Author: bpoussin Date: 2011-02-22 19:57:43 +0100 (Tue, 22 Feb 2011) New Revision: 719 Url: http://nuiton.org/repositories/revision/wikitty/719 Log: Evolution #1352: Add information in log during reindexation process add getStatistic method on WikittyStorage interface Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2011-02-21 17:49:33 UTC (rev 718) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2011-02-22 18:57:43 UTC (rev 719) @@ -928,6 +928,7 @@ boolean txBeginHere = false; try { + log.info("Reindexation started"); final int numberForCommit = 1000; // TODO poussin 20110221 configurable variable final WikittySearchEngine searchEngine = getSearchEngine(); final List<Wikitty> wikitties = new ArrayList<Wikitty>(numberForCommit); @@ -944,7 +945,14 @@ tx.begin(); txBeginHere = true; } + + WikittyStorage.DataStatistic stat = getWikittyStorage().getDataStatistic(tx); + final long max = stat.getActiveWikitties(); + + log.info("Reindexation 0%"); getWikittyStorage().scanWikitties(tx, new WikittyStorage.Scanner() { + long lastPurcent = -1; + long current = 0; int count = 0; @Override @@ -952,6 +960,7 @@ Wikitty wikitty = restore(securityToken, wikittyId); Date deleteDate = wikitty.getDeleteDate(); if(deleteDate == null) { + current++; count ++; wikitties.add(wikitty); @@ -963,6 +972,16 @@ count = 0; wikitties.clear(); tx.begin(); + // si on a les statistiques a disposition on affiche + // l'etat d'avancement dans les logs + if (max > 0) { + long purcent = current * 100 / max; + // on affiche l'etat d'avancement environ tous les 10% + if (purcent / 10 > lastPurcent) { + lastPurcent = purcent / 10; + log.info(String.format("Reindexation %s%%", purcent)); + } + } } } } @@ -973,6 +992,7 @@ if (txBeginHere) { tx.commit(); } + log.info("Reindexation finished"); } catch (WikittyException ex) { if (tx != null && tx.isStarted()) { tx.rollback(); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java 2011-02-21 17:49:33 UTC (rev 718) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java 2011-02-22 18:57:43 UTC (rev 719) @@ -129,4 +129,58 @@ */ public WikittyEvent clear(WikittyTransaction transaction); + /** + * Return some statistique about the data + * @param transaction + * @return + * @since 3.0.5 + */ + public DataStatistic getDataStatistic(WikittyTransaction transaction); + + /** + * @see #getDataStatistic(org.nuiton.wikitty.services.WikittyTransaction) + * @since 3.0.5 + */ + static public class DataStatistic { + protected long activeWikitties = -1; + protected long deletedWikitties = -1; + + /** + * Use this constructor when your implementation don't support statistic + */ + public DataStatistic() { + } + + public DataStatistic(long activeWikitties, long deletedWikitties) { + this.activeWikitties = activeWikitties; + this.deletedWikitties = deletedWikitties; + } + /** + * Return number of non deleted wikitties, or negative value if this + * information can't be retrieved + * @return + */ + public long getActiveWikitties() { + return activeWikitties; + } + + /** + * Return number of deleted wikitties, or negative value if this + * information can't be retrieved + * @return + */ + public long getDeletedWikitties() { + return deletedWikitties; + } + + /** + * Return number of non deleted and deleted wikitties, or negative value + * if this information can't be retrieved + * @return + */ + public long getTotalWikitties() { + long result = getActiveWikitties() + getDeletedWikitties(); + return result; + } + } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2011-02-21 17:49:33 UTC (rev 718) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorageInMemory.java 2011-02-22 18:57:43 UTC (rev 719) @@ -175,4 +175,21 @@ result.addType(WikittyEvent.WikittyEventType.CLEAR_WIKITTY); return result; } + + @Override + public DataStatistic getDataStatistic(WikittyTransaction transaction) { + long active = 0; + long deleted = 0; + Collection<Wikitty> all = wikitties.values(); + for (Wikitty wikitty : all) { + if (wikitty.isDeleted()) { + deleted++; + } else { + active++; + } + } + DataStatistic result = new DataStatistic(active, deleted); + return result; + } + } Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-02-21 17:49:33 UTC (rev 718) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-02-22 18:57:43 UTC (rev 719) @@ -100,6 +100,10 @@ static final public String QUERY_SELECT = "jdbc.queries.select"; /** basic selection without where clause query property name */ static final public String QUERY_SELECT_NOTDELETED = "jdbc.queries.select.notdeleted"; + /** count number of active (not deleted wikitties) */ + static final public String QUERY_COUNT_ACTIVE_WIKITTY = "jdbc.queries.select.count.active.wikitties"; + /** count number of deleted */ + static final public String QUERY_COUNT_DELETED_WIKITTY = "jdbc.queries.select.count.deleted.wikitties"; /** basic selection with where clause query property name */ static final public String QUERY_SELECT_WHERE = "jdbc.queries.select.where"; /** basic selection with where clause query property name */ 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 2011-02-21 17:49:33 UTC (rev 718) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2011-02-22 18:57:43 UTC (rev 719) @@ -48,6 +48,8 @@ import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_INSERT_WIKITTY_ADMIN; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_INSERT_WIKITTY_DATA; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_NOTDELETED; +import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_COUNT_ACTIVE_WIKITTY; +import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_COUNT_DELETED_WIKITTY; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_WHERE; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_TWO_WHERE; import static org.nuiton.wikitty.jdbc.WikittyJDBCUtil.QUERY_SELECT_WHERE_NOTDELETED; @@ -621,4 +623,31 @@ WikittyJDBCUtil.closeQuietly(connection); } } + + @Override + public DataStatistic getDataStatistic(WikittyTransaction transaction) { + DataStatistic result;; + Connection connection = WikittyJDBCUtil.getConnection(config); + try { + Statement statement = connection.createStatement(); + + ResultSet resultSet = statement.executeQuery( + jdbcQuery.getProperty(QUERY_COUNT_ACTIVE_WIKITTY)); + long activeWikitties = resultSet.getLong(1); + + resultSet = statement.executeQuery( + jdbcQuery.getProperty(QUERY_COUNT_DELETED_WIKITTY)); + long deletedWikitties = resultSet.getLong(1); + + result = new DataStatistic(activeWikitties, deletedWikitties); + } catch (SQLException eee) { + result = new DataStatistic(); + log.warn("Can't retrieve statisticn data", eee); + } finally { + WikittyJDBCUtil.closeQuietly(connection); + } + return result; + } + + } Modified: trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties =================================================================== --- trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2011-02-21 17:49:33 UTC (rev 718) +++ trunk/wikitty-jdbc-impl/src/main/resources/wikitty-jdbc-query.properties 2011-02-22 18:57:43 UTC (rev 719) @@ -77,6 +77,10 @@ jdbc.queries.select=SELECT %s FROM %s; #not deleted data selection query without where clause jdbc.queries.select.notdeleted=SELECT %s FROM %s WHERE deletionDate IS NULL; +#count number of active (not deleted wikitties) +jdbc.queries.select.count.active.wikitties=SELECT count(id) FROM wikitty_admin WHERE deletiondate IS NULL; +#count number of deleted wikitties +jdbc.queries.select.count.deleted.wikitties=SELECT count(id) FROM wikitty_admin WHERE deletiondate IS NOT NULL; #basic selection query with where clause jdbc.queries.select.where=SELECT %s FROM %s WHERE %s = ?; #basic 2 selections query with where clause

1 0

r718 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr
by bpoussin＠users.nuiton.org 21 Feb '11

21 Feb '11

Author: bpoussin Date: 2011-02-21 18:49:33 +0100 (Mon, 21 Feb 2011) New Revision: 718 Url: http://nuiton.org/repositories/revision/wikitty/718 Log: Anomalie #1351: Bug in reindexation with new SolR indexation implementation when syncSearchEngine Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2011-02-21 17:45:43 UTC (rev 717) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/AttachmentInTree.java 2011-02-21 17:49:33 UTC (rev 718) @@ -145,8 +145,10 @@ } /** + * Ajout les attachment du TreeNode passe en parametre via son Id + * * @param id TreeNode id - * @param ids attachment id + * @param attId attachment id */ public void add(String id, Collection<String> attId) { if (attId != null && !attId.isEmpty()) { @@ -155,7 +157,21 @@ } } + /** + * Ajout l'attachment du TreeNode passe en parametre via son Id + * + * @param id TreeNode id + * @param attId attachment id + */ + public void add(String id, String attId) { + if (attId != null) { + attachmentAddedInTree.get(id).add(attId); + allAttachmentToIndex.add(attId); + } + } + /** + * Ajout les attachment du TreeNode passe en parametre sous forme de doc Solr * @param doc TreeNode document representation */ public void add(SolrDocument doc) { @@ -168,8 +184,31 @@ } /** + * Ajout les attachment du TreeNode passe en parametre sous forme de doc Solr + * Mais seulement si l'attachment est aussi dans la liste restriction + * * @param doc TreeNode document representation + * @param restriction la liste accepte de wikitty a ajouter */ + public void add(SolrDocument doc, Set<String> restriction) { + String id = (String)doc.getFieldValue(WikittySolrConstant.SOLR_ID); + + Collection att = doc.getFieldValues(SolrUtil.getSolrFieldName( + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, + TYPE.WIKITTY)); + if (att != null) { + for (Object attId : att) { + if (restriction.contains(attId)) { + add(id, (String)attId); + } + } + } + } + + /** + * Ajout les attachment du TreeNode passe en parametre sous forme de doc Solr + * @param doc TreeNode document representation + */ public void add(SolrInputDocument doc) { String id = (String)doc.getFieldValue(WikittySolrConstant.SOLR_ID); @@ -180,6 +219,7 @@ } /** + * Ajout les attachment du TreeNode passe en parametre sous forme de Wikitty * @param doc TreeNode document representation */ public void add(Wikitty w) { Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-21 17:45:43 UTC (rev 717) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2011-02-21 17:49:33 UTC (rev 718) @@ -161,6 +161,9 @@ Map<String, Wikitty> allWikitties = new HashMap<String, Wikitty>(); // les ids des wikitties en parametre reellement modifier (a reindexer) Set<String> dirtyObject = new HashSet<String>(); + // les ids des wikitties qui n'appartiennent pas a un TreeNode passé en + // parametre, mais qui pourrait appartenir a un treenode deja indexe + Set<String> possibleAttachment = new HashSet<String>(); // les ids des TreeNodes dont le champs parent a change (est aussi // contenu dans dirtyObject Set<String> dirtyParent = new HashSet<String>(); @@ -176,8 +179,8 @@ // s'il y a au moins un champs a reindexer ou que l'objet // n'a jamais ete sauve (1 > version) dirtyObject.add(w.getId()); - if (WikittyTreeNodeHelper.hasExtension(w) && - (w.getDirty().contains(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT) + if (WikittyTreeNodeHelper.hasExtension(w) && (force + ||w.getDirty().contains(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT) || null == WikittyTreeNodeHelper.getParent(w))) { // si le pere a change // ou qu'il est null (creation d'un nouvel arbre) @@ -205,16 +208,21 @@ // // Phase 1: on indexe les objets passe en paremetre, on copie si - // besoin #tree.attached et #tree.* des TreeNode dont - // leur champs parent n'a pas ete modifie, et dans ce cas - // on collecte les modif d'attachments des TreeNode + // besoin #tree.attached des wikitties et #tree.* des + // TreeNode dont leur champs parent n'a pas ete modifie, et + // dans ce cas on collecte les modif d'attachments des TreeNode // for(String id : dirtyObject) { Wikitty w = allWikitties.get(id); SolrDocument oldDoc = dirtyObjectDoc.get(id); SolrInputDocument doc = createIndexDocument(w); - if (oldDoc != null) { + if (oldDoc == null) { + // Le document n'existait pas, mais peut-etre qu'il etait + // dans la liste des attachments d'un TreeNode. Il faudra + // donc rechercher si c'est le cas et l'indexer convenablement + possibleAttachment.add(id); + } else { // copy des champs #tree.attached SolrUtil.copySolrDocument(oldDoc, doc, TREENODE_ATTACHED + ".*"); if (WikittyTreeNodeHelper.hasExtension(w) @@ -315,9 +323,15 @@ // Phase 3: on reindexe les attachments qui en ont besoin // - // on passe null pour tree, car tous les noeuds doivent etre dans - // solrResource - addTreeIndexField(solrResource, null, attachmentInTree); + // on ajoute les attachment au TreeNode qui ont ete store, sans + // leurs attachments (ni en base, ni dans le meme store) + Map<String, SolrDocument> tree = + SolrUtil.findAllByAttachment(solrServer, possibleAttachment); + for (SolrDocument doc : tree.values()) { + attachmentInTree.add(doc, possibleAttachment); + } + + addTreeIndexField(solrResource, tree, attachmentInTree); } catch (Exception eee) { throw new WikittyException("Can't store wikitty", eee); } @@ -369,6 +383,10 @@ attachmentInTree.remove(doc); } // recherche tous les noeuds sur lequel est attache cet objet + + // TODO poussin 20110217 optimiser cette requete pour la faire + // hors de la boucle et pour tous les doc a supprimer en meme + // temps (donc 1 seul requete au lieu de N) Set<String> treeNodeIds = SolrUtil.getAttachedTreeNode(doc); treeNodeAttachmentRemovedId.addAll(treeNodeIds); @@ -528,12 +546,12 @@ } /** - * Update attaced extra field on all objects passed in argument allAttachmentToIndex + * Update attached extra field on all objects passed in argument + * allAttachmentToIndex * * @param solrResource must contains reindexed TreeNode, that contains attachment - * @param allAttachmentToIndex id of object to update - * @param attachmentRemovedInTree index to remove - * @param attachmentAddedInTree index to add + * @param tree solr document for some TreeNode (used when TreeNode not find in solrResource) + * @param attachmentInTree attachment added and removed from TreeNode */ protected void addTreeIndexField(SolrResource solrResource, Map<String, SolrDocument> tree, AttachmentInTree attachmentInTree) { @@ -566,18 +584,29 @@ log.error("SolR doc not found in Transaction or in tree." + "This is a bug !!!"); } + // add tree indexation on all attachments for this treeNodeId for (String attId : attachmentInTree.getAdded().get(treeNodeId)) { SolrDocument oldDoc = attachments.get(attId); SolrInputDocument doc = solrResource.getAddedDoc(attId); - if (doc == null) { - doc = new SolrInputDocument(); - SolrUtil.copySolrDocument(oldDoc, doc); - solrResource.addDoc(attId, doc); + // il faut que oldDoc ou doc soit different de null pour + // pouvoir ajouter l'indexation d'arbre. Le cas on les deux + // sont nuls arrivent lorsqu'on demande la sauvegarde d'un + // TreeNode alors qu'on a pas encore sauve les attachments + // (ex: durant un syncSearchEngine ou l'on demande une + // reindexation totale). Ceci n'est pas un probleme car + // les attachments seront convenablement indexes lorsqu'ils + // seront ajoutes + if (oldDoc != null || doc != null) { + if (doc == null) { + doc = new SolrInputDocument(); + SolrUtil.copySolrDocument(oldDoc, doc); + solrResource.addDoc(attId, doc); + } + doc.removeField(TREENODE_ATTACHED + treeNodeId); + for (Object id : treeNodeParents) { + doc.addField(TREENODE_ATTACHED + treeNodeId, id); + } } - doc.removeField(TREENODE_ATTACHED + treeNodeId); - for (Object id : treeNodeParents) { - doc.addField(TREENODE_ATTACHED + treeNodeId, id); - } } } }

1 0

r717 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api
by bpoussin＠users.nuiton.org 21 Feb '11

21 Feb '11

Author: bpoussin Date: 2011-02-21 18:45:43 +0100 (Mon, 21 Feb 2011) New Revision: 717 Url: http://nuiton.org/repositories/revision/wikitty/717 Log: use Integer.valueOf (better than new Integer) Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2011-02-21 17:45:16 UTC (rev 716) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2011-02-21 17:45:43 UTC (rev 717) @@ -250,7 +250,7 @@ } }); // test java.lang.Integer => int - w.setField(StorageTest.EXTNAME, "fieldName1", new Integer(123)); + w.setField(StorageTest.EXTNAME, "fieldName1", Integer.valueOf(123)); Assert.assertEquals(123, w.getFieldAsInt(StorageTest.EXTNAME, "fieldName1") ); // test String => int w.setField(StorageTest.EXTNAME, "fieldName1", "123");

1 0