You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/07/17 13:59:14 UTC
[1/2] lucene-solr:branch_7x: SOLR-11052: Remove unnecessary
Long-to-Integer and back casts in ReplicationHandler. (Ramsey Haddad via
Christine Poerschke)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x dc28374be -> 2cac0a732
SOLR-11052: Remove unnecessary Long-to-Integer and back casts in ReplicationHandler.
(Ramsey Haddad via Christine Poerschke)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/fc8b1464
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/fc8b1464
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/fc8b1464
Branch: refs/heads/branch_7x
Commit: fc8b14644fe879a9351fbeef15b50f7b1041331b
Parents: dc28374
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Jul 17 13:18:59 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Jul 17 14:40:30 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 4 ++++
.../src/java/org/apache/solr/handler/ReplicationHandler.java | 6 +++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc8b1464/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 3cd0cb4..965f968 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -71,6 +71,10 @@ Other Changes
* SOLR-10964: Reduce SolrIndexSearcher casting in LTRRescorer. (Christine Poerschke)
* SOLR-11075: Refactor handling of params in CloudSolrStream and FacetStream (Erick Erickson)
+
+* SOLR-11052: Remove unnecessary Long-to-Integer and back casts in ReplicationHandler.
+ (Ramsey Haddad via Christine Poerschke)
+
================== 7.0.0 ==================
Versions of Major Components
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fc8b1464/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index 2d545ba..1da8f85 100644
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@ -205,7 +205,7 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
private final Map<String, FileInfo> confFileInfoCache = new HashMap<>();
- private Integer reserveCommitDuration = readIntervalMs("00:00:10");
+ private Long reserveCommitDuration = readIntervalMs("00:00:10");
volatile IndexCommit indexCommitPoint;
@@ -1695,8 +1695,8 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw
}
- private static Integer readIntervalMs(String interval) {
- return (int) TimeUnit.MILLISECONDS.convert(readIntervalNs(interval), TimeUnit.NANOSECONDS);
+ private static Long readIntervalMs(String interval) {
+ return TimeUnit.MILLISECONDS.convert(readIntervalNs(interval), TimeUnit.NANOSECONDS);
}
private static Long readIntervalNs(String interval) {
[2/2] lucene-solr:branch_7x: SOLR-11012: Fix three (JavaBinCodec not
being closed) Resource Leak warnings.
Posted by cp...@apache.org.
SOLR-11012: Fix three (JavaBinCodec not being closed) Resource Leak warnings.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2cac0a73
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2cac0a73
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2cac0a73
Branch: refs/heads/branch_7x
Commit: 2cac0a732f1c71a439803a593984dd498bd055d9
Parents: fc8b146
Author: Christine Poerschke <cp...@apache.org>
Authored: Mon Jul 17 13:22:36 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Mon Jul 17 14:40:43 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../core/src/test/org/apache/solr/util/TestUtils.java | 14 ++++++++------
.../org/apache/solr/common/util/CommandOperation.java | 6 ++++--
.../src/java/org/apache/solr/common/util/Utils.java | 8 +++++---
4 files changed, 19 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cac0a73/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 965f968..78b4333 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -52,6 +52,8 @@ Bug Fixes
* SOLR-8984: EnumField's error reporting to now indicate the field name in failure log (Lanny Ripple,
Ann Addicks via Ishan Chattopadhyaya)
+* SOLR-11012: Fix three (JavaBinCodec not being closed) Resource Leak warnings. (Christine Poerschke)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cac0a73/solr/core/src/test/org/apache/solr/util/TestUtils.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/util/TestUtils.java b/solr/core/src/test/org/apache/solr/util/TestUtils.java
index 0423fbf..2f4cd53 100644
--- a/solr/core/src/test/org/apache/solr/util/TestUtils.java
+++ b/solr/core/src/test/org/apache/solr/util/TestUtils.java
@@ -183,12 +183,14 @@ public class TestUtils extends SolrTestCaseJ4 {
public void testBinaryCommands() throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- new JavaBinCodec().marshal((MapWriter) ew -> {
- ew.put("set-user", fromJSONString("{x:y}"));
- ew.put("set-user", fromJSONString("{x:y,x1:y1}"));
- ew.put("single", Arrays.asList(fromJSONString("[{x:y,x1:y1},{x2:y2}]"), fromJSONString( "{x2:y2}")));
- ew.put("multi", Arrays.asList(fromJSONString("{x:y,x1:y1}"), fromJSONString( "{x2:y2}")));
- }, baos);
+ try (final JavaBinCodec jbc = new JavaBinCodec()) {
+ jbc.marshal((MapWriter) ew -> {
+ ew.put("set-user", fromJSONString("{x:y}"));
+ ew.put("set-user", fromJSONString("{x:y,x1:y1}"));
+ ew.put("single", Arrays.asList(fromJSONString("[{x:y,x1:y1},{x2:y2}]"), fromJSONString( "{x2:y2}")));
+ ew.put("multi", Arrays.asList(fromJSONString("{x:y,x1:y1}"), fromJSONString( "{x2:y2}")));
+ }, baos);
+ }
ContentStream stream = new ContentStreamBase.ByteArrayStream(baos.toByteArray(),null, "application/javabin");
List<CommandOperation> commands = CommandOperation.readCommands(Collections.singletonList(stream), new NamedList(), Collections.singleton("single"));
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cac0a73/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
index 50002f6..19ea199 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/CommandOperation.java
@@ -245,14 +245,16 @@ public class CommandOperation {
}
};
- new JavaBinCodec() {
+ try (final JavaBinCodec jbc = new JavaBinCodec() {
int level = 0;
@Override
protected Map<Object, Object> newMap(int size) {
level++;
return level == 1 ? map : super.newMap(size);
}
- }.unmarshal(in);
+ }) {
+ jbc.unmarshal(in);
+ }
return operations;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2cac0a73/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
index 3be565c..0605a35 100644
--- a/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
+++ b/solr/solrj/src/java/org/apache/solr/common/util/Utils.java
@@ -106,9 +106,11 @@ public class Utils {
}
public static InputStream toJavabin(Object o) throws IOException {
- BinaryRequestWriter.BAOS baos = new BinaryRequestWriter.BAOS();
- new JavaBinCodec().marshal(o,baos);
- return new ByteBufferInputStream(ByteBuffer.wrap(baos.getbuf(),0,baos.size()));
+ try (final JavaBinCodec jbc = new JavaBinCodec()) {
+ BinaryRequestWriter.BAOS baos = new BinaryRequestWriter.BAOS();
+ jbc.marshal(o,baos);
+ return new ByteBufferInputStream(ByteBuffer.wrap(baos.getbuf(),0,baos.size()));
+ }
}
public static Collection getDeepCopy(Collection c, int maxDepth, boolean mutable) {