diff options
| -rw-r--r-- | container-search/src/test/java/com/yahoo/search/dispatch/rpc/MockClient.java | 3 | ||||
| -rw-r--r-- | vespajlib/src/main/java/com/yahoo/compress/Compressor.java | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/MockClient.java b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/MockClient.java index 3cc3257194c..b6b7a1f5819 100644 --- a/container-search/src/test/java/com/yahoo/search/dispatch/rpc/MockClient.java +++ b/container-search/src/test/java/com/yahoo/search/dispatch/rpc/MockClient.java @@ -83,7 +83,8 @@ public class MockClient implements Client { } } byte[] slimeBytes = BinaryFormat.encode(responseSlime); - Compressor.Compression compressionResult = compressor.compress(compression, slimeBytes); + CompressionType responseCompressionType = compression == CompressionType.INCOMPRESSIBLE ? CompressionType.NONE : compression; + Compressor.Compression compressionResult = compressor.compress(responseCompressionType, slimeBytes); GetDocsumsResponse response = new GetDocsumsResponse(compressionResult.type().getCode(), slimeBytes.length, compressionResult.data(), hitsContext); responseReceiver.receive(ResponseOrError.fromResponse(response)); diff --git a/vespajlib/src/main/java/com/yahoo/compress/Compressor.java b/vespajlib/src/main/java/com/yahoo/compress/Compressor.java index 6e14c3bd971..9e9fac936f4 100644 --- a/vespajlib/src/main/java/com/yahoo/compress/Compressor.java +++ b/vespajlib/src/main/java/com/yahoo/compress/Compressor.java @@ -88,8 +88,8 @@ public class Compressor { throw new IllegalArgumentException(requestedCompression + " is not supported"); } } - /** Compresses some data using the compression type of this compressor */ - public Compression compress(CompressionType requestedCompression, byte[] data) { return compress(type, data, Optional.empty()); } + /** Compresses some data using the requested compression type */ + public Compression compress(CompressionType requestedCompression, byte[] data) { return compress(requestedCompression, data, Optional.empty()); } /** Compresses some data using the compression type of this compressor */ public Compression compress(byte[] data, int uncompressedSize) { return compress(type, data, Optional.of(uncompressedSize)); } /** Compresses some data using the compression type of this compressor */ @@ -150,7 +150,7 @@ public class Compressor { * This will be either the requested compression or INCOMPRESSIBLE. */ public CompressionType type() { return compressionType; } - + /** Returns the uncompressed size of this data in bytes */ public int uncompressedSize() { return uncompressedSize; } |