Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c0cfc6a7 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c0cfc6a7 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c0cfc6a7 Branch: refs/heads/ignite-1.5.1-2 Commit: c0cfc6a784ab94430b730d200d37788b70dc930b Parents: b534c42 bbdb202 Author: Anton Vinogradov <a...@apache.org> Authored: Tue Dec 22 11:54:01 2015 +0300 Committer: Anton Vinogradov <a...@apache.org> Committed: Tue Dec 22 11:54:01 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 44 +++- .../internal/binary/BinaryClassDescriptor.java | 56 ++++- .../ignite/internal/binary/BinaryUtils.java | 11 + .../processors/cache/IgniteCacheProxy.java | 3 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../cache/VisorCacheQueryConfiguration.java | 11 + .../cache/VisorCacheStoreConfiguration.java | 13 +- .../internal/visor/query/VisorQueryJob.java | 6 + .../binary/BinaryMarshallerSelfTest.java | 110 +++++++++ .../processors/query/h2/IgniteH2Indexing.java | 118 ++++++--- .../processors/query/h2/sql/GridSqlQuery.java | 3 + .../query/h2/sql/GridSqlQuerySplitter.java | 113 +++++---- .../query/IgniteSqlSchemaIndexingTest.java | 240 +++++++++++++++++++ .../query/IgniteSqlSplitterSelfTest.java | 52 ++++ .../query/h2/sql/GridQueryParsingTest.java | 9 +- .../IgniteBinaryCacheQueryTestSuite.java | 3 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + .../commands/cache/VisorCacheCommand.scala | 14 +- .../config/benchmark-multicast.properties | 2 +- 19 files changed, 709 insertions(+), 107 deletions(-) ----------------------------------------------------------------------
