Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2931 from dgquintas/none-to-identity

Browse Source 
Renamed "none" as "identity" for the no-op compression algorithm
pull/2938/head
Yang Gao 9 years ago
parent 685674c554 cddd95bfd8
commit 0791cf0dcd
2 changed files with 5 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/core/compression/algorithm.c
  2. 6
      test/core/end2end/tests/request_with_compressed_payload.c

4
src/core/compression/algorithm.c
Unescape View File

@ -37,7 +37,7 @@
int grpc_compression_algorithm_parse(const char* name, int grpc_compression_algorithm_parse(const char* name,
grpc_compression_algorithm *algorithm) { grpc_compression_algorithm *algorithm) {
if (strcmp(name, "none") == 0) { if (strcmp(name, "identity") == 0) {
*algorithm = GRPC_COMPRESS_NONE; *algorithm = GRPC_COMPRESS_NONE;
} else if (strcmp(name, "gzip") == 0) { } else if (strcmp(name, "gzip") == 0) {
*algorithm = GRPC_COMPRESS_GZIP; *algorithm = GRPC_COMPRESS_GZIP;
@ -53,7 +53,7 @@ int grpc_compression_algorithm_name(grpc_compression_algorithm algorithm,
char **name) { char **name) {
switch (algorithm) { switch (algorithm) {
case GRPC_COMPRESS_NONE: case GRPC_COMPRESS_NONE:
*name = "none"; *name = "identity";
break; break;
case GRPC_COMPRESS_DEFLATE: case GRPC_COMPRESS_DEFLATE:
*name = "deflate"; *name = "deflate";

6
test/core/end2end/tests/request_with_compressed_payload.c
Unescape View File

@ -300,12 +300,12 @@ static void test_invoke_request_with_compressed_payload_md_override(
sizeof(gzip_compression_override.internal_data)); sizeof(gzip_compression_override.internal_data));
none_compression_override.key = GRPC_COMPRESS_REQUEST_ALGORITHM_KEY; none_compression_override.key = GRPC_COMPRESS_REQUEST_ALGORITHM_KEY;
none_compression_override.value = "none"; none_compression_override.value = "identity";
none_compression_override.value_length = 4; none_compression_override.value_length = 4;
memset(&none_compression_override.internal_data, 0, memset(&none_compression_override.internal_data, 0,
sizeof(none_compression_override.internal_data)); sizeof(none_compression_override.internal_data));
/* Channel default NONE, call override to GZIP */ /* Channel default NONE (aka IDENTITY), call override to GZIP */
request_with_payload_template( request_with_payload_template(
config, "test_invoke_request_with_compressed_payload_md_override_1", 0, config, "test_invoke_request_with_compressed_payload_md_override_1", 0,
GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, &gzip_compression_override); GRPC_COMPRESS_NONE, GRPC_COMPRESS_GZIP, &gzip_compression_override);
@ -315,7 +315,7 @@ static void test_invoke_request_with_compressed_payload_md_override(
config, "test_invoke_request_with_compressed_payload_md_override_2", 0, config, "test_invoke_request_with_compressed_payload_md_override_2", 0,
GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_GZIP, &gzip_compression_override); GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_GZIP, &gzip_compression_override);
/* Channel default DEFLATE, call override to NONE */ /* Channel default DEFLATE, call override to NONE (aka IDENTITY) */
request_with_payload_template( request_with_payload_template(
config, "test_invoke_request_with_compressed_payload_md_override_3", 0, config, "test_invoke_request_with_compressed_payload_md_override_3", 0,
GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_NONE, &none_compression_override); GRPC_COMPRESS_DEFLATE, GRPC_COMPRESS_NONE, &none_compression_override);

Write Preview
Loading…
Cancel
Save