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

SOLR-8494: SimplePostTool and therefore the bin/post script cannot upload files larger than 2.1GB 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1723360 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Shalin Shekhar Mangar 2016-01-06 16:23:20 +00:00
parent 21ed3b7ffa
commit 71a18c4ddc
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
solr/CHANGES.txt
View File

@ -334,6 +334,8 @@ Bug Fixes
* SOLR-8418: Adapt to changes in LUCENE-6590 for use of boosts with MLTHandler and
Simple/CloudMLTQParser (Jens Wille, Ramkumar Aiyengar)
* SOLR-8494: SimplePostTool and therefore the bin/post script cannot upload files larger than 2.1GB. (shalin)
Other Changes
----------------------

15
solr/core/src/java/org/apache/solr/util/SimplePostTool.java
View File

@ -17,11 +17,6 @@ package org.apache.solr.util;
* limitations under the License.
*/
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import javax.xml.bind.DatatypeConverter;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@ -60,13 +55,17 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
import java.util.zip.GZIPInputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
/**
* A simple utility class for posting raw updates to a Solr server,
* has a main method so it can be run on the command line.
@ -791,7 +790,7 @@ public class SimplePostTool {
}
info("POSTing file " + file.getName() + (auto?" ("+type+")":"") + " to [base]" + suffix);
is = new FileInputStream(file);
postData(is, (int)file.length(), output, type, url);
postData(is, file.length(), output, type, url);
} catch (IOException e) {
e.printStackTrace();
warn("Can't open/read file: " + file);
@ -861,7 +860,7 @@ public class SimplePostTool {
* writes to the response to output
* @return true if success
*/
public boolean postData(InputStream data, Integer length, OutputStream output, String type, URL url) {
public boolean postData(InputStream data, Long length, OutputStream output, String type, URL url) {
if(mockMode) return true;
boolean success = true;
if(type == null)