-
Notifications
You must be signed in to change notification settings - Fork 896
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Override
HttpRequestDecoder.createMessage() for perfomance (#4863)
Motivation: By overriding `HttpRequestDecoder.createMessage()`, performance can be improved because there is no need to copy original netty header. Result: - Closes #4853 - Performance is improved <!-- Visit this URL to learn more about how to write a pull request description: https://armeria.dev/community/developer-guide#how-to-write-pull-request-description --> --------- Co-authored-by: jrhee17 <guins_j@guins.org> Co-authored-by: minwoox <songmw725@gmail.com> Co-authored-by: Ikhun Um <ih.pert@gmail.com>
- Loading branch information
4 people
committed
Apr 11, 2024
1 parent
a20911a
commit 8a99f23
Showing
12 changed files
with
712 additions
and
45 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
core/src/main/java/com/linecorp/armeria/server/ArmeriaHttpHeadersFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| /* | ||
| * Copyright 2024 LINE Corporation | ||
| * | ||
| * LINE Corporation 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: | ||
| * | ||
| * https://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 com.linecorp.armeria.server; | ||
|
|
||
| import io.netty.handler.codec.http.HttpHeaders; | ||
| import io.netty.handler.codec.http.HttpHeadersFactory; | ||
|
|
||
| enum ArmeriaHttpHeadersFactory implements HttpHeadersFactory { | ||
|
|
||
| INSTANCE; | ||
|
|
||
| @Override | ||
| public HttpHeaders newHeaders() { | ||
| return new NettyHttp1Headers(); | ||
| } | ||
|
|
||
| @Override | ||
| public HttpHeaders newEmptyHeaders() { | ||
| return new NettyHttp1Headers(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
145 changes: 145 additions & 0 deletions
145
core/src/main/java/com/linecorp/armeria/server/HttpServerCodec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,145 @@ | ||
| /* | ||
| * Copyright 2023 LINE Corporation | ||
| * | ||
| * LINE Corporation 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: | ||
| * | ||
| * https://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. | ||
| */ | ||
| /* | ||
| * Copyright 2012 The Netty Project | ||
| * | ||
| * The Netty Project 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: | ||
| * | ||
| * https://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 com.linecorp.armeria.server; | ||
|
|
||
| import static io.netty.handler.codec.http.HttpObjectDecoder.DEFAULT_MAX_CHUNK_SIZE; | ||
| import static io.netty.handler.codec.http.HttpObjectDecoder.DEFAULT_MAX_HEADER_SIZE; | ||
| import static io.netty.handler.codec.http.HttpObjectDecoder.DEFAULT_MAX_INITIAL_LINE_LENGTH; | ||
|
|
||
| import java.util.ArrayDeque; | ||
| import java.util.List; | ||
| import java.util.Queue; | ||
|
|
||
| import io.netty.buffer.ByteBuf; | ||
| import io.netty.channel.ChannelHandlerContext; | ||
| import io.netty.channel.CombinedChannelDuplexHandler; | ||
| import io.netty.handler.codec.http.HttpClientCodec; | ||
| import io.netty.handler.codec.http.HttpHeaderNames; | ||
| import io.netty.handler.codec.http.HttpMessage; | ||
| import io.netty.handler.codec.http.HttpMethod; | ||
| import io.netty.handler.codec.http.HttpRequest; | ||
| import io.netty.handler.codec.http.HttpRequestDecoder; | ||
| import io.netty.handler.codec.http.HttpResponse; | ||
| import io.netty.handler.codec.http.HttpResponseEncoder; | ||
| import io.netty.handler.codec.http.HttpServerUpgradeHandler; | ||
| import io.netty.handler.codec.http.HttpStatusClass; | ||
| import io.netty.handler.codec.http.HttpVersion; | ||
|
|
||
| /** | ||
| * Forked from {@link HttpClientCodec} to override {@code HttpServerRequestDecoder#createMessage(String[])}. | ||
| * A combination of {@link HttpRequestDecoder} and {@link HttpResponseEncoder} | ||
| * which enables easier server side HTTP implementation. | ||
| */ | ||
| final class HttpServerCodec extends CombinedChannelDuplexHandler<HttpRequestDecoder, HttpResponseEncoder> | ||
| implements HttpServerUpgradeHandler.SourceCodec { | ||
|
|
||
| // Forked from https://github.com/netty/netty/blob/cf624c93c5f97097f1b13fe926ed50c32c8b1430/codec-http/src/main/java/io/netty/handler/codec/http/HttpServerCodec.java | ||
|
|
||
| /** A queue that is used for correlating a request and a response. */ | ||
| private final Queue<HttpMethod> queue = new ArrayDeque<HttpMethod>(); | ||
|
|
||
| /** | ||
| * Creates a new instance with the default decoder options | ||
| * ({@code maxInitialLineLength (4096}}, {@code maxHeaderSize (8192)}, and | ||
| * {@code maxChunkSize (8192)}). | ||
| */ | ||
| HttpServerCodec() { | ||
| this(DEFAULT_MAX_INITIAL_LINE_LENGTH, DEFAULT_MAX_HEADER_SIZE, DEFAULT_MAX_CHUNK_SIZE); | ||
| } | ||
|
|
||
| /** | ||
| * Creates a new instance with the specified decoder options. | ||
| */ | ||
| HttpServerCodec(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize) { | ||
| init(new HttpServerRequestDecoder(maxInitialLineLength, maxHeaderSize, maxChunkSize), | ||
| new HttpServerResponseEncoder()); | ||
| } | ||
|
|
||
| /** | ||
| * Upgrades to another protocol from HTTP. Removes the {@link HttpRequestDecoder} and | ||
| * {@link HttpResponseEncoder} from the pipeline. | ||
| */ | ||
| @Override | ||
| public void upgradeFrom(ChannelHandlerContext ctx) { | ||
| ctx.pipeline().remove(this); | ||
| } | ||
|
|
||
| private final class HttpServerRequestDecoder extends HttpRequestDecoder { | ||
|
|
||
| HttpServerRequestDecoder(int maxInitialLineLength, int maxHeaderSize, int maxChunkSize) { | ||
| super(maxInitialLineLength, maxHeaderSize, maxChunkSize); | ||
| } | ||
|
|
||
| @Override | ||
| protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> out) throws Exception { | ||
| final int oldSize = out.size(); | ||
| super.decode(ctx, buffer, out); | ||
| final int size = out.size(); | ||
| for (int i = oldSize; i < size; i++) { | ||
| final Object obj = out.get(i); | ||
| if (obj instanceof HttpRequest) { | ||
| queue.add(((HttpRequest) obj).method()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected HttpMessage createMessage(String[] initialLine) throws Exception { | ||
| return new NettyHttp1Request( | ||
| HttpVersion.valueOf(initialLine[2]), | ||
| HttpMethod.valueOf(initialLine[0]), initialLine[1]); | ||
| } | ||
| } | ||
|
|
||
| private final class HttpServerResponseEncoder extends HttpResponseEncoder { | ||
|
|
||
| private HttpMethod method; | ||
|
|
||
| @Override | ||
| protected void sanitizeHeadersBeforeEncode(HttpResponse msg, boolean isAlwaysEmpty) { | ||
| if (!isAlwaysEmpty && HttpMethod.CONNECT.equals(method) && | ||
| msg.status().codeClass() == HttpStatusClass.SUCCESS) { | ||
| // Stripping Transfer-Encoding: | ||
| // See section 3.3.1 of https://datatracker.ietf.org/doc/rfc7230 | ||
| msg.headers().remove(HttpHeaderNames.TRANSFER_ENCODING); | ||
| return; | ||
| } | ||
|
|
||
| super.sanitizeHeadersBeforeEncode(msg, isAlwaysEmpty); | ||
| } | ||
|
|
||
| @Override | ||
| protected boolean isContentAlwaysEmpty(@SuppressWarnings("unused") HttpResponse msg) { | ||
| method = queue.poll(); | ||
| return HttpMethod.HEAD.equals(method) || super.isContentAlwaysEmpty(msg); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.