You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2015/07/17 14:10:41 UTC
svn commit: r1691531 - in /lucene/dev/branches/branch_5x/solr: ./ core/
core/src/java/org/apache/solr/handler/component/
core/src/java/org/apache/solr/search/facet/
core/src/java/org/apache/solr/util/hll/
core/src/test/org/apache/solr/handler/component...
Author: dweiss
Date: Fri Jul 17 12:10:40 2015
New Revision: 1691531
URL: http://svn.apache.org/r1691531
Log:
SOLR-7787: Removed fastutil and java-hll dependency, integrated HyperLogLog from java-hll into Solr core.
Added:
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/hll/
- copied from r1691518, lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/hll/
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/util/hll/
- copied from r1691518, lucene/dev/trunk/solr/core/src/test/org/apache/solr/util/hll/
Modified:
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/NOTICE.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/ivy.xml
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/UniqueSlotAcc.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Fri Jul 17 12:10:40 2015
@@ -200,6 +200,9 @@ Optimizations
Other Changes
----------------------
+* SOLR-7787: Removed fastutil and java-hll dependency, integrated HyperLogLog from java-hll
+ into Solr core. (Dawid Weiss)
+
* SOLR-7595: Allow method chaining for all CollectionAdminRequests in Solrj. (shalin)
* SOLR-7146: MiniSolrCloudCluster based tests can fail with ZooKeeperException NoNode for /live_nodes.
Modified: lucene/dev/branches/branch_5x/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/NOTICE.txt?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/NOTICE.txt (original)
+++ lucene/dev/branches/branch_5x/solr/NOTICE.txt Fri Jul 17 12:10:40 2015
@@ -13,6 +13,9 @@ including, but not limited to:
- Apache Blur
- Apache Hadoop
+This product includes code forked from the Java-HLL library.
+Copyright (c) 2013 Aggregate Knowledge, Inc., https://github.com/aggregateknowledge/java-hll/
+
This product includes the JQuery JavaScript library created by John Resig.
Copyright (c) 2010 John Resig, http://jquery.com/
Modified: lucene/dev/branches/branch_5x/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/ivy.xml?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/ivy.xml (original)
+++ lucene/dev/branches/branch_5x/solr/core/ivy.xml Fri Jul 17 12:10:40 2015
@@ -129,10 +129,6 @@
<!-- StatsComponents percentiles Dependencies-->
<dependency org="com.tdunning" name="t-digest" rev="${/com.tdunning/t-digest}" conf="compile->*"/>
- <!-- StatsComponents HLL Dependencies-->
- <dependency org="net.agkn" name="hll" rev="${/net.agkn/hll}" conf="compile->*"/>
- <dependency org="it.unimi.dsi" name="fastutil" rev="${/it.unimi.dsi/fastutil}" conf="compile->*"/>
-
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsField.java Fri Jul 17 12:10:40 2015
@@ -55,9 +55,9 @@ import org.apache.solr.search.QParserPlu
import org.apache.solr.search.QueryParsing;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.SyntaxError;
+import org.apache.solr.util.hll.HLL;
+import org.apache.solr.util.hll.HLLType;
-import net.agkn.hll.HLL;
-import net.agkn.hll.HLLType;
import com.google.common.hash.Hashing;
import com.google.common.hash.HashFunction;
@@ -625,8 +625,8 @@ public class StatsField {
* Creates an HllOptions based on the (local) params specified (if appropriate).
*
* @param localParams the LocalParams for this {@link StatsField}
- * @param field the field corrisponding to this {@link StatsField}, may be null if these stats are over a value source
- * @return the {@link HllOptions} to use basd on the params, or null if no {@link HLL} should be computed
+ * @param field the field corresponding to this {@link StatsField}, may be null if these stats are over a value source
+ * @return the {@link HllOptions} to use based on the params, or null if no {@link HLL} should be computed
* @throws SolrException if there are invalid options
*/
public static HllOptions parseHllOptions(SolrParams localParams, SchemaField field)
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/StatsValuesFactory.java Fri Jul 17 12:10:40 2015
@@ -33,12 +33,12 @@ import org.apache.solr.handler.component
import org.apache.solr.schema.*;
import com.tdunning.math.stats.AVLTreeDigest;
-
-import net.agkn.hll.HLL;
-import net.agkn.hll.HLLType;
import com.google.common.hash.Hashing;
import com.google.common.hash.HashFunction;
+import org.apache.solr.util.hll.HLL;
+import org.apache.solr.util.hll.HLLType;
+
/**
* Factory class for creating instance of
* {@link org.apache.solr.handler.component.StatsValues}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/HLLAgg.java Fri Jul 17 12:10:40 2015
@@ -23,8 +23,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import net.agkn.hll.HLL;
-import net.agkn.hll.HLLType;
+import org.apache.solr.util.hll.HLL;
+import org.apache.solr.util.hll.HLLType;
import org.apache.lucene.index.DocValues;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.NumericDocValues;
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/UniqueSlotAcc.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/UniqueSlotAcc.java?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/UniqueSlotAcc.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/facet/UniqueSlotAcc.java Fri Jul 17 12:10:40 2015
@@ -21,7 +21,7 @@ import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import net.agkn.hll.HLL;
+import org.apache.solr.util.hll.HLL;
import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.index.MultiDocValues;
import org.apache.lucene.index.SortedDocValues;
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java Fri Jul 17 12:10:40 2015
@@ -55,9 +55,9 @@ import org.apache.solr.util.AbstractSolr
import org.apache.commons.math3.util.Combinations;
import com.tdunning.math.stats.AVLTreeDigest;
-import net.agkn.hll.HLL;
import com.google.common.hash.Hashing;
-import com.google.common.hash.HashFunction;
+import com.google.common.hash.HashFunction;
+import org.apache.solr.util.hll.HLL;
import org.junit.BeforeClass;
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/handler/component/TestDistributedStatsComponentCardinality.java Fri Jul 17 12:10:40 2015
@@ -31,7 +31,7 @@ import org.apache.solr.client.solrj.resp
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.ModifiableSolrParams;
-import net.agkn.hll.HLL;
+import org.apache.solr.util.hll.HLL;
import com.google.common.hash.Hashing;
import com.google.common.hash.HashFunction;
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java?rev=1691531&r1=1691530&r2=1691531&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/facet/TestJsonFacets.java Fri Jul 17 12:10:40 2015
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.Random;
import com.tdunning.math.stats.AVLTreeDigest;
-import net.agkn.hll.HLL;
+import org.apache.solr.util.hll.HLL;
import org.apache.lucene.queryparser.flexible.standard.processors.NumericQueryNodeProcessor;
import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.packed.GrowableWriter;