You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2013/02/12 21:30:07 UTC
svn commit: r1445341 - in /lucene/dev/trunk/lucene/facet/src:
java/org/apache/lucene/facet/associations/
java/org/apache/lucene/facet/codecs/facet42/
java/org/apache/lucene/facet/index/ java/org/apache/lucene/facet/params/
java/org/apache/lucene/facet/...
Author: shaie
Date: Tue Feb 12 20:30:06 2013
New Revision: 1445341
URL: http://svn.apache.org/r1445341
Log:
rename FacetIndexingParams.ALL_PARENTS to DEFAULT
Modified:
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42Codec.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetFields.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetIndexingParams.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java
lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java
lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/complements/TestTotalFacetCountsCache.java
lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/FacetIndexingParamsTest.java
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java?rev=1445341&r1=1445340&r2=1445341&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/associations/AssociationsFacetFields.java Tue Feb 12 20:30:06 2013
@@ -54,7 +54,7 @@ public class AssociationsFacetFields ext
}
/**
- * Constructs a new instance with the {@link FacetIndexingParams#ALL_PARENTS
+ * Constructs a new instance with the {@link FacetIndexingParams#DEFAULT
* default} facet indexing params.
*
* @param taxonomyWriter
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42Codec.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42Codec.java?rev=1445341&r1=1445340&r2=1445341&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42Codec.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/codecs/facet42/Facet42Codec.java Tue Feb 12 20:30:06 2013
@@ -49,9 +49,9 @@ public class Facet42Codec extends Lucene
private final DocValuesFormat lucene42DVFormat = DocValuesFormat.forName("Lucene42");
// must have that for SPI purposes
- /** Default constructor, uses {@link FacetIndexingParams#ALL_PARENTS}. */
+ /** Default constructor, uses {@link FacetIndexingParams#DEFAULT}. */
public Facet42Codec() {
- this(FacetIndexingParams.ALL_PARENTS);
+ this(FacetIndexingParams.DEFAULT);
}
/**
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetFields.java?rev=1445341&r1=1445340&r2=1445341&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetFields.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetFields.java Tue Feb 12 20:30:06 2013
@@ -74,14 +74,14 @@ public class FacetFields {
protected final FacetIndexingParams indexingParams;
/**
- * Constructs a new instance with the {@link FacetIndexingParams#ALL_PARENTS
+ * Constructs a new instance with the {@link FacetIndexingParams#DEFAULT
* default} facet indexing params.
*
* @param taxonomyWriter
* used to resolve given categories to ordinals
*/
public FacetFields(TaxonomyWriter taxonomyWriter) {
- this(taxonomyWriter, FacetIndexingParams.ALL_PARENTS);
+ this(taxonomyWriter, FacetIndexingParams.DEFAULT);
}
/**
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetIndexingParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetIndexingParams.java?rev=1445341&r1=1445340&r2=1445341&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetIndexingParams.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetIndexingParams.java Tue Feb 12 20:30:06 2013
@@ -3,7 +3,6 @@ package org.apache.lucene.facet.params;
import java.util.Collections;
import java.util.List;
-import org.apache.lucene.facet.params.CategoryListParams.OrdinalPolicy;
import org.apache.lucene.facet.search.FacetArrays;
import org.apache.lucene.facet.taxonomy.CategoryPath;
@@ -47,9 +46,10 @@ public class FacetIndexingParams {
/**
* A {@link FacetIndexingParams} which fixes a single
- * {@link CategoryListParams} with {@link OrdinalPolicy#ALL_PARENTS}.
+ * {@link CategoryListParams} with
+ * {@link CategoryListParams#DEFAULT_ORDINAL_POLICY}.
*/
- public static final FacetIndexingParams ALL_PARENTS = new FacetIndexingParams();
+ public static final FacetIndexingParams DEFAULT = new FacetIndexingParams();
/**
* The default delimiter with which {@link CategoryPath#components} are
@@ -67,7 +67,7 @@ public class FacetIndexingParams {
/**
* Initializes new default params. You should use this constructor only if you
* intend to override any of the getters, otherwise you can use
- * {@link #ALL_PARENTS} to save unnecessary object allocations.
+ * {@link #DEFAULT} to save unnecessary object allocations.
*/
public FacetIndexingParams() {
this(DEFAULT_CATEGORY_LIST_PARAMS);
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java?rev=1445341&r1=1445340&r2=1445341&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java Tue Feb 12 20:30:06 2013
@@ -40,22 +40,22 @@ public class FacetSearchParams {
/**
* Initializes with the given {@link FacetRequest requests} and default
- * {@link FacetIndexingParams#ALL_PARENTS}. If you used a different
+ * {@link FacetIndexingParams#DEFAULT}. If you used a different
* {@link FacetIndexingParams}, you should use
* {@link #FacetSearchParams(FacetIndexingParams, List)}.
*/
public FacetSearchParams(FacetRequest... facetRequests) {
- this(FacetIndexingParams.ALL_PARENTS, Arrays.asList(facetRequests));
+ this(FacetIndexingParams.DEFAULT, Arrays.asList(facetRequests));
}
/**
* Initializes with the given {@link FacetRequest requests} and default
- * {@link FacetIndexingParams#ALL_PARENTS}. If you used a different
+ * {@link FacetIndexingParams#DEFAULT}. If you used a different
* {@link FacetIndexingParams}, you should use
* {@link #FacetSearchParams(FacetIndexingParams, List)}.
*/
public FacetSearchParams(List<FacetRequest> facetRequests) {
- this(FacetIndexingParams.ALL_PARENTS, facetRequests);
+ this(FacetIndexingParams.DEFAULT, facetRequests);
}
/**
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java?rev=1445341&r1=1445340&r2=1445341&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java Tue Feb 12 20:30:06 2013
@@ -74,7 +74,7 @@ public class OrdinalMappingAtomicReader
* OrdinalMappingAtomicReader(in, ordinalMap, new DefaultFacetIndexingParams())}
*/
public OrdinalMappingAtomicReader(AtomicReader in, int[] ordinalMap) {
- this(in, ordinalMap, FacetIndexingParams.ALL_PARENTS);
+ this(in, ordinalMap, FacetIndexingParams.DEFAULT);
}
/**
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/complements/TestTotalFacetCountsCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/complements/TestTotalFacetCountsCache.java?rev=1445341&r1=1445340&r2=1445341&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/complements/TestTotalFacetCountsCache.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/complements/TestTotalFacetCountsCache.java Tue Feb 12 20:30:06 2013
@@ -187,7 +187,7 @@ public class TestTotalFacetCountsCache e
Multi[] multis = new Multi[numThreads];
for (int i = 0; i < numThreads; i++) {
- multis[i] = new Multi(slowIndexReader, slowTaxoReader, FacetIndexingParams.ALL_PARENTS);
+ multis[i] = new Multi(slowIndexReader, slowTaxoReader, FacetIndexingParams.DEFAULT);
}
for (Multi m : multis) {
@@ -234,7 +234,7 @@ public class TestTotalFacetCountsCache e
// Create our index/taxonomy writers
IndexWriter indexWriter = new IndexWriter(indexDir, newIndexWriterConfig(TEST_VERSION_CURRENT, null));
TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir);
- FacetIndexingParams iParams = FacetIndexingParams.ALL_PARENTS;
+ FacetIndexingParams iParams = FacetIndexingParams.DEFAULT;
// Add a facet to the index
addFacets(iParams, indexWriter, taxoWriter, "a", "b");
@@ -385,7 +385,7 @@ public class TestTotalFacetCountsCache e
IndexWriter w = new IndexWriter(indexDir, new IndexWriterConfig(
TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false)));
DirectoryTaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir);
- FacetIndexingParams iParams = FacetIndexingParams.ALL_PARENTS;
+ FacetIndexingParams iParams = FacetIndexingParams.DEFAULT;
// Add documents and facets
for (int i = 0; i < 1000; i++) {
addFacets(iParams, w, tw, "facet", Integer.toString(i));
@@ -440,7 +440,7 @@ public class TestTotalFacetCountsCache e
IndexWriter indexWriter2 = new IndexWriter(indexDir2, newIndexWriterConfig(TEST_VERSION_CURRENT, null));
TaxonomyWriter taxoWriter1 = new DirectoryTaxonomyWriter(taxoDir1);
TaxonomyWriter taxoWriter2 = new DirectoryTaxonomyWriter(taxoDir2);
- FacetIndexingParams iParams = FacetIndexingParams.ALL_PARENTS;
+ FacetIndexingParams iParams = FacetIndexingParams.DEFAULT;
// Add a facet to the index
addFacets(iParams, indexWriter1, taxoWriter1, "a", "b");
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/FacetIndexingParamsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/FacetIndexingParamsTest.java?rev=1445341&r1=1445340&r2=1445341&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/FacetIndexingParamsTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/params/FacetIndexingParamsTest.java Tue Feb 12 20:30:06 2013
@@ -30,7 +30,7 @@ public class FacetIndexingParamsTest ext
@Test
public void testDefaultSettings() {
- FacetIndexingParams dfip = FacetIndexingParams.ALL_PARENTS;
+ FacetIndexingParams dfip = FacetIndexingParams.DEFAULT;
assertNotNull("Missing default category list", dfip.getAllCategoryListParams());
assertEquals("all categories have the same CategoryListParams by default",
dfip.getCategoryListParams(null), dfip.getCategoryListParams(new CategoryPath("a")));