Skip to content

Commit 557c6f0

Browse files
Remove unsed openOrGetStreamInput() and CompressorFactory`
1 parent 26b9464 commit 557c6f0

File tree

1 file changed

+14
-38
lines changed

1 file changed

+14
-38
lines changed

server/src/main/java/org/elasticsearch/transport/TransportLogger.java

Lines changed: 14 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.TransportVersion;
1414
import org.elasticsearch.TransportVersions;
1515
import org.elasticsearch.common.bytes.BytesReference;
16-
import org.elasticsearch.common.compress.CompressorFactory;
1716
import org.elasticsearch.common.io.stream.StreamInput;
1817
import org.elasticsearch.common.util.concurrent.ThreadContext;
1918
import org.elasticsearch.core.IOUtils;
@@ -111,55 +110,32 @@ private static String format(TcpChannel channel, BytesReference message, String
111110
return sb.toString();
112111
}
113112

114-
private static String format(TcpChannel channel, InboundMessage message, String event) throws IOException {
113+
private static String format(TcpChannel channel, InboundMessage message, String event) {
115114
final StringBuilder sb = new StringBuilder();
116115
sb.append(channel);
117116

118117
if (message.isPing()) {
119118
sb.append(" [ping]").append(' ').append(event).append(": ").append(6).append('B');
120119
} else {
121-
boolean success = false;
122120
Header header = message.getHeader();
123121
int networkMessageSize = header.getNetworkMessageSize();
124122
int messageLengthWithHeader = HEADER_SIZE + networkMessageSize;
125-
StreamInput streamInput = message.openOrGetStreamInput();
126-
try {
127-
final long requestId = header.getRequestId();
128-
final boolean isRequest = header.isRequest();
129-
final String type = isRequest ? "request" : "response";
130-
final String version = header.getVersion().toString();
131-
sb.append(" [length: ").append(messageLengthWithHeader);
132-
sb.append(", request id: ").append(requestId);
133-
sb.append(", type: ").append(type);
134-
sb.append(", version: ").append(version);
123+
final long requestId = header.getRequestId();
124+
final boolean isRequest = header.isRequest();
125+
final String type = isRequest ? "request" : "response";
126+
final String version = header.getVersion().toString();
127+
sb.append(" [length: ").append(messageLengthWithHeader);
128+
sb.append(", request id: ").append(requestId);
129+
sb.append(", type: ").append(type);
130+
sb.append(", version: ").append(version);
135131

136-
// TODO: Maybe Fix for BWC
137-
if (header.needsToReadVariableHeader() == false && isRequest) {
138-
sb.append(", action: ").append(header.getActionName());
139-
}
140-
sb.append(']');
141-
sb.append(' ').append(event).append(": ").append(messageLengthWithHeader).append('B');
142-
success = true;
143-
} finally {
144-
if (success) {
145-
IOUtils.close(streamInput);
146-
} else {
147-
IOUtils.closeWhileHandlingException(streamInput);
148-
}
132+
// TODO: Maybe Fix for BWC
133+
if (header.needsToReadVariableHeader() == false && isRequest) {
134+
sb.append(", action: ").append(header.getActionName());
149135
}
136+
sb.append(']');
137+
sb.append(' ').append(event).append(": ").append(messageLengthWithHeader).append('B');
150138
}
151139
return sb.toString();
152140
}
153-
154-
private static StreamInput decompressingStream(byte status, StreamInput streamInput) throws IOException {
155-
if (TransportStatus.isCompress(status) && streamInput.available() > 0) {
156-
try {
157-
return CompressorFactory.COMPRESSOR.threadLocalStreamInput(streamInput);
158-
} catch (IllegalArgumentException e) {
159-
throw new IllegalStateException("stream marked as compressed, but is missing deflate header");
160-
}
161-
} else {
162-
return streamInput;
163-
}
164-
}
165141
}

0 commit comments

Comments
 (0)