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/08 15:36:58 UTC
svn commit: r1444026 [2/3] - in /lucene/dev/trunk/lucene: ./
demo/src/java/org/apache/lucene/demo/facet/
demo/src/java/org/apache/lucene/demo/facet/adaptive/
demo/src/java/org/apache/lucene/demo/facet/association/
demo/src/java/org/apache/lucene/demo/f...
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntEncoder.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntEncoder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/VInt8IntEncoder.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util.encoding;
+package org.apache.lucene.facet.encoding;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IntsRef;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/package.html?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/encoding/package.html Fri Feb 8 14:35:50 2013
@@ -16,25 +16,9 @@
-->
<html>
<head>
-<title>Encoding</title>
+<title>Facets Encoding</title>
</head>
<body>
-Offers various encoders and decoders for integers, as well as the
-mechanisms to create new ones. The super class for all encoders is
-{@link org.apache.lucene.util.encoding.IntEncoder} and for most of the
-encoders there is a matching {@link
-org.apache.lucene.util.encoding.IntDecoder} implementation (not all
-encoders need a decoder).
-<p>
-Some encoders don't perform any encoding at all, or do not include an
-encoding logic. Those are called {@link
-org.apache.lucene.util.encoding.IntEncoderFilter}s. A filter is an
-encoder which delegates the encoding task to a given encoder, however
-performs additional logic before the values are sent for encoding. An
-example is {@link org.apache.lucene.util.encoding.DGapIntEncoder}
-which encodes the gaps between values rather than the values themselves.
-Another example is {@link
-org.apache.lucene.util.encoding.SortingIntEncoder} which sorts all the
-values in ascending order before they are sent for encoding.
+Offers various encoders and decoders for category ordinals.
</body>
</html>
\ No newline at end of file
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CountingListBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CountingListBuilder.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CountingListBuilder.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/CountingListBuilder.java Fri Feb 8 14:35:50 2013
@@ -7,15 +7,15 @@ import java.util.Iterator;
import java.util.Map;
import java.util.Map.Entry;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.CategoryListParams.OrdinalPolicy;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.encoding.IntEncoder;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.CategoryListParams.OrdinalPolicy;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.facet.util.PartitionsUtils;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.encoding.IntEncoder;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/DrillDownStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/DrillDownStream.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/DrillDownStream.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/DrillDownStream.java Fri Feb 8 14:35:50 2013
@@ -5,7 +5,7 @@ import java.util.Iterator;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
import org.apache.lucene.facet.taxonomy.CategoryPath;
/*
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=1444026&r1=1444025&r2=1444026&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 Fri Feb 8 14:35:50 2013
@@ -13,8 +13,8 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.index.FieldInfo.IndexOptions;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/package.html?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/package.html Fri Feb 8 14:35:50 2013
@@ -16,16 +16,10 @@
-->
<html>
<head>
-<title>Indexing of document categories</title>
+<title>Facets indexing code</title>
</head>
<body>
-<h1>Indexing of document categories</h1>
-
-Attachment of
-{@link org.apache.lucene.facet.taxonomy.CategoryPath CategoryPath}'s
-or {@link org.apache.lucene.facet.associations.CategoryAssociation CategoryAssociation}'s
-to a given document using a
-{@link org.apache.lucene.facet.taxonomy.TaxonomyWriter Taxonomy}.
+Facets indexing code.
</body>
</html>
\ No newline at end of file
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/CategoryListParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/CategoryListParams.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/CategoryListParams.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/CategoryListParams.java Fri Feb 8 14:35:50 2013
@@ -1,16 +1,16 @@
-package org.apache.lucene.facet.index.params;
+package org.apache.lucene.facet.params;
import java.io.IOException;
+import org.apache.lucene.facet.encoding.DGapVInt8IntEncoder;
+import org.apache.lucene.facet.encoding.IntDecoder;
+import org.apache.lucene.facet.encoding.IntEncoder;
+import org.apache.lucene.facet.encoding.SortingIntEncoder;
+import org.apache.lucene.facet.encoding.UniqueValuesIntEncoder;
import org.apache.lucene.facet.search.CategoryListIterator;
import org.apache.lucene.facet.search.DocValuesCategoryListIterator;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.util.PartitionsUtils;
-import org.apache.lucene.util.encoding.DGapVInt8IntEncoder;
-import org.apache.lucene.util.encoding.IntDecoder;
-import org.apache.lucene.util.encoding.IntEncoder;
-import org.apache.lucene.util.encoding.SortingIntEncoder;
-import org.apache.lucene.util.encoding.UniqueValuesIntEncoder;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
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=1444026&r1=1443839&r2=1444026&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 Fri Feb 8 14:35:50 2013
@@ -1,9 +1,9 @@
-package org.apache.lucene.facet.index.params;
+package org.apache.lucene.facet.params;
import java.util.Collections;
import java.util.List;
-import org.apache.lucene.facet.index.params.CategoryListParams.OrdinalPolicy;
+import org.apache.lucene.facet.params.CategoryListParams.OrdinalPolicy;
import org.apache.lucene.facet.search.FacetArrays;
import org.apache.lucene.facet.taxonomy.CategoryPath;
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/FacetSearchParams.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/FacetSearchParams.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/FacetSearchParams.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/FacetSearchParams.java Fri Feb 8 14:35:50 2013
@@ -1,9 +1,9 @@
-package org.apache.lucene.facet.search.params;
+package org.apache.lucene.facet.params;
import java.util.Arrays;
import java.util.List;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.search.FacetRequest;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionIndexingParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionIndexingParams.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionIndexingParams.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionIndexingParams.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.index.params;
+package org.apache.lucene.facet.params;
import java.util.ArrayList;
import java.util.HashMap;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionOrdinalPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionOrdinalPolicy.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionOrdinalPolicy.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/PerDimensionOrdinalPolicy.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.index.params;
+package org.apache.lucene.facet.params;
import java.util.Map;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/package.html?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/params/package.html Fri Feb 8 14:35:50 2013
@@ -16,13 +16,10 @@
-->
<html>
<head>
-<title>Indexing-time specifications for handling facets</title>
+<title>Facets indexing and search parameters</title>
</head>
<body>
-<h1>Indexing-time specifications for handling facets</h1>
-
-Parameters on how facets are to be written to the index,
-such as which fields and terms are used to refer to the facets posting list.
-
+Facets indexing and search parameters. Define how facets are indexed
+as well as which categories need to be aggregated.
</body>
</html>
\ No newline at end of file
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/IntermediateFacetResult.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/IntermediateFacetResult.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/IntermediateFacetResult.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/IntermediateFacetResult.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/IntermediateFacetResult.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/IntermediateFacetResult.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/IntermediateFacetResult.java Fri Feb 8 14:35:50 2013
@@ -1,8 +1,8 @@
-package org.apache.lucene.facet.partitions.search;
+package org.apache.lucene.facet.partitions;
+import org.apache.lucene.facet.search.FacetRequest;
+import org.apache.lucene.facet.search.FacetResult;
import org.apache.lucene.facet.search.FacetResultsHandler;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.results.FacetResult;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/PartitionsFacetResultsHandler.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/PartitionsFacetResultsHandler.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/PartitionsFacetResultsHandler.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/PartitionsFacetResultsHandler.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/PartitionsFacetResultsHandler.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/search/PartitionsFacetResultsHandler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/partitions/PartitionsFacetResultsHandler.java Fri Feb 8 14:35:50 2013
@@ -1,14 +1,14 @@
-package org.apache.lucene.facet.partitions.search;
+package org.apache.lucene.facet.partitions;
import java.io.IOException;
import org.apache.lucene.facet.search.FacetArrays;
+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.FacetResultsHandler;
import org.apache.lucene.facet.search.ScoredDocIDs;
import org.apache.lucene.facet.search.StandardFacetsAccumulator;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
/*
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RandomSampler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RandomSampler.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RandomSampler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RandomSampler.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search.sampling;
+package org.apache.lucene.facet.sampling;
import java.io.IOException;
import java.util.Random;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RepeatableSampler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RepeatableSampler.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RepeatableSampler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/RepeatableSampler.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search.sampling;
+package org.apache.lucene.facet.sampling;
import java.io.IOException;
import java.util.Arrays;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SampleFixer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SampleFixer.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SampleFixer.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SampleFixer.java Fri Feb 8 14:35:50 2013
@@ -1,9 +1,9 @@
-package org.apache.lucene.facet.search.sampling;
+package org.apache.lucene.facet.sampling;
import java.io.IOException;
+import org.apache.lucene.facet.search.FacetResult;
import org.apache.lucene.facet.search.ScoredDocIDs;
-import org.apache.lucene.facet.search.results.FacetResult;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/Sampler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/Sampler.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/Sampler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/Sampler.java Fri Feb 8 14:35:50 2013
@@ -1,16 +1,16 @@
-package org.apache.lucene.facet.search.sampling;
+package org.apache.lucene.facet.sampling;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.search.Aggregator;
import org.apache.lucene.facet.search.FacetArrays;
+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.ScoredDocIDs;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingAccumulator.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingAccumulator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingAccumulator.java Fri Feb 8 14:35:50 2013
@@ -1,18 +1,17 @@
-package org.apache.lucene.facet.search.sampling;
+package org.apache.lucene.facet.sampling;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.facet.partitions.search.PartitionsFacetResultsHandler;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.partitions.PartitionsFacetResultsHandler;
+import org.apache.lucene.facet.sampling.Sampler.SampleResult;
import org.apache.lucene.facet.search.FacetArrays;
+import org.apache.lucene.facet.search.FacetResult;
import org.apache.lucene.facet.search.FacetsAccumulator;
-import org.apache.lucene.facet.search.SamplingWrapper;
import org.apache.lucene.facet.search.ScoredDocIDs;
import org.apache.lucene.facet.search.StandardFacetsAccumulator;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.sampling.Sampler.SampleResult;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.index.IndexReader;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingParams.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingParams.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingParams.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search.sampling;
+package org.apache.lucene.facet.sampling;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingWrapper.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SamplingWrapper.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingWrapper.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingWrapper.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SamplingWrapper.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SamplingWrapper.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/SamplingWrapper.java Fri Feb 8 14:35:50 2013
@@ -1,14 +1,15 @@
-package org.apache.lucene.facet.search;
+package org.apache.lucene.facet.sampling;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.facet.partitions.search.PartitionsFacetResultsHandler;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.sampling.Sampler;
-import org.apache.lucene.facet.search.sampling.Sampler.SampleResult;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.partitions.PartitionsFacetResultsHandler;
+import org.apache.lucene.facet.sampling.Sampler.SampleResult;
+import org.apache.lucene.facet.search.FacetResult;
+import org.apache.lucene.facet.search.ScoredDocIDs;
+import org.apache.lucene.facet.search.StandardFacetsAccumulator;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/TakmiSampleFixer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/TakmiSampleFixer.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/TakmiSampleFixer.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/TakmiSampleFixer.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search.sampling;
+package org.apache.lucene.facet.sampling;
import java.io.IOException;
@@ -9,12 +9,12 @@ import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.util.Bits;
+import org.apache.lucene.facet.params.FacetSearchParams;
import org.apache.lucene.facet.search.DrillDown;
+import org.apache.lucene.facet.search.FacetResult;
+import org.apache.lucene.facet.search.FacetResultNode;
import org.apache.lucene.facet.search.ScoredDocIDs;
import org.apache.lucene.facet.search.ScoredDocIDsIterator;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/package.html?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/sampling/package.html Fri Feb 8 14:35:50 2013
@@ -15,10 +15,10 @@
limitations under the License.
-->
<html>
- <head>
- <title>Sampling for facets accumulation</title>
- </head>
- <body>
- <h1>Sampling for facets accumulation</h1>
- </body>
+<head>
+<title>Facets sampling</title>
+</head>
+<body>
+Facets sampling.
+</body>
</html>
\ No newline at end of file
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/AdaptiveFacetsAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/AdaptiveFacetsAccumulator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/AdaptiveFacetsAccumulator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/AdaptiveFacetsAccumulator.java Fri Feb 8 14:35:50 2013
@@ -3,11 +3,10 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
import java.util.List;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.sampling.RandomSampler;
-import org.apache.lucene.facet.search.sampling.Sampler;
-import org.apache.lucene.facet.search.sampling.SamplingAccumulator;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.sampling.RandomSampler;
+import org.apache.lucene.facet.sampling.Sampler;
+import org.apache.lucene.facet.sampling.SamplingAccumulator;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.index.IndexReader;
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/Aggregator.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/Aggregator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/Aggregator.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/Aggregator.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/Aggregator.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/Aggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/Aggregator.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search.aggregator;
+package org.apache.lucene.facet.search;
import java.io.IOException;
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountFacetRequest.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/CountFacetRequest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountFacetRequest.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountFacetRequest.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/CountFacetRequest.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/CountFacetRequest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountFacetRequest.java Fri Feb 8 14:35:50 2013
@@ -1,9 +1,6 @@
-package org.apache.lucene.facet.search.params;
+package org.apache.lucene.facet.search;
-import org.apache.lucene.facet.search.FacetArrays;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
-import org.apache.lucene.facet.search.aggregator.ComplementCountingAggregator;
-import org.apache.lucene.facet.search.aggregator.CountingAggregator;
+import org.apache.lucene.facet.complements.ComplementCountingAggregator;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingAggregator.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/CountingAggregator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingAggregator.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingAggregator.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/CountingAggregator.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/CountingAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingAggregator.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search.aggregator;
+package org.apache.lucene.facet.search;
import java.io.IOException;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingFacetsAggregator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingFacetsAggregator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingFacetsAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/CountingFacetsAggregator.java Fri Feb 8 14:35:50 2013
@@ -2,7 +2,7 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
-import org.apache.lucene.facet.index.params.CategoryListParams;
+import org.apache.lucene.facet.params.CategoryListParams;
import org.apache.lucene.facet.search.FacetsCollector.MatchingDocs;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.util.IntsRef;
@@ -70,7 +70,7 @@ public class CountingFacetsAggregator im
}
@Override
- public void rollupValues(int ordinal, int[] children, int[] siblings, FacetArrays facetArrays) {
+ public void rollupValues(FacetRequest fr, int ordinal, int[] children, int[] siblings, FacetArrays facetArrays) {
final int[] counts = facetArrays.getIntArray();
counts[ordinal] += rollupCounts(children[ordinal], children, siblings, counts);
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DepthOneFacetResultsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DepthOneFacetResultsHandler.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DepthOneFacetResultsHandler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DepthOneFacetResultsHandler.java Fri Feb 8 14:35:50 2013
@@ -6,11 +6,8 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest.SortBy;
-import org.apache.lucene.facet.search.params.FacetRequest.SortOrder;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
+import org.apache.lucene.facet.search.FacetRequest.SortBy;
+import org.apache.lucene.facet.search.FacetRequest.SortOrder;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.ParallelTaxonomyArrays;
import org.apache.lucene.util.PriorityQueue;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DocValuesCategoryListIterator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DocValuesCategoryListIterator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DocValuesCategoryListIterator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DocValuesCategoryListIterator.java Fri Feb 8 14:35:50 2013
@@ -2,11 +2,11 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
+import org.apache.lucene.facet.encoding.IntDecoder;
import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.encoding.IntDecoder;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDown.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDown.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDown.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/DrillDown.java Fri Feb 8 14:35:50 2013
@@ -7,9 +7,9 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
+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.taxonomy.CategoryPath;
/*
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetRequest.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/FacetRequest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetRequest.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetRequest.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/FacetRequest.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/FacetRequest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetRequest.java Fri Feb 8 14:35:50 2013
@@ -1,10 +1,7 @@
-package org.apache.lucene.facet.search.params;
+package org.apache.lucene.facet.search;
import java.io.IOException;
-import org.apache.lucene.facet.search.FacetArrays;
-import org.apache.lucene.facet.search.FacetResultsHandler;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResult.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/results/FacetResult.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResult.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResult.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/results/FacetResult.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/results/FacetResult.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResult.java Fri Feb 8 14:35:50 2013
@@ -1,6 +1,5 @@
-package org.apache.lucene.facet.search.results;
+package org.apache.lucene.facet.search;
-import org.apache.lucene.facet.search.params.FacetRequest;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultNode.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/results/FacetResultNode.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultNode.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultNode.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/results/FacetResultNode.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/results/FacetResultNode.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultNode.java Fri Feb 8 14:35:50 2013
@@ -1,11 +1,9 @@
-package org.apache.lucene.facet.search.results;
+package org.apache.lucene.facet.search;
import java.util.Collections;
import java.util.List;
-import org.apache.lucene.facet.search.params.CountFacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest.ResultMode;
+import org.apache.lucene.facet.search.FacetRequest.ResultMode;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultsHandler.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultsHandler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetResultsHandler.java Fri Feb 8 14:35:50 2013
@@ -2,8 +2,6 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.results.FacetResult;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
/*
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAccumulator.java Fri Feb 8 14:35:50 2013
@@ -7,20 +7,18 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.CategoryListParams.OrdinalPolicy;
+import org.apache.lucene.facet.encoding.DGapVInt8IntDecoder;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.params.CategoryListParams.OrdinalPolicy;
+import org.apache.lucene.facet.search.FacetRequest.FacetArraysSource;
+import org.apache.lucene.facet.search.FacetRequest.ResultMode;
+import org.apache.lucene.facet.search.FacetRequest.SortBy;
+import org.apache.lucene.facet.search.FacetRequest.SortOrder;
import org.apache.lucene.facet.search.FacetsCollector.MatchingDocs;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.params.FacetRequest.FacetArraysSource;
-import org.apache.lucene.facet.search.params.FacetRequest.ResultMode;
-import org.apache.lucene.facet.search.params.FacetRequest.SortBy;
-import org.apache.lucene.facet.search.params.FacetRequest.SortOrder;
-import org.apache.lucene.facet.search.results.FacetResult;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.ParallelTaxonomyArrays;
import org.apache.lucene.index.IndexReader;
-import org.apache.lucene.util.encoding.DGapVInt8IntDecoder;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -47,10 +45,10 @@ import org.apache.lucene.util.encoding.D
*/
public class FacetsAccumulator {
- protected final TaxonomyReader taxonomyReader;
- protected final IndexReader indexReader;
- protected final FacetArrays facetArrays;
- protected FacetSearchParams searchParams;
+ public final TaxonomyReader taxonomyReader;
+ public final IndexReader indexReader;
+ public final FacetArrays facetArrays;
+ public FacetSearchParams searchParams;
/**
* Initializes the accumulator with the given search params, index reader and
@@ -162,7 +160,7 @@ public class FacetsAccumulator {
OrdinalPolicy ordinalPolicy = clp .getOrdinalPolicy(fr.categoryPath.components[0]);
if (ordinalPolicy == OrdinalPolicy.NO_PARENTS) {
// rollup values
- aggregator.rollupValues(rootOrd, children, siblings, facetArrays);
+ aggregator.rollupValues(fr, rootOrd, children, siblings, facetArrays);
}
FacetResultsHandler frh = createFacetResultsHandler(fr);
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAggregator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAggregator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsAggregator.java Fri Feb 8 14:35:50 2013
@@ -2,8 +2,8 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.CategoryListParams.OrdinalPolicy;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.CategoryListParams.OrdinalPolicy;
import org.apache.lucene.facet.search.FacetsCollector.MatchingDocs;
/*
@@ -41,7 +41,7 @@ public interface FacetsAggregator {
* ordinal is the requested category, and you should use the children and
* siblings arrays to traverse its sub-tree.
*/
- public void rollupValues(int ordinal, int[] children, int[] siblings, FacetArrays facetArrays);
+ public void rollupValues(FacetRequest fr, int ordinal, int[] children, int[] siblings, FacetArrays facetArrays);
/** Returns {@code true} if this aggregator requires document scores. */
public boolean requiresDocScores();
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java Fri Feb 8 14:35:50 2013
@@ -4,10 +4,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.facet.search.params.CountFacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
+import org.apache.lucene.facet.params.FacetSearchParams;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.index.AtomicReaderContext;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FastCountingFacetsAggregator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FastCountingFacetsAggregator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FastCountingFacetsAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FastCountingFacetsAggregator.java Fri Feb 8 14:35:50 2013
@@ -2,15 +2,14 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
-import org.apache.lucene.facet.index.params.CategoryListParams;
+import org.apache.lucene.facet.encoding.DGapVInt8IntDecoder;
+import org.apache.lucene.facet.encoding.DGapVInt8IntEncoder;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetSearchParams;
import org.apache.lucene.facet.search.FacetsCollector.MatchingDocs;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.encoding.DGapVInt8IntDecoder;
-import org.apache.lucene.util.encoding.DGapVInt8IntEncoder;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -109,7 +108,7 @@ public final class FastCountingFacetsAgg
}
@Override
- public final void rollupValues(int ordinal, int[] children, int[] siblings, FacetArrays facetArrays) {
+ public final void rollupValues(FacetRequest fr, int ordinal, int[] children, int[] siblings, FacetArrays facetArrays) {
final int[] counts = facetArrays.getIntArray();
counts[ordinal] += rollupCounts(children[ordinal], children, siblings, counts);
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FloatFacetResultsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FloatFacetResultsHandler.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FloatFacetResultsHandler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/FloatFacetResultsHandler.java Fri Feb 8 14:35:50 2013
@@ -3,8 +3,6 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
import java.util.ArrayList;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.results.FacetResultNode;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.util.PriorityQueue;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/IntFacetResultsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/IntFacetResultsHandler.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/IntFacetResultsHandler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/IntFacetResultsHandler.java Fri Feb 8 14:35:50 2013
@@ -3,8 +3,6 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
import java.util.ArrayList;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.results.FacetResultNode;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.util.PriorityQueue;
Added: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/PerCategoryListAggregator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/PerCategoryListAggregator.java?rev=1444026&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/PerCategoryListAggregator.java (added)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/PerCategoryListAggregator.java Fri Feb 8 14:35:50 2013
@@ -0,0 +1,62 @@
+package org.apache.lucene.facet.search;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
+import org.apache.lucene.facet.search.FacetsCollector.MatchingDocs;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A {@link FacetsAggregator} which invokes the proper aggregator per
+ * {@link CategoryListParams}.
+ */
+public class PerCategoryListAggregator implements FacetsAggregator {
+
+ private final Map<CategoryListParams,FacetsAggregator> aggregators;
+ private final FacetIndexingParams fip;
+
+ public PerCategoryListAggregator(Map<CategoryListParams,FacetsAggregator> aggregators, FacetIndexingParams fip) {
+ this.aggregators = aggregators;
+ this.fip = fip;
+ }
+
+ @Override
+ public void aggregate(MatchingDocs matchingDocs, CategoryListParams clp, FacetArrays facetArrays) throws IOException {
+ aggregators.get(clp).aggregate(matchingDocs, clp, facetArrays);
+ }
+
+ @Override
+ public void rollupValues(FacetRequest fr, int ordinal, int[] children, int[] siblings, FacetArrays facetArrays) {
+ CategoryListParams clp = fip.getCategoryListParams(fr.categoryPath);
+ aggregators.get(clp).rollupValues(fr, ordinal, children, siblings, facetArrays);
+ }
+
+ @Override
+ public boolean requiresDocScores() {
+ for (FacetsAggregator aggregator : aggregators.values()) {
+ if (aggregator.requiresDocScores()) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+}
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/ScoringAggregator.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ScoringAggregator.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/ScoringAggregator.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/ScoringAggregator.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ScoringAggregator.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/aggregator/ScoringAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/ScoringAggregator.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search.aggregator;
+package org.apache.lucene.facet.search;
import java.io.IOException;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/StandardFacetsAccumulator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/StandardFacetsAccumulator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/StandardFacetsAccumulator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/StandardFacetsAccumulator.java Fri Feb 8 14:35:50 2013
@@ -10,16 +10,14 @@ import java.util.Map.Entry;
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
-import org.apache.lucene.facet.partitions.search.PartitionsFacetResultsHandler;
+import org.apache.lucene.facet.complements.TotalFacetCounts;
+import org.apache.lucene.facet.complements.TotalFacetCountsCache;
+import org.apache.lucene.facet.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.partitions.IntermediateFacetResult;
+import org.apache.lucene.facet.partitions.PartitionsFacetResultsHandler;
+import org.apache.lucene.facet.search.FacetRequest.ResultMode;
import org.apache.lucene.facet.search.FacetsCollector.MatchingDocs;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
-import org.apache.lucene.facet.search.params.CountFacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest.ResultMode;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.partitions.search.IntermediateFacetResult;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.util.PartitionsUtils;
import org.apache.lucene.facet.util.ScoredDocIdsUtils;
@@ -410,5 +408,10 @@ public class StandardFacetsAccumulator e
public void setComplementThreshold(double complementThreshold) {
this.complementThreshold = complementThreshold;
}
+
+ /** Returns true if complements are enabled. */
+ public boolean isUsingComplements() {
+ return isUsingComplements;
+ }
}
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetRequest.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/SumScoreFacetRequest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetRequest.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetRequest.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/SumScoreFacetRequest.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/params/SumScoreFacetRequest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetRequest.java Fri Feb 8 14:35:50 2013
@@ -1,8 +1,5 @@
-package org.apache.lucene.facet.search.params;
+package org.apache.lucene.facet.search;
-import org.apache.lucene.facet.search.FacetArrays;
-import org.apache.lucene.facet.search.aggregator.Aggregator;
-import org.apache.lucene.facet.search.aggregator.ScoringAggregator;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetsAggregator.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetsAggregator.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetsAggregator.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/SumScoreFacetsAggregator.java Fri Feb 8 14:35:50 2013
@@ -2,7 +2,7 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
-import org.apache.lucene.facet.index.params.CategoryListParams;
+import org.apache.lucene.facet.params.CategoryListParams;
import org.apache.lucene.facet.search.FacetsCollector.MatchingDocs;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.util.IntsRef;
@@ -65,7 +65,7 @@ public class SumScoreFacetsAggregator im
}
@Override
- public void rollupValues(int ordinal, int[] children, int[] siblings, FacetArrays facetArrays) {
+ public void rollupValues(FacetRequest fr, int ordinal, int[] children, int[] siblings, FacetArrays facetArrays) {
float[] scores = facetArrays.getFloatArray();
scores[ordinal] += rollupScores(children[ordinal], children, siblings, scores);
}
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKFacetResultsHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKFacetResultsHandler.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKFacetResultsHandler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKFacetResultsHandler.java Fri Feb 8 14:35:50 2013
@@ -3,11 +3,8 @@ package org.apache.lucene.facet.search;
import java.io.IOException;
import java.util.ArrayList;
-import org.apache.lucene.facet.partitions.search.IntermediateFacetResult;
-import org.apache.lucene.facet.partitions.search.PartitionsFacetResultsHandler;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
+import org.apache.lucene.facet.partitions.IntermediateFacetResult;
+import org.apache.lucene.facet.partitions.PartitionsFacetResultsHandler;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.ParallelTaxonomyArrays;
import org.apache.lucene.facet.util.ResultSortUtils;
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKInEachNodeHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKInEachNodeHandler.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKInEachNodeHandler.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/TopKInEachNodeHandler.java Fri Feb 8 14:35:50 2013
@@ -4,17 +4,14 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import org.apache.lucene.facet.partitions.search.IntermediateFacetResult;
-import org.apache.lucene.facet.partitions.search.PartitionsFacetResultsHandler;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest.SortOrder;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
+import org.apache.lucene.facet.collections.IntIterator;
+import org.apache.lucene.facet.collections.IntToObjectMap;
+import org.apache.lucene.facet.partitions.IntermediateFacetResult;
+import org.apache.lucene.facet.partitions.PartitionsFacetResultsHandler;
+import org.apache.lucene.facet.search.FacetRequest.SortOrder;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.ParallelTaxonomyArrays;
import org.apache.lucene.util.PriorityQueue;
-import org.apache.lucene.util.collections.IntIterator;
-import org.apache.lucene.util.collections.IntToObjectMap;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/package.html?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/search/package.html Fri Feb 8 14:35:50 2013
@@ -15,44 +15,10 @@
limitations under the License.
-->
<html>
- <head>
- <title>Faceted Search API</title>
- </head>
- <body>
- <h1>Faceted Search API</h1>
-
- API for faceted search has several interfaces - simple, top level ones, adequate for most users,
- and advanced, more complicated ones, for the more advanced users.
-
- <p>
-
- We now describe the simpler interfaces.
- There are mainly 3 interfaces for faceted search:
- <ol>
- <li>{@link org.apache.lucene.facet.search.params.FacetRequest Facets Request}
- defines requirements:
- <ul>
- <li>which facets are required, e.g. depth</li>
- <li>what is computed for each facet - e.g. count, score.</li>
- </ul>
- </li>
- <li>{@link org.apache.lucene.facet.search.FacetsAccumulator Facets Extractor}
- Controls how facets are extracted, with variations of:
- <ul>
- <li>default (partitioned, like all extractors). </li>
- <li>sampled - inspects only a fraction of the documents.</li>
- </ul>
- </li>
- <li>{@link org.apache.lucene.facet.search.FacetResultsHandler Facet Results Handler }
- Controls how results are further processed and merged (also between partitions):
- <ul>
- <li>Top K.</li>
- <li>Tree.</li>
- <li>Tree with top K at each level</li>
- <li>...</li>
- </ul>
- </li>
- </ol>
-
- </body>
+<head>
+<title>Facets search code</title>
+</head>
+<body>
+Facets search code.
+</body>
</html>
\ No newline at end of file
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java Fri Feb 8 14:35:50 2013
@@ -5,6 +5,7 @@ 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.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.directory.Consts.LoadFullPathOnly;
@@ -17,7 +18,6 @@ import org.apache.lucene.search.DocIdSet
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.collections.LRUHashMap;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/package.html?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/package.html Fri Feb 8 14:35:50 2013
@@ -16,10 +16,9 @@
-->
<html>
<head>
-<title>Taxonomy implemented using a Lucene-Index</title>
+<title>Taxonomy index implementation using on top of a Directory</title>
</head>
<body>
- <h1>Taxonomy implemented using a Lucene-Index</h1>
-
+Taxonomy index implementation using on top of a Directory.
</body>
</html>
\ No newline at end of file
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/package.html?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/package.html Fri Feb 8 14:35:50 2013
@@ -22,7 +22,7 @@
<h1>Taxonomy of Categories</h1>
Facets are defined using a hierarchy of categories, known as a
- <i>Taxonomy</i>
+ <i>Taxonomy</i>.
<br>
For example, in a book store application, a Taxonomy could have the
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/package.html?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/package.html (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/package.html Fri Feb 8 14:35:50 2013
@@ -16,10 +16,9 @@
-->
<html>
<head>
-<title>Improves indexing time by caching a map of CategoryPath to their Ordinal</title>
+<title>Taxonomy index cache</title>
</head>
<body>
- <h1>Improves indexing time by caching a map of CategoryPath to their Ordinal</h1>
-
+Improves indexing time by caching a map of CategoryPath to their Ordinal.
</body>
</html>
\ No newline at end of file
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/FacetsPayloadMigrationReader.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetsPayloadMigrationReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/FacetsPayloadMigrationReader.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/FacetsPayloadMigrationReader.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetsPayloadMigrationReader.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/FacetsPayloadMigrationReader.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/FacetsPayloadMigrationReader.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.index;
+package org.apache.lucene.facet.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,8 +23,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+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.AtomicReaderContext;
import org.apache.lucene.index.BinaryDocValues;
Copied: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java (from r1443839, lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/OrdinalMappingAtomicReader.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java?p2=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java&p1=lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/OrdinalMappingAtomicReader.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/index/OrdinalMappingAtomicReader.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/OrdinalMappingAtomicReader.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.index;
+package org.apache.lucene.facet.util;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,16 +21,16 @@ import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.encoding.IntDecoder;
+import org.apache.lucene.facet.encoding.IntEncoder;
+import org.apache.lucene.facet.params.CategoryListParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.OrdinalMap;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.FilterAtomicReader;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.encoding.IntDecoder;
-import org.apache.lucene.util.encoding.IntEncoder;
/**
* A {@link FilterAtomicReader} for updating facets ordinal references,
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/PartitionsUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/PartitionsUtils.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/PartitionsUtils.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/PartitionsUtils.java Fri Feb 8 14:35:50 2013
@@ -1,6 +1,6 @@
package org.apache.lucene.facet.util;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
/*
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/ResultSortUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/ResultSortUtils.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/ResultSortUtils.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/ResultSortUtils.java Fri Feb 8 14:35:50 2013
@@ -6,10 +6,10 @@ import java.util.Comparator;
import org.apache.lucene.util.PriorityQueue;
+import org.apache.lucene.facet.search.FacetRequest;
+import org.apache.lucene.facet.search.FacetResultNode;
import org.apache.lucene.facet.search.Heap;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetRequest.SortOrder;
-import org.apache.lucene.facet.search.results.FacetResultNode;
+import org.apache.lucene.facet.search.FacetRequest.SortOrder;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java (original)
+++ lucene/dev/trunk/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java Fri Feb 8 14:35:50 2013
@@ -3,8 +3,7 @@ package org.apache.lucene.facet.util;
import java.io.IOException;
import java.util.List;
-import org.apache.lucene.facet.index.OrdinalMappingAtomicReader;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
+import org.apache.lucene.facet.params.FacetIndexingParams;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter.OrdinalMap;
import org.apache.lucene.index.AtomicReader;
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java Fri Feb 8 14:35:50 2013
@@ -16,14 +16,15 @@ import org.apache.lucene.analysis.MockTo
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
+import org.apache.lucene.facet.collections.IntToObjectMap;
import org.apache.lucene.facet.index.FacetFields;
-import org.apache.lucene.facet.index.params.CategoryListParams;
-import org.apache.lucene.facet.index.params.CategoryListParams.OrdinalPolicy;
-import org.apache.lucene.facet.index.params.FacetIndexingParams;
-import org.apache.lucene.facet.search.params.FacetRequest;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
+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.CategoryListParams.OrdinalPolicy;
+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.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyReader;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
@@ -46,7 +47,6 @@ import org.apache.lucene.util.Bits;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
import org.apache.lucene.util._TestUtil;
-import org.apache.lucene.util.collections.IntToObjectMap;
import org.junit.AfterClass;
import org.junit.BeforeClass;
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestCase.java Fri Feb 8 14:35:50 2013
@@ -2,17 +2,17 @@ package org.apache.lucene.facet;
import java.util.Random;
-import org.apache.lucene.facet.index.params.CategoryListParams;
+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.util.LuceneTestCase;
-import org.apache.lucene.util.encoding.DGapIntEncoder;
-import org.apache.lucene.util.encoding.DGapVInt8IntEncoder;
-import org.apache.lucene.util.encoding.EightFlagsIntEncoder;
-import org.apache.lucene.util.encoding.FourFlagsIntEncoder;
-import org.apache.lucene.util.encoding.IntEncoder;
-import org.apache.lucene.util.encoding.NOnesIntEncoder;
-import org.apache.lucene.util.encoding.SortingIntEncoder;
-import org.apache.lucene.util.encoding.UniqueValuesIntEncoder;
-import org.apache.lucene.util.encoding.VInt8IntEncoder;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java?rev=1444026&r1=1444025&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java Fri Feb 8 14:35:50 2013
@@ -1,7 +1,7 @@
package org.apache.lucene.facet;
-import org.apache.lucene.facet.search.results.FacetResult;
-import org.apache.lucene.facet.search.results.FacetResultNode;
+import org.apache.lucene.facet.search.FacetResult;
+import org.apache.lucene.facet.search.FacetResultNode;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java (from r1443839, lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java?p2=lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java&p1=lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java&r1=1443839&r2=1444026&rev=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/SlowRAMDirectory.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.util;
+package org.apache.lucene.facet;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,6 +24,7 @@ import org.apache.lucene.store.IOContext
import org.apache.lucene.store.IndexInput;
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.store.RAMDirectory;
+import org.apache.lucene.util.ThreadInterruptedException;
/**
* Test utility - slow directory
@@ -89,18 +90,18 @@ public class SlowRAMDirectory extends RA
private class SlowIndexInput extends IndexInput {
private IndexInput ii;
private int numRead = 0;
- private Random random;
+ private Random rand;
public SlowIndexInput(IndexInput ii) {
super("SlowIndexInput(" + ii + ")");
- this.random = forkRandom();
+ this.rand = forkRandom();
this.ii = ii;
}
@Override
public byte readByte() throws IOException {
if (numRead >= IO_SLEEP_THRESHOLD) {
- doSleep(random, 0);
+ doSleep(rand, 0);
numRead = 0;
}
++numRead;
@@ -110,7 +111,7 @@ public class SlowRAMDirectory extends RA
@Override
public void readBytes(byte[] b, int offset, int len) throws IOException {
if (numRead >= IO_SLEEP_THRESHOLD) {
- doSleep(random, len);
+ doSleep(rand, len);
numRead = 0;
}
numRead += len;
@@ -135,17 +136,17 @@ public class SlowRAMDirectory extends RA
private IndexOutput io;
private int numWrote;
- private final Random random;
+ private final Random rand;
public SlowIndexOutput(IndexOutput io) {
this.io = io;
- this.random = forkRandom();
+ this.rand = forkRandom();
}
@Override
public void writeByte(byte b) throws IOException {
if (numWrote >= IO_SLEEP_THRESHOLD) {
- doSleep(random, 0);
+ doSleep(rand, 0);
numWrote = 0;
}
++numWrote;
@@ -155,7 +156,7 @@ public class SlowRAMDirectory extends RA
@Override
public void writeBytes(byte[] b, int offset, int length) throws IOException {
if (numWrote >= IO_SLEEP_THRESHOLD) {
- doSleep(random, length);
+ doSleep(rand, length);
numWrote = 0;
}
numWrote += length;
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/associations/AssociationsFacetRequestTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/associations/AssociationsFacetRequestTest.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/associations/AssociationsFacetRequestTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/associations/AssociationsFacetRequestTest.java Fri Feb 8 14:35:50 2013
@@ -1,4 +1,4 @@
-package org.apache.lucene.facet.search.associations;
+package org.apache.lucene.facet.associations;
import java.util.List;
@@ -6,15 +6,15 @@ import org.apache.lucene.analysis.MockAn
import org.apache.lucene.analysis.MockTokenizer;
import org.apache.lucene.document.Document;
import org.apache.lucene.facet.FacetTestCase;
+import org.apache.lucene.facet.associations.AssociationFloatSumFacetRequest;
+import org.apache.lucene.facet.associations.AssociationIntSumFacetRequest;
import org.apache.lucene.facet.associations.AssociationsFacetFields;
import org.apache.lucene.facet.associations.CategoryAssociationsContainer;
import org.apache.lucene.facet.associations.CategoryFloatAssociation;
import org.apache.lucene.facet.associations.CategoryIntAssociation;
+import org.apache.lucene.facet.params.FacetSearchParams;
+import org.apache.lucene.facet.search.FacetResult;
import org.apache.lucene.facet.search.FacetsCollector;
-import org.apache.lucene.facet.search.params.FacetSearchParams;
-import org.apache.lucene.facet.search.params.associations.AssociationFloatSumFacetRequest;
-import org.apache.lucene.facet.search.params.associations.AssociationIntSumFacetRequest;
-import org.apache.lucene.facet.search.results.FacetResult;
import org.apache.lucene.facet.taxonomy.CategoryPath;
import org.apache.lucene.facet.taxonomy.TaxonomyWriter;
import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader;
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/ArrayHashMapTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/ArrayHashMapTest.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/ArrayHashMapTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/ArrayHashMapTest.java Fri Feb 8 14:35:50 2013
@@ -1,10 +1,11 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Random;
import org.apache.lucene.facet.FacetTestCase;
+import org.apache.lucene.facet.collections.ArrayHashMap;
import org.junit.Test;
/*
Modified: lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/FloatToObjectMapTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/FloatToObjectMapTest.java?rev=1444026&r1=1443839&r2=1444026&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/FloatToObjectMapTest.java (original)
+++ lucene/dev/trunk/lucene/facet/src/test/org/apache/lucene/facet/collections/FloatToObjectMapTest.java Fri Feb 8 14:35:50 2013
@@ -1,10 +1,12 @@
-package org.apache.lucene.util.collections;
+package org.apache.lucene.facet.collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Random;
import org.apache.lucene.facet.FacetTestCase;
+import org.apache.lucene.facet.collections.FloatIterator;
+import org.apache.lucene.facet.collections.FloatToObjectMap;
import org.junit.Test;
/*