Merge 86163e1 into 3947c33

wikimedia · Apr 3, 2019 · 2ed4db6 · 2ed4db6
2 parents 3947c33 + 86163e1
commit 2ed4db6
Show file tree

Hide file tree

Showing 14 changed files with 88 additions and 208 deletions.
diff --git a/lib/mwUtil.js b/lib/mwUtil.js
@@ -17,12 +17,13 @@ const mwUtil = {};
 /**
  * Create an etag value of the form
  * "<revision>/<tid>/<optional_suffix>"
- * @param   {Integer}   rev         page revision number
- * @param   {string}    tid         page render UUID
+ * @param   {Integer}   [rev]       page revision number
+ * @param   {string}    [tid]       page render UUID
  * @param   {string}    [suffix]    optional suffix
  * @return  {string}                the value of the ETag header
  */
-mwUtil.makeETag = (rev, tid, suffix) => {
+mwUtil.makeETag = (rev = 0, tid, suffix) => {
+    tid = tid || uuid.now();
     let etag = `"${rev}/${tid}`;
     if (suffix) {
         etag += `/${suffix}`;

diff --git a/projects/dev.yaml b/projects/dev.yaml
@@ -118,18 +118,4 @@ paths:
                 - path: sys/mobileapps.js
                   options: '{{merge({"response_cache_control": options.purged_cache_control},
                                 options.mobileapps)}}'
-            /mobile_bucket:
-              x-modules:
-                - path: sys/multi_content_bucket.js
-                  options:
-                    grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
-                    delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
-                    table_name_prefix: mobile
-                    main_content_type:
-                      name: lead
-                      value_type: json
-                    dependent_content_types:
-                      - name: remaining
-                        value_type: json
-        options: '{{options}}'
 
diff --git a/projects/wmf_enwiki.yaml b/projects/wmf_enwiki.yaml
@@ -18,12 +18,12 @@ paths:
                   allows us to contact you quickly. Email addresses or URLs
                   of contact pages work well.
 
-                By using this API, you agree to Wikimedia's 
+                By using this API, you agree to Wikimedia's
                 [Terms of Use](https://wikimediafoundation.org/wiki/Terms_of_Use) and
                 [Privacy Policy](https://wikimediafoundation.org/wiki/Privacy_policy).
                 Unless otherwise specified in the endpoint documentation
                 below, content accessed via this API is licensed under the
-                [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) 
+                [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
                 and [GFDL](https://www.gnu.org/copyleft/fdl.html) licenses,
                 and you irrevocably agree to release modifications or
                 additions made through this API under these licenses.
@@ -221,19 +221,6 @@ paths:
                 - path: sys/mobileapps.js
                   options: '{{merge({"response_cache_control": options.purged_cache_control},
                                 options.mobileapps)}}'
-            /mobile_bucket:
-              x-modules:
-                - path: sys/multi_content_bucket.js
-                  options:
-                    grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
-                    delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
-                    table_name_prefix: mobile_ng
-                    main_content_type:
-                      name: lead
-                      value_type: json
-                    dependent_content_types:
-                      - name: remaining
-                        value_type: json
             /events:
               x-modules:
                 - path: sys/events.js

diff --git a/projects/wmf_wikipedia.yaml b/projects/wmf_wikipedia.yaml
@@ -18,12 +18,12 @@ paths:
                   allows us to contact you quickly. Email addresses or URLs
                   of contact pages work well.
 
-                By using this API, you agree to Wikimedia's 
+                By using this API, you agree to Wikimedia's
                 [Terms of Use](https://wikimediafoundation.org/wiki/Terms_of_Use) and
                 [Privacy Policy](https://wikimediafoundation.org/wiki/Privacy_policy).
                 Unless otherwise specified in the endpoint documentation
                 below, content accessed via this API is licensed under the
-                [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) 
+                [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
                 and [GFDL](https://www.gnu.org/copyleft/fdl.html) licenses,
                 and you irrevocably agree to release modifications or
                 additions made through this API under these licenses.
@@ -242,19 +242,6 @@ paths:
                 - path: sys/mobileapps.js
                   options: '{{merge({"response_cache_control": options.purged_cache_control},
                                 options.mobileapps)}}'
-            /mobile_bucket:
-              x-modules:
-                - path: sys/multi_content_bucket.js
-                  options:
-                    grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
-                    delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
-                    table_name_prefix: mobile_ng
-                    main_content_type:
-                      name: lead
-                      value_type: json
-                    dependent_content_types:
-                      - name: remaining
-                        value_type: json
             /events:
               x-modules:
                 - path: sys/events.js

diff --git a/projects/wmf_wikivoyage.yaml b/projects/wmf_wikivoyage.yaml
@@ -179,19 +179,6 @@ paths:
               x-modules:
                 - path: sys/mobileapps.js
                   options: '{{merge({"response_cache_control": options.purged_cache_control}, options.mobileapps)}}'
-            /mobile_bucket:
-              x-modules:
-                - path: sys/multi_content_bucket.js
-                  options:
-                    grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
-                    delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
-                    table_name_prefix: mobile_ng
-                    main_content_type:
-                      name: lead
-                      value_type: json
-                    dependent_content_types:
-                      - name: remaining
-                        value_type: json
             /events:
               x-modules:
                 - path: sys/events.js

diff --git a/projects/wmf_wiktionary.yaml b/projects/wmf_wiktionary.yaml
@@ -19,15 +19,15 @@ paths:
                   allows us to contact you quickly. Email addresses or URLs
                   of contact pages work well.
 
-                By using this API, you agree to Wikimedia's 
+                By using this API, you agree to Wikimedia's
                 [Terms of Use](https://wikimediafoundation.org/wiki/Terms_of_Use) and
                 [Privacy Policy](https://wikimediafoundation.org/wiki/Privacy_policy).
                 Unless otherwise specified in the endpoint documentation
                 below, content accessed via this API is licensed under the
-                [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/) 
+                [CC-BY-SA 3.0](https://creativecommons.org/licenses/by-sa/3.0/)
                 and [GFDL](https://www.gnu.org/copyleft/fdl.html) licenses,
                 and you irrevocably agree to release modifications or
-                additions made through this API under these licenses. 
+                additions made through this API under these licenses.
                 See https://www.mediawiki.org/wiki/REST_API for background and details.
 
                 ### Endpoint documentation
@@ -174,19 +174,6 @@ paths:
                 - path: sys/mobileapps.js
                   options: '{{merge({"response_cache_control": options.purged_cache_control},
                                 options.mobileapps)}}'
-            /mobile_bucket:
-              x-modules:
-                - path: sys/multi_content_bucket.js
-                  options:
-                    grace_ttl: '{{default(options.parsoid.grace_ttl, 86400)}}'
-                    delete_probability: '{{default(options.parsoid.delete_probability, 1)}}'
-                    table_name_prefix: mobile_ng
-                    main_content_type:
-                      name: lead
-                      value_type: json
-                    dependent_content_types:
-                      - name: remaining
-                        value_type: json
             /events:
               x-modules:
                 - path: sys/events.js

diff --git a/sys/key_value.js b/sys/key_value.js
@@ -4,7 +4,6 @@
  * Key-value bucket handler
  */
 
-const uuid = require('cassandra-uuid').TimeUuid;
 const mwUtil = require('../lib/mwUtil');
 const HyperSwitch = require('hyperswitch');
 const stringify = require('fast-json-stable-stringify');
@@ -19,15 +18,9 @@ function returnRevision(req) {
     return (dbResult) => {
         if (dbResult.body && dbResult.body.items && dbResult.body.items.length) {
             const row = dbResult.body.items[0];
-            let headers = {
-                etag: row.headers.etag || mwUtil.makeETag('0', row.tid)
-            };
-            if (row.headers) {
-                headers = Object.assign(headers, row.headers);
-            }
             return {
                 status: 200,
-                headers,
+                headers: row.headers,
                 body: row.value
             };
         } else {
@@ -56,7 +49,7 @@ class KVBucket {
     }
 
     makeSchema(opts) {
-        const schemaVersionMajor = 5;
+        const schemaVersionMajor = 6;
 
         return {
             // Combine option & bucket version into a monotonically increasing
@@ -76,7 +69,6 @@ class KVBucket {
             },
             attributes: {
                 key: opts.keyType || 'string',
-                tid: 'timeuuid',
                 headers: 'json',
                 value: opts.valueType || 'blob'
             },
@@ -88,7 +80,13 @@ class KVBucket {
 
     getRevision(hyper, req) {
         if (mwUtil.isNoCacheRequest(req)) {
-            throw new HTTPError({ status: 404 });
+            throw new HTTPError({
+                status: 404,
+                body: {
+                    type: 'not_found',
+                    description: 'Not attempting to fetch content for no-cache request'
+                }
+            });
         }
 
         const rp = req.params;
@@ -98,8 +96,7 @@ class KVBucket {
                 table: rp.bucket,
                 attributes: {
                     key: rp.key
-                },
-                limit: 1
+                }
             }
         };
         return hyper.get(storeReq).then(returnRevision(req));
@@ -114,7 +111,6 @@ class KVBucket {
                 attributes: {
                     key: req.params.key
                 },
-                proj: ['tid'],
                 limit: 1000
             }
         };
@@ -132,20 +128,8 @@ class KVBucket {
 
     putRevision(hyper, req) {
         const rp = req.params;
-        let tid = rp.tid && mwUtil.coerceTid(rp.tid, 'key_value');
-
-        if (!tid) {
-            tid = (mwUtil.parseETag(req.headers && req.headers.etag) || {}).tid;
-            tid = tid || uuid.now().toString();
-        }
-
         if (mwUtil.isNoStoreRequest(req)) {
-            return {
-                status: 202,
-                headers: {
-                    etag: req.headers && req.headers.etag || mwUtil.makeETag('0', tid)
-                }
-            };
+            return { status: 202 };
         }
 
         const doPut = () => hyper.put({
@@ -154,7 +138,6 @@ class KVBucket {
                 table: rp.bucket,
                 attributes: {
                     key: rp.key,
-                    tid,
                     value: req.body,
                     headers: req.headers
                 }
@@ -164,22 +147,15 @@ class KVBucket {
             if (res.status === 201) {
                 return {
                     status: 201,
-                    headers: {
-                        etag: req.headers && req.headers.etag || mwUtil.makeETag('0', tid)
-                    },
                     body: {
-                        message: 'Created.',
-                        tid
+                        message: 'Created.'
                     }
                 };
             } else {
                 throw res;
             }
         })
-        .catch((error) => {
-            hyper.logger.log('error/kv/putRevision', error);
-            return { status: 400 };
-        });
+        .tapCatch((error) => hyper.logger.log('error/kv/putRevision', error));
 
         if (req.headers['if-none-hash-match']) {
             delete req.headers['if-none-hash-match'];
@@ -191,14 +167,15 @@ class KVBucket {
                         (!req.headers['content-type'] ||
                         req.headers['content-type'] === oldContent.headers['content-type'])) {
                     hyper.metrics.increment(`sys_kv_${req.params.bucket}.unchanged_rev_render`);
-                    return {
+                    throw new HTTPError({
                         status: 412,
-                        headers: {
-                            etag: oldContent.headers.etag
+                        body: {
+                            type: 'precondition_failed',
+                            description: 'Not replacing existing content'
                         }
-                    };
+                    });
                 }
-                throw new HTTPError({ status: 404 });
+                return doPut();
             })
             .catch({ status: 404 }, doPut);
         } else {