ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ivasilin...@apache.org
Subject [10/39] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-964' into ignite-964-1
Date Wed, 01 Jul 2015 10:13:46 GMT
Merge remote-tracking branch 'remotes/origin/ignite-964' into ignite-964-1


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/913a5d46
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/913a5d46
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/913a5d46

Branch: refs/heads/ignite-964
Commit: 913a5d46693644557eb4697bb35862466014d70e
Parents: d218dfb 576c435
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Tue Jun 30 14:26:07 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Tue Jun 30 14:26:07 2015 +0300

----------------------------------------------------------------------
 .../handlers/query/QueryCommandHandler.java     |  8 +--
 .../rest/request/RestSqlQueryRequest.java       | 10 ++--
 modules/nodejs/src/main/js/cache.js             |  9 +---
 modules/nodejs/src/main/js/sql-fields-query.js  | 23 ++------
 modules/nodejs/src/test/js/test-query.js        | 55 +++++++++-----------
 5 files changed, 43 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/913a5d46/modules/nodejs/src/main/js/cache.js
----------------------------------------------------------------------
diff --cc modules/nodejs/src/main/js/cache.js
index 1ece92d,8f074e3..4333389
--- a/modules/nodejs/src/main/js/cache.js
+++ b/modules/nodejs/src/main/js/cache.js
@@@ -149,12 -146,14 +144,12 @@@ Cache.prototype.query = function(qry) 
          qry.page(res["items"]);
  
          if (res["last"]) {
-             qry.end();
+             qry.end(null);
          }
          else {
 -            this._server.runCommand("qryfetch", [
 -                Server.pair("cacheName", this._cacheName),
 -                Server.pair("qryId", res.queryId),
 -                Server.pair("psz", qry.pageSize())],
 -                onQueryExecute.bind(this, qry));
 +            var command = this._createCommand("qryfetch");
 +            command.addParam("qryId", res.queryId).addParam("psz", qry.pageSize());
 +            this._server.runCommand(command, onQueryExecute.bind(this, qry));
          }
      }
  


Mime
View raw message