You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2017/05/24 17:27:02 UTC

[18/41] ignite git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


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

Branch: refs/heads/ignite-5267
Commit: c04b39a1be92a500a273b75c58b75d27603bc477
Parents: f353faf 1554a16
Author: sboikov <sb...@gridgain.com>
Authored: Tue May 23 15:34:06 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue May 23 15:34:06 2017 +0300

----------------------------------------------------------------------
 .../java/org/apache/ignite/IgniteCache.java     |  13 +++
 .../ignite/cache/query/FieldsQueryCursor.java   |  39 +++++++
 .../processors/cache/IgniteCacheProxy.java      |  11 +-
 .../processors/cache/QueryCursorImpl.java       |  19 +++-
 .../processors/query/GridQueryIndexing.java     |   5 +-
 .../processors/query/GridQueryProcessor.java    |  15 +--
 .../multijvm/IgniteCacheProcessProxy.java       |   8 ++
 .../processors/query/h2/IgniteH2Indexing.java   |   5 +-
 .../query/h2/ddl/DdlStatementsProcessor.java    |   4 +-
 .../processors/query/h2/opt/GridH2Table.java    | 107 ++++++++++++-------
 .../query/h2/twostep/GridMapQueryExecutor.java  |   2 +-
 .../cache/SqlFieldsQuerySelfTest.java           |  12 ++-
 .../query/IgniteSqlSegmentedIndexSelfTest.java  |  25 +++++
 13 files changed, 205 insertions(+), 60 deletions(-)
----------------------------------------------------------------------