knguyen     2004/09/30 15:13:28 CEST

  Modified files:        (Branch: JAHIA-4-0-BRANCH)
    src/java/org/jahia/services/search JahiaSearchBaseService.java 
  Log:
  - more debugging msg
  
  Revision   Changes    Path
  1.42.2.12  +72 -0     
jahia/src/java/org/jahia/services/search/JahiaSearchBaseService.java
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/java/org/jahia/services/search/JahiaSearchBaseService.java.diff?r1=1.42.2.11&r2=1.42.2.12&f=h
  
  
  
  Index: JahiaSearchBaseService.java
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/src/java/org/jahia/services/search/Attic/JahiaSearchBaseService.java,v
  retrieving revision 1.42.2.11
  retrieving revision 1.42.2.12
  diff -u -r1.42.2.11 -r1.42.2.12
  --- JahiaSearchBaseService.java       23 Sep 2004 16:26:47 -0000      1.42.2.11
  +++ JahiaSearchBaseService.java       30 Sep 2004 13:13:27 -0000      1.42.2.12
  @@ -967,6 +967,9 @@
           if (indObj == null)
               return;
   
  +        long startTime = System.currentTimeMillis();
  +        long overalStartTime = startTime;
  +
           Document doc = new Document ();
           Locale locale = Locale.getDefault();
           String[] langCodes = (String[])indObj.getFields()
  @@ -1005,13 +1008,29 @@
           doc.add (Field.Keyword (indObj.getKeyFieldName (),
                   indObj.getKey ()));
   
  +        long elapsedTime = System.currentTimeMillis() - startTime;
  +        if (logger.isInfoEnabled()) {
  +            logger.info(
  +                "Finished preparing document to index in " + elapsedTime + "ms.");
  +        }
  +
  +        startTime = System.currentTimeMillis();
  +
           // first remove previous entry
           Term term = new Term (indObj.getKeyFieldName (), indObj.getKey ());
           removeDoc (indObj.getSiteId (), term, reader);
   
  +        elapsedTime = System.currentTimeMillis() - startTime;
  +        if (logger.isInfoEnabled()) {
  +            logger.info(
  +                "Finished removing document from index in " + elapsedTime + "ms.");
  +        }
  +
           boolean closeWriter = false;
           try {
   
  +            startTime = System.currentTimeMillis();
  +
               // Try to get the site's index if any.
               if (writer == null) {
                   writer = getIndexWriter (indObj.getSiteId (),
  @@ -1028,15 +1047,42 @@
                   }
                   closeWriter = true;
               }
  +
  +            elapsedTime = System.currentTimeMillis() - startTime;
  +            if (logger.isInfoEnabled()) {
  +                logger.info(
  +                    "Time to get index writer : " + elapsedTime + "ms.");
  +            }
  +
  +            startTime = System.currentTimeMillis();
  +
               writer.addDocument (doc);
   
  +            elapsedTime = System.currentTimeMillis() - startTime;
  +            if (logger.isInfoEnabled()) {
  +                logger.info(
  +                    "Time to write document to index writer : " + elapsedTime + 
"ms.");
  +            }
  +
           } catch (Throwable t) {
               logger.error ("Error while indexing object " + indObj.getKey () + ":", 
t);
           } finally {
               if (closeWriter) {
  +                startTime = System.currentTimeMillis();
                   closeIndexWriter (writer);
  +                elapsedTime = System.currentTimeMillis() - startTime;
  +                if (logger.isInfoEnabled()) {
  +                    logger.info(
  +                        "Time to close index writer : " + elapsedTime + "ms.");
  +                }
               }
           }
  +
  +        elapsedTime = System.currentTimeMillis() - overalStartTime;
  +        if (logger.isInfoEnabled()) {
  +            logger.info(
  +                "########## Overall document indexing : " + indObj +  elapsedTime + 
" ms. ###########");
  +        }
       }
   
       //--------------------------------------------------------------------------
  @@ -1128,6 +1174,10 @@
        * @param reader optional, use it if not null
        */
       private void removeDoc (int siteID, Term term, IndexReader reader) {
  +
  +        long startTime = System.currentTimeMillis();
  +        long overalStartTime = startTime;
  +
           boolean closeReader = false;
           try {
   
  @@ -1136,18 +1186,40 @@
                   closeReader = true;
                   reader = getIndexReader(siteID);
               }
  +
  +            long elapsedTime = System.currentTimeMillis() - startTime;
  +            if (logger.isInfoEnabled()) {
  +                logger.info(
  +                    "Time to get IndexReader " + elapsedTime + "ms.");
  +            }
  +
               if (reader == null)
                   return;
   
  +            startTime = System.currentTimeMillis();
  +
               // Remove all documents containing the term.
               int nbDeleted = reader.delete (term);
  +
  +            elapsedTime = System.currentTimeMillis() - startTime;
  +            if (logger.isInfoEnabled()) {
  +                logger.info(
  +                    "Time to delete document from IndexReader " + elapsedTime + 
"ms.");
  +            }
  +
               // logger.debug( "Field removed :" + aField.getID() + " , "
               //                       + String.valueOf(nbDeleted) + " Doc deleted ");
           } catch (Throwable t) {
               logger.error ("Error while removing doc for site " + siteID, t);
           } finally {
               if ( closeReader ){
  +                startTime = System.currentTimeMillis();
                   closeIndexReader(reader);
  +                long elapsedTime = System.currentTimeMillis() - startTime;
  +                if (logger.isInfoEnabled()) {
  +                    logger.info(
  +                        "Time to close IndexReader " + elapsedTime + "ms.");
  +                }
               }
           }
       }
  

Reply via email to