Merge remote-tracking branch 'remotes/origin/master' into ignite-5009
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dfdf8192 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dfdf8192 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dfdf8192 Branch: refs/heads/ignite-5009 Commit: dfdf81921875979a5bf6ad4e44b9d4ea4d796dfe Parents: 689bdf6 3a9dba5 Author: sboikov <[email protected]> Authored: Thu May 11 23:01:57 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu May 11 23:01:57 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheContext.java | 7 + .../processors/cache/IgniteCacheProxy.java | 41 +----- .../processors/query/GridQueryIndexing.java | 36 ++--- .../processors/query/GridQueryProcessor.java | 132 +++++++++++-------- .../query/h2/DmlStatementsProcessor.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 14 +- .../query/h2/twostep/GridMergeIndexSorted.java | 3 + .../cache/GridCacheCrossCacheQuerySelfTest.java | 12 +- .../query/IgniteSqlSplitterSelfTest.java | 68 ++++++++++ .../IgniteStartStopTest.cs | 2 + .../dotnet/Apache.Ignite.Core/Ignition.cs | 16 ++- .../Impl/Binary/BinaryProcessor.cs | 1 - 12 files changed, 207 insertions(+), 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/dfdf8192/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ----------------------------------------------------------------------
