ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [12/12] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-841
Date Wed, 06 May 2015 12:16:21 GMT
Merge remote-tracking branch 'remotes/origin/ignite-sprint-4' into ignite-841

Conflicts:
	modules/core/src/test/java/org/apache/ignite/testsuites/IgniteIgfsTestSuite.java


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

Branch: refs/heads/ignite-841
Commit: 657d8a54ed0e53e819e1ab0ce1eb56c071817b7f
Parents: 25d7156 91b2764
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Wed May 6 15:15:55 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Wed May 6 15:15:55 2015 +0300

----------------------------------------------------------------------
 .../cache/query/GridCacheSqlQuery.java          |   2 +-
 .../cache/query/GridCacheTwoStepQuery.java      |  17 +++
 .../processors/query/h2/IgniteH2Indexing.java   |   4 +
 .../processors/query/h2/sql/GridSqlQuery.java   |  20 ++++
 .../query/h2/sql/GridSqlQueryParser.java        |  10 +-
 .../query/h2/sql/GridSqlQuerySplitter.java      |  11 +-
 .../processors/query/h2/sql/GridSqlSelect.java  |   2 +-
 .../processors/query/h2/sql/GridSqlUnion.java   |   2 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |   3 +
 .../h2/twostep/GridReduceQueryExecutor.java     | 119 +++++++++++++++----
 .../IgniteCacheAbstractFieldsQuerySelfTest.java |  21 ++++
 11 files changed, 184 insertions(+), 27 deletions(-)
----------------------------------------------------------------------



Mime
View raw message