Skip to content

Fix #850: Resolve UTF-8 encoding and IPC issues in Search plugin #859

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LakatosMark1 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #850: Resolve UTF-8 encoding and IPC issues in Search plugin #859

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion plugins/search/indexer/indexer-java/src/cc/search/indexer/Context.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
import java.util.Map;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;

/**
* Analysis context.
Expand Down Expand Up @@ -60,7 +62,7 @@ public Context(String fileId_, File file_, String fileMimeType_)
// Read content from a file stream
try (FileInputStream stream = new FileInputStream(file_)) {
String fileContent = IOHelper.readFullContent(
IOHelper.getReaderForInput(stream));
new InputStreamReader(stream, StandardCharsets.UTF_8));

// Get line informations
try (Reader reader = new StringReader(fileContent)) {
Expand Down
14 changes: 6 additions & 8 deletions plugins/search/indexer/indexer-java/src/cc/search/indexer/util/IOHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,12 @@ public static InputStreamReader getReaderForInput(InputStream input_) throws IOE
* @throws IOException
*/
public static String readFullContent(InputStreamReader reader_) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();

int b = reader_.read();
while (b != -1) {
out.write(b);
b = reader_.read();
StringBuilder out = new StringBuilder();
char[] buffer = new char[4096];
int read;
while ((read = reader_.read(buffer)) != -1) {
out.append(buffer, 0, read);
}

return out.toString(reader_.getEncoding());
return out.toString();
}
}
1 change: 1 addition & 0 deletions plugins/search/indexer/src/indexerprocess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ IndexerProcess::IndexerProcess(

std::vector<const char*> execArguments {
"java", JAVAMEMORYAMOUNT,
"-Dfile.encoding=UTF-8",
"-classpath", classpath.c_str(),
"-Djava.util.logging.config.class=cc.search.common.config.LogConfigurator",
"-Djava.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tT [%4$s] %5$s%6$s%n",
Expand Down
1 change: 1 addition & 0 deletions plugins/search/service/include/service/serviceprocess.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class ServiceProcess : public SearchServiceIf, public util::PipedProcess
std::string classpath = compassRoot_ + "/lib/java/*";

::execlp("java", "java", "-server",
"-Dfile.encoding=UTF-8",
"-classpath", classpath.c_str(),
//"-Xdebug", "-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8666",
"-Djava.util.logging.config.class=cc.search.common.config.LogConfigurator",
Expand Down
Loading