From a24b971214a3d95ddb86f6c04171b84c26da2a61 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Thu, 6 Apr 2017 09:03:21 -0700
Subject: [PATCH] Rename compress_filter --> message_compress_filter
---
BUILD | 4 ++--
CMakeLists.txt | 8 ++++----
Makefile | 8 ++++----
binding.gyp | 2 +-
build.yaml | 4 ++--
config.m4 | 2 +-
gRPC-Core.podspec | 6 +++---
grpc.gemspec | 4 ++--
package.xml | 4 ++--
src/core/ext/filters/http/http_filters_plugin.c | 2 +-
.../message_compress_filter.c} | 2 +-
.../message_compress_filter.h} | 0
src/python/grpcio/grpc_core_dependencies.py | 2 +-
test/core/end2end/fixtures/h2_sockpair+trace.c | 2 +-
test/core/end2end/fixtures/h2_sockpair.c | 2 +-
test/core/end2end/fixtures/h2_sockpair_1byte.c | 2 +-
test/cpp/microbenchmarks/bm_call_create.cc | 2 +-
tools/doxygen/Doxyfile.core.internal | 4 ++--
tools/run_tests/generated/sources_and_headers.json | 6 +++---
19 files changed, 33 insertions(+), 33 deletions(-)
rename src/core/ext/filters/http/{compress/compress_filter.c => message_compress/message_compress_filter.c} (99%)
rename src/core/ext/filters/http/{compress/compress_filter.h => message_compress/message_compress_filter.h} (100%)
diff --git a/BUILD b/BUILD
index bc4f4eb978..83cf3e651a 100644
--- a/BUILD
+++ b/BUILD
@@ -780,12 +780,12 @@ grpc_cc_library(
grpc_cc_library(
name = "grpc_http_filters",
hdrs = [
- "src/core/ext/filters/http/compress/compress_filter.h",
+ "src/core/ext/filters/http/message_compress/message_compress_filter.h",
"src/core/ext/filters/http/client/http_client_filter.h",
"src/core/ext/filters/http/server/http_server_filter.h",
],
srcs = [
- "src/core/ext/filters/http/compress/compress_filter.c",
+ "src/core/ext/filters/http/message_compress/message_compress_filter.c",
"src/core/ext/filters/http/client/http_client_filter.c",
"src/core/ext/filters/http/server/http_server_filter.c",
"src/core/ext/filters/http/http_filters_plugin.c"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 089e028bff..f79d7154a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1051,7 +1051,7 @@ add_library(grpc
src/core/ext/transport/chttp2/transport/writing.c
src/core/ext/transport/chttp2/alpn/alpn.c
src/core/ext/filters/http/client/http_client_filter.c
- src/core/ext/filters/http/compress/compress_filter.c
+ src/core/ext/filters/http/message_compress/message_compress_filter.c
src/core/ext/filters/http/http_filters_plugin.c
src/core/ext/filters/http/server/http_server_filter.c
src/core/lib/http/httpcli_security_connector.c
@@ -1377,7 +1377,7 @@ add_library(grpc_cronet
src/core/ext/transport/chttp2/transport/writing.c
src/core/ext/transport/chttp2/alpn/alpn.c
src/core/ext/filters/http/client/http_client_filter.c
- src/core/ext/filters/http/compress/compress_filter.c
+ src/core/ext/filters/http/message_compress/message_compress_filter.c
src/core/ext/filters/http/http_filters_plugin.c
src/core/ext/filters/http/server/http_server_filter.c
src/core/ext/filters/client_channel/channel_connectivity.c
@@ -1939,7 +1939,7 @@ add_library(grpc_unsecure
src/core/ext/transport/chttp2/transport/writing.c
src/core/ext/transport/chttp2/alpn/alpn.c
src/core/ext/filters/http/client/http_client_filter.c
- src/core/ext/filters/http/compress/compress_filter.c
+ src/core/ext/filters/http/message_compress/message_compress_filter.c
src/core/ext/filters/http/http_filters_plugin.c
src/core/ext/filters/http/server/http_server_filter.c
src/core/ext/transport/chttp2/server/chttp2_server.c
@@ -2687,7 +2687,7 @@ add_library(grpc++_cronet
src/core/ext/transport/chttp2/transport/writing.c
src/core/ext/transport/chttp2/alpn/alpn.c
src/core/ext/filters/http/client/http_client_filter.c
- src/core/ext/filters/http/compress/compress_filter.c
+ src/core/ext/filters/http/message_compress/message_compress_filter.c
src/core/ext/filters/http/http_filters_plugin.c
src/core/ext/filters/http/server/http_server_filter.c
src/core/ext/filters/client_channel/channel_connectivity.c
diff --git a/Makefile b/Makefile
index 035e92f8e4..f2ee6901cf 100644
--- a/Makefile
+++ b/Makefile
@@ -2956,7 +2956,7 @@ LIBGRPC_SRC = \
src/core/ext/transport/chttp2/transport/writing.c \
src/core/ext/transport/chttp2/alpn/alpn.c \
src/core/ext/filters/http/client/http_client_filter.c \
- src/core/ext/filters/http/compress/compress_filter.c \
+ src/core/ext/filters/http/message_compress/message_compress_filter.c \
src/core/ext/filters/http/http_filters_plugin.c \
src/core/ext/filters/http/server/http_server_filter.c \
src/core/lib/http/httpcli_security_connector.c \
@@ -3280,7 +3280,7 @@ LIBGRPC_CRONET_SRC = \
src/core/ext/transport/chttp2/transport/writing.c \
src/core/ext/transport/chttp2/alpn/alpn.c \
src/core/ext/filters/http/client/http_client_filter.c \
- src/core/ext/filters/http/compress/compress_filter.c \
+ src/core/ext/filters/http/message_compress/message_compress_filter.c \
src/core/ext/filters/http/http_filters_plugin.c \
src/core/ext/filters/http/server/http_server_filter.c \
src/core/ext/filters/client_channel/channel_connectivity.c \
@@ -3813,7 +3813,7 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/transport/chttp2/transport/writing.c \
src/core/ext/transport/chttp2/alpn/alpn.c \
src/core/ext/filters/http/client/http_client_filter.c \
- src/core/ext/filters/http/compress/compress_filter.c \
+ src/core/ext/filters/http/message_compress/message_compress_filter.c \
src/core/ext/filters/http/http_filters_plugin.c \
src/core/ext/filters/http/server/http_server_filter.c \
src/core/ext/transport/chttp2/server/chttp2_server.c \
@@ -4546,7 +4546,7 @@ LIBGRPC++_CRONET_SRC = \
src/core/ext/transport/chttp2/transport/writing.c \
src/core/ext/transport/chttp2/alpn/alpn.c \
src/core/ext/filters/http/client/http_client_filter.c \
- src/core/ext/filters/http/compress/compress_filter.c \
+ src/core/ext/filters/http/message_compress/message_compress_filter.c \
src/core/ext/filters/http/http_filters_plugin.c \
src/core/ext/filters/http/server/http_server_filter.c \
src/core/ext/filters/client_channel/channel_connectivity.c \
diff --git a/binding.gyp b/binding.gyp
index ad9d7c8f28..21cd56e684 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -792,7 +792,7 @@
'src/core/ext/transport/chttp2/transport/writing.c',
'src/core/ext/transport/chttp2/alpn/alpn.c',
'src/core/ext/filters/http/client/http_client_filter.c',
- 'src/core/ext/filters/http/compress/compress_filter.c',
+ 'src/core/ext/filters/http/message_compress/message_compress_filter.c',
'src/core/ext/filters/http/http_filters_plugin.c',
'src/core/ext/filters/http/server/http_server_filter.c',
'src/core/lib/http/httpcli_security_connector.c',
diff --git a/build.yaml b/build.yaml
index 1df62654a4..2d52b38fbf 100644
--- a/build.yaml
+++ b/build.yaml
@@ -472,11 +472,11 @@ filegroups:
- name: grpc_http_filters
headers:
- src/core/ext/filters/http/client/http_client_filter.h
- - src/core/ext/filters/http/compress/compress_filter.h
+ - src/core/ext/filters/http/message_compress/message_compress_filter.h
- src/core/ext/filters/http/server/http_server_filter.h
src:
- src/core/ext/filters/http/client/http_client_filter.c
- - src/core/ext/filters/http/compress/compress_filter.c
+ - src/core/ext/filters/http/message_compress/message_compress_filter.c
- src/core/ext/filters/http/http_filters_plugin.c
- src/core/ext/filters/http/server/http_server_filter.c
plugin: grpc_http_filters
diff --git a/config.m4 b/config.m4
index 85593afd3c..985de08562 100644
--- a/config.m4
+++ b/config.m4
@@ -226,7 +226,7 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/transport/chttp2/transport/writing.c \
src/core/ext/transport/chttp2/alpn/alpn.c \
src/core/ext/filters/http/client/http_client_filter.c \
- src/core/ext/filters/http/compress/compress_filter.c \
+ src/core/ext/filters/http/message_compress/message_compress_filter.c \
src/core/ext/filters/http/http_filters_plugin.c \
src/core/ext/filters/http/server/http_server_filter.c \
src/core/lib/http/httpcli_security_connector.c \
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index 9cd92835ac..b79a759438 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -381,7 +381,7 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/varint.h',
'src/core/ext/transport/chttp2/alpn/alpn.h',
'src/core/ext/filters/http/client/http_client_filter.h',
- 'src/core/ext/filters/http/compress/compress_filter.h',
+ 'src/core/ext/filters/http/message_compress/message_compress_filter.h',
'src/core/ext/filters/http/server/http_server_filter.h',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/composite/composite_credentials.h',
@@ -601,7 +601,7 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/writing.c',
'src/core/ext/transport/chttp2/alpn/alpn.c',
'src/core/ext/filters/http/client/http_client_filter.c',
- 'src/core/ext/filters/http/compress/compress_filter.c',
+ 'src/core/ext/filters/http/message_compress/message_compress_filter.c',
'src/core/ext/filters/http/http_filters_plugin.c',
'src/core/ext/filters/http/server/http_server_filter.c',
'src/core/lib/http/httpcli_security_connector.c',
@@ -832,7 +832,7 @@ Pod::Spec.new do |s|
'src/core/ext/transport/chttp2/transport/varint.h',
'src/core/ext/transport/chttp2/alpn/alpn.h',
'src/core/ext/filters/http/client/http_client_filter.h',
- 'src/core/ext/filters/http/compress/compress_filter.h',
+ 'src/core/ext/filters/http/message_compress/message_compress_filter.h',
'src/core/ext/filters/http/server/http_server_filter.h',
'src/core/lib/security/context/security_context.h',
'src/core/lib/security/credentials/composite/composite_credentials.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 0e4a3d6fec..2a6563f879 100755
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -297,7 +297,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/transport/chttp2/transport/varint.h )
s.files += %w( src/core/ext/transport/chttp2/alpn/alpn.h )
s.files += %w( src/core/ext/filters/http/client/http_client_filter.h )
- s.files += %w( src/core/ext/filters/http/compress/compress_filter.h )
+ s.files += %w( src/core/ext/filters/http/message_compress/message_compress_filter.h )
s.files += %w( src/core/ext/filters/http/server/http_server_filter.h )
s.files += %w( src/core/lib/security/context/security_context.h )
s.files += %w( src/core/lib/security/credentials/composite/composite_credentials.h )
@@ -517,7 +517,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/transport/chttp2/transport/writing.c )
s.files += %w( src/core/ext/transport/chttp2/alpn/alpn.c )
s.files += %w( src/core/ext/filters/http/client/http_client_filter.c )
- s.files += %w( src/core/ext/filters/http/compress/compress_filter.c )
+ s.files += %w( src/core/ext/filters/http/message_compress/message_compress_filter.c )
s.files += %w( src/core/ext/filters/http/http_filters_plugin.c )
s.files += %w( src/core/ext/filters/http/server/http_server_filter.c )
s.files += %w( src/core/lib/http/httpcli_security_connector.c )
diff --git a/package.xml b/package.xml
index 8cda68a266..0771774b4c 100644
--- a/package.xml
+++ b/package.xml
@@ -306,7 +306,7 @@
<file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/varint.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/transport/chttp2/alpn/alpn.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/http/client/http_client_filter.h" role="src" />
- <file baseinstalldir="/" name="src/core/ext/filters/http/compress/compress_filter.h" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/filters/http/message_compress/message_compress_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/http/server/http_server_filter.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/context/security_context.h" role="src" />
<file baseinstalldir="/" name="src/core/lib/security/credentials/composite/composite_credentials.h" role="src" />
@@ -526,7 +526,7 @@
<file baseinstalldir="/" name="src/core/ext/transport/chttp2/transport/writing.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/transport/chttp2/alpn/alpn.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/http/client/http_client_filter.c" role="src" />
- <file baseinstalldir="/" name="src/core/ext/filters/http/compress/compress_filter.c" role="src" />
+ <file baseinstalldir="/" name="src/core/ext/filters/http/message_compress/message_compress_filter.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/http/http_filters_plugin.c" role="src" />
<file baseinstalldir="/" name="src/core/ext/filters/http/server/http_server_filter.c" role="src" />
<file baseinstalldir="/" name="src/core/lib/http/httpcli_security_connector.c" role="src" />
diff --git a/src/core/ext/filters/http/http_filters_plugin.c b/src/core/ext/filters/http/http_filters_plugin.c
index a6e35bc181..825c21cb6a 100644
--- a/src/core/ext/filters/http/http_filters_plugin.c
+++ b/src/core/ext/filters/http/http_filters_plugin.c
@@ -34,7 +34,7 @@
#include <string.h>
#include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
#include "src/core/ext/filters/http/server/http_server_filter.h"
#include "src/core/lib/channel/channel_stack_builder.h"
#include "src/core/lib/surface/channel_init.h"
diff --git a/src/core/ext/filters/http/compress/compress_filter.c b/src/core/ext/filters/http/message_compress/message_compress_filter.c
similarity index 99%
rename from src/core/ext/filters/http/compress/compress_filter.c
rename to src/core/ext/filters/http/message_compress/message_compress_filter.c
index ab6c94a153..f110e7beb6 100644
--- a/src/core/ext/filters/http/compress/compress_filter.c
+++ b/src/core/ext/filters/http/message_compress/message_compress_filter.c
@@ -39,7 +39,7 @@
#include <grpc/support/alloc.h>
#include <grpc/support/log.h>
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
#include "src/core/lib/channel/channel_args.h"
#include "src/core/lib/compression/algorithm_metadata.h"
#include "src/core/lib/compression/message_compress.h"
diff --git a/src/core/ext/filters/http/compress/compress_filter.h b/src/core/ext/filters/http/message_compress/message_compress_filter.h
similarity index 100%
rename from src/core/ext/filters/http/compress/compress_filter.h
rename to src/core/ext/filters/http/message_compress/message_compress_filter.h
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index c858dc9e1f..afaf2acaa4 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -220,7 +220,7 @@ CORE_SOURCE_FILES = [
'src/core/ext/transport/chttp2/transport/writing.c',
'src/core/ext/transport/chttp2/alpn/alpn.c',
'src/core/ext/filters/http/client/http_client_filter.c',
- 'src/core/ext/filters/http/compress/compress_filter.c',
+ 'src/core/ext/filters/http/message_compress/message_compress_filter.c',
'src/core/ext/filters/http/http_filters_plugin.c',
'src/core/ext/filters/http/server/http_server_filter.c',
'src/core/lib/http/httpcli_security_connector.c',
diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c
index 5fc0e4ea73..c59b544902 100644
--- a/test/core/end2end/fixtures/h2_sockpair+trace.c
+++ b/test/core/end2end/fixtures/h2_sockpair+trace.c
@@ -47,7 +47,7 @@
#include <grpc/support/useful.h>
#include "src/core/ext/filters/client_channel/client_channel.h"
#include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
#include "src/core/ext/filters/http/server/http_server_filter.h"
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/lib/channel/connected_channel.h"
diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c
index 24ed048e7d..1cb4e70727 100644
--- a/test/core/end2end/fixtures/h2_sockpair.c
+++ b/test/core/end2end/fixtures/h2_sockpair.c
@@ -42,7 +42,7 @@
#include <grpc/support/useful.h>
#include "src/core/ext/filters/client_channel/client_channel.h"
#include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
#include "src/core/ext/filters/http/server/http_server_filter.h"
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/lib/channel/connected_channel.h"
diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c
index fee30946c4..9cd93c234a 100644
--- a/test/core/end2end/fixtures/h2_sockpair_1byte.c
+++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c
@@ -42,7 +42,7 @@
#include <grpc/support/useful.h>
#include "src/core/ext/filters/client_channel/client_channel.h"
#include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
#include "src/core/ext/filters/http/server/http_server_filter.h"
#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h"
#include "src/core/lib/channel/connected_channel.h"
diff --git a/test/cpp/microbenchmarks/bm_call_create.cc b/test/cpp/microbenchmarks/bm_call_create.cc
index ae6041733c..7221cf5512 100644
--- a/test/cpp/microbenchmarks/bm_call_create.cc
+++ b/test/cpp/microbenchmarks/bm_call_create.cc
@@ -48,7 +48,7 @@ extern "C" {
#include "src/core/ext/filters/client_channel/client_channel.h"
#include "src/core/ext/filters/deadline/deadline_filter.h"
#include "src/core/ext/filters/http/client/http_client_filter.h"
-#include "src/core/ext/filters/http/compress/compress_filter.h"
+#include "src/core/ext/filters/http/message_compress/message_compress_filter.h"
#include "src/core/ext/filters/http/server/http_server_filter.h"
#include "src/core/ext/filters/load_reporting/load_reporting_filter.h"
#include "src/core/ext/filters/message_size/message_size_filter.h"
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index 8bc5896e88..ca38e2fe0f 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -958,8 +958,8 @@ src/core/ext/filters/deadline/deadline_filter.c \
src/core/ext/filters/deadline/deadline_filter.h \
src/core/ext/filters/http/client/http_client_filter.c \
src/core/ext/filters/http/client/http_client_filter.h \
-src/core/ext/filters/http/compress/compress_filter.c \
-src/core/ext/filters/http/compress/compress_filter.h \
+src/core/ext/filters/http/message_compress/message_compress_filter.c \
+src/core/ext/filters/http/message_compress/message_compress_filter.h \
src/core/ext/filters/http/http_filters_plugin.c \
src/core/ext/filters/http/server/http_server_filter.c \
src/core/ext/filters/http/server/http_server_filter.h \
diff --git a/tools/run_tests/generated/sources_and_headers.json b/tools/run_tests/generated/sources_and_headers.json
index 6cf4494b12..63d6419146 100644
--- a/tools/run_tests/generated/sources_and_headers.json
+++ b/tools/run_tests/generated/sources_and_headers.json
@@ -8013,7 +8013,7 @@
],
"headers": [
"src/core/ext/filters/http/client/http_client_filter.h",
- "src/core/ext/filters/http/compress/compress_filter.h",
+ "src/core/ext/filters/http/message_compress/message_compress_filter.h",
"src/core/ext/filters/http/server/http_server_filter.h"
],
"is_filegroup": true,
@@ -8022,8 +8022,8 @@
"src": [
"src/core/ext/filters/http/client/http_client_filter.c",
"src/core/ext/filters/http/client/http_client_filter.h",
- "src/core/ext/filters/http/compress/compress_filter.c",
- "src/core/ext/filters/http/compress/compress_filter.h",
+ "src/core/ext/filters/http/message_compress/message_compress_filter.c",
+ "src/core/ext/filters/http/message_compress/message_compress_filter.h",
"src/core/ext/filters/http/http_filters_plugin.c",
"src/core/ext/filters/http/server/http_server_filter.c",
"src/core/ext/filters/http/server/http_server_filter.h"
--
GitLab