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 2017/05/12 09:14:14 UTC
svn commit: r1794946 - in /jackrabbit/oak/trunk:
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/pr...
Author: chetanm
Date: Fri May 12 09:14:14 2017
New Revision: 1794946
URL: http://svn.apache.org/viewvc?rev=1794946&view=rev
Log:
OAK-6080 - Index report service
IndexInfo should also provide diff between stored index definition and
current index definition
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfo.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoServiceImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinterTest.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProvider.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfo.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfo.java?rev=1794946&r1=1794945&r2=1794946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfo.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfo.java Fri May 12 09:14:14 2017
@@ -82,4 +82,13 @@ public interface IndexInfo {
* was done for that change.
*/
boolean hasIndexDefinitionChangedWithoutReindexing();
+
+ /**
+ * If the index definition has changed without doing any reindexing
+ * then this method can be used to determine the diff in the index
+ * definition
+ * @return diff if the definition change otherwise null
+ */
+ @CheckForNull
+ String getIndexDefinitionDiff();
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoServiceImpl.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoServiceImpl.java?rev=1794946&r1=1794945&r2=1794946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoServiceImpl.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexInfoServiceImpl.java Fri May 12 09:14:14 2017
@@ -165,5 +165,10 @@ public class IndexInfoServiceImpl implem
public boolean hasIndexDefinitionChangedWithoutReindexing() {
return false;
}
+
+ @Override
+ public String getIndexDefinitionDiff() {
+ return null;
+ }
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java?rev=1794946&r1=1794945&r2=1794946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinter.java Fri May 12 09:14:14 2017
@@ -146,6 +146,14 @@ public class IndexPrinter implements Inv
if (info.getEstimatedEntryCount() >= 0){
pw.printf(" Estimated entry count : %d%n", info.getEstimatedEntryCount());
}
+
+ if (info.hasIndexDefinitionChangedWithoutReindexing()) {
+ pw.println(" Index definition changed without reindexing");
+ String diff = info.getIndexDefinitionDiff();
+ if (diff != null) {
+ pw.println(" "+diff);
+ }
+ }
pw.println();
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java?rev=1794946&r1=1794945&r2=1794946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexInfoProvider.java Fri May 12 09:14:14 2017
@@ -142,5 +142,10 @@ public class PropertyIndexInfoProvider i
public boolean hasIndexDefinitionChangedWithoutReindexing() {
return false;
}
+
+ @Override
+ public String getIndexDefinitionDiff() {
+ return null;
+ }
}
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinterTest.java?rev=1794946&r1=1794945&r2=1794946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinterTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/inventory/IndexPrinterTest.java Fri May 12 09:14:14 2017
@@ -126,6 +126,11 @@ public class IndexPrinterTest {
public boolean hasIndexDefinitionChangedWithoutReindexing() {
return false;
}
+
+ @Override
+ public String getIndexDefinitionDiff() {
+ return null;
+ }
}
}
\ No newline at end of file
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProvider.java?rev=1794946&r1=1794945&r2=1794946&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProvider.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexInfoProvider.java Fri May 12 09:14:14 2017
@@ -185,5 +185,10 @@ public class LuceneIndexInfoProvider imp
public boolean hasIndexDefinitionChangedWithoutReindexing() {
return false; //TODO To be computed
}
+
+ @Override
+ public String getIndexDefinitionDiff() {
+ return null;
+ }
}
}