You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2013/11/26 01:12:58 UTC
svn commit: r1545466 - in /lucene/dev/branches/lucene5339/lucene/facet/src:
java/org/apache/lucene/facet/associations/
java/org/apache/lucene/facet/collections/
java/org/apache/lucene/facet/complements/
java/org/apache/lucene/facet/encoding/ java/org/a...
Author: mikemccand
Date: Tue Nov 26 00:12:57 2013
New Revision: 1545466
URL: http://svn.apache.org/r1545466
Log:
LUCENE-5339: finish cutover
Added:
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/DoubleRange.java
- copied, changed from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FloatRange.java
- copied, changed from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/FloatRange.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/LongRange.java
- copied, changed from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/Range.java
- copied, changed from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/Range.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SearcherTaxonomyManager.java
- copied, changed from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/SearcherTaxonomyManager.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/LRUHashMap.java
- copied, changed from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/collections/LRUHashMap.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/PrintTaxonomyStats.java
- copied, changed from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/util/PrintTaxonomyStats.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java
- copied, changed from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/collections/TestLRUHashMap.java
Removed:
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/associations/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/collections/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/complements/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/encoding/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/index/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/old/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/params/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/partitions/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/sampling/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/sortedset/
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/util/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/associations/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/collections/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/complements/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/encoding/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/old/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/params/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/range/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/sampling/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/search/
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/util/
Modified:
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FacetField.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/RangeFacetCounts.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillDownQuery.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillSideways.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleFacetsCollector.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SortedSetDocValuesReaderState.java
lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestCachedOrdinalsReader.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestDrillDownQuery.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestMultipleIndexFields.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSearcherTaxonomyManager.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSimpleDrillSideways.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts2.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetSumValueSource.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java
lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
Copied: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/DoubleRange.java (from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/DoubleRange.java?p2=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/DoubleRange.java&p1=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java&r1=1542066&r2=1545466&rev=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRange.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/DoubleRange.java Tue Nov 26 00:12:57 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.range;
+package org.apache.lucene.facet.simple;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FacetField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FacetField.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FacetField.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FacetField.java Tue Nov 26 00:12:57 2013
@@ -30,8 +30,8 @@ public class FacetField extends Field {
TYPE.setIndexed(true);
TYPE.freeze();
}
- final String dim;
- final String[] path;
+ public final String dim;
+ public final String[] path;
public FacetField(String dim, String... path) {
super("dummy", TYPE);
Copied: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FloatRange.java (from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/FloatRange.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FloatRange.java?p2=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FloatRange.java&p1=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/FloatRange.java&r1=1542066&r2=1545466&rev=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/FloatRange.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/FloatRange.java Tue Nov 26 00:12:57 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.range;
+package org.apache.lucene.facet.simple;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/LongRange.java (from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/LongRange.java?p2=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/LongRange.java&p1=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java&r1=1542066&r2=1545466&rev=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/LongRange.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/LongRange.java Tue Nov 26 00:12:57 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.range;
+package org.apache.lucene.facet.simple;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/Range.java (from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/Range.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/Range.java?p2=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/Range.java&p1=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/Range.java&r1=1542066&r2=1545466&rev=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/range/Range.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/Range.java Tue Nov 26 00:12:57 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.range;
+package org.apache.lucene.facet.simple;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/RangeFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/RangeFacetCounts.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/RangeFacetCounts.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/RangeFacetCounts.java Tue Nov 26 00:12:57 2013
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.Collections;
import java.util.List;
-import org.apache.lucene.facet.range.Range;
import org.apache.lucene.facet.simple.SimpleFacetsCollector.MatchingDocs;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.queries.function.FunctionValues;
Copied: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SearcherTaxonomyManager.java (from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/SearcherTaxonomyManager.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SearcherTaxonomyManager.java?p2=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SearcherTaxonomyManager.java&p1=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/SearcherTaxonomyManager.java&r1=1542066&r2=1545466&rev=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/search/SearcherTaxonomyManager.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SearcherTaxonomyManager.java Tue Nov 26 00:12:57 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search;
+package org.apache.lucene.facet.simple;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillDownQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillDownQuery.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillDownQuery.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillDownQuery.java Tue Nov 26 00:12:57 2013
@@ -23,7 +23,6 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.lucene.facet.params.CategoryListParams;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillSideways.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillSideways.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillSideways.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleDrillSideways.java Tue Nov 26 00:12:57 2013
@@ -26,9 +26,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.params.FacetSearchParams;
-import org.apache.lucene.facet.search.DrillDownQuery;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleFacetsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleFacetsCollector.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleFacetsCollector.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SimpleFacetsCollector.java Tue Nov 26 00:12:57 2013
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.facet.params.FacetSearchParams;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.index.AtomicReaderContext;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SortedSetDocValuesReaderState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SortedSetDocValuesReaderState.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SortedSetDocValuesReaderState.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/simple/SortedSetDocValuesReaderState.java Tue Nov 26 00:12:57 2013
@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
-import org.apache.lucene.facet.params.CategoryListParams;
-import org.apache.lucene.facet.params.FacetIndexingParams;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.CompositeReader;
import org.apache.lucene.index.IndexReader;
Copied: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/LRUHashMap.java (from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/collections/LRUHashMap.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/LRUHashMap.java?p2=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/LRUHashMap.java&p1=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/collections/LRUHashMap.java&r1=1542066&r2=1545466&rev=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/collections/LRUHashMap.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/LRUHashMap.java Tue Nov 26 00:12:57 2013
@@ -1,7 +1,4 @@
-package org.apache.lucene.facet.collections;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
+package org.apache.lucene.facet.taxonomy;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,6 +17,9 @@ import java.util.Map;
* limitations under the License.
*/
+import java.util.LinkedHashMap;
+import java.util.Map;
+
/**
* LRUHashMap is an extension of Java's HashMap, which has a bounded size();
* When it reaches that size, each time a new element is added, the least
Copied: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/PrintTaxonomyStats.java (from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/util/PrintTaxonomyStats.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/PrintTaxonomyStats.java?p2=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/PrintTaxonomyStats.java&p1=lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/util/PrintTaxonomyStats.java&r1=1542066&r2=1545466&rev=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/util/PrintTaxonomyStats.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/PrintTaxonomyStats.java Tue Nov 26 00:12:57 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.util;
+package org.apache.lucene.facet.taxonomy;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,8 +21,6 @@ import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
-import org.apache.lucene.facet.taxonomy.FacetLabel;
-import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.TaxonomyReader.ChildrenIterator;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.store.Directory;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java Tue Nov 26 00:12:57 2013
@@ -5,8 +5,8 @@ import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.lucene.facet.collections.LRUHashMap;
import org.apache.lucene.facet.taxonomy.FacetLabel;
+import org.apache.lucene.facet.taxonomy.LRUHashMap;
import org.apache.lucene.facet.taxonomy.ParallelTaxonomyArrays;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.index.CorruptIndexException; // javadocs
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java Tue Nov 26 00:12:57 2013
@@ -1,29 +1,5 @@
package org.apache.lucene.facet;
-import java.io.IOException;
-import java.util.Random;
-
-import org.apache.lucene.facet.encoding.DGapIntEncoder;
-import org.apache.lucene.facet.encoding.DGapVInt8IntEncoder;
-import org.apache.lucene.facet.encoding.EightFlagsIntEncoder;
-import org.apache.lucene.facet.encoding.FourFlagsIntEncoder;
-import org.apache.lucene.facet.encoding.IntEncoder;
-import org.apache.lucene.facet.encoding.NOnesIntEncoder;
-import org.apache.lucene.facet.encoding.SortingIntEncoder;
-import org.apache.lucene.facet.encoding.UniqueValuesIntEncoder;
-import org.apache.lucene.facet.encoding.VInt8IntEncoder;
-import org.apache.lucene.facet.params.CategoryListParams;
-import org.apache.lucene.facet.simple.CachedOrdinalsReader;
-import org.apache.lucene.facet.simple.DocValuesOrdinalsReader;
-import org.apache.lucene.facet.simple.Facets;
-import org.apache.lucene.facet.simple.FacetsConfig;
-import org.apache.lucene.facet.simple.FastTaxonomyFacetCounts;
-import org.apache.lucene.facet.simple.OrdinalsReader;
-import org.apache.lucene.facet.simple.SimpleFacetsCollector;
-import org.apache.lucene.facet.simple.TaxonomyFacetCounts;
-import org.apache.lucene.facet.taxonomy.TaxonomyReader;
-import org.apache.lucene.util.LuceneTestCase;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -41,36 +17,22 @@ import org.apache.lucene.util.LuceneTest
* limitations under the License.
*/
+import java.io.IOException;
+import java.util.Random;
+
+import org.apache.lucene.facet.simple.CachedOrdinalsReader;
+import org.apache.lucene.facet.simple.DocValuesOrdinalsReader;
+import org.apache.lucene.facet.simple.Facets;
+import org.apache.lucene.facet.simple.FacetsConfig;
+import org.apache.lucene.facet.simple.FastTaxonomyFacetCounts;
+import org.apache.lucene.facet.simple.OrdinalsReader;
+import org.apache.lucene.facet.simple.SimpleFacetsCollector;
+import org.apache.lucene.facet.simple.TaxonomyFacetCounts;
+import org.apache.lucene.facet.taxonomy.TaxonomyReader;
+import org.apache.lucene.util.LuceneTestCase;
+
public abstract class FacetTestCase extends LuceneTestCase {
- private static final IntEncoder[] ENCODERS = new IntEncoder[] {
- new SortingIntEncoder(new UniqueValuesIntEncoder(new VInt8IntEncoder())),
- new SortingIntEncoder(new UniqueValuesIntEncoder(new DGapIntEncoder(new VInt8IntEncoder()))),
- new SortingIntEncoder(new UniqueValuesIntEncoder(new DGapVInt8IntEncoder())),
- new SortingIntEncoder(new UniqueValuesIntEncoder(new DGapIntEncoder(new EightFlagsIntEncoder()))),
- new SortingIntEncoder(new UniqueValuesIntEncoder(new DGapIntEncoder(new FourFlagsIntEncoder()))),
- new SortingIntEncoder(new UniqueValuesIntEncoder(new DGapIntEncoder(new NOnesIntEncoder(3)))),
- new SortingIntEncoder(new UniqueValuesIntEncoder(new DGapIntEncoder(new NOnesIntEncoder(4)))),
- };
-
- /** Returns a {@link CategoryListParams} with random {@link IntEncoder} and field. */
- public static CategoryListParams randomCategoryListParams() {
- final String field = CategoryListParams.DEFAULT_FIELD + "$" + random().nextInt();
- return randomCategoryListParams(field);
- }
-
- /** Returns a {@link CategoryListParams} with random {@link IntEncoder}. */
- public static CategoryListParams randomCategoryListParams(String field) {
- Random random = random();
- final IntEncoder encoder = ENCODERS[random.nextInt(ENCODERS.length)];
- return new CategoryListParams(field) {
- @Override
- public IntEncoder createEncoder() {
- return encoder;
- }
- };
- }
-
public Facets getTaxonomyFacetCounts(TaxonomyReader taxoReader, FacetsConfig config, SimpleFacetsCollector c) throws IOException {
return getTaxonomyFacetCounts(taxoReader, config, c, FacetsConfig.DEFAULT_INDEX_FIELD_NAME);
}
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestCachedOrdinalsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestCachedOrdinalsReader.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestCachedOrdinalsReader.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestCachedOrdinalsReader.java Tue Nov 26 00:12:57 2013
@@ -23,8 +23,6 @@ import java.util.Arrays;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.params.FacetIndexingParams;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
import org.apache.lucene.index.AtomicReaderContext;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestDrillDownQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestDrillDownQuery.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestDrillDownQuery.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestDrillDownQuery.java Tue Nov 26 00:12:57 2013
@@ -29,10 +29,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.params.CategoryListParams;
-import org.apache.lucene.facet.params.FacetIndexingParams;
-import org.apache.lucene.facet.params.PerDimensionIndexingParams;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestMultipleIndexFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestMultipleIndexFields.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestMultipleIndexFields.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestMultipleIndexFields.java Tue Nov 26 00:12:57 2013
@@ -31,12 +31,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.params.CategoryListParams;
-import org.apache.lucene.facet.params.FacetIndexingParams;
-import org.apache.lucene.facet.params.FacetSearchParams;
-import org.apache.lucene.facet.params.PerDimensionIndexingParams;
-import org.apache.lucene.facet.search.FacetRequest.ResultMode;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestRangeFacets.java Tue Nov 26 00:12:57 2013
@@ -34,20 +34,6 @@ import org.apache.lucene.document.FloatF
import org.apache.lucene.document.LongField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.FacetTestUtils;
-import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.params.FacetIndexingParams;
-import org.apache.lucene.facet.params.FacetSearchParams;
-import org.apache.lucene.facet.range.DoubleRange;
-import org.apache.lucene.facet.range.FloatRange;
-import org.apache.lucene.facet.range.LongRange;
-import org.apache.lucene.facet.search.CountFacetRequest;
-import org.apache.lucene.facet.search.DrillDownQuery;
-import org.apache.lucene.facet.search.FacetRequest;
-import org.apache.lucene.facet.search.FacetResult;
-import org.apache.lucene.facet.search.FacetResultNode;
-import org.apache.lucene.facet.search.FacetsAccumulator;
-import org.apache.lucene.facet.search.FacetsCollector;
import org.apache.lucene.facet.simple.SimpleDrillSideways.SimpleDrillSidewaysResult;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSearcherTaxonomyManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSearcherTaxonomyManager.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSearcherTaxonomyManager.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSearcherTaxonomyManager.java Tue Nov 26 00:12:57 2013
@@ -27,11 +27,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.params.FacetIndexingParams;
-import org.apache.lucene.facet.params.FacetSearchParams;
-import org.apache.lucene.facet.search.SearcherTaxonomyManager.SearcherAndTaxonomy;
-import org.apache.lucene.facet.search.SearcherTaxonomyManager;
+import org.apache.lucene.facet.simple.SearcherTaxonomyManager.SearcherAndTaxonomy;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
import org.apache.lucene.index.IndexWriter;
@@ -61,7 +57,6 @@ public class TestSearcherTaxonomyManager
List<String> paths = new ArrayList<String>();
while (true) {
Document doc = new Document();
- List<FacetLabel> docPaths = new ArrayList<FacetLabel>();
int numPaths = _TestUtil.nextInt(random(), 1, 5);
for(int i=0;i<numPaths;i++) {
String path;
@@ -73,7 +68,7 @@ public class TestSearcherTaxonomyManager
path = null;
while (true) {
path = _TestUtil.randomRealisticUnicodeString(random());
- if (path.length() != 0 && !seen.contains(path) && path.indexOf(FacetIndexingParams.DEFAULT_FACET_DELIM_CHAR) == -1) {
+ if (path.length() != 0 && !seen.contains(path)) {
seen.add(path);
paths.add(path);
break;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSimpleDrillSideways.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSimpleDrillSideways.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSimpleDrillSideways.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestSimpleDrillSideways.java Tue Nov 26 00:12:57 2013
@@ -32,8 +32,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.search.AssertingSubDocsAtOnceCollector;
import org.apache.lucene.facet.simple.SimpleDrillSideways.SimpleDrillSidewaysResult;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts.java Tue Nov 26 00:12:57 2013
@@ -28,11 +28,11 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.StringField;
import org.apache.lucene.facet.FacetTestCase;
+import org.apache.lucene.facet.taxonomy.PrintTaxonomyStats;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
-import org.apache.lucene.facet.util.PrintTaxonomyStats;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts2.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts2.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetCounts2.java Tue Nov 26 00:12:57 2013
@@ -31,13 +31,6 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field.Store;
import org.apache.lucene.document.StringField;
import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.collections.ObjectToIntMap;
-import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.params.CategoryListParams;
-import org.apache.lucene.facet.params.FacetIndexingParams;
-import org.apache.lucene.facet.params.FacetSearchParams;
-import org.apache.lucene.facet.params.PerDimensionOrdinalPolicy;
-import org.apache.lucene.facet.params.CategoryListParams.OrdinalPolicy;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
@@ -92,7 +85,7 @@ public class TestTaxonomyFacetCounts2 ex
}
private static Directory indexDir, taxoDir;
- private static ObjectToIntMap<String> allExpectedCounts, termExpectedCounts;
+ private static Map<String,Integer> allExpectedCounts, termExpectedCounts;
@AfterClass
public static void afterClassCountingFacetsAggregatorTest() throws Exception {
@@ -172,7 +165,7 @@ public class TestTaxonomyFacetCounts2 ex
}
private static void indexDocsWithFacetsNoTerms(IndexWriter indexWriter, TaxonomyWriter taxoWriter,
- ObjectToIntMap<String> expectedCounts) throws IOException {
+ Map<String,Integer> expectedCounts) throws IOException {
Random random = random();
int numDocs = atLeast(random, 2);
FacetsConfig config = getConfig(taxoWriter);
@@ -185,7 +178,7 @@ public class TestTaxonomyFacetCounts2 ex
}
private static void indexDocsWithFacetsAndTerms(IndexWriter indexWriter, TaxonomyWriter taxoWriter,
- ObjectToIntMap<String> expectedCounts) throws IOException {
+ Map<String,Integer> expectedCounts) throws IOException {
Random random = random();
int numDocs = atLeast(random, 2);
FacetsConfig config = getConfig(taxoWriter);
@@ -199,7 +192,7 @@ public class TestTaxonomyFacetCounts2 ex
}
private static void indexDocsWithFacetsAndSomeTerms(IndexWriter indexWriter, TaxonomyWriter taxoWriter,
- ObjectToIntMap<String> expectedCounts) throws IOException {
+ Map<String,Integer> expectedCounts) throws IOException {
Random random = random();
int numDocs = atLeast(random, 2);
FacetsConfig config = getConfig(taxoWriter);
@@ -216,8 +209,8 @@ public class TestTaxonomyFacetCounts2 ex
}
// initialize expectedCounts w/ 0 for all categories
- private static ObjectToIntMap<String> newCounts() {
- ObjectToIntMap<String> counts = new ObjectToIntMap<String>();
+ private static Map<String,Integer> newCounts() {
+ Map<String,Integer> counts = new HashMap<String,Integer>();
counts.put(CP_A, 0);
counts.put(CP_B, 0);
counts.put(CP_C, 0);
@@ -285,12 +278,12 @@ public class TestTaxonomyFacetCounts2 ex
SimpleFacetResult result = facets.getTopChildren(NUM_CHILDREN_CP_A, CP_A);
assertEquals(-1, result.value.intValue());
for(LabelAndValue labelValue : result.labelValues) {
- assertEquals(termExpectedCounts.get(CP_A + "/" + labelValue.label), labelValue.value.intValue());
+ assertEquals(termExpectedCounts.get(CP_A + "/" + labelValue.label), labelValue.value);
}
result = facets.getTopChildren(NUM_CHILDREN_CP_B, CP_B);
- assertEquals(termExpectedCounts.get(CP_B), result.value.intValue());
+ assertEquals(termExpectedCounts.get(CP_B), result.value);
for(LabelAndValue labelValue : result.labelValues) {
- assertEquals(termExpectedCounts.get(CP_B + "/" + labelValue.label), labelValue.value.intValue());
+ assertEquals(termExpectedCounts.get(CP_B + "/" + labelValue.label), labelValue.value);
}
IOUtils.close(indexReader, taxoReader);
@@ -311,16 +304,16 @@ public class TestTaxonomyFacetCounts2 ex
assertEquals(-1, result.value.intValue());
int prevValue = Integer.MAX_VALUE;
for(LabelAndValue labelValue : result.labelValues) {
- assertEquals(allExpectedCounts.get(CP_A + "/" + labelValue.label), labelValue.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_A + "/" + labelValue.label), labelValue.value);
assertTrue("wrong sort order of sub results: labelValue.value=" + labelValue.value + " prevValue=" + prevValue, labelValue.value.intValue() <= prevValue);
prevValue = labelValue.value.intValue();
}
result = facets.getTopChildren(NUM_CHILDREN_CP_B, CP_B);
- assertEquals(allExpectedCounts.get(CP_B), result.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_B), result.value);
prevValue = Integer.MAX_VALUE;
for(LabelAndValue labelValue : result.labelValues) {
- assertEquals(allExpectedCounts.get(CP_B + "/" + labelValue.label), labelValue.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_B + "/" + labelValue.label), labelValue.value);
assertTrue("wrong sort order of sub results: labelValue.value=" + labelValue.value + " prevValue=" + prevValue, labelValue.value.intValue() <= prevValue);
prevValue = labelValue.value.intValue();
}
@@ -342,12 +335,12 @@ public class TestTaxonomyFacetCounts2 ex
SimpleFacetResult result = facets.getTopChildren(Integer.MAX_VALUE, CP_A);
assertEquals(-1, result.value.intValue());
for(LabelAndValue labelValue : result.labelValues) {
- assertEquals(allExpectedCounts.get(CP_A + "/" + labelValue.label), labelValue.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_A + "/" + labelValue.label), labelValue.value);
}
result = facets.getTopChildren(Integer.MAX_VALUE, CP_B);
- assertEquals(allExpectedCounts.get(CP_B), result.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_B), result.value);
for(LabelAndValue labelValue : result.labelValues) {
- assertEquals(allExpectedCounts.get(CP_B + "/" + labelValue.label), labelValue.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_B + "/" + labelValue.label), labelValue.value);
}
IOUtils.close(indexReader, taxoReader);
@@ -365,14 +358,14 @@ public class TestTaxonomyFacetCounts2 ex
Facets facets = getTaxonomyFacetCounts(taxoReader, getConfig(), sfc);
SimpleFacetResult result = facets.getTopChildren(NUM_CHILDREN_CP_C, CP_C);
- assertEquals(allExpectedCounts.get(CP_C), result.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_C), result.value);
for(LabelAndValue labelValue : result.labelValues) {
- assertEquals(allExpectedCounts.get(CP_C + "/" + labelValue.label), labelValue.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_C + "/" + labelValue.label), labelValue.value);
}
result = facets.getTopChildren(NUM_CHILDREN_CP_D, CP_D);
- assertEquals(allExpectedCounts.get(CP_C), result.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_C), result.value);
for(LabelAndValue labelValue : result.labelValues) {
- assertEquals(allExpectedCounts.get(CP_D + "/" + labelValue.label), labelValue.value.intValue());
+ assertEquals(allExpectedCounts.get(CP_D + "/" + labelValue.label), labelValue.value);
}
IOUtils.close(indexReader, taxoReader);
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetSumValueSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetSumValueSource.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetSumValueSource.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/simple/TestTaxonomyFacetSumValueSource.java Tue Nov 26 00:12:57 2013
@@ -35,11 +35,11 @@ import org.apache.lucene.document.Numeri
import org.apache.lucene.document.StringField;
import org.apache.lucene.facet.FacetTestCase;
import org.apache.lucene.facet.taxonomy.FacetLabel;
+import org.apache.lucene.facet.taxonomy.PrintTaxonomyStats;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
-import org.apache.lucene.facet.util.PrintTaxonomyStats;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
Copied: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java (from r1542066, lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/collections/TestLRUHashMap.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java?p2=lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java&p1=lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/collections/TestLRUHashMap.java&r1=1542066&r2=1545466&rev=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/collections/TestLRUHashMap.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/TestLRUHashMap.java Tue Nov 26 00:12:57 2013
@@ -1,8 +1,4 @@
-package org.apache.lucene.facet.collections;
-
-import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.collections.LRUHashMap;
-import org.junit.Test;
+package org.apache.lucene.facet.taxonomy;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,6 +17,10 @@ import org.junit.Test;
* limitations under the License.
*/
+import org.apache.lucene.facet.FacetTestCase;
+import org.apache.lucene.facet.taxonomy.LRUHashMap;
+import org.junit.Test;
+
public class TestLRUHashMap extends FacetTestCase {
// testLRU() tests that the specified size limit is indeed honored, and
// the remaining objects in the map are indeed those that have been most
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestConcurrentFacetedIndexing.java Tue Nov 26 00:12:57 2013
@@ -9,7 +9,8 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.index.FacetFields;
+import org.apache.lucene.facet.simple.FacetField;
+import org.apache.lucene.facet.simple.FacetsConfig;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.facet.taxonomy.writercache.TaxonomyWriterCache;
import org.apache.lucene.facet.taxonomy.writercache.cl2o.Cl2oTaxonomyWriterCache;
@@ -56,12 +57,12 @@ public class TestConcurrentFacetedIndexi
};
- static FacetLabel newCategory() {
+ static FacetField newCategory() {
Random r = random();
String l1 = "l1." + r.nextInt(10); // l1.0-l1.9 (10 categories)
String l2 = "l2." + r.nextInt(30); // l2.0-l2.29 (30 categories)
String l3 = "l3." + r.nextInt(100); // l3.0-l3.99 (100 categories)
- return new FacetLabel(l1, l2, l3);
+ return new FacetField(l1, l2, l3);
}
static TaxonomyWriterCache newTaxoWriterCache(int ndocs) {
@@ -87,10 +88,14 @@ public class TestConcurrentFacetedIndexi
final IndexWriter iw = new IndexWriter(indexDir, newIndexWriterConfig(TEST_VERSION_CURRENT, null));
final DirectoryTaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE, newTaxoWriterCache(numDocs.get()));
final Thread[] indexThreads = new Thread[atLeast(4)];
+ final FacetsConfig config = new FacetsConfig(tw);
+ for(int i=0;i<10;i++) {
+ config.setHierarchical("l1." + i, true);
+ config.setMultiValued("l1." + i, true);
+ }
for (int i = 0; i < indexThreads.length; i++) {
indexThreads[i] = new Thread() {
- private final FacetFields facetFields = new FacetFields(tw);
@Override
public void run() {
@@ -99,20 +104,20 @@ public class TestConcurrentFacetedIndexi
try {
Document doc = new Document();
int numCats = random.nextInt(3) + 1; // 1-3
- List<FacetLabel> cats = new ArrayList<FacetLabel>(numCats);
while (numCats-- > 0) {
- FacetLabel cp = newCategory();
- cats.add(cp);
+ FacetField ff = newCategory();
+ doc.add(ff);
+
+ FacetLabel label = FacetLabel.create(ff.dim, ff.path);
// add all prefixes to values
- int level = cp.length;
+ int level = label.length;
while (level > 0) {
- String s = cp.subpath(level).toString('/');
+ String s = label.subpath(level).toString('/');
values.put(s, s);
--level;
}
}
- facetFields.addFields(doc, cats);
- iw.addDocument(doc);
+ iw.addDocument(config.build(doc));
} catch (IOException e) {
throw new RuntimeException(e);
}
@@ -140,9 +145,8 @@ public class TestConcurrentFacetedIndexi
parentOrd = ord; // next level should have this parent
}
}
- tr.close();
- IOUtils.close(tw, iw, taxoDir, indexDir);
+ IOUtils.close(tw, iw, tr, taxoDir, indexDir);
}
}
Modified: lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java?rev=1545466&r1=1545465&r2=1545466&view=diff
==============================================================================
--- lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java (original)
+++ lucene/dev/branches/lucene5339/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyWriter.java Tue Nov 26 00:12:57 2013
@@ -11,9 +11,9 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.FacetTestCase;
-import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.params.FacetIndexingParams;
-import org.apache.lucene.facet.search.DrillDownQuery;
+import org.apache.lucene.facet.simple.FacetField;
+import org.apache.lucene.facet.simple.FacetsConfig;
+import org.apache.lucene.facet.simple.SimpleDrillDownQuery;
import org.apache.lucene.facet.taxonomy.FacetLabel;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.MemoryOrdinalMap;
@@ -23,8 +23,8 @@ import org.apache.lucene.facet.taxonomy.
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
+import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.SegmentInfos;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.store.AlreadyClosedException;
@@ -427,30 +427,28 @@ public class TestDirectoryTaxonomyWriter
Directory indexDir = newDirectory(), taxoDir = newDirectory();
IndexWriter indexWriter = new IndexWriter(indexDir, newIndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())));
DirectoryTaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE, new Cl2oTaxonomyWriterCache(2, 1f, 1));
- FacetFields facetFields = new FacetFields(taxoWriter);
+ FacetsConfig config = new FacetsConfig(taxoWriter);
// Add one huge label:
String bigs = null;
int ordinal = -1;
- FacetLabel cp = null;
- while (true) {
- int len = FacetLabel.MAX_CATEGORY_PATH_LENGTH - 4; // for the dimension and separator
- bigs = _TestUtil.randomSimpleString(random(), len, len);
- cp = new FacetLabel("dim", bigs);
- ordinal = taxoWriter.addCategory(cp);
- Document doc = new Document();
- facetFields.addFields(doc, Collections.singletonList(cp));
- indexWriter.addDocument(doc);
- break;
- }
+
+ int len = FacetLabel.MAX_CATEGORY_PATH_LENGTH - 4; // for the dimension and separator
+ bigs = _TestUtil.randomSimpleString(random(), len, len);
+ FacetField ff = new FacetField("dim", bigs);
+ FacetLabel cp = FacetLabel.create("dim", bigs);
+ ordinal = taxoWriter.addCategory(cp);
+ Document doc = new Document();
+ doc.add(ff);
+ indexWriter.addDocument(config.build(doc));
// Add tiny ones to cause a re-hash
for (int i = 0; i < 3; i++) {
String s = _TestUtil.randomSimpleString(random(), 1, 10);
taxoWriter.addCategory(new FacetLabel("dim", s));
- Document doc = new Document();
- facetFields.addFields(doc, Collections.singletonList(new FacetLabel("dim", s)));
- indexWriter.addDocument(doc);
+ doc = new Document();
+ doc.add(new FacetField("dim", s));
+ indexWriter.addDocument(config.build(doc));
}
// when too large components were allowed to be added, this resulted in a new added category
@@ -461,13 +459,11 @@ public class TestDirectoryTaxonomyWriter
DirectoryReader indexReader = DirectoryReader.open(indexDir);
TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir);
IndexSearcher searcher = new IndexSearcher(indexReader);
- DrillDownQuery ddq = new DrillDownQuery(FacetIndexingParams.DEFAULT);
- ddq.add(cp);
+ SimpleDrillDownQuery ddq = new SimpleDrillDownQuery(new FacetsConfig());
+ ddq.add("dim", bigs);
assertEquals(1, searcher.search(ddq, 10).totalHits);
- IOUtils.close(indexReader, taxoReader);
-
- IOUtils.close(indexDir, taxoDir);
+ IOUtils.close(indexReader, taxoReader, indexDir, taxoDir);
}
@Test