You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/07/14 16:26:27 UTC
[lucene-solr] branch reference_impl updated (bfb4cae -> e8031cd)
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a change to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from bfb4cae #143 - More test executor usage.
new eeb3bfc #144 - Fix this test.
new e8031cd #145 - Tighten up these test tools to hit all tests.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../solr/common/util/ObjectReleaseTracker.java | 6 +++---
.../solrj/routing/ReplicaListTransformerTest.java | 24 ++++++++++++++--------
.../src/java/org/apache/solr/SolrTestCase.java | 12 ++++++++++-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 8 --------
4 files changed, 29 insertions(+), 21 deletions(-)
[lucene-solr] 02/02: #145 - Tighten up these test tools to hit all
tests.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit e8031cd77b5c128b6dbc19bebf59f68f6cd96085
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 14 11:25:11 2020 -0500
#145 - Tighten up these test tools to hit all tests.
---
.../org/apache/solr/common/util/ObjectReleaseTracker.java | 6 +++---
.../src/java/org/apache/solr/SolrTestCase.java | 12 +++++++++++-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 8 --------
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/ObjectReleaseTracker.java b/solr/solrj/src/java/org/apache/solr/common/util/ObjectReleaseTracker.java
index a05ea2b..36024b0 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/ObjectReleaseTracker.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/ObjectReleaseTracker.java
@@ -35,10 +35,10 @@ import org.slf4j.LoggerFactory;
public class ObjectReleaseTracker {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- public static Map<Object,String> OBJECTS = new ConcurrentHashMap<>();
+ public static Map<Object,String> OBJECTS = new ConcurrentHashMap<>(128, 0.75f, 2048);
public static boolean track(Object object) {
- StringBuilderWriter sw = new StringBuilderWriter(1000);
+ StringBuilderWriter sw = new StringBuilderWriter(4096);
PrintWriter pw = new PrintWriter(sw);
new ObjectTrackerException(object.getClass().getName()).printStackTrace(pw);
OBJECTS.put(object, sw.toString());
@@ -62,7 +62,7 @@ public class ObjectReleaseTracker {
Set<Entry<Object,String>> entries = OBJECTS.entrySet();
if (entries.size() > 0) {
- List<String> objects = new ArrayList<>();
+ List<String> objects = new ArrayList<>(entries.size());
for (Entry<Object,String> entry : entries) {
objects.add(entry.getKey().getClass().getSimpleName());
}
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index caa8407..8f750ff 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -34,6 +34,7 @@ import org.apache.solr.client.solrj.impl.Http2SolrClient;
import org.apache.solr.client.solrj.impl.HttpClientUtil;
import org.apache.solr.cloud.autoscaling.ScheduledTriggers;
import org.apache.solr.common.TimeTracker;
+import org.apache.solr.common.util.ObjectReleaseTracker;
import org.apache.solr.servlet.SolrDispatchFilter;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.RandomizeSSL;
@@ -318,7 +319,16 @@ public class SolrTestCase extends LuceneTestCase {
@AfterClass
public static void afterSolrTestCase() throws Exception {
-
+ try {
+ if (suiteFailureMarker.wasSuccessful()) {
+ // if the tests passed, make sure everything was closed / released
+ String orr = ObjectReleaseTracker.checkEmpty();
+ ObjectReleaseTracker.clear();
+ assertNull(orr, orr);
+ }} finally {
+ ObjectReleaseTracker.OBJECTS.clear();
+ TestInjection.reset();
+ }
try {
HttpClientUtil.resetHttpClientBuilder();
Http2SolrClient.resetSslContextFactory();
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
index 272d02b..63c3c17 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
@@ -310,17 +310,9 @@ public abstract class SolrTestCaseJ4 extends SolrTestCase {
resetExceptionIgnores();
- if (suiteFailureMarker.wasSuccessful()) {
- // if the tests passed, make sure everything was closed / released
- String orr = ObjectReleaseTracker.checkEmpty();
- ObjectReleaseTracker.clear();
- assertNull(orr, orr);
- }
resetFactory();
coreName = DEFAULT_TEST_CORENAME;
} finally {
- ObjectReleaseTracker.clear();
- TestInjection.reset();
initCoreDataDir = null;
System.clearProperty("solr.v2RealPath");
System.clearProperty("zookeeper.forceSync");
[lucene-solr] 01/02: #144 - Fix this test.
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit eeb3bfc1757e51838265fc57f32db95fed39efa0
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Tue Jul 14 11:24:42 2020 -0500
#144 - Fix this test.
---
.../solrj/routing/ReplicaListTransformerTest.java | 24 ++++++++++++++--------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java
index 75afe70..ad33a18 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/routing/ReplicaListTransformerTest.java
@@ -25,6 +25,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
import org.apache.solr.SolrTestCase;
import org.apache.solr.common.cloud.Replica;
@@ -106,16 +107,20 @@ public class ReplicaListTransformerTest extends SolrTestCase {
final String regex = ".*" + random().nextInt(10) + ".*";
- ReplicaListTransformer transformer = null;
+ AtomicReference<ReplicaListTransformer> transformer = new AtomicReference<>();
try {
if (random().nextBoolean()) {
log.info("Using ToyMatching Transfomer");
- transformer = new ToyMatchingReplicaListTransformer(regex);
+ transformer.set(new ToyMatchingReplicaListTransformer(regex));
} else {
log.info("Using conditional Transfomer");
- transformer = new HttpShardHandlerFactory() {
-
+ try (HttpShardHandlerFactory hsh = new HttpShardHandlerFactory() {
+ {
+ transformer.set(getReplicaListTransformer(
+ new LocalSolrQueryRequest(null,
+ new ModifiableSolrParams().add("toyRegEx", regex))));
+ }
@Override
protected ReplicaListTransformer getReplicaListTransformer(final SolrQueryRequest req) {
final SolrParams params = req.getParams();
@@ -132,9 +137,10 @@ public class ReplicaListTransformerTest extends SolrTestCase {
return super.getReplicaListTransformer(req);
}
- }.getReplicaListTransformer(
- new LocalSolrQueryRequest(null,
- new ModifiableSolrParams().add("toyRegEx", regex)));
+ };) {
+
+ }
+
}
final List<Replica> inputs = new ArrayList<>();
@@ -167,12 +173,12 @@ public class ReplicaListTransformerTest extends SolrTestCase {
}
final List<Replica> actualTransformed = new ArrayList<>(inputs);
- transformer.transform(actualTransformed);
+ transformer.get().transform(actualTransformed);
assertEquals(expectedTransformed, actualTransformed);
} finally {
if (transformer != null) {
- transformer.close();
+ transformer.get().close();
}
}
}