GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/195187
Change subject: Update to latest master
......................................................................
Update to latest master
Change-Id: I513f65627cbe0be4385e72fbfdc974a0886bf44a
---
M node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
M node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
M node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
M node_modules/istanbul/node_modules/mkdirp/package.json
M node_modules/mocha-jshint/package.json
M node_modules/mocha/node_modules/commander/package.json
M node_modules/mocha/node_modules/debug/node_modules/ms/package.json
M node_modules/mocha/node_modules/debug/package.json
M node_modules/mocha/node_modules/glob/package.json
M node_modules/mocha/node_modules/jade/node_modules/mkdirp/package.json
M node_modules/mocha/node_modules/mkdirp/package.json
M
node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
D node_modules/request/node_modules/isstream/LICENSE
A node_modules/request/node_modules/isstream/LICENSE.md
M node_modules/request/node_modules/isstream/README.md
M node_modules/request/node_modules/isstream/package.json
M node_modules/restbase-mod-table-cassandra/lib/db.js
M node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
M node_modules/restbase-mod-table-cassandra/package.json
A node_modules/restbase-mod-table-cassandra/tmp/create-varint-tbl.json
A node_modules/restbase-mod-table-cassandra/tmp/get-varint-range.json
A node_modules/restbase-mod-table-cassandra/tmp/insert-varint.json
A node_modules/restbase-mod-table-cassandra/tmp/proba.js
R node_modules/service-runner/node_modules/extend/.npmignore
R node_modules/service-runner/node_modules/extend/.travis.yml
R node_modules/service-runner/node_modules/extend/LICENSE
R node_modules/service-runner/node_modules/extend/README.md
R node_modules/service-runner/node_modules/extend/component.json
R node_modules/service-runner/node_modules/extend/index.js
R node_modules/service-runner/node_modules/extend/package.json
M node_modules/swagger-ui/node_modules/swagger-client/package.json
M node_modules/url-template/package.json
M restbase
33 files changed, 148 insertions(+), 76 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy
refs/changes/87/195187/1
diff --git
a/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
b/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
index 92eaac6..a6de8f3 100644
--- a/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
+++ b/node_modules/bunyan/node_modules/mv/node_modules/mkdirp/package.json
@@ -53,5 +53,6 @@
],
"directories": {},
"_shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
- "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+ "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
b/node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
index 915a365..46a04b1 100644
--- a/node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
+++ b/node_modules/istanbul/node_modules/fileset/node_modules/glob/package.json
@@ -36,7 +36,7 @@
"homepage": "https://github.com/isaacs/node-glob";,
"_id": "glob@3.2.11",
"_shasum": "4a973f635b9190f715d10987d5c00fd2815ebe3d",
- "_from": "glob@3.x",
+ "_from": "glob@~ 3.2.1",
"_npmVersion": "1.4.10",
"_npmUser": {
"name": "isaacs",
diff --git
a/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
b/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
index 7cd80f4..09e9ec4 100644
---
a/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
+++
b/node_modules/istanbul/node_modules/mkdirp/node_modules/minimist/package.json
@@ -62,5 +62,6 @@
],
"directories": {},
"_shasum": "857fcabfc3397d2625b8228262e86aa7a011b05d",
- "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";
+ "_resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/istanbul/node_modules/mkdirp/package.json
b/node_modules/istanbul/node_modules/mkdirp/package.json
index 92eaac6..a6de8f3 100644
--- a/node_modules/istanbul/node_modules/mkdirp/package.json
+++ b/node_modules/istanbul/node_modules/mkdirp/package.json
@@ -53,5 +53,6 @@
],
"directories": {},
"_shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
- "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+ "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha-jshint/package.json
b/node_modules/mocha-jshint/package.json
index 36262b6..2b3a402 100644
--- a/node_modules/mocha-jshint/package.json
+++ b/node_modules/mocha-jshint/package.json
@@ -50,6 +50,5 @@
"shasum": "a5a2f4eec4d148f20fa4b0d61b1098c5f50b44fa",
"tarball":
"http://registry.npmjs.org/mocha-jshint/-/mocha-jshint-0.0.9.tgz";
},
- "_resolved":
"https://registry.npmjs.org/mocha-jshint/-/mocha-jshint-0.0.9.tgz";,
- "readme": "ERROR: No README data found!"
+ "_resolved":
"https://registry.npmjs.org/mocha-jshint/-/mocha-jshint-0.0.9.tgz";
}
diff --git a/node_modules/mocha/node_modules/commander/package.json
b/node_modules/mocha/node_modules/commander/package.json
index f2b43dd..de917f5 100644
--- a/node_modules/mocha/node_modules/commander/package.json
+++ b/node_modules/mocha/node_modules/commander/package.json
@@ -66,5 +66,6 @@
"tarball": "http://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz";
+ "_resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
b/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
index 87ad70d..48de118 100644
--- a/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
+++ b/node_modules/mocha/node_modules/debug/node_modules/ms/package.json
@@ -40,5 +40,6 @@
"directories": {},
"_shasum": "d89c2124c6fdc1353d65a8b77bf1aac4b193708c",
"_resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz";,
- "readme": "ERROR: No README data found!"
+ "readme": "ERROR: No README data found!",
+ "scripts": {}
}
diff --git a/node_modules/mocha/node_modules/debug/package.json
b/node_modules/mocha/node_modules/debug/package.json
index e3c906e..f516035 100644
--- a/node_modules/mocha/node_modules/debug/package.json
+++ b/node_modules/mocha/node_modules/debug/package.json
@@ -66,5 +66,6 @@
"tarball": "http://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz";
+ "_resolved": "https://registry.npmjs.org/debug/-/debug-2.0.0.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/glob/package.json
b/node_modules/mocha/node_modules/glob/package.json
index b00d5b9..aa7a4e2 100644
--- a/node_modules/mocha/node_modules/glob/package.json
+++ b/node_modules/mocha/node_modules/glob/package.json
@@ -51,5 +51,6 @@
],
"directories": {},
"_shasum": "e313eeb249c7affaa5c475286b0e115b59839467",
- "_resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz";
+ "_resolved": "https://registry.npmjs.org/glob/-/glob-3.2.3.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/mocha/node_modules/jade/node_modules/mkdirp/package.json
b/node_modules/mocha/node_modules/jade/node_modules/mkdirp/package.json
index e856460..dc39920 100644
--- a/node_modules/mocha/node_modules/jade/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/jade/node_modules/mkdirp/package.json
@@ -53,6 +53,5 @@
"bugs": {
"url": "https://github.com/substack/node-mkdirp/issues";
},
- "readme": "ERROR: No README data found!",
- "homepage": "https://github.com/substack/node-mkdirp";
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/mocha/node_modules/mkdirp/package.json
b/node_modules/mocha/node_modules/mkdirp/package.json
index 92eaac6..a6de8f3 100644
--- a/node_modules/mocha/node_modules/mkdirp/package.json
+++ b/node_modules/mocha/node_modules/mkdirp/package.json
@@ -53,5 +53,6 @@
],
"directories": {},
"_shasum": "1d73076a6df986cd9344e15e71fcc05a4c9abf12",
- "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";
+ "_resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
index 85aec01..19228ab 100644
---
a/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
+++
b/node_modules/request/node_modules/bl/node_modules/readable-stream/node_modules/isarray/package.json
@@ -45,5 +45,9 @@
],
"directories": {},
"_shasum": "8a18acfca9a8f4177e09abfc6038939b05d1eedf",
- "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+ "_resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";,
+ "bugs": {
+ "url": "https://github.com/juliangruber/isarray/issues";
+ },
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/request/node_modules/isstream/LICENSE
b/node_modules/request/node_modules/isstream/LICENSE
deleted file mode 100644
index e7554b5..0000000
--- a/node_modules/request/node_modules/isstream/LICENSE
+++ /dev/null
@@ -1,39 +0,0 @@
-Copyright 2014, Rod Vagg (the "Original Author")
-All rights reserved.
-
-MIT +no-false-attribs License
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-Distributions of all or part of the Software intended to be used
-by the recipients as they would use the unmodified Software,
-containing modifications that substantially alter, remove, or
-disable functionality of the Software, outside of the documented
-configuration mechanisms provided by the Software, shall be
-modified such that the Original Author's bug reporting email
-addresses and urls are either replaced with the contact information
-of the parties responsible for the changes, or removed entirely.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-
-Except where noted, this license applies to any and all software
-programs and associated documentation files created by the
-Original Author, when distributed with the Software.
diff --git a/node_modules/request/node_modules/isstream/LICENSE.md
b/node_modules/request/node_modules/isstream/LICENSE.md
new file mode 100644
index 0000000..43f7153
--- /dev/null
+++ b/node_modules/request/node_modules/isstream/LICENSE.md
@@ -0,0 +1,11 @@
+The MIT License (MIT)
+=====================
+
+Copyright (c) 2015 Rod Vagg
+---------------------------
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
diff --git a/node_modules/request/node_modules/isstream/README.md
b/node_modules/request/node_modules/isstream/README.md
index e60fc8a..06770e8 100644
--- a/node_modules/request/node_modules/isstream/README.md
+++ b/node_modules/request/node_modules/isstream/README.md
@@ -63,4 +63,4 @@
## License
-**isStream** is Copyright (c) 2014 Rod Vagg
[@rvagg](https://twitter.com/rvagg) and licenced under the MIT licence. All
rights not explicitly granted in the MIT license are reserved. See the included
LICENSE file for more details.
+**isStream** is Copyright (c) 2015 Rod Vagg
[@rvagg](https://twitter.com/rvagg) and licenced under the MIT licence. All
rights not explicitly granted in the MIT license are reserved. See the included
LICENSE.md file for more details.
diff --git a/node_modules/request/node_modules/isstream/package.json
b/node_modules/request/node_modules/isstream/package.json
index 919643b..6c0a6da 100644
--- a/node_modules/request/node_modules/isstream/package.json
+++ b/node_modules/request/node_modules/isstream/package.json
@@ -1,6 +1,6 @@
{
"name": "isstream",
- "version": "0.1.1",
+ "version": "0.1.2",
"description": "Determine if an object is a Stream",
"main": "isstream.js",
"scripts": {
@@ -33,11 +33,12 @@
"url": "https://github.com/rvagg/isstream/issues";
},
"homepage": "https://github.com/rvagg/isstream";,
- "gitHead": "0406cfe2677231b7b23a229a61b15999bf60ce67",
- "_id": "isstream@0.1.1",
- "_shasum": "48332c5999893996ba253c81c7bd6e7ae0905c4f",
+ "gitHead": "cd39cba6da939b4fc9110825203adc506422c3dc",
+ "_id": "isstream@0.1.2",
+ "_shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
"_from": "isstream@~0.1.1",
- "_npmVersion": "1.4.28",
+ "_npmVersion": "2.6.1",
+ "_nodeVersion": "1.4.3",
"_npmUser": {
"name": "rvagg",
"email": "r...@vagg.org"
@@ -49,10 +50,10 @@
}
],
"dist": {
- "shasum": "48332c5999893996ba253c81c7bd6e7ae0905c4f",
- "tarball": "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz";
+ "shasum": "47e63f7af55afa6f92e1500e690eb8b8529c099a",
+ "tarball": "http://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";
},
"directories": {},
- "_resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz";,
+ "_resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz";,
"readme": "ERROR: No README data found!"
}
diff --git a/node_modules/restbase-mod-table-cassandra/lib/db.js
b/node_modules/restbase-mod-table-cassandra/lib/db.js
index b83fb82..db48549 100644
--- a/node_modules/restbase-mod-table-cassandra/lib/db.js
+++ b/node_modules/restbase-mod-table-cassandra/lib/db.js
@@ -877,9 +877,23 @@
});
// Execute the table creation query
- return tasks.then(function() {
+ var tableCreation = tasks.then(function() {
return self.client.execute_p(cql, [], {consistency: req.consistency});
});
+
+ // Create a Cassandra-native secondary index on the _domain attribute, for
+ // all tables except meta.
+ if (columnfamily !== 'meta') {
+ return tableCreation.then(function() {
+ var createIdx = 'CREATE INDEX IF NOT EXISTS ON '
+ + cassID(req.keyspace) + '.' + cassID(columnfamily) + '
("_domain")';
+ return self.client.execute_p(createIdx, [], {consistency:
req.consistency});
+ });
+ }
+ else {
+ return tableCreation;
+ }
+
};
DB.prototype._createKeyspace = function (req, options) {
diff --git
a/node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
b/node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
index 8a0aae5..bdbe740 100644
--- a/node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
+++ b/node_modules/restbase-mod-table-cassandra/node_modules/async/package.json
@@ -41,7 +41,7 @@
"shasum": "ac3613b1da9bed1b47510bb4651b8931e47146c7",
"tarball": "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
},
- "_from": "async@0.x.x",
+ "_from": "async@~0.9.0",
"_npmVersion": "1.4.3",
"_npmUser": {
"name": "caolan",
diff --git a/node_modules/restbase-mod-table-cassandra/package.json
b/node_modules/restbase-mod-table-cassandra/package.json
index ca65130..9de8a7a 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.5.1",
+ "version": "0.5.2",
"dependencies": {
"async": "0.x.x",
"bluebird": "~2.3.10",
@@ -26,13 +26,38 @@
"mocha": "x.x.x",
"mocha-jshint": "0.0.9"
},
- "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-mod-table-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[](https://travis-ci.org/wikimedia/restbase-mod-table-cassandra)\n[](https://coveralls.io/r/wikimedia/restbase-mod-table-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 <gwi...@wikimedia.org>\n* Hardik Juneja
<hardikjuneja...@gmail.com>\n",
- "readmeFilename": "Readme.md",
- "gitHead": "9de4c1ad62554a41e2be4838015081a96a3af8d0",
+ "gitHead": "122d78b23c6e5589572ad1b23b8d839eaa607ce0",
"bugs": {
"url": "https://github.com/wikimedia/restbase-mod-table-cassandra/issues";
},
- "_id": "restbase-mod-table-cassandra@0.5.1",
- "_shasum": "33a4ee23c097ab63a828b4b23b2fce04f2e74006",
- "_from": "restbase-mod-table-cassandra@^0.5.0"
+ "homepage": "https://github.com/wikimedia/restbase-mod-table-cassandra";,
+ "_id": "restbase-mod-table-cassandra@0.5.2",
+ "_shasum": "25dfd723a597199ff4a36f02c270a79253718577",
+ "_from": "restbase-mod-table-cassandra@^0.5.2",
+ "_npmVersion": "1.4.28",
+ "_npmUser": {
+ "name": "doorman",
+ "email": "marko.obro...@gmail.com"
+ },
+ "maintainers": [
+ {
+ "name": "doorman",
+ "email": "marko.obro...@gmail.com"
+ },
+ {
+ "name": "gwicke",
+ "email": "gabr...@gwicke.net"
+ },
+ {
+ "name": "earldouglas",
+ "email": "ja...@earldouglas.com"
+ }
+ ],
+ "dist": {
+ "shasum": "25dfd723a597199ff4a36f02c270a79253718577",
+ "tarball":
"http://registry.npmjs.org/restbase-mod-table-cassandra/-/restbase-mod-table-cassandra-0.5.2.tgz";
+ },
+ "directories": {},
+ "_resolved":
"https://registry.npmjs.org/restbase-mod-table-cassandra/-/restbase-mod-table-cassandra-0.5.2.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git
a/node_modules/restbase-mod-table-cassandra/tmp/create-varint-tbl.json
b/node_modules/restbase-mod-table-cassandra/tmp/create-varint-tbl.json
new file mode 100644
index 0000000..715fc81
--- /dev/null
+++ b/node_modules/restbase-mod-table-cassandra/tmp/create-varint-tbl.json
@@ -0,0 +1,13 @@
+{
+ domain: 'restbase.cassandra.test.local',
+ table: 'varintTable',
+ options: { durability: 'low' },
+ attributes: {
+ key: 'string',
+ rev: 'varint',
+ },
+ index: [
+ { attribute: 'key', type: 'hash' },
+ { attribute: 'rev', type: 'range', order: 'desc' }
+ ]
+}
diff --git
a/node_modules/restbase-mod-table-cassandra/tmp/get-varint-range.json
b/node_modules/restbase-mod-table-cassandra/tmp/get-varint-range.json
new file mode 100644
index 0000000..9281330
--- /dev/null
+++ b/node_modules/restbase-mod-table-cassandra/tmp/get-varint-range.json
@@ -0,0 +1,7 @@
+{
+ table: 'varintTable',
+ attributes: {
+ key: 'testing',
+ rev: { gt: 1 }
+ }
+}
diff --git a/node_modules/restbase-mod-table-cassandra/tmp/insert-varint.json
b/node_modules/restbase-mod-table-cassandra/tmp/insert-varint.json
new file mode 100644
index 0000000..11450ba
--- /dev/null
+++ b/node_modules/restbase-mod-table-cassandra/tmp/insert-varint.json
@@ -0,0 +1,7 @@
+{
+ table: 'varintTable',
+ attributes: {
+ key: 'testing',
+ rev: 5
+ }
+}
diff --git a/node_modules/restbase-mod-table-cassandra/tmp/proba.js
b/node_modules/restbase-mod-table-cassandra/tmp/proba.js
new file mode 100755
index 0000000..53d9640
--- /dev/null
+++ b/node_modules/restbase-mod-table-cassandra/tmp/proba.js
@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+
+"use strict";
+
+var util = require( 'util' );
+
+function keko( arr, elem ) {
+ arr.push( elem );
+ return true;
+}
+
+function proba() {
+ var a = [];
+ var b = "Seljak";
+ var c = 450;
+ a.push( b.constructor.name, c.constructor.name );
+ console.log( "A = %s", util.inspect( a ) );
+}
+
+var a = 1234;
+
+console.log('a is %s', typeof a);
+
diff --git a/node_modules/extend/.npmignore
b/node_modules/service-runner/node_modules/extend/.npmignore
similarity index 100%
rename from node_modules/extend/.npmignore
rename to node_modules/service-runner/node_modules/extend/.npmignore
diff --git a/node_modules/extend/.travis.yml
b/node_modules/service-runner/node_modules/extend/.travis.yml
similarity index 100%
rename from node_modules/extend/.travis.yml
rename to node_modules/service-runner/node_modules/extend/.travis.yml
diff --git a/node_modules/extend/LICENSE
b/node_modules/service-runner/node_modules/extend/LICENSE
similarity index 100%
rename from node_modules/extend/LICENSE
rename to node_modules/service-runner/node_modules/extend/LICENSE
diff --git a/node_modules/extend/README.md
b/node_modules/service-runner/node_modules/extend/README.md
similarity index 100%
rename from node_modules/extend/README.md
rename to node_modules/service-runner/node_modules/extend/README.md
diff --git a/node_modules/extend/component.json
b/node_modules/service-runner/node_modules/extend/component.json
similarity index 100%
rename from node_modules/extend/component.json
rename to node_modules/service-runner/node_modules/extend/component.json
diff --git a/node_modules/extend/index.js
b/node_modules/service-runner/node_modules/extend/index.js
similarity index 100%
rename from node_modules/extend/index.js
rename to node_modules/service-runner/node_modules/extend/index.js
diff --git a/node_modules/extend/package.json
b/node_modules/service-runner/node_modules/extend/package.json
similarity index 97%
rename from node_modules/extend/package.json
rename to node_modules/service-runner/node_modules/extend/package.json
index af0f4c9..e798f3e 100644
--- a/node_modules/extend/package.json
+++ b/node_modules/service-runner/node_modules/extend/package.json
@@ -40,7 +40,7 @@
"homepage": "https://github.com/justmoon/node-extend";,
"_id": "extend@1.3.0",
"_shasum": "d1516fb0ff5624d2ebf9123ea1dac5a1994004f8",
- "_from": "extend@~1.3.0",
+ "_from": "extend@^1.3.0",
"_npmVersion": "1.4.14",
"_npmUser": {
"name": "ljharb",
diff --git a/node_modules/swagger-ui/node_modules/swagger-client/package.json
b/node_modules/swagger-ui/node_modules/swagger-client/package.json
index af3c72f..4378b3b 100644
--- a/node_modules/swagger-ui/node_modules/swagger-client/package.json
+++ b/node_modules/swagger-ui/node_modules/swagger-client/package.json
@@ -65,5 +65,6 @@
"tarball":
"http://registry.npmjs.org/swagger-client/-/swagger-client-2.1.1-M1.tgz";
},
"directories": {},
- "_resolved":
"https://registry.npmjs.org/swagger-client/-/swagger-client-2.1.1-M1.tgz";
+ "_resolved":
"https://registry.npmjs.org/swagger-client/-/swagger-client-2.1.1-M1.tgz";,
+ "readme": "ERROR: No README data found!"
}
diff --git a/node_modules/url-template/package.json
b/node_modules/url-template/package.json
index 15d8ed5..3cebc03 100644
--- a/node_modules/url-template/package.json
+++ b/node_modules/url-template/package.json
@@ -31,8 +31,6 @@
"scripts": {
"test": "mocha --reporter spec"
},
- "readme": "## A JavaScript URI template implementation\n\nThis is a simple
URI template implementation following the [RFC 6570 URI Template
specification](http://tools.ietf.org/html/rfc6570). The implementation supports
all levels defined in the specification and is extensively tested.\n\n##
Installation\n\nFor use with Node.js you can install it through npm:\n\n $
npm install url-template\n\nIf you want to use it in a browser, copy
`lib/url-template.js` into your project and use the global `urltemplate`
instance. Alternatively you can use [Bower](http://bower.io/) to install this
package:\n\n $ bower install url-template\n\n## Example\n\n var template
= require('url-template');\n\n ...\n\n var emailUrl =
template.parse('/{email}/{folder}/{id}');\n\n // Returns
'/user@domain/test/42'\n emailUrl.expand({\n user: 'user@domain',\n
folder: 'test',\n id: 42\n });\n\n## A note on error handling and
reporting\n\nThe RFC states that errors in the templates could optionally be
handled and reported to the user. This implementation takes a slightly
different approach in that it tries to do a best effort template expansion and
leaves erroneous expressions in the returned URI instead of throwing errors. So
for example, the incorrect expression `{unclosed` will return `{unclosed` as
output. The leaves incorrect URLs to be handled by your URL library of
choice.\n",
- "readmeFilename": "README.md",
"_id": "url-template@2.0.4",
"description": "This is a simple URI template implementation following the
[RFC 6570 URI Template specification](http://tools.ietf.org/html/rfc6570). The
implementation supports all levels defined in the specification and is
extensively tested.",
"dist": {
@@ -55,5 +53,6 @@
"_resolved":
"https://registry.npmjs.org/url-template/-/url-template-2.0.4.tgz";,
"bugs": {
"url": "https://github.com/bramstein/url-template/issues";
- }
+ },
+ "readme": "ERROR: No README data found!"
}
diff --git a/restbase b/restbase
index f18d15b..efc2b2c 160000
--- a/restbase
+++ b/restbase
-Subproject commit f18d15b392ea556ffa1c0a863fd77417c0ea16b5
+Subproject commit efc2b2c4c386af6ab22fb13868e26dea0cdb4fee
--
To view, visit https://gerrit.wikimedia.org/r/195187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I513f65627cbe0be4385e72fbfdc974a0886bf44a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/restbase/deploy
Gerrit-Branch: master
Gerrit-Owner: GWicke <gwi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
