[V1, V2] Fix http compression #2645
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,110 @@ | ||
| package com.clickhouse.client.api.internal; | ||
|
|
||
| import org.apache.commons.compress.compressors.CompressorException; | ||
| import org.apache.commons.compress.compressors.CompressorStreamFactory; | ||
| import org.apache.hc.core5.function.Supplier; | ||
| import org.apache.hc.core5.http.Header; | ||
| import org.apache.hc.core5.http.HttpEntity; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.io.OutputStream; | ||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| public class CompressedEntity implements HttpEntity { | ||
|
|
||
| private HttpEntity httpEntity; | ||
| private final boolean isResponse; | ||
| private final CompressorStreamFactory compressorStreamFactory; | ||
| private final String compressionAlgo; | ||
|
|
||
| CompressedEntity(HttpEntity httpEntity, boolean isResponse, CompressorStreamFactory compressorStreamFactory) { | ||
| this.httpEntity = httpEntity; | ||
| this.isResponse = isResponse; | ||
| this.compressorStreamFactory = compressorStreamFactory; | ||
| this.compressionAlgo = getCompressionAlgoName(httpEntity.getContentEncoding()); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isRepeatable() { | ||
| return httpEntity.isRepeatable(); | ||
| } | ||
|
|
||
| @Override | ||
| public InputStream getContent() throws IOException, UnsupportedOperationException { | ||
| if (!isResponse) { | ||
| throw new UnsupportedOperationException("Unsupported: getting compressed content of request"); | ||
| } | ||
|
|
||
| try { | ||
| return compressorStreamFactory.createCompressorInputStream(compressionAlgo, httpEntity.getContent()); | ||
| } catch (CompressorException e) { | ||
| throw new IOException("Failed to create decompressing input stream", e); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public void writeTo(OutputStream outStream) throws IOException { | ||
| if (isResponse) { | ||
| // called by us to get compressed response | ||
| throw new UnsupportedOperationException("Unsupported: writing compressed response to elsewhere"); | ||
| } | ||
|
|
||
| try { | ||
| httpEntity.writeTo(compressorStreamFactory.createCompressorOutputStream(compressionAlgo, outStream)); | ||
| } catch (CompressorException e) { | ||
| throw new IOException("Failed to create compressing output stream", e); | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isStreaming() { | ||
| return httpEntity.isStreaming(); | ||
| } | ||
|
|
||
| @Override | ||
| public Supplier<List<? extends Header>> getTrailers() { | ||
| return httpEntity.getTrailers(); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws IOException { | ||
| httpEntity.close(); | ||
| } | ||
|
|
||
| @Override | ||
| public long getContentLength() { | ||
| return httpEntity.getContentLength(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getContentType() { | ||
| return httpEntity.getContentType(); | ||
| } | ||
|
|
||
| @Override | ||
| public String getContentEncoding() { | ||
| return httpEntity.getContentEncoding(); | ||
|
Comment on lines
+87
to
+88
Contributor
There was a problem hiding this comment. The |
||
| } | ||
|
|
||
| @Override | ||
| public boolean isChunked() { | ||
| return httpEntity.isChunked(); | ||
| } | ||
|
|
||
| @Override | ||
| public Set<String> getTrailerNames() { | ||
| return httpEntity.getTrailerNames(); | ||
| } | ||
|
|
||
| private String getCompressionAlgoName(String contentEncoding) { | ||
| String algo = contentEncoding; | ||
| if (algo.equalsIgnoreCase("gzip")) { | ||
| algo = CompressorStreamFactory.GZIP; | ||
| } else if (algo.equalsIgnoreCase("lz4")) { | ||
| algo = CompressorStreamFactory.LZ4_FRAMED; | ||
| } | ||
| return algo; | ||
| } | ||
| } | ||
This file contains hidden or 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 hidden or 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.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
httpEntityfield should be declared asfinalfor consistency with theLZ4Entityclass (line 18 of LZ4Entity.java) and to prevent accidental reassignment since it's set only in the constructor.