Created
July 28, 2016 18:31
-
-
Save cbodley/c661d6124f3baf45b09eed322d2b2b06 to your computer and use it in GitHub Desktop.
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
diff --git a/src/rgw/CMakeLists.txt b/src/rgw/CMakeLists.txt | |
index 9648800..52b6eaa 100644 | |
--- a/src/rgw/CMakeLists.txt | |
+++ b/src/rgw/CMakeLists.txt | |
@@ -27,6 +27,7 @@ set(rgw_a_srcs | |
rgw_cache.cc | |
rgw_client_io.cc | |
rgw_common.cc | |
+ rgw_compression.cc | |
rgw_cors.cc | |
rgw_cors_s3.cc | |
rgw_dencoder.cc | |
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc | |
index b5be68a..3a81dd5 100644 | |
--- a/src/rgw/rgw_op.cc | |
+++ b/src/rgw/rgw_op.cc | |
@@ -2920,9 +2920,11 @@ void RGWPutObj::execute() | |
} | |
// add attr to bucket to know original size of data | |
- map<string, bufferlist>::iterator cmp = s->bucket_attrs.find(RGW_ATTR_COMPRESSION); | |
- if (cmp != s->bucket_attrs.end()) | |
- ::decode(bucket_size, cmp->second); | |
+ { | |
+ map<string, bufferlist>::iterator cmp = s->bucket_attrs.find(RGW_ATTR_COMPRESSION); | |
+ if (cmp != s->bucket_attrs.end()) | |
+ ::decode(bucket_size, cmp->second); | |
+ } | |
bucket_size += s->obj_size; | |
::encode(bucket_size, bs); | |
s->bucket_attrs[RGW_ATTR_COMPRESSION] = bs; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment