Merge pull request #112 from rakyll/protobuf

datastore: Protobuf switch
googleapis · Aug 18, 2014 · 12ad6d4 · 12ad6d4
2 parents 362b6a8 + 0ebe9f3
commit 12ad6d4
Show file tree

Hide file tree

Showing 15 changed files with 1,062 additions and 293 deletions.
diff --git a/.jshintrc b/.jshintrc
@@ -1,6 +1,5 @@
 {
   "bitwise": true,
-  "camelcase": true,
   "curly": true,
   "eqeqeq": true,
   "esnext": true,

diff --git a/lib/common/connection.js b/lib/common/connection.js
@@ -14,8 +14,6 @@
  * limitations under the License.
  */
 
-/*jshint camelcase:false */
-
 'use strict';
 
 var fs = require('fs');

diff --git a/lib/datastore/dataset.js b/lib/datastore/dataset.js
@@ -19,6 +19,7 @@
 var conn = require('../common/connection.js');
 var entity = require('./entity.js');
 var Transaction = require('./transaction.js');
+var pb = require('./pb.js');
 var Query = require('./query.js');
 var util = require('../common/util.js');
 
@@ -108,12 +109,14 @@ Dataset.prototype.allocateIds = function(incompleteKey, n, callback) {
     incompleteKeys.push(entity.keyToKeyProto(incompleteKey));
   }
   this.transaction.makeReq(
-      'allocateIds', { keys: incompleteKeys }, function(err, resp) {
+      'allocateIds',
+      new pb.AllocateIdsRequest({ key: incompleteKeys }),
+      pb.AllocateIdsResponse, function(err, resp) {
     if (err) {
       return callback(err);
     }
     var keys = [];
-    resp.keys.forEach(function(k) {
+    (resp.key || []).forEach(function(k) {
       keys.push(entity.keyFromKeyProto(k));
     });
     callback(null ,keys);