From f09df7c02a2e917c64e358319fda7404d2a1e525 Mon Sep 17 00:00:00 2001
From: Petr Pchelko <ppchelko@wikimedia.org>
Date: Fri, 4 Dec 2015 15:17:54 +0300
Subject: [PATCH 1/2] Update dependencies and integrate jscs

---
 index.js                |  16 ++--
 lib/db.js               | 205 +++++++++++++---------------------------
 lib/dbutils.js          |  86 ++++++++---------
 lib/index.js            |   4 +-
 lib/revisionPolicy.js   |   2 +-
 lib/schemaMigration.js  |   3 +-
 lib/secondaryIndexes.js |   6 +-
 package.json            |  25 ++---
 test/index.js           |   2 +
 9 files changed, 138 insertions(+), 211 deletions(-)

diff --git a/index.js b/index.js
index 7a1f90b..0e5983d 100644
--- a/index.js
+++ b/index.js
@@ -6,7 +6,7 @@
 // global includes
 var spec = require('restbase-mod-table-spec').spec;
 
-function RBCassandra (options) {
+function RBCassandra(options) {
     this.options = options;
     this.conf = options.conf;
     this.log = options.log;
@@ -24,7 +24,7 @@ function RBCassandra (options) {
     };
 }
 
-RBCassandra.prototype.createTable = function (rb, req) {
+RBCassandra.prototype.createTable = function(rb, req) {
     var store = this.store;
     // XXX: decide on the interface
     req.body.table = req.params.table;
@@ -64,7 +64,7 @@ RBCassandra.prototype.createTable = function (rb, req) {
 };
 
 // Query a table
-RBCassandra.prototype.get = function (rb, req) {
+RBCassandra.prototype.get = function(rb, req) {
     var rp = req.params;
     if (!rp.rest && !req.body) {
         // Return the entire table
@@ -97,7 +97,7 @@ RBCassandra.prototype.get = function (rb, req) {
 };
 
 // Update a table
-RBCassandra.prototype.put = function (rb, req) {
+RBCassandra.prototype.put = function(rb, req) {
     var domain = req.params.domain;
     // XXX: Use the path to determine the primary key?
     return this.store.put(domain, req.body)
@@ -120,7 +120,7 @@ RBCassandra.prototype.put = function (rb, req) {
     });
 };
 
-RBCassandra.prototype.dropTable = function (rb, req) {
+RBCassandra.prototype.dropTable = function(rb, req) {
     var domain = req.params.domain;
     return this.store.dropTable(domain, req.params.table)
     .then(function(res) {
@@ -142,7 +142,7 @@ RBCassandra.prototype.dropTable = function (rb, req) {
     });
 };
 
-RBCassandra.prototype.getTableSchema = function (rb, req) {
+RBCassandra.prototype.getTableSchema = function(rb, req) {
     var domain = req.params.domain;
     return this.store.getTableSchema(domain, req.params.table)
     .then(function(res) {
@@ -171,7 +171,7 @@ RBCassandra.prototype.getTableSchema = function (rb, req) {
  *
  * @return {Promise<registry>}
  */
-RBCassandra.prototype.setup = function setup () {
+RBCassandra.prototype.setup = function setup() {
     var self = this;
     // Set up storage backend
     var backend = require('./lib/index');
@@ -190,7 +190,7 @@ RBCassandra.prototype.setup = function setup () {
  * @return {Promise<registration>} with registration being the registration
  * object
  */
-function makeRBCassandra (options) {
+function makeRBCassandra(options) {
     var rb = new RBCassandra(options);
     return rb.setup();
 }
diff --git a/lib/db.js b/lib/db.js
index 8847975..b9cda3d 100644
--- a/lib/db.js
+++ b/lib/db.js
@@ -11,9 +11,9 @@ var SchemaMigrator = require('./schemaMigration');
 var secIndexes = require('./secondaryIndexes');
 
 /** @const */
-var validTextConsistencies = {all:1, localOne: 1, localQuorum:1};
+var validTextConsistencies = { all: 1, localOne: 1, localQuorum: 1 };
 
-function DB (client, options) {
+function DB(client, options) {
     this.conf = options.conf;
     this.log = options.log;
 
@@ -48,7 +48,7 @@ DB.prototype._initCaches = function() {
  * Set up internal request-related information and wrap it into an
  * InternalRequest instance.
  */
-DB.prototype._makeInternalRequest = function (domain, table, query, consistency) {
+DB.prototype._makeInternalRequest = function(domain, table, query, consistency) {
     consistency = consistency || this.defaultConsistency;
     if (query.consistency && query.consistency in validTextConsistencies) {
         consistency = cass.types.consistencies[query.consistency];
@@ -112,7 +112,7 @@ DB.prototype._fetchSchema = function(req) {
             return self.client.execute_p('SELECT columnfamily_name FROM '
                 + 'system.schema_columnfamilies WHERE keyspace_name=? '
                 + 'and columnfamily_name=?', [req.keyspace, 'meta'])
-            .then(function (res) {
+            .then(function(res) {
                 if (res && res.rows.length === 0) {
                     // meta column family doesn't exist yet
                     return req;
@@ -128,22 +128,22 @@ DB.prototype._fetchSchema = function(req) {
 /**
  * Process the storage group configuration.
  *
- * @param {Array} the array of group objects to read, each must contain
+ * @param {Array} groups the array of group objects to read, each must contain
  *                at least the name and domains keys
  * @return {Array} Array of storage group objects
  */
-DB.prototype._buildStorageGroups = function (groups) {
+DB.prototype._buildStorageGroups = function(groups) {
     var storageGroups = [];
-    if(!Array.isArray(groups)) {
+    if (!Array.isArray(groups)) {
         return storageGroups;
     }
     groups.forEach(function(group) {
         var grp = extend(true, {}, group);
-        if(!Array.isArray(grp.domains)) {
+        if (!Array.isArray(grp.domains)) {
             grp.domains = [grp.domains];
         }
         grp.domains = grp.domains.map(function(domain) {
-            if(/^\/.*\/$/.test(domain)) {
+            if (/^\/.*\/$/.test(domain)) {
                 return new RegExp(domain.slice(1, -1));
             }
             return domain;
@@ -163,7 +163,7 @@ DB.prototype._buildStorageGroups = function (groups) {
  * @param {string} table, the logical table name
  * @return {string} Valid Cassandra keyspace key
  */
-DB.prototype._keyspaceName = function (domain, table) {
+DB.prototype._keyspaceName = function(domain, table) {
     var cacheKey = JSON.stringify([domain,table]);
     var cachedName = this.keyspaceNameCache[cacheKey];
     if (cachedName) {
@@ -186,29 +186,29 @@ DB.prototype._keyspaceName = function (domain, table) {
  * @param {String} domain the domain's name
  * @return {Object} the group object matching the domain
  */
-DB.prototype._resolveStorageGroup = function (domain) {
+DB.prototype._resolveStorageGroup = function(domain) {
     var group = this.storageGroupsCache[domain];
     var idx;
-    if(group) {
+    if (group) {
         return group;
     }
     // not found in cache, find it
-    for(idx = 0; idx < this.storageGroups.length; idx++) {
+    for (idx = 0; idx < this.storageGroups.length; idx++) {
         var curr = this.storageGroups[idx];
         var domIdx;
-        for(domIdx = 0; domIdx < curr.domains.length; domIdx++) {
+        for (domIdx = 0; domIdx < curr.domains.length; domIdx++) {
             var dom = curr.domains[domIdx];
-            if(((dom instanceof RegExp) && dom.test(domain)) ||
+            if (((dom instanceof RegExp) && dom.test(domain)) ||
                     (typeof dom === 'string' && dom === domain)) {
                 group = curr;
                 break;
             }
         }
-        if(group) {
+        if (group) {
             break;
         }
     }
-    if(!group) {
+    if (!group) {
         // no group found, assume the domain is to
         // be grouped by itself
         group = {
@@ -239,7 +239,7 @@ DB.prototype.infoSchema = dbu.validateAndNormalizeSchema({
 
 DB.prototype.infoSchemaInfo = dbu.makeSchemaInfo(DB.prototype.infoSchema, true);
 
-DB.prototype.get = function (domain, query) {
+DB.prototype.get = function(domain, query) {
     var self = this;
     return this._makeInternalRequest(domain, query.table, query)
     .then(function(req) {
@@ -252,7 +252,7 @@ DB.prototype.get = function (domain, query) {
     });
 };
 
-DB.prototype._getRaw = function (req, options) {
+DB.prototype._getRaw = function(req, options) {
     var self = this;
     options = options || {};
 
@@ -267,24 +267,24 @@ DB.prototype._getRaw = function (req, options) {
 
     // Index queries are currently handled in buildGetQuery. See
     // https://phabricator.wikimedia.org/T78722 for secondary index TODOs.
-    //if (req.index) {
+    // if (req.index) {
     //    return this._getSecondaryIndex(keyspace, req, consistency, table, buildResult);
-    //}
+    // }
 
     // Paging request:
-    var cassOpts = {consistency: req.consistency, prepare: true};
+    var cassOpts = { consistency: req.consistency, prepare: true };
 
     if (req.query.limit) {
         cassOpts.fetchSize = req.query.limit;
 
         if (req.query.next) {
-            cassOpts.pageState = new Buffer( req.query.next, 'base64');
+            cassOpts.pageState = new Buffer(req.query.next, 'base64');
         }
     }
 
     var buildResult = dbu.buildGetQuery(req, options);
     return self.client.execute_p(buildResult.cql, buildResult.params, cassOpts)
-    .then(function(result){
+    .then(function(result) {
         var rows = result.rows;
         // Decorate the row result with the _ttl attribute.
         if (options.withTTLs) {
@@ -312,77 +312,6 @@ DB.prototype._getRaw = function (req, options) {
     });
 };
 
-/*
-    Handler for request GET requests on secondary indexes.
-    This is currently not used. TODO: fix.
-*/
-//DB.prototype._getSecondaryIndex = function(keyspace, domain, req,
-//        consistency, table, buildResult){
-//
-//    // TODO: handle '_tid' cases
-//    var self = this;
-//    return self.client.execute_p(buildResult.cql, buildResult.params,
-//            {consistency: consistency, prepare: true})
-//    .then(function(results) {
-//        var queries = [];
-//        var cachedSchema = self.schemaCache[keyspace];
-//
-//        // convert the result values
-//        results.rows.forEach(function (row) {
-//            dbu.convertRow(row, cachedSchema);
-//        });
-//
-//        var newReq = {
-//            table: table,
-//            attributes: {},
-//            limit: req.limit + Math.ceil(req.limit/4)
-//        };
-//
-//        // build main data queries
-//        for ( var rowno in results.rows ) {
-//            for ( var attr in cachedSchema.iKeyMap ) {
-//                newReq.attributes[attr] = results.rows[rowno][attr];
-//            }
-//            queries.push(dbu.buildGetQuery(keyspace, domain, newReq, consistency, table, cachedSchema));
-//            newReq.attributes = {};
-//        }
-//
-//        // prepare promises for batch execution
-//        var batchPromises = [];
-//        queries.forEach(function(item) {
-//            batchPromises.push(self.client.execute_p(item.cql, item.params,
-//                        item.options || {consistency: consistency, prepare: true}));
-//        });
-//
-//        // execute batch and check if limit is fulfilled
-//        return P.all(batchPromises).then(function(batchResults){
-//            var finalRows = [];
-//            batchResults.forEach(function(item){
-//                if (finalRows.length < req.limit) {
-//                    finalRows.push(dbu.convertRow(item.rows[0], cachedSchema));
-//                }
-//            });
-//            return [finalRows, results.rows[rowno]];
-//        });
-//    })
-//    .then(function(rows){
-//        //TODO: handle case when limit > no of entries in table
-//        if (rows[0].length<req.limit) {
-//            return self.indexReads(keyspace, domain, req, consistency, table, rows[1], rows[0]);
-//        }
-//        return rows[0];
-//    }).then(function(rows){
-//        // hide the columns property added by node-cassandra-cql
-//        // XXX: submit a patch to avoid adding it in the first place
-//        for (var row in rows) {
-//            row.columns = undefined;
-//        }
-//        return {
-//            items: rows
-//        };
-//    });
-//};
-
 /*
     Fetch index entries and compare them against data row for false positives
     - if limit is fullfilled return
@@ -395,7 +324,7 @@ DB.prototype.indexReads = function(keyspace, domain, req, consistency, table, st
         table: table,
         index: req.index,
         attributes: {},
-        limit: req.limit + Math.ceil(req.limit/4)
+        limit: req.limit + Math.ceil(req.limit / 4)
     };
 
     var internalColumns = {
@@ -404,11 +333,11 @@ DB.prototype.indexReads = function(keyspace, domain, req, consistency, table, st
     };
 
     var cachedSchema = this.schemaCache[keyspace].secondaryIndexes[req.index];
-    for(var item in startKey) {
-        if ( !internalColumns[item] && cachedSchema._attributeIndexes[item]) {
-            if (cachedSchema.attributes[item] === 'timeuuid' ) {
+    for (var item in startKey) {
+        if (!internalColumns[item] && cachedSchema._attributeIndexes[item]) {
+            if (cachedSchema.attributes[item] === 'timeuuid') {
                 // TODO : change 'le' to requested range conditions
-                newIndexReq.attributes[item] = {'le': startKey[item]};
+                newIndexReq.attributes[item] = { le: startKey[item] };
             } else {
                 newIndexReq.attributes[item] = startKey[item];
             }
@@ -421,18 +350,18 @@ DB.prototype.indexReads = function(keyspace, domain, req, consistency, table, st
     var self = this;
     var queries = [];
     var lastrow;
-    return new P(function(resolve, reject){
+    return new P(function(resolve, reject) {
         // stream  the main data table
         var stream = self.client.stream(buildResult.cql, buildResult.params,
                     {
                         autoPage: true,
-                        fetchSize: req.limit + Math.ceil(req.limit/4),
+                        fetchSize: req.limit + Math.ceil(req.limit / 4),
                         prepare: true,
                         consistency: consistency
                     })
-        .on('readable', function(){
+        .on('readable', function() {
             var row = dbu.convertRow(this.read(), cachedSchema);
-            for (row; row !== null; row=dbu.convertRow(this.read(), cachedSchema)) {
+            for (row; row !== null; row = dbu.convertRow(this.read(), cachedSchema)) {
                 lastrow = row;
                 var attributes = {};
                 var proj = {};
@@ -443,15 +372,15 @@ DB.prototype.indexReads = function(keyspace, domain, req, consistency, table, st
                                                 table: table,
                                                 attributes: attributes,
                                                 proj: proj,
-                                                limit: req.limit + Math.ceil(req.limit/4)},
+                                                limit: req.limit + Math.ceil(req.limit / 4) },
                                                 consistency, table, cachedSchema));
                 var finalRows = [];
-                if (finalRows.length<req.limit) {
+                if (finalRows.length < req.limit) {
                     return self.indexReads(keyspace, req, consistency, table, lastrow, finalRows);
                 } else {
                     return self.client.execute_p(item.cql, item.params,
-                            item.options || {consistency: consistency, prepare: true})
-                    .then(function(results){
+                            item.options || { consistency: consistency, prepare: true })
+                    .then(function(results) {
                         if (finalRows.length < req.limit) {
                             finalRows.push(dbu.convertRow(results.rows[0], cachedSchema));
                         }
@@ -462,7 +391,7 @@ DB.prototype.indexReads = function(keyspace, domain, req, consistency, table, st
     });
 };
 
-DB.prototype.put = function (domain, query) {
+DB.prototype.put = function(domain, query) {
     return this._makeInternalRequest(domain, query.table, query)
     .bind(this)
     .then(this._put);
@@ -490,12 +419,11 @@ DB.prototype._put = function(req) {
     // insert into secondary Indexes first
     var batch = [];
     if (schema.secondaryIndexes) {
-        for ( var idx in schema.secondaryIndexes) {
+        Object.keys(schema.secondaryIndexes).forEach(function(idx) {
             var secondarySchema = schema.secondaryIndexes[idx];
             if (!secondarySchema) {
                 throw new Error('Table not found!');
             }
-            //if (query.attributes.uri) { console.log(query.attributes.uri, query.timestamp); }
             var idxReq = req.extend({
                 columnfamily: dbu.idxColumnFamily(idx),
                 schema: secondarySchema
@@ -512,13 +440,12 @@ DB.prototype._put = function(req) {
             idxReq.query.attributes = newQueryAttributes;
 
             batch.push(dbu.buildPutQuery(idxReq));
-        }
+        });
     }
 
     batch.push(dbu.buildPutQuery(req));
 
-    //console.log(batch, schema);
-    var queryOptions = {consistency: req.consistency, prepare: true};
+    var queryOptions = { consistency: req.consistency, prepare: true };
     var update;
     if (batch.length === 1) {
         // Single query only (no secondary indexes): no need for a batch.
@@ -534,8 +461,7 @@ DB.prototype._put = function(req) {
         update = this.client.batch_p(driverBatch, queryOptions);
     }
 
-    if (self._shouldRunBackgroundUpdates(schema))
-    {
+    if (self._shouldRunBackgroundUpdates(schema)) {
         update = update.then(function() {
             return self._backgroundUpdates(req, 3);
         });
@@ -636,7 +562,7 @@ DB.prototype._backgroundUpdates = function(req, limit, indexes) {
     // Clone the query, and create le & gt variants
     var newerDataQuery = extend(true, {}, dataQuery);
     // 1) select one newer index entry
-    newerDataQuery.attributes[schema.tid] = { 'ge': reqTid };
+    newerDataQuery.attributes[schema.tid] = { ge: reqTid };
     newerDataQuery.order = {};
     newerDataQuery.order[schema.tid] = 'asc'; // select sibling entries
     newerDataQuery.limit = 2; // data entry + newer entry
@@ -671,7 +597,7 @@ DB.prototype._backgroundUpdates = function(req, limit, indexes) {
         throw e;
     })
     .then(function() {       // Query for 'limit' subsequent records
-        dataQuery.attributes[schema.tid] = {'lt': reqTid};
+        dataQuery.attributes[schema.tid] = { lt: reqTid };
 
         // Traverse the bulk of the data, in timestamp descending order
         // (reverse chronological)
@@ -685,7 +611,7 @@ DB.prototype._backgroundUpdates = function(req, limit, indexes) {
             self.client,
             dataGetInfo.cql,
             dataGetInfo.params,
-            {retries: 3, fetchSize: 5, log: self.log, withTTLs: true},
+            { retries: 3, fetchSize: 5, log: self.log, withTTLs: true },
             handler.handleRow.bind(handler)
         );
     })
@@ -698,13 +624,13 @@ DB.prototype._backgroundUpdates = function(req, limit, indexes) {
     });
 };
 
-DB.prototype.delete = function (domain, query) {
+DB.prototype.delete = function(domain, query) {
     return this._makeInternalRequest(domain, query.table, query)
     .bind(this)
     .then(this._delete);
 };
 
-DB.prototype._delete = function (req) {
+DB.prototype._delete = function(req) {
 
     // Mark _del with current timestamp and update the row.
     req.query.attributes._del = TimeUuid.now();
@@ -724,7 +650,7 @@ DB.prototype._delete = function (req) {
  */
 DB.prototype._migrateBackend = function(req, from, to) {
     // Perform a backend migration, as-needed.
-    switch(from._backend_version) {
+    switch (from._backend_version) {
     case 0:
         return this._dropDomainIndex(req);
     default:
@@ -754,7 +680,7 @@ DB.prototype._migrateIfNecessary = function(req, currentSchemaInfo, newSchema, n
         self.log('info/cassandra/schema_hash_mismatch',
                 'Schema hash mismatch: ' + currentSchemaInfo.hash
                 + ' != ' + newSchemaInfo.hash);
-        var migrator =new SchemaMigrator({
+        var migrator = new SchemaMigrator({
                 db: self,
                 client: self.client,
                 log: self.log,
@@ -790,7 +716,8 @@ DB.prototype._migrateIfNecessary = function(req, currentSchemaInfo, newSchema, n
                 status: 400,
                 body: {
                     type: 'bad_request',
-                    title: 'The table already exists, and it cannot be upgraded to the requested schema (' + error + ').',
+                    title: 'The table already exists, and it cannot be ' +
+                           'upgraded to the requested schema (' + error + ').',
                     keyspace: req.keyspace,
                     schema: newSchema,
                     stack: error.stack,
@@ -802,7 +729,7 @@ DB.prototype._migrateIfNecessary = function(req, currentSchemaInfo, newSchema, n
     }
 };
 
-DB.prototype.createTable = function (domain, query) {
+DB.prototype.createTable = function(domain, query) {
     var self = this;
     if (!query.table) {
         throw new Error('Table name required.');
@@ -874,7 +801,6 @@ DB.prototype.createTable = function (domain, query) {
             .catch(function(e) {
                 // TODO: proper error reporting:
                 if (retries--) {
-                    //console.error('Retrying..', retries, e);
                     // Increase the delay by a factor of 2 on average
                     delay = delay * (1.5 + Math.random());
                     return P.delay(delay).then(doCreateTables);
@@ -898,7 +824,7 @@ DB.prototype._getCassandraVersion = function() {
     }
 };
 
-DB.prototype._createTable = function (req, schema, columnfamily) {
+DB.prototype._createTable = function(req, schema, columnfamily) {
     var self = this;
 
     if (!schema.attributes) {
@@ -958,20 +884,18 @@ DB.prototype._createTable = function (req, schema, columnfamily) {
         cql += ' and clustering order by ( ' + orderBits.join(',') + ' )';
     }
 
-    //console.log(cql);
-
     // TODO: If the table already exists, check that the schema actually
     // matches / can be upgraded!
     // See https://phabricator.wikimedia.org/T75808.
     this.log('warn/table/cassandra/createTable', {
         message: 'Creating CF ' + columnfamily + ' in keyspace ' + req.keyspace,
         columnfamily: columnfamily,
-        keyspace : req.keyspace
+        keyspace: req.keyspace
     });
 
     // Execute the table creation query
     return tasks.then(function() {
-        return self.client.execute_p(cql, [], {consistency: req.consistency});
+        return self.client.execute_p(cql, [], { consistency: req.consistency });
     });
 };
 
@@ -980,7 +904,7 @@ DB.prototype._dropDomainIndex = function(req) {
     var self = this;
     var cql = "select index_name from system.schema_columns where keyspace_name = ? "
         + " and columnfamily_name = ? and column_name = '_domain';";
-    return self.client.execute_p(cql, [req.keyspace, req.columnfamily], {prepare: true})
+    return self.client.execute_p(cql, [req.keyspace, req.columnfamily], { prepare: true })
     .then(function(res) {
         if (res.rows.length && res.rows[0].index_name) {
             // drop the index
@@ -990,11 +914,11 @@ DB.prototype._dropDomainIndex = function(req) {
     });
 };
 
-DB.prototype._createKeyspace = function (req) {
+DB.prototype._createKeyspace = function(req) {
     var cql = 'create keyspace if not exists ' + cassID(req.keyspace)
         + ' WITH REPLICATION = ' + this._createReplicationOptionsCQL(req.query.options);
     return this.client.execute_p(cql, [],
-            {consistency: req.consistency || this.defaultConsistency});
+            { consistency: req.consistency || this.defaultConsistency });
 };
 
 DB.prototype._createReplicationOptionsCQL = function(options) {
@@ -1018,11 +942,11 @@ DB.prototype._replicationPolicy = function(options) {
     return replicas;
 };
 
-DB.prototype.dropTable = function (domain, table) {
+DB.prototype.dropTable = function(domain, table) {
     var keyspace = this._keyspaceName(domain, table);
     this.schemaCache[keyspace] = null;
     return this.client.execute_p('drop keyspace ' + cassID(keyspace), [],
-            {consistency: this.defaultConsistency});
+            { consistency: this.defaultConsistency });
 };
 
 DB.prototype.getTableSchema = function(domain, table) {
@@ -1066,7 +990,7 @@ DB.prototype._getReplication = function(domain, table) {
     if (!ks) {
         return datacenters;
     }
-    Object.keys(ks.strategyOptions).forEach(function (dc) {
+    Object.keys(ks.strategyOptions).forEach(function(dc) {
         datacenters[dc] = parseInt(ks.strategyOptions[dc]);
     });
     return P.resolve(datacenters);
@@ -1083,13 +1007,14 @@ DB.prototype._getReplication = function(domain, table) {
  */
 DB.prototype._setReplication = function(domain, table, options) {
     var keyspace = this._keyspaceName(domain, table);
-    var cql = "ALTER KEYSPACE " + dbu.cassID(keyspace) + " WITH replication = " + this._createReplicationOptionsCQL(options);
+    var cql = "ALTER KEYSPACE " + dbu.cassID(keyspace) +
+              " WITH replication = " + this._createReplicationOptionsCQL(options);
     this.log('warn/cassandra/replication', {
         message: 'Updating replication for ' + keyspace,
         replicas: this._replicationPolicy(options),
         durability: options && options.durability || null
     });
-    return this.client.execute_p(cql, [], {consistency: this.defaultConsistency});
+    return this.client.execute_p(cql, [], { consistency: this.defaultConsistency });
 };
 
 /**
@@ -1128,7 +1053,7 @@ DB.prototype.updateReplicationIfNecessary = function(domain, table, options) {
 /**
  * Wrap common internal request state
  */
-function InternalRequest (opts) {
+function InternalRequest(opts) {
     this.domain = opts.domain;
     this.table = opts.table;
     this.keyspace = opts.keyspace;
diff --git a/lib/dbutils.js b/lib/dbutils.js
index cae364a..cbb459e 100644
--- a/lib/dbutils.js
+++ b/lib/dbutils.js
@@ -7,7 +7,7 @@ var extend = require('extend');
 var cass = require('cassandra-driver');
 var util = require('util');
 var P = require('bluebird');
-var stable_stringify = require('json-stable-stringify');
+var stableStringify = require('json-stable-stringify');
 var validator = require('restbase-mod-table-spec').validator;
 var Long = require('cassandra-driver').types.Long;
 var semver = require('semver');
@@ -46,7 +46,7 @@ function HTTPError(response) {
 util.inherits(HTTPError, Error);
 dbu.HTTPError = HTTPError;
 
-dbu.cassID = function cassID (name) {
+dbu.cassID = function cassID(name) {
     if (/^[a-zA-Z0-9_]+$/.test(name)) {
         return '"' + name + '"';
     } else {
@@ -58,7 +58,7 @@ dbu.cassTTL = function cassTTL(name) {
     return '_ttl_' + name;
 };
 
-dbu.idxColumnFamily = function idxColumnFamily (name, bucket) {
+dbu.idxColumnFamily = function idxColumnFamily(name, bucket) {
     var idx = 'idx_' + name;
     if (bucket) {
         return idx + '_' + bucket;
@@ -73,7 +73,7 @@ dbu.tidNanoTime = function(tid) {
 };
 
 // Hash a key into a valid Cassandra key name
-dbu.hashKey = function hashKey (key) {
+dbu.hashKey = function hashKey(key) {
     return crypto.Hash('sha1')
         .update(key)
         .digest()
@@ -84,7 +84,7 @@ dbu.hashKey = function hashKey (key) {
         .replace(/=+$/, '');
 };
 
-dbu.getValidPrefix = function getValidPrefix (key) {
+dbu.getValidPrefix = function getValidPrefix(key) {
     var prefixMatch = /^[a-zA-Z0-9_]+/.exec(key);
     if (prefixMatch) {
         return prefixMatch[0];
@@ -93,7 +93,7 @@ dbu.getValidPrefix = function getValidPrefix (key) {
     }
 };
 
-dbu.makeValidKey = function makeValidKey (key, length) {
+dbu.makeValidKey = function makeValidKey(key, length) {
     var origKey = key;
     key = key.replace(/_/g, '__')
                 .replace(/\./g, '_');
@@ -121,8 +121,7 @@ dbu.assignMaxTTL = function assignMaxTTL(row) {
         if (/^_ttl_.+/.test(key)) {
             if (max === undefined) {
                 max = row[key];
-            }
-            else if (row[key] > max) {
+            } else if (row[key] > max) {
                 max = row[key];
             }
         }
@@ -221,7 +220,7 @@ dbu.validateAndNormalizeSchema = function validateAndNormalizeSchema(schema, con
 };
 
 // Extract the index keys from a table schema
-dbu.indexKeys = function indexKeys (index) {
+dbu.indexKeys = function indexKeys(index) {
     var res = [];
     index.forEach(function(elem) {
         if (elem.type === 'hash' || elem.type === 'range') {
@@ -231,7 +230,7 @@ dbu.indexKeys = function indexKeys (index) {
     return res;
 };
 
-dbu.makeIndexSchema = function makeIndexSchema (dataSchema, indexName) {
+dbu.makeIndexSchema = function makeIndexSchema(dataSchema, indexName) {
 
     var index = dataSchema.secondaryIndexes[indexName];
     var s = {
@@ -286,7 +285,7 @@ dbu.makeIndexSchema = function makeIndexSchema (dataSchema, indexName) {
     return s;
 };
 
-function encodeBlob (blob) {
+function encodeBlob(blob) {
     if (blob instanceof Buffer) {
         return blob;
     } else {
@@ -296,31 +295,31 @@ function encodeBlob (blob) {
 
 
 var schemaTypeToCQLTypeMap = {
-    'blob': 'blob',
+    blob: 'blob',
     'set<blob>': 'set<blob>',
-    'decimal': 'decimal',
+    decimal: 'decimal',
     'set<decimal>': 'set<decimal>',
-    'double': 'double',
+    double: 'double',
     'set<double>': 'set<double>',
-    'float': 'float',
+    float: 'float',
     'set<float>': 'set<float>',
-    'boolean': 'boolean',
+    boolean: 'boolean',
     'set<boolean>': 'set<boolean>',
-    'int': 'int',
+    int: 'int',
     'set<int>': 'set<int>',
-    'varint': 'varint',
+    varint: 'varint',
     'set<varint>': 'set<varint>',
-    'string': 'text',
+    string: 'text',
     'set<string>': 'set<text>',
-    'timeuuid': 'timeuuid',
+    timeuuid: 'timeuuid',
     'set<timeuuid>': 'set<timeuuid>',
-    'uuid': 'uuid',
+    uuid: 'uuid',
     'set<uuid>': 'set<uuid>',
-    'timestamp': 'timestamp',
+    timestamp: 'timestamp',
     'set<timestamp>': 'set<timestamp>',
-    'json': 'text',
+    json: 'text',
     'set<json>': 'set<text>',
-    'long': 'bigint',
+    long: 'bigint',
     'set<long>': 'set<bigint>'
 };
 
@@ -340,7 +339,7 @@ dbu.schemaTypeToCQLType = function(schemaType) {
  * @param {Object} convObj the conversion object to use for individual values (from dbu.conversions)
  * @returns {Object} an object with 'read' and 'write' attributes
  */
-function generateSetConvertor (convObj) {
+function generateSetConvertor(convObj) {
     if (!convObj) {
         return {
             write: function(arr) {
@@ -360,7 +359,7 @@ function generateSetConvertor (convObj) {
         read: null
     };
     if (convObj.write) {
-        res.write = function (valArray) {
+        res.write = function(valArray) {
             if (!Array.isArray(valArray) || valArray.length === 0) {
                 // Empty set is equivalent to null in Cassandra
                 return null;
@@ -370,7 +369,7 @@ function generateSetConvertor (convObj) {
         };
     }
     if (convObj.read) {
-        res.read = function (valArray) {
+        res.read = function(valArray) {
             return valArray.map(convObj.read);
         };
     }
@@ -394,7 +393,7 @@ dbu.conversions = {
     json: { write: JSON.stringify, read: JSON.parse },
     decimal: { read: toString() },
     timestamp: {
-        read: function (date) {
+        read: function(date) {
             return date.toISOString();
         }
     },
@@ -427,10 +426,10 @@ dbu.makeSchemaInfo = function makeSchemaInfo(schema, isMetaCF) {
     psi.conversions = {};
     for (var att in psi.attributes) {
         var type = psi.attributes[att];
-        var set_type = /^set<(\w+)>$/.exec(type);
-        if (set_type) {
+        var setType = /^set<(\w+)>$/.exec(type);
+        if (setType) {
             // this is a set-typed attribute
-            type = set_type[1];
+            type = setType[1];
             // generate the convertors only if the underlying type has them defined
             psi.conversions[att] = generateSetConvertor(dbu.conversions[type]);
         } else if (dbu.conversions[type]) {
@@ -511,7 +510,7 @@ dbu.makeSchemaInfo = function makeSchemaInfo(schema, isMetaCF) {
 
     // define a 'hash' string representation for the schema for quick schema
     // comparisons.
-    psi.hash = stable_stringify(psi);
+    psi.hash = stableStringify(psi);
 
     return psi;
 };
@@ -524,7 +523,7 @@ dbu.makeSchemaInfo = function makeSchemaInfo(schema, isMetaCF) {
  * @param {object} schema the schema info to use for conversion
  * @returns {array} a converted array of result rows
  */
-dbu.convertRows = function convertRows (rows, schema) {
+dbu.convertRows = function convertRows(rows, schema) {
     var conversions = schema.conversions;
     var newRows = new Array(rows.length);
     for (var i = 0; i < rows.length; i++) {
@@ -560,12 +559,12 @@ dbu.makeRawRequest = function(internalReq, extendFields) {
     extendFields.query = extend(true, {}, internalReq.query);
     var clonedReq = internalReq.extend(extendFields);
     var attrs = clonedReq.query.attributes;
-    if(!conversions || !attrs) {
+    if (!conversions || !attrs) {
         return clonedReq;
     }
     Object.keys(attrs).forEach(function(key) {
         var conv = conversions[key];
-        if(conv && conv.write) {
+        if (conv && conv.write) {
             attrs[key] = conv.write(attrs[key]);
         }
     });
@@ -583,7 +582,7 @@ dbu.makeRawRequest = function(internalReq, extendFields) {
  * @param {Boolean} noConvert if true, no attribute value conversion will take place
  * @return {object} queryInfo object with cql and params attributes
  */
-dbu.buildCondition = function buildCondition (predicates, schema, noConvert) {
+dbu.buildCondition = function buildCondition(predicates, schema, noConvert) {
     function convert(key, val) {
         var convObj = schema.conversions[key];
         if (!noConvert && convObj && convObj.write) {
@@ -594,7 +593,7 @@ dbu.buildCondition = function buildCondition (predicates, schema, noConvert) {
     }
 
     // make sure we have got a predicate object
-    if(!predicates || predicates.constructor !== Object) {
+    if (!predicates || predicates.constructor !== Object) {
         throw new Error('The condition predicate has not been supplied or is not an Object.');
     }
 
@@ -660,9 +659,6 @@ dbu.buildCondition = function buildCondition (predicates, schema, noConvert) {
  * @return {object} queryInfo object with cql and params attributes
  */
 dbu.buildPutQuery = function(req, noConvert) {
-
-    //table = schema.table;
-
     if (!req.schema) {
         throw new Error('Table not found!');
     }
@@ -707,7 +703,8 @@ dbu.buildPutQuery = function(req, noConvert) {
                 params.push(val);
             }
             placeholders.push('?');
-        } else if (!/^_ttl.*/.test(key) && !schema.attributes[key]) { // Allow TTL fields not in the schema
+        } else if (!/^_ttl.*/.test(key) && !schema.attributes[key]) {
+            // Allow TTL fields not in the schema
             throw new Error('Unknown attribute ' + key);
         }
     });
@@ -736,7 +733,8 @@ dbu.buildPutQuery = function(req, noConvert) {
     //   - Need to verify that all primary key members are supplied as well,
     //     else error.
 
-    var cql = '', condResult;
+    var cql = '';
+    var condResult;
 
     if (query.if && query.if.constructor === String) {
         query.if = query.if.trim().split(/\s+/).join(' ').toLowerCase();
@@ -920,7 +918,7 @@ dbu.buildGetQuery = function(req, options) {
         cql += limit ? ' limit ' + limit : '';
     }
 
-    return {cql: cql, params: params};
+    return { cql: cql, params: params };
 };
 
 dbu.getOptionCQL = function(options, db) {
@@ -938,7 +936,7 @@ var updateOptionMap = {
     'write-once': "{ 'class' : 'SizeTieredCompactionStrategy', "
         + "'tombstone_threshold': '0.02' }",
     'random-update': "{ 'class' : 'LeveledCompactionStrategy' }",
-    'timeseries': "{ 'class': 'DateTieredCompactionStrategy', "
+    timeseries: "{ 'class': 'DateTieredCompactionStrategy', "
         // Change base_time_seconds from 60s default to 45, for better
         // alignment with two-day expiry (24 hour TTL + 24 hour
         // gc_grace_seconds). See also:
diff --git a/lib/index.js b/lib/index.js
index 8a9675f..a3329fb 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -9,7 +9,7 @@ var DB = require('./db');
 
 P.promisifyAll(cass, { suffix: '_p' });
 
-function validateAndNormalizeDcConf (conf) {
+function validateAndNormalizeDcConf(conf) {
     // Default to 'datacenter1'
     if (!conf.localDc) { conf.localDc = 'datacenter1'; }
     if (!conf.datacenters) { conf.datacenters = ['datacenter1']; }
@@ -42,7 +42,7 @@ function sslOptions(sslConf) {
     return sslOpts;
 }
 
-function makeClient (options) {
+function makeClient(options) {
     var clientOpts = {};
     var conf = options.conf;
     validateAndNormalizeDcConf(conf);
diff --git a/lib/revisionPolicy.js b/lib/revisionPolicy.js
index 2b416e7..b3a1dfc 100644
--- a/lib/revisionPolicy.js
+++ b/lib/revisionPolicy.js
@@ -32,7 +32,7 @@ RevisionPolicyManager.prototype._setTtl = function(item) {
     self.request.query.timestamp = null;
 
     var query = dbu.buildPutQuery(self.request, true);
-    var queryOptions = {consistency: self.request.consistency, prepare: true};
+    var queryOptions = { consistency: self.request.consistency, prepare: true };
 
     return self.db.client.execute_p(query.cql, query.params, queryOptions)
     .catch(function(e) {
diff --git a/lib/schemaMigration.js b/lib/schemaMigration.js
index ea4fcde..31acf2e 100644
--- a/lib/schemaMigration.js
+++ b/lib/schemaMigration.js
@@ -173,7 +173,8 @@ Index.prototype.validate = function(req, current, proposed) {
             }
         });
 
-        // If index deleted the column is not deleted, need to remove it and add back to change index.
+        // If index deleted the column is not deleted,
+        // need to remove it and add back to change index.
         // Not supported.
         delIndexes.forEach(function(index) {
             if (proposed.attributes[index.attribute]) {
diff --git a/lib/secondaryIndexes.js b/lib/secondaryIndexes.js
index 30703cc..0185770 100644
--- a/lib/secondaryIndexes.js
+++ b/lib/secondaryIndexes.js
@@ -5,7 +5,7 @@ var cass = require('cassandra-driver');
 var TimeUuid = cass.types.TimeUuid;
 var dbu = require('./dbutils');
 
-function IndexRebuilder (db, req, secondaryKeys, timestamp) {
+function IndexRebuilder(db, req, secondaryKeys, timestamp) {
     this.db = db;
     this.req = dbu.makeRawRequest(req);
     this.primaryKeys = this.req.schema.iKeys;
@@ -21,7 +21,7 @@ function IndexRebuilder (db, req, secondaryKeys, timestamp) {
  * for each diff: find / update indexes
  *   _del is included to handle deleted primary table items
  */
-IndexRebuilder.prototype.diffRow = function (row) {
+IndexRebuilder.prototype.diffRow = function(row) {
     var diff = {};
     var i, att;
     for (i = 0; i < this.primaryKeys.length; i++) {
@@ -62,7 +62,7 @@ IndexRebuilder.prototype.diffRow = function (row) {
  * @param {object} row; a row object
  * @return a promise that resolves when the update is complete
  */
-IndexRebuilder.prototype.handleRow = function (row) {
+IndexRebuilder.prototype.handleRow = function(row) {
     if (!this.prevRow) {
         // In normal operation there is no need to update the index for the
         // first row, as we are only interested in diffs, and the new data was
diff --git a/package.json b/package.json
index 361eb91..1823d41 100644
--- a/package.json
+++ b/package.json
@@ -1,16 +1,16 @@
 {
   "name": "restbase-mod-table-cassandra",
   "description": "RESTBase table storage on Cassandra",
-  "version": "0.8.12",
+  "version": "0.8.13",
   "dependencies": {
     "bluebird": "~2.8.2",
-    "cassandra-driver": "~2.2.1",
-    "core-js": "^1.1.1",
-    "extend": "^2.0.0",
-    "js-yaml": "^3.2.5",
+    "cassandra-driver": "^2.2.2",
+    "core-js": "^1.2.6",
+    "extend": "^3.0.0",
+    "js-yaml": "^3.4.6",
     "json-stable-stringify": "git+https://github.com/wikimedia/json-stable-stringify#master",
     "restbase-mod-table-spec": "^0.1.3",
-    "semver": "^5.0.3"
+    "semver": "^5.1.0"
   },
   "repository": {
     "type": "git",
@@ -22,11 +22,12 @@
     "coveralls": "cat ./coverage/lcov.info | coveralls"
   },
   "devDependencies": {
-    "coveralls": "2.11.2",
-    "istanbul": "0.3.5",
-    "mocha": "x.x.x",
-    "mocha-jshint": "0.0.9",
-    "mocha-lcov-reporter": "0.0.1",
-    "preq": "^0.4.4"
+    "coveralls": "^2.11.4",
+    "istanbul": "^0.4.1",
+    "mocha": "^2.3.4",
+    "mocha-jshint": "^2.2.5",
+    "mocha-jscs": "^4.0.0",
+    "mocha-lcov-reporter": "^1.0.0",
+    "preq": "^0.4.7"
   }
 }
diff --git a/test/index.js b/test/index.js
index 4fcbe83..fe26f98 100644
--- a/test/index.js
+++ b/test/index.js
@@ -8,6 +8,8 @@ var fs = require("fs");
 
 // Run jshint as part of normal testing
 require('mocha-jshint')();
+require('mocha-jscs')();
+
 
 describe('Functional', function() {
     var conf = yaml.safeLoad(fs.readFileSync(__dirname + '/utils/test_client.conf.yaml'));

From d23c0c9a4f4f3d9c57de2ae45f3d26ff2581e0a3 Mon Sep 17 00:00:00 2001
From: Petr Pchelko <ppchelko@wikimedia.org>
Date: Mon, 7 Dec 2015 12:45:12 +0300
Subject: [PATCH 2/2] Added a .jscs config file

---
 .jscs.json | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 .jscs.json

diff --git a/.jscs.json b/.jscs.json
new file mode 100644
index 0000000..9adad94
--- /dev/null
+++ b/.jscs.json
@@ -0,0 +1,32 @@
+{
+  "preset": "node-style-guide",
+  "requireCurlyBraces": [
+    "if",
+    "else",
+    "for",
+    "while",
+    "do",
+    "try",
+    "catch"
+  ],
+  "validateIndentation": 4,
+  "requireCamelCaseOrUpperCaseIdentifiers": "ignoreProperties",
+  "requireCapitalizedComments": null,
+  "maximumLineLength": {
+    "value": 100,
+    "allExcept": ["urlComments"]
+  },
+  "validateQuoteMarks": null,
+  "requireTrailingComma": null,
+  "disallowTrailingComma": null,
+  "requireSpacesInsideObjectBrackets": "all",
+
+  "excludeFiles": [
+    "node_modules/**",
+    "test/**",
+    "coverage/**",
+    "scripts/**",
+    "maintenance/**",
+    "doc/**"
+  ]
+}
\ No newline at end of file