Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-12793: Move TestCloudJSONFacetJoinDomain amd TestCloudJSONFacetSKG to the facet test package

This commit is contained in:
Varun Thacker 2018-10-24 13:57:28 -07:00
parent 16ee847663
commit 71988c756b
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -178,6 +178,8 @@ Other Changes
* SOLR-12423: Upgrade to Tika 1.19.1 when available (Tim Allison via Erick Erickson)
* SOLR-12793: Move TestCloudJSONFacetJoinDomain amd TestCloudJSONFacetSKG to the facet test package (Varun Thacker)
Bug Fixes
----------------------

2
solr/core/src/test/org/apache/solr/search/facet/DebugAgg.java
View File

@ -32,7 +32,7 @@ import org.apache.solr.search.SyntaxError;
import org.apache.solr.search.ValueSourceParser;
public class DebugAgg extends AggValueSource {
class DebugAgg extends AggValueSource {
public static AtomicLong parses = new AtomicLong(0);
public static class Parser extends ValueSourceParser {

6
solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetJoinDomain.java → solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetJoinDomain.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.solr.cloud;
package org.apache.solr.search.facet;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
@ -39,12 +39,14 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.cloud.AbstractDistribZkTestBase;
import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.cloud.TestCloudPivotFacet;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.facet.FacetField;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.slf4j.Logger;

7
solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetSKG.java → solr/core/src/test/org/apache/solr/search/facet/TestCloudJSONFacetSKG.java
View File

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.solr.cloud;
package org.apache.solr.search.facet;
import java.io.IOException;
import java.lang.invoke.MethodHandles;
@ -40,10 +40,11 @@ import org.apache.solr.client.solrj.impl.HttpSolrClient;
import org.apache.solr.client.solrj.request.CollectionAdminRequest;
import org.apache.solr.client.solrj.request.QueryRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.cloud.AbstractDistribZkTestBase;
import org.apache.solr.cloud.SolrCloudTestCase;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.search.facet.FacetField;
import static org.apache.solr.search.facet.RelatednessAgg.computeRelatedness;
import static org.apache.solr.search.facet.RelatednessAgg.roundTo5Digits;
@ -91,7 +92,7 @@ public class TestCloudJSONFacetSKG extends SolrCloudTestCase {
private static final String[] STR_FIELD_SUFFIXES = new String[] { "_ss", "_sds", "_sdsS" };
/** Multivalued int field suffixes that can be randomized for testing diff facet/join code paths */
private static final String[] INT_FIELD_SUFFIXES = new String[] { "_is", "_ids", "_idsS" };
/** A basic client for operations at the cloud level, default collection will be set */
private static CloudSolrClient CLOUD_CLIENT;
/** One client per node */