Remove duplicates from Lucene search results

New version more 2.9 oriented (use a lot less deprecated APIs but still some like Hits). Just need to add more tests and i will committ it.

Indeed, i will also rename it in "Upgrade to Lucene 2.9.1"

You can also close http://jira.xwiki.org/jira/browse/XPLUCENE-37, although I upgraded directly to 2.9, and also the references to the deprecated class Hits have not been replaced yet. Maybe we should open a new issue for upgrading to Lucene 3.0.

Just to make sure: this patch fixes XPLUCENE-5, XPLUCENE-38 and XPLUCENE-40, right ? Do you see any other one to close with it ?

Yes, that is correct. testCleanLock does not validate anything at the moment.

Ok i'm fixing it.

I should have commented on the testCleanLock. I was experimenting with the locks to find a solution for XPLUCENE-33, but since I found that unlocking the locks did not work, at least not on my platform, I did not fix that.

Does this mean that currently testCleanLock does not validate anything ?

Hi Thomas,

Regarding the @Override annotation, it should be removed again. I added it since it did override the default implementation in AbstractXWikiRunnable, but since, I guess, there is nothing that guarantees that AbstractXWikiRunnable provides a default implementation, it should not be there.

Sorry about the style issue. I have read through the code style and I was trying to follow it, but I'm not using Eclipse, so I couldn't use the style file. Thanks for cleaning it up.

The six lines of code

indexDirs = config.getProperty(PROP_INDEX_DIR);
if (indexDirs == null || indexDirs.equals("")) {
    File workDir = context.getWiki().getWorkSubdirectory("lucene", context);
    indexDirs = workDir.getAbsolutePath();
}
String indexDir = StringUtils.split(indexDirs, ",")[0];

should be removed from init(IndexUpdater, IndexRebuilder, XWikiContext), its just a leftover from the rearanging of the init-method. Note that the exact same lines are in init(XWikiContext), and those lines should of course remain.

I should have commented on the testCleanLock. I was experimenting with the locks to find a solution for XPLUCENE-33, but since I found that unlocking the locks did not work, at least not on my platform, I did not fix that.

Here is a cleaned version with your unit tests working on trunk (there is a little more than your patch actually since i also fixed codestyle in existing code) if you want to look at my following comments from what i already fixed (or broken if i made a mistake ).

Some things i did not fixed yet:

• In LucenePlugin#init(IndexUpdater indexUpdater, IndexRebuilder indexRebuilder, XWikiContext context) you introduce a local variable "String indexDir" that you don't use.
• In IndexUpdaterTest#testCleanLock(), LockObtainFailedException does not make test fail, are you sure it's expected ?

Notes: you don't follow XWiki codestyle in your patch, see http://dev.xwiki.org/xwiki/bin/view/Community/CodeStyle

One first comment: i can't build with your patch because of

@Override
    public void run()

in IndexUpdater class. These is no run() implementation in AbstractXWikiRunnable. Could you check your patch is still valid in trunk ? In the meantime i will review it anyway and try if all is ok just by removing the @Override