You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by ch...@apache.org on 2015/07/09 10:26:16 UTC

svn commit: r1690017 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index: AsyncIndexUpdate.java IndexUpdate.java

Author: chetanm
Date: Thu Jul  9 08:26:16 2015
New Revision: 1690017

URL: http://svn.apache.org/r1690017
Log:
OAK-3088 - IndexUpdate reports at debug level quite verbose

Modified:
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
    jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java?rev=1690017&r1=1690016&r2=1690017&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java Thu Jul  9 08:26:16 2015
@@ -786,7 +786,7 @@ public class AsyncIndexUpdate implements
                 return;
             }
             throw new CommitFailedException("Async", 2,
-                    "Missing index provider detected");
+                    "Missing index provider detected for type ["+type+"]");
         }
     }
 

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java?rev=1690017&r1=1690016&r2=1690017&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexUpdate.java Thu Jul  9 08:26:16 2015
@@ -224,7 +224,7 @@ public class IndexUpdate implements Edit
         if (parent == null){
             if (rootState.isReindexingPerformed()){
                 log.info(rootState.getReport());
-            } else if (log.isDebugEnabled()){
+            } else if (log.isDebugEnabled() && rootState.somethingIndexed()){
                 log.debug(rootState.getReport());
             }
         }
@@ -363,7 +363,9 @@ public class IndexUpdate implements Edit
                 if (!log.isDebugEnabled() && !cb.reindex) {
                     continue;
                 }
-                pw.printf("    - %s%n", cb);
+                if (cb.count > 0) {
+                    pw.printf("    - %s%n", cb);
+                }
             }
             return sw.toString();
         }
@@ -378,6 +380,15 @@ public class IndexUpdate implements Edit
             return stats;
         }
 
+        public boolean somethingIndexed() {
+            for (CountingCallback cb : callbacks.values()) {
+                if (cb.count > 0){
+                    return true;
+                }
+            }
+            return false;
+        }
+
         public boolean isReindexingPerformed(){
             return !reindexedIndexes.isEmpty();
         }