GWicke has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/193023

Change subject: Pull in a cassandra module paging fix
......................................................................

Pull in a cassandra module paging fix

Change-Id: Ie163f30dc8dc3cbd2f7dd136790bac7df58e2917
---
M node_modules/istanbul/node_modules/mkdirp/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M node_modules/restbase-mod-table-cassandra/lib/db.js
M node_modules/restbase-mod-table-cassandra/package.json
4 files changed, 11 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy 
refs/changes/23/193023/1

diff --git a/node_modules/istanbul/node_modules/mkdirp/package.json 
b/node_modules/istanbul/node_modules/mkdirp/package.json
index a915c51..b7fe466 100644
--- a/node_modules/istanbul/node_modules/mkdirp/package.json
+++ b/node_modules/istanbul/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
     "shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
     "tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
   },
-  "_from": "[email protected]",
+  "_from": "[email protected]",
   "_npmVersion": "1.4.3",
   "_npmUser": {
     "name": "substack",
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json 
b/node_modules/mocha/node_modules/mkdirp/package.json
index a915c51..b7fe466 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/package.json
@@ -39,7 +39,7 @@
     "shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
     "tarball": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
   },
-  "_from": "[email protected]",
+  "_from": "[email protected]",
   "_npmVersion": "1.4.3",
   "_npmUser": {
     "name": "substack",
diff --git a/node_modules/restbase-mod-table-cassandra/lib/db.js 
b/node_modules/restbase-mod-table-cassandra/lib/db.js
index 11fcdc2..ac9f51d 100644
--- a/node_modules/restbase-mod-table-cassandra/lib/db.js
+++ b/node_modules/restbase-mod-table-cassandra/lib/db.js
@@ -147,9 +147,12 @@
                             if (result.meta.pageState) {
                                 token = 
result.meta.pageState.toString('base64')
                                     .replace(/\//g,'_').replace(/\+/g,'-')
-                                    // FIXME: use proper hashing
+                                    // FIXME: use proper hashing - this is
+                                    // nonsense.
                                     // See  
https://phabricator.wikimedia.org/T85640
-                                    + 
dbu.hashKey(self.conf.salt_key.toString() || 'deadbeef');
+                                    + dbu.hashKey(self.conf.salt_key
+                                            && self.conf.salt_key.toString()
+                                            || 'deadbeef');
                             }
                             resolve({
                                 items: rows,
diff --git a/node_modules/restbase-mod-table-cassandra/package.json 
b/node_modules/restbase-mod-table-cassandra/package.json
index 724e4a3..524f8ad 100644
--- a/node_modules/restbase-mod-table-cassandra/package.json
+++ b/node_modules/restbase-mod-table-cassandra/package.json
@@ -1,7 +1,7 @@
 {
   "name": "restbase-mod-table-cassandra",
   "description": "RESTBase table storage on Cassandra",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "dependencies": {
     "async": "0.x.x",
     "bluebird": "~2.3.10",
@@ -30,11 +30,11 @@
   },
   "readme": "# [RESTBase](https://github.com/gwicke/restbase) table storage on 
Cassandra\n\nProvides a high-level table storage service abstraction similar to 
Amazon\nDynamoDB or Google DataStore, with a Cassandra backend. See [the 
design\ndocs](https://github.com/gwicke/restbase-cassandra/tree/master/doc) 
for\ndetails and background.\n\nThis is the default table storage backend 
for\n[RESTBase](https://github.com/gwicke/restbase), and automatically 
installed as\nan npm module dependency (`restbase-cassandra`). See the install 
instructions\nthere.\n  \n## Issue tracking\n\nWe use [Phabricator to 
track\nissues](https://phabricator.wikimedia.org/maniphest/task/create/?projects=PHID-PROJ-xdgck5inpvozg2uwmj3f).
 See the [list of current issues in 
RESTBase-cassandra](https://phabricator.wikimedia.org/tag/restbase-cassandra/).\n\n##
 Status\n\nPreparing for production.\n\n[![Build 
Status](https://travis-ci.org/wikimedia/restbase-cassandra.svg?branch=master)](https://travis-ci.org/wikimedia/restbase-cassandra)\n[![coverage
 
status](https://coveralls.io/repos/wikimedia/restbase-cassandra/badge.png)](https://coveralls.io/r/wikimedia/restbase-cassandra)\n\nFeatures:\n-
 basic table storage service with REST interface, backed by Cassandra\n- 
multi-tenant design: domain creation, prepared for per-domain ACLs\n- table 
creation with declarative JSON schemas\n- secondary index creation and basic 
maintenance\n- data insertion and retrieval by primary key, including range 
queries\n\n### Next steps\n- More refined [secondary\n  
index](https://github.com/gwicke/restbase-cassandra/blob/master/doc/SecondaryIndexes.md)\n
  implementation\n    - range queries on secondary indexes\n- Refine HTTP 
interface & response formats, especially paging\n- Authentication (OAuth2 / JWT 
/ JWS / auth service callbacks) and ACLs\n- 
[Transactions](https://github.com/gwicke/restbase-cassandra/blob/master/doc/Transactions.md):\n
  light-weight CAS and 2PC\n- Get ready for production: robustness, 
performance, logging\n- Basic schema evolution support\n\n## Contributors\n* 
Gabriel Wicke <[email protected]>\n* Hardik Juneja 
<[email protected]>\n",
   "readmeFilename": "Readme.md",
-  "gitHead": "09f3e59e41686335088d4164a5b7698b999e0a7d",
+  "gitHead": "ab362856cf609f27d4d383e921aa7d74955ff984",
   "bugs": {
     "url": "https://github.com/wikimedia/restbase-mod-table-cassandra/issues";
   },
-  "_id": "[email protected]",
-  "_shasum": "3365663ec1831db33afb0caf274d35ece9adb23e",
+  "_id": "[email protected]",
+  "_shasum": "ca88e16de1be08c93f28a9904e2107bbf9508ce0",
   "_from": "restbase-mod-table-cassandra@^0.4.7"
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/193023
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie163f30dc8dc3cbd2f7dd136790bac7df58e2917
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to