Attachment #104995 for bug #194351

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 194351
Collapse All | Expand All

Lines 37-44 Link Here

(-)a/csl.api/nbproject/project.xml (-2 / +2 lines)
37	<build-prerequisite/>	37	<build-prerequisite/>
38	<compile-dependency/>	38	<compile-dependency/>
39	<run-dependency>	39	<run-dependency>
40	<release-version>1</release-version>	40	<release-version>3</release-version>
41	<specification-version>2.1</specification-version>	41	<specification-version>3.0</specification-version>
42	</run-dependency>	42	</run-dependency>
43	</dependency>	43	</dependency>
44	<dependency>	44	<dependency>

Lines 107-114 Link Here

(-)a/java.hints/nbproject/project.xml (-2 / +2 lines)
107	<build-prerequisite/>	107	<build-prerequisite/>
108	<compile-dependency/>	108	<compile-dependency/>
109	<run-dependency>	109	<run-dependency>
110	<release-version>1</release-version>	110	<release-version>3</release-version>
111	<specification-version>2.9</specification-version>	111	<specification-version>3.0</specification-version>
112	</run-dependency>	112	</run-dependency>
113	</dependency>	113	</dependency>
114	<dependency>	114	<dependency>

Lines 106-113 Link Here

(-)a/java.source/nbproject/project.xml (-2 / +2 lines)
106	<build-prerequisite/>	106	<build-prerequisite/>
107	<compile-dependency/>	107	<compile-dependency/>
108	<run-dependency>	108	<run-dependency>
109	<release-version>1</release-version>	109	<release-version>3</release-version>
110	<specification-version>2.12</specification-version>	110	<specification-version>3.0</specification-version>
111	</run-dependency>	111	</run-dependency>
112	</dependency>	112	</dependency>
113	<dependency>	113	<dependency>




        }
        caseInsensitiveName = simpleName.toLowerCase();         //XXX: I18N, Locale
        Document doc = new Document ();        
        Field field = new Field (FIELD_BINARY_NAME,fileName,Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
        doc.add (field);
        field = new Field (FIELD_PACKAGE_NAME,pkgName,Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
        doc.add (field);
        field = new Field (FIELD_SIMPLE_NAME,simpleName, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
        doc.add (field);
        field = new Field (FIELD_CASE_INSENSITIVE_NAME, caseInsensitiveName, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
        doc.add (field);
        for (String reference : references) {
            field = new Field (FIELD_REFERENCES,reference,Field.Store.NO,Field.Index.NOT_ANALYZED_NO_NORMS);
            doc.add(field);
        }
        if (featureIdents != null) {
            field = new Field(FIELD_FEATURE_IDENTS, featureIdents, Field.Store.NO, Field.Index.ANALYZED_NO_NORMS);
            doc.add(field);
            field = new Field(FIELD_CASE_INSENSITIVE_FEATURE_IDENTS, featureIdents, Field.Store.NO, Field.Index.ANALYZED_NO_NORMS);
            doc.add(field);
        }
        if (idents != null) {
            field = new Field(FIELD_IDENTS, idents, Field.Store.NO, Field.Index.ANALYZED_NO_NORMS);
            doc.add(field);
        }
        if (source != null) {
            field = new Field (FIELD_SOURCE,source,Field.Store.YES,Field.Index.NOT_ANALYZED_NO_NORMS);
            doc.add(field);
        }
        return doc;

Lines 45-52 Link Here

(-)a/java.sourceui/nbproject/project.xml (-2 / +2 lines)
45	<build-prerequisite/>	45	<build-prerequisite/>
46	<compile-dependency/>	46	<compile-dependency/>
47	<run-dependency>	47	<run-dependency>
48	<release-version>1</release-version>	48	<release-version>3</release-version>
49	<specification-version>2.12</specification-version>	49	<specification-version>3.0</specification-version>
50	</run-dependency>	50	</run-dependency>
51	</dependency>	51	</dependency>
52	<dependency>	52	<dependency>

Line 1 Link Here

(-)a/libs.lucene/external/binaries-list (-1 / +1 lines)
1	284963A064E39FA33ECBA8E57CC5581067CD81D1 lucene-core-2.9.3.jar	1	335F7EA0E28A4A1358AA745F4BD2037E8AFE44FC lucene-core-3.0.3.jar

Lines 1-4 Link Here

(-)a/libs.lucene/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.libs.lucene/1	2	OpenIDE-Module: org.netbeans.libs.lucene/3
3	OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/lucene/Bundle.properties	3	OpenIDE-Module-Localizing-Bundle: org/netbeans/libs/lucene/Bundle.properties
4	OpenIDE-Module-Implementation-Version: 232	4	OpenIDE-Module-Implementation-Version: 232

Lines 41-45 Link Here

(-)a/libs.lucene/nbproject/project.properties (-2 / +2 lines)
41	# made subject to such option by the copyright holder.	41	# made subject to such option by the copyright holder.
42		42
43	is.autoload=true	43	is.autoload=true
44	release.external/lucene-core-2.9.3.jar=modules/ext/lucene-core-2.9.3.jar	44	release.external/lucene-core-3.0.3.jar=modules/ext/lucene-core-3.0.3.jar
45	spec.version.base=2.13.0	45	spec.version.base=3.0.0

Lines 53-60 Link Here

(-)a/libs.lucene/nbproject/project.xml (-2 / +2 lines)
53	<subpackages>org</subpackages>	53	<subpackages>org</subpackages>
54	</public-packages>	54	</public-packages>
55	<class-path-extension>	55	<class-path-extension>
56	<runtime-relative-path>ext/lucene-core-2.9.3.jar</runtime-relative-path>	56	<runtime-relative-path>ext/lucene-core-3.0.3.jar</runtime-relative-path>
57	<binary-origin>external/lucene-core-2.9.3.jar</binary-origin>	57	<binary-origin>external/lucene-core-3.0.3.jar</binary-origin>
58	</class-path-extension>	58	</class-path-extension>
59	</data>	59	</data>
60	</configuration>	60	</configuration>

Lines 62-69 Link Here

(-)a/maven.hints/nbproject/project.xml (-2 / +2 lines)
62	<build-prerequisite/>	62	<build-prerequisite/>
63	<compile-dependency/>	63	<compile-dependency/>
64	<run-dependency>	64	<run-dependency>
65	<release-version>1</release-version>	65	<release-version>3</release-version>
66	<specification-version>2.13</specification-version>	66	<specification-version>3.0</specification-version>
67	</run-dependency>	67	</run-dependency>
68	</dependency>	68	</dependency>
69	<dependency>	69	<dependency>

Lines 81-88 Link Here

(-)a/maven.indexer/nbproject/project.xml (-2 / +2 lines)
81	<build-prerequisite/>	81	<build-prerequisite/>
82	<compile-dependency/>	82	<compile-dependency/>
83	<run-dependency>	83	<run-dependency>
84	<release-version>1</release-version>	84	<release-version>3</release-version>
85	<specification-version>2.4</specification-version>	85	<specification-version>3.0</specification-version>
86	</run-dependency>	86	</run-dependency>
87	</dependency>	87	</dependency>
88	<dependency>	88	<dependency>




import java.io.InputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.BitSet;
import java.util.Comparator;
import java.util.Iterator;
import java.util.LinkedHashMap;

import org.apache.lucene.index.Term;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;
import org.apache.lucene.search.Collector;
import org.apache.lucene.search.Hits;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.TopDocs;
import org.apache.lucene.store.FSDirectory;
import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;


    private static synchronized IndexSearcher getIndexSearcher() throws Exception {
        if (indexReader == null) {
            FSDirectory dir = FSDirectory.open(getDefaultIndexLocation());
            indexReader = IndexReader.open(dir);
        }
        //TODO shall the searcher be stored as field??

            PrefixQuery pq = new PrefixQuery(new Term(FIELD_ID, grp));
            bq.add(new BooleanClause(pq, BooleanClause.Occur.SHOULD));
        }
        final BitSetCollector searchRes = new BitSetCollector();
        searcher.search(bq, searchRes);
        final BitSet bitSet = searchRes.getMatchedDocs();
        TreeSet<String> toRet = new TreeSet<String>();
        for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
            Document doc = searcher.getIndexReader().document(docNum);
            Document doc = hit.getDocument();
            //TODO shall we somehow pick just one version fom a given plugin here? how?
            String prefix = doc.getField(FIELD_PREFIX).stringValue();
            String goals = doc.getField(FIELD_GOALS).stringValue();

        IndexSearcher searcher = getIndexSearcher();
        String id = groupId + "|" + artifactId + "|" + version; //NOI18N
        TermQuery tq = new TermQuery(new Term(FIELD_ID, id));
        final BitSetCollector searchRes = new BitSetCollector();
        searcher.search(tq, searchRes);
        final BitSet bitSet = searchRes.getMatchedDocs();
        if (bitSet.isEmpty()) {
            return null;
        }
        Iterator it = hits.iterator();
        TreeSet<String> toRet = new TreeSet<String>();
        for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
            Document doc = searcher.getIndexReader().document(docNum);
            Document doc = hit.getDocument();
            String goals = doc.getField(FIELD_GOALS).stringValue();
            String[] gls = StringUtils.split(goals, " "); //NOI18N
            for (String goal : gls) {

        IndexSearcher searcher = getIndexSearcher();
        String id = groupId + "|" + artifactId + "|" + version; //NOI18N
        TermQuery tq = new TermQuery(new Term(FIELD_ID, id));
        final BitSetCollector searchRes = new BitSetCollector();
        searcher.search(tq, searchRes);
        final BitSet bitSet = searchRes.getMatchedDocs();
        if (bitSet.isEmpty()) {
            return null;
        }        
        Iterator it = hits.iterator();
        TreeSet<ParameterDetail> toRet = new TreeSet<ParameterDetail>(new PComparator());
        for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
            Document doc = searcher.getIndexReader().document(docNum);
            Document doc = hit.getDocument();
            String goals = doc.getField(FIELD_GOALS).stringValue();
            String[] gls = StringUtils.split(goals, " "); //NOI18N
            for (String goal : gls) {

        assert prefix != null;
        IndexSearcher searcher = getIndexSearcher();
        TermQuery tq = new TermQuery(new Term(FIELD_PREFIX, prefix));
        final BitSetCollector searchRes = new BitSetCollector();
        searcher.search(tq, searchRes);
        final BitSet bitSet = searchRes.getMatchedDocs();
        if (bitSet.isEmpty()) {
            return null;
        }
        Iterator it = hits.iterator();
        TreeSet<String> toRet = new TreeSet<String>();
        for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
            Document doc = searcher.getIndexReader().document(docNum);
            Document doc = hit.getDocument();
            String id = doc.getField(FIELD_ID).stringValue();
            toRet.add(id);
        }

        }
        bq.add(bq2, BooleanClause.Occur.SHOULD); //why doesn't MUST work?

        final BitSetCollector searchRes = new BitSetCollector();
        searcher.search(bq, searchRes);
        final BitSet bitSet = searchRes.getMatchedDocs();
        if (bitSet.isEmpty()) {
            return null;
        }
        Iterator it = hits.iterator();
        LinkedHashMap<String, List<String>> toRet = new LinkedHashMap<String, List<String>>();
        for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
            Document doc = searcher.getIndexReader().document(docNum);
            Document doc = hit.getDocument();
            Field prefixed = doc.getField(PREFIX_FIELD_CYCLE + packaging);
            if (prefixed != null) {
                String mapping = prefixed.stringValue();

        }

    }
    
    
    private static final class BitSetCollector extends Collector {

        private int docBase;
        private final BitSet bits = new BitSet();

        public BitSet getMatchedDocs() {
            return this.bits;
        }

        
        @Override
        public void setScorer(Scorer scorer) {
            //Todo: ignoring scorer for now, if ordering accoring to score needed
            // this will need to be implemented
        }

        // accept docs out of order (for a BitSet it doesn't matter)
        @Override
        public boolean acceptsDocsOutOfOrder() {
          return true;
        }

        @Override
        public void collect(int doc) {
          bits.set(doc + docBase);
        }

        @Override
        public void setNextReader(IndexReader reader, int docBase) {
          this.docBase = docBase;
        }

    }
    
}

Lines 72-79 Link Here

(-)a/maven.repository/nbproject/project.xml (-2 / +2 lines)
72	<build-prerequisite/>	72	<build-prerequisite/>
73	<compile-dependency/>	73	<compile-dependency/>
74	<run-dependency>	74	<run-dependency>
75	<release-version>1</release-version>	75	<release-version>3</release-version>
76	<specification-version>2.5</specification-version>	76	<specification-version>3.0</specification-version>
77	</run-dependency>	77	</run-dependency>
78	</dependency>	78	</dependency>
79	<dependency>	79	<dependency>

Lines 54-61 Link Here

(-)a/maven.search/nbproject/project.xml (-2 / +2 lines)
54	<build-prerequisite/>	54	<build-prerequisite/>
55	<compile-dependency/>	55	<compile-dependency/>
56	<run-dependency>	56	<run-dependency>
57	<release-version>1</release-version>	57	<release-version>3</release-version>
58	<specification-version>2.5</specification-version>	58	<specification-version>3.0</specification-version>
59	</run-dependency>	59	</run-dependency>
60	</dependency>	60	</dependency>
61	<dependency>	61	<dependency>

Lines 116-123 Link Here

(-)a/maven/nbproject/project.xml (-2 / +2 lines)
116	<build-prerequisite/>	116	<build-prerequisite/>
117	<compile-dependency/>	117	<compile-dependency/>
118	<run-dependency>	118	<run-dependency>
119	<release-version>1</release-version>	119	<release-version>3</release-version>
120	<specification-version>2.5</specification-version>	120	<specification-version>3.0</specification-version>
121	</run-dependency>	121	</run-dependency>
122	</dependency>	122	</dependency>
123	<dependency>	123	<dependency>

Lines 37-44 Link Here

(-)a/parsing.api/nbproject/project.xml (-2 / +2 lines)
37	<build-prerequisite/>	37	<build-prerequisite/>
38	<compile-dependency/>	38	<compile-dependency/>
39	<run-dependency>	39	<run-dependency>
40	<release-version>1</release-version>	40	<release-version>3</release-version>
41	<specification-version>2.6</specification-version>	41	<specification-version>3.0</specification-version>
42	</run-dependency>	42	</run-dependency>
43	</dependency>	43	</dependency>
44	<dependency>	44	<dependency>

Lines 19-26 Link Here

(-)a/parsing.lucene/nbproject/project.xml (-2 / +2 lines)
19	<build-prerequisite/>	19	<build-prerequisite/>
20	<compile-dependency/>	20	<compile-dependency/>
21	<run-dependency>	21	<run-dependency>
22	<release-version>1</release-version>	22	<release-version>3</release-version>
23	<specification-version>2.13</specification-version>	23	<specification-version>3.0</specification-version>
24	</run-dependency>	24	</run-dependency>
25	</dependency>	25	</dependency>
26	<dependency>	26	<dependency>

Lines 256-262 Link Here

(-)a/parsing.lucene/src/org/netbeans/modules/parsing/lucene/DocumentIndexImpl.java (-1 / +1 lines)
256	}	256	}
257	}	257	}
258		258
259	private Reference getDataRef() {	259	private Reference<List[]> getDataRef() {
260	assert Thread.holdsLock(this);	260	assert Thread.holdsLock(this);
261	if (toAdd.isEmpty() && toRemove.isEmpty()) {	261	if (toAdd.isEmpty() && toRemove.isEmpty()) {
262	assert dataRef == null;	262	assert dataRef == null;

Lines 76-82 Link Here

(-)a/parsing.lucene/src/org/netbeans/modules/parsing/lucene/IndexDocumentImpl.java (-2 / +2 lines)
76	@SuppressWarnings("deprecation") //NOI18N	76	@SuppressWarnings("deprecation") //NOI18N
77	final Field field = new Field (key, value,	77	final Field field = new Field (key, value,
78	stored ? Field.Store.YES : Field.Store.NO,	78	stored ? Field.Store.YES : Field.Store.NO,
79	searchable ? Field.Index.NO_NORMS : Field.Index.NO);	79	searchable ? Field.Index.NOT_ANALYZED_NO_NORMS : Field.Index.NO);
80	doc.add (field);	80	doc.add (field);
81	}	81	}
82		82
Lines 102-108 Link Here
102		102
103	@SuppressWarnings("deprecation") //NOI18N	103	@SuppressWarnings("deprecation") //NOI18N
104	private static Fieldable sourceNameField(String relativePath) {	104	private static Fieldable sourceNameField(String relativePath) {
105	return new Field(FIELD_PRIMARY_KEY, relativePath, Field.Store.YES, Field.Index.NO_NORMS);	105	return new Field(FIELD_PRIMARY_KEY, relativePath, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
106	}	106	}
107		107
108	static Query sourceNameQuery(String relativePath) {	108	static Query sourceNameQuery(String relativePath) {




        private  TermCollector termCollector;
                
        @Override
        public final BitSet bits(IndexReader reader) throws IOException {
            final FilteredTermEnum enumerator = getTermEnum(reader);
            try {
                final BitSet bitSet = new BitSet(reader.maxDoc());
                new DocumentVisitor() {
                    @Override
                    public void visit(Term term, int doc) {
                        bitSet.set(doc);
                        if (termCollector != null) {
                            termCollector.add(doc, term);
                        }
                    }
                }.generate(reader, enumerator);
                return bitSet;
            } finally {
                enumerator.close();
            }
        }

        @Override
        public final DocIdSet getDocIdSet(IndexReader reader) throws IOException {
            final FilteredTermEnum enumerator = getTermEnum(reader);
            try {

Return to bug 194351

Lines 257-286 Link Here

(-)a/java.source/src/org/netbeans/modules/java/source/usages/DocumentUtil.java (-9 / +9 lines)
257	}	257	}
258	caseInsensitiveName = simpleName.toLowerCase(); //XXX: I18N, Locale	258	caseInsensitiveName = simpleName.toLowerCase(); //XXX: I18N, Locale
259	Document doc = new Document ();	259	Document doc = new Document ();
260	Field field = new Field (FIELD_BINARY_NAME,fileName,Field.Store.YES, Field.Index.NO_NORMS);	260	Field field = new Field (FIELD_BINARY_NAME,fileName,Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
261	doc.add (field);	261	doc.add (field);
262	field = new Field (FIELD_PACKAGE_NAME,pkgName,Field.Store.YES, Field.Index.NO_NORMS);	262	field = new Field (FIELD_PACKAGE_NAME,pkgName,Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
263	doc.add (field);	263	doc.add (field);
264	field = new Field (FIELD_SIMPLE_NAME,simpleName, Field.Store.YES, Field.Index.NO_NORMS);	264	field = new Field (FIELD_SIMPLE_NAME,simpleName, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
265	doc.add (field);	265	doc.add (field);
266	field = new Field (FIELD_CASE_INSENSITIVE_NAME, caseInsensitiveName, Field.Store.YES, Field.Index.NO_NORMS);	266	field = new Field (FIELD_CASE_INSENSITIVE_NAME, caseInsensitiveName, Field.Store.YES, Field.Index.NOT_ANALYZED_NO_NORMS);
267	doc.add (field);	267	doc.add (field);
268	for (String reference : references) {	268	for (String reference : references) {
269	field = new Field (FIELD_REFERENCES,reference,Field.Store.NO,Field.Index.NO_NORMS);	269	field = new Field (FIELD_REFERENCES,reference,Field.Store.NO,Field.Index.NOT_ANALYZED_NO_NORMS);
270	doc.add(field);	270	doc.add(field);
271	}	271	}
272	if (featureIdents != null) {	272	if (featureIdents != null) {
273	field = new Field(FIELD_FEATURE_IDENTS, featureIdents, Field.Store.NO, Field.Index.TOKENIZED);	273	field = new Field(FIELD_FEATURE_IDENTS, featureIdents, Field.Store.NO, Field.Index.ANALYZED_NO_NORMS);
274	doc.add(field);	274	doc.add(field);
275	field = new Field(FIELD_CASE_INSENSITIVE_FEATURE_IDENTS, featureIdents, Field.Store.NO, Field.Index.TOKENIZED);	275	field = new Field(FIELD_CASE_INSENSITIVE_FEATURE_IDENTS, featureIdents, Field.Store.NO, Field.Index.ANALYZED_NO_NORMS);
276	doc.add(field);	276	doc.add(field);
277	}	277	}
278	if (idents != null) {	278	if (idents != null) {
279	field = new Field(FIELD_IDENTS, idents, Field.Store.NO, Field.Index.TOKENIZED);	279	field = new Field(FIELD_IDENTS, idents, Field.Store.NO, Field.Index.ANALYZED_NO_NORMS);
280	doc.add(field);	280	doc.add(field);
281	}	281	}
282	if (source != null) {	282	if (source != null) {
283	field = new Field (FIELD_SOURCE,source,Field.Store.YES,Field.Index.NO_NORMS);	283	field = new Field (FIELD_SOURCE,source,Field.Store.YES,Field.Index.NOT_ANALYZED_NO_NORMS);
284	doc.add(field);	284	doc.add(field);
285	}	285	}
286	return doc;	286	return doc;

Lines 52-57 Link Here

(-)a/maven.indexer/src/org/netbeans/modules/maven/indexer/api/PluginIndexManager.java (-33 / +70 lines)
52	import java.io.InputStream;	52	import java.io.InputStream;
53	import java.util.ArrayList;	53	import java.util.ArrayList;
54	import java.util.Arrays;	54	import java.util.Arrays;
		55	import java.util.BitSet;
55	import java.util.Comparator;	56	import java.util.Comparator;
56	import java.util.Iterator;	57	import java.util.Iterator;
57	import java.util.LinkedHashMap;	58	import java.util.LinkedHashMap;
Lines 67-77 Link Here
67	import org.apache.lucene.index.Term;	68	import org.apache.lucene.index.Term;
68	import org.apache.lucene.search.BooleanClause;	69	import org.apache.lucene.search.BooleanClause;
69	import org.apache.lucene.search.BooleanQuery;	70	import org.apache.lucene.search.BooleanQuery;
70	import org.apache.lucene.search.Hit;	71	import org.apache.lucene.search.Collector;
71	import org.apache.lucene.search.Hits;
72	import org.apache.lucene.search.IndexSearcher;	72	import org.apache.lucene.search.IndexSearcher;
73	import org.apache.lucene.search.PrefixQuery;	73	import org.apache.lucene.search.PrefixQuery;
		74	import org.apache.lucene.search.Scorer;
74	import org.apache.lucene.search.TermQuery;	75	import org.apache.lucene.search.TermQuery;
		76	import org.apache.lucene.search.TopDocs;
75	import org.apache.lucene.store.FSDirectory;	77	import org.apache.lucene.store.FSDirectory;
76	import org.openide.filesystems.FileUtil;	78	import org.openide.filesystems.FileUtil;
77	import org.openide.util.Exceptions;	79	import org.openide.util.Exceptions;
Lines 125-131 Link Here
125		127
126	private static synchronized IndexSearcher getIndexSearcher() throws Exception {	128	private static synchronized IndexSearcher getIndexSearcher() throws Exception {
127	if (indexReader == null) {	129	if (indexReader == null) {
128	FSDirectory dir = FSDirectory.getDirectory(getDefaultIndexLocation());	130	FSDirectory dir = FSDirectory.open(getDefaultIndexLocation());
129	indexReader = IndexReader.open(dir);	131	indexReader = IndexReader.open(dir);
130	}	132	}
131	//TODO shall the searcher be stored as field??	133	//TODO shall the searcher be stored as field??
Lines 144-155 Link Here
144	PrefixQuery pq = new PrefixQuery(new Term(FIELD_ID, grp));	146	PrefixQuery pq = new PrefixQuery(new Term(FIELD_ID, grp));
145	bq.add(new BooleanClause(pq, BooleanClause.Occur.SHOULD));	147	bq.add(new BooleanClause(pq, BooleanClause.Occur.SHOULD));
146	}	148	}
147	Hits hits = searcher.search(bq);	149	final BitSetCollector searchRes = new BitSetCollector();
148	Iterator it = hits.iterator();	150	searcher.search(bq, searchRes);
		151	final BitSet bitSet = searchRes.getMatchedDocs();
149	TreeSet<String> toRet = new TreeSet<String>();	152	TreeSet<String> toRet = new TreeSet<String>();
150	while (it.hasNext()) {	153	for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
151	Hit hit = (Hit) it.next();	154	Document doc = searcher.getIndexReader().document(docNum);
152	Document doc = hit.getDocument();
153	//TODO shall we somehow pick just one version fom a given plugin here? how?	155	//TODO shall we somehow pick just one version fom a given plugin here? how?
154	String prefix = doc.getField(FIELD_PREFIX).stringValue();	156	String prefix = doc.getField(FIELD_PREFIX).stringValue();
155	String goals = doc.getField(FIELD_GOALS).stringValue();	157	String goals = doc.getField(FIELD_GOALS).stringValue();
Lines 173-187 Link Here
173	IndexSearcher searcher = getIndexSearcher();	175	IndexSearcher searcher = getIndexSearcher();
174	String id = groupId + "\|" + artifactId + "\|" + version; //NOI18N	176	String id = groupId + "\|" + artifactId + "\|" + version; //NOI18N
175	TermQuery tq = new TermQuery(new Term(FIELD_ID, id));	177	TermQuery tq = new TermQuery(new Term(FIELD_ID, id));
176	Hits hits = searcher.search(tq);	178	final BitSetCollector searchRes = new BitSetCollector();
177	if (hits.length() == 0) {	179	searcher.search(tq, searchRes);
		180	final BitSet bitSet = searchRes.getMatchedDocs();
		181	if (bitSet.isEmpty()) {
178	return null;	182	return null;
179	}	183	}
180	Iterator it = hits.iterator();
181	TreeSet<String> toRet = new TreeSet<String>();	184	TreeSet<String> toRet = new TreeSet<String>();
182	while (it.hasNext()) { //well should be just one anyway..	185	for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
183	Hit hit = (Hit) it.next();	186	Document doc = searcher.getIndexReader().document(docNum);
184	Document doc = hit.getDocument();
185	String goals = doc.getField(FIELD_GOALS).stringValue();	187	String goals = doc.getField(FIELD_GOALS).stringValue();
186	String[] gls = StringUtils.split(goals, " "); //NOI18N	188	String[] gls = StringUtils.split(goals, " "); //NOI18N
187	for (String goal : gls) {	189	for (String goal : gls) {
Lines 204-218 Link Here
204	IndexSearcher searcher = getIndexSearcher();	206	IndexSearcher searcher = getIndexSearcher();
205	String id = groupId + "\|" + artifactId + "\|" + version; //NOI18N	207	String id = groupId + "\|" + artifactId + "\|" + version; //NOI18N
206	TermQuery tq = new TermQuery(new Term(FIELD_ID, id));	208	TermQuery tq = new TermQuery(new Term(FIELD_ID, id));
207	Hits hits = searcher.search(tq);	209	final BitSetCollector searchRes = new BitSetCollector();
208	if (hits.length() == 0) {	210	searcher.search(tq, searchRes);
		211	final BitSet bitSet = searchRes.getMatchedDocs();
		212	if (bitSet.isEmpty()) {
209	return null;	213	return null;
210	}	214	}
211	Iterator it = hits.iterator();
212	TreeSet<ParameterDetail> toRet = new TreeSet<ParameterDetail>(new PComparator());	215	TreeSet<ParameterDetail> toRet = new TreeSet<ParameterDetail>(new PComparator());
213	while (it.hasNext()) { //well should be just one anyway..	216	for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
214	Hit hit = (Hit) it.next();	217	Document doc = searcher.getIndexReader().document(docNum);
215	Document doc = hit.getDocument();
216	String goals = doc.getField(FIELD_GOALS).stringValue();	218	String goals = doc.getField(FIELD_GOALS).stringValue();
217	String[] gls = StringUtils.split(goals, " "); //NOI18N	219	String[] gls = StringUtils.split(goals, " "); //NOI18N
218	for (String goal : gls) {	220	for (String goal : gls) {
Lines 263-277 Link Here
263	assert prefix != null;	265	assert prefix != null;
264	IndexSearcher searcher = getIndexSearcher();	266	IndexSearcher searcher = getIndexSearcher();
265	TermQuery tq = new TermQuery(new Term(FIELD_PREFIX, prefix));	267	TermQuery tq = new TermQuery(new Term(FIELD_PREFIX, prefix));
266	Hits hits = searcher.search(tq);	268	final BitSetCollector searchRes = new BitSetCollector();
267	if (hits.length() == 0) {	269	searcher.search(tq, searchRes);
		270	final BitSet bitSet = searchRes.getMatchedDocs();
		271	if (bitSet.isEmpty()) {
268	return null;	272	return null;
269	}	273	}
270	Iterator it = hits.iterator();
271	TreeSet<String> toRet = new TreeSet<String>();	274	TreeSet<String> toRet = new TreeSet<String>();
272	while (it.hasNext()) { //well should be just one anyway..	275	for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
273	Hit hit = (Hit) it.next();	276	Document doc = searcher.getIndexReader().document(docNum);
274	Document doc = hit.getDocument();
275	String id = doc.getField(FIELD_ID).stringValue();	277	String id = doc.getField(FIELD_ID).stringValue();
276	toRet.add(id);	278	toRet.add(id);
277	}	279	}
Lines 304-318 Link Here
304	}	306	}
305	bq.add(bq2, BooleanClause.Occur.SHOULD); //why doesn't MUST work?	307	bq.add(bq2, BooleanClause.Occur.SHOULD); //why doesn't MUST work?
306		308
307	Hits hits = searcher.search(bq);	309	final BitSetCollector searchRes = new BitSetCollector();
308	if (hits.length() == 0) {	310	searcher.search(bq, searchRes);
		311	final BitSet bitSet = searchRes.getMatchedDocs();
		312	if (bitSet.isEmpty()) {
309	return null;	313	return null;
310	}	314	}
311	Iterator it = hits.iterator();
312	LinkedHashMap<String, List<String>> toRet = new LinkedHashMap<String, List<String>>();	315	LinkedHashMap<String, List<String>> toRet = new LinkedHashMap<String, List<String>>();
313	while (it.hasNext()) { //well should be just one anyway..	316	for (int docNum = bitSet.nextSetBit(0); docNum >= 0; docNum = bitSet.nextSetBit(docNum+1)) {
314	Hit hit = (Hit) it.next();	317	Document doc = searcher.getIndexReader().document(docNum);
315	Document doc = hit.getDocument();
316	Field prefixed = doc.getField(PREFIX_FIELD_CYCLE + packaging);	318	Field prefixed = doc.getField(PREFIX_FIELD_CYCLE + packaging);
317	if (prefixed != null) {	319	if (prefixed != null) {
318	String mapping = prefixed.stringValue();	320	String mapping = prefixed.stringValue();
Lines 505-509 Link Here
505	}	507	}
506		508
507	}	509	}
		510
		511
		512	private static final class BitSetCollector extends Collector {
508		513
		514	private int docBase;
		515	private final BitSet bits = new BitSet();
		516
		517	public BitSet getMatchedDocs() {
		518	return this.bits;
		519	}
		520
		521
		522	@Override
		523	public void setScorer(Scorer scorer) {
		524	//Todo: ignoring scorer for now, if ordering accoring to score needed
		525	// this will need to be implemented
		526	}
		527
		528	// accept docs out of order (for a BitSet it doesn't matter)
		529	@Override
		530	public boolean acceptsDocsOutOfOrder() {
		531	return true;
		532	}
		533
		534	@Override
		535	public void collect(int doc) {
		536	bits.set(doc + docBase);
		537	}
		538
		539	@Override
		540	public void setNextReader(IndexReader reader, int docBase) {
		541	this.docBase = docBase;
		542	}
		543
		544	}
		545
509	}	546	}

Lines 293-318 Link Here

(-)a/parsing.lucene/src/org/netbeans/modules/parsing/lucene/support/Queries.java (-20 lines)
293	private TermCollector termCollector;	293	private TermCollector termCollector;
294		294
295	@Override	295	@Override
296	public final BitSet bits(IndexReader reader) throws IOException {
297	final FilteredTermEnum enumerator = getTermEnum(reader);
298	try {
299	final BitSet bitSet = new BitSet(reader.maxDoc());
300	new DocumentVisitor() {
301	@Override
302	public void visit(Term term, int doc) {
303	bitSet.set(doc);
304	if (termCollector != null) {
305	termCollector.add(doc, term);
306	}
307	}
308	}.generate(reader, enumerator);
309	return bitSet;
310	} finally {
311	enumerator.close();
312	}
313	}
314
315	@Override
316	public final DocIdSet getDocIdSet(IndexReader reader) throws IOException {	296	public final DocIdSet getDocIdSet(IndexReader reader) throws IOException {
317	final FilteredTermEnum enumerator = getTermEnum(reader);	297	final FilteredTermEnum enumerator = getTermEnum(reader);
318	try {	298	try {