From 8d92e08c9c19f478b944ac2d3d4735fc9bb921b0 Mon Sep 17 00:00:00 2001 From: Chris Hostetter Date: Thu, 22 Jun 2017 16:05:39 -0700 Subject: [PATCH] SOLR-10939: update @SuppressPointFields on TestJoin to note why points are suppressed Also update the annotation on TestCloudJSONFacetJoinDomain since SOLR-9989 is resolved but the join problems still prevent that test from passing with points enabled --- solr/core/src/test/org/apache/solr/TestJoin.java | 2 +- .../org/apache/solr/cloud/TestCloudJSONFacetJoinDomain.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/solr/core/src/test/org/apache/solr/TestJoin.java b/solr/core/src/test/org/apache/solr/TestJoin.java index f4b2cf59128..0b99b11d0f0 100644 --- a/solr/core/src/test/org/apache/solr/TestJoin.java +++ b/solr/core/src/test/org/apache/solr/TestJoin.java @@ -37,7 +37,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -@SuppressPointFields +@SuppressPointFields(bugUrl="https://issues.apache.org/jira/browse/SOLR-10939") public class TestJoin extends SolrTestCaseJ4 { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); diff --git a/solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetJoinDomain.java b/solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetJoinDomain.java index afdbb7e300d..1acf92eba2b 100644 --- a/solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetJoinDomain.java +++ b/solr/core/src/test/org/apache/solr/cloud/TestCloudJSONFacetJoinDomain.java @@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory; * * @see TestCloudPivotFacet */ -@SuppressPointFields(bugUrl="https://issues.apache.org/jira/browse/SOLR-9989") +@SuppressPointFields(bugUrl="https://issues.apache.org/jira/browse/SOLR-10939") public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase { private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); @@ -82,6 +82,10 @@ public class TestCloudJSONFacetJoinDomain extends SolrCloudTestCase { /** One client per node */ private static ArrayList CLIENTS = new ArrayList<>(5); + public TestCloudJSONFacetJoinDomain() { + // we need DVs on point fields to compute stats & facets + if (Boolean.getBoolean(NUMERIC_POINTS_SYSPROP)) System.setProperty(NUMERIC_DOCVALUES_SYSPROP,"true"); + } @BeforeClass private static void createMiniSolrCloudCluster() throws Exception {