You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/09/30 05:02:05 UTC

[41/41] ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1168


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

Branch: refs/heads/ignite-1168
Commit: 3a322c0556c054a291ee5c28e6e853e700587f3a
Parents: 6acba08 7402918
Author: Andrey <an...@gridgain.com>
Authored: Wed Sep 30 10:01:28 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Sep 30 10:01:28 2015 +0700

----------------------------------------------------------------------
 .../cache/GridCacheExplicitLockSpan.java        |  13 +-
 .../cache/GridCacheMvccCandidate.java           |   5 +-
 .../processors/cache/GridCacheMvccManager.java  |  47 ++--
 .../distributed/GridDistributedCacheEntry.java  |   2 +-
 .../dht/colocated/GridDhtColocatedCache.java    |  12 +-
 .../colocated/GridDhtColocatedLockFuture.java   |  16 +-
 .../dht/preloader/GridDhtPreloader.java         |   2 +-
 .../cache/distributed/near/GridNearTxLocal.java |   2 +-
 .../cache/local/GridLocalCacheEntry.java        |   2 +-
 .../ignite/internal/util/GridArgumentCheck.java |   5 +-
 .../processors/cache/CrossCacheLockTest.java    | 142 +++++++++++++
 .../GridCacheFinishPartitionsSelfTest.java      |   5 +-
 .../IgniteCacheCreatePutMultiNodeSelfTest.java  | 151 +++++++++++++
 .../IgniteCrossCacheTxNearEnabledSelfTest.java  |  28 +++
 .../dht/IgniteCrossCacheTxSelfTest.java         | 213 +++++++++++++++++++
 .../testsuites/IgniteCacheTestSuite4.java       |   7 +
 .../processors/query/h2/sql/GridSqlArray.java   |  52 +++++
 .../processors/query/h2/sql/GridSqlElement.java |   2 +-
 .../query/h2/sql/GridSqlFunction.java           |  60 ++++--
 .../query/h2/sql/GridSqlFunctionType.java       |   3 +
 .../query/h2/sql/GridSqlPlaceholder.java        |   7 +-
 .../query/h2/sql/GridSqlQueryParser.java        |  84 +++++---
 .../processors/query/h2/sql/GridSqlType.java    |  29 ++-
 .../query/h2/sql/GridQueryParsingTest.java      |  27 +++
 24 files changed, 798 insertions(+), 118 deletions(-)
----------------------------------------------------------------------