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 th...@apache.org on 2019/04/03 07:26:52 UTC
svn commit: r1856854 - in /jackrabbit/oak/trunk/oak-lucene/src:
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/
main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/
test/java/org/apache/jackrabbit/oak/plugins/index/lucene/direc...
Author: thomasm
Date: Wed Apr 3 07:26:51 2019
New Revision: 1856854
URL: http://svn.apache.org/viewvc?rev=1856854&view=rev
Log:
OAK-8134 Index Copier Stats MBean shows stale info
Modified:
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java?rev=1856854&r1=1856853&r2=1856854&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java Wed Apr 3 07:26:51 2019
@@ -453,7 +453,7 @@ public class IndexCopier implements Copy
TabularDataSupport tds;
try{
TabularType tt = new TabularType(IndexMappingData.class.getName(),
- "Lucene Index Stats", IndexMappingData.TYPE, new String[]{"jcrPath"});
+ "Lucene Index Stats", IndexMappingData.TYPE, new String[]{"fsPath"});
tds = new TabularDataSupport(tt);
for (LocalIndexDir indexDir : indexRootDirectory.getAllLocalIndexes()){
String size = humanReadableByteCount(indexDir.size());
Modified: jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java?rev=1856854&r1=1856853&r2=1856854&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectory.java Wed Apr 3 07:26:51 2019
@@ -132,9 +132,9 @@ public class IndexRootDirectory {
*/
public List<LocalIndexDir> getAllLocalIndexes() throws IOException {
Map<String, List<LocalIndexDir>> mapping = getIndexesPerPath();
- List<LocalIndexDir> result = Lists.newArrayListWithCapacity(mapping.size());
+ List<LocalIndexDir> result = new ArrayList<>();
for (Map.Entry<String, List<LocalIndexDir>> e : mapping.entrySet()){
- result.add(e.getValue().get(0));
+ result.addAll(e.getValue());
}
return result;
}
@@ -228,7 +228,7 @@ public class IndexRootDirectory {
pathToDirMap.get(localIndexDir.getJcrPath()).add(localIndexDir);
}
- Map<String, List<LocalIndexDir>> result = Maps.newHashMap();
+ Map<String, List<LocalIndexDir>> result = Maps.newTreeMap();
for (Map.Entry<String, Collection<LocalIndexDir>> e : pathToDirMap.asMap().entrySet()){
List<LocalIndexDir> sortedDirs = new ArrayList<>(e.getValue());
Collections.sort(sortedDirs, Collections.<LocalIndexDir>reverseOrder());
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java?rev=1856854&r1=1856853&r2=1856854&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexRootDirectoryTest.java Wed Apr 3 07:26:51 2019
@@ -106,7 +106,7 @@ public class IndexRootDirectoryTest {
File fb2 = dir.getIndexDir(getDefn(), "/b", "default");
List<LocalIndexDir> dirs = dir.getAllLocalIndexes();
- assertEquals(2, dirs.size());
+ assertEquals(4, dirs.size());
assertEquals(fb2.getParentFile().getAbsolutePath(), getDir("/b", dirs).getFSPath());
assertEquals(fa2.getParentFile().getAbsolutePath(), getDir("/a", dirs).getFSPath());
@@ -233,4 +233,4 @@ public class IndexRootDirectoryTest {
return null;
}
-}
\ No newline at end of file
+}