You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2018/04/23 17:35:36 UTC
[32/40] lucene-solr:jira/solr-11833: SOLR-12250:
NegativeArraySizeException on TransactionLog if previous document more than
1.9GB
SOLR-12250: NegativeArraySizeException on TransactionLog if previous document more than 1.9GB
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/f8c210f1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/f8c210f1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/f8c210f1
Branch: refs/heads/jira/solr-11833
Commit: f8c210f1484ed2749d4e14be1fa4905fb3d96e94
Parents: 4e0e8e9
Author: Cao Manh Dat <da...@apache.org>
Authored: Mon Apr 23 08:42:03 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Mon Apr 23 08:42:03 2018 +0700
----------------------------------------------------------------------
solr/CHANGES.txt | 2 +
.../org/apache/solr/update/TransactionLog.java | 3 +-
.../apache/solr/update/TransactionLogTest.java | 45 ++++++++++++++++++++
3 files changed, 49 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f8c210f1/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a9e63f3..ff82838 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -180,6 +180,8 @@ Bug Fixes
* SOLR-9304: Fix Solr's HTTP handling to respect '-Dsolr.ssl.checkPeerName=false' aka SOLR_SSL_CHECK_PEER_NAME
(Shawn Heisey, Carlton Findley, Robby Pond, hossman)
+* SOLR-12250: NegativeArraySizeException on TransactionLog if previous document more than 1.9GB (Cao Manh Dat)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f8c210f1/solr/core/src/java/org/apache/solr/update/TransactionLog.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/update/TransactionLog.java b/solr/core/src/java/org/apache/solr/update/TransactionLog.java
index 35d722b..be4dabc 100644
--- a/solr/core/src/java/org/apache/solr/update/TransactionLog.java
+++ b/solr/core/src/java/org/apache/solr/update/TransactionLog.java
@@ -379,7 +379,8 @@ public class TransactionLog implements Closeable {
// adaptive buffer sizing
int bufSize = lastAddSize; // unsynchronized access of lastAddSize should be fine
- bufSize = Math.min(1024*1024, bufSize+(bufSize>>3)+256);
+ // at least 256 bytes and at most 1 MB
+ bufSize = Math.min(1024*1024, Math.max(256, bufSize+(bufSize>>3)+256));
MemOutputStream out = new MemOutputStream(new byte[bufSize]);
codec.init(out);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/f8c210f1/solr/core/src/test/org/apache/solr/update/TransactionLogTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/TransactionLogTest.java b/solr/core/src/test/org/apache/solr/update/TransactionLogTest.java
new file mode 100644
index 0000000..944b2ee
--- /dev/null
+++ b/solr/core/src/test/org/apache/solr/update/TransactionLogTest.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.solr.update;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.util.ArrayList;
+import java.util.Locale;
+
+import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.common.SolrInputDocument;
+import org.junit.Test;
+
+import static org.mockito.Mockito.*;
+
+public class TransactionLogTest extends LuceneTestCase {
+
+ @Test
+ public void testBigLastAddSize() throws IOException {
+ String tlogFileName = String.format(Locale.ROOT, UpdateLog.LOG_FILENAME_PATTERN, UpdateLog.TLOG_NAME, 0);
+ try (TransactionLog transactionLog = new TransactionLog(Files.createTempFile(tlogFileName, "").toFile(), new ArrayList<>())) {
+ transactionLog.lastAddSize = 2000000000;
+ AddUpdateCommand updateCommand = mock(AddUpdateCommand.class);
+ when(updateCommand.isInPlaceUpdate()).thenReturn(false);
+ when(updateCommand.getSolrInputDocument()).thenReturn(new SolrInputDocument());
+ transactionLog.write(updateCommand, 0);
+ }
+ }
+
+}