Merge branch 'ignite-1.5' of https://github.com/apache/ignite into ignite-2206
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3b03b449 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3b03b449 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3b03b449 Branch: refs/heads/ignite-2206 Commit: 3b03b44988e0d41f6c2d3d52ecf7f4d888646600 Parents: 31c40d6 6ad758c Author: iveselovskiy <iveselovs...@gridgain.com> Authored: Tue Dec 22 16:06:20 2015 +0300 Committer: iveselovskiy <iveselovs...@gridgain.com> Committed: Tue Dec 22 16:06:20 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 44 ++- .../internal/binary/BinaryClassDescriptor.java | 56 +++- .../internal/binary/BinaryObjectImpl.java | 20 +- .../ignite/internal/binary/BinaryUtils.java | 11 + .../internal/binary/GridBinaryMarshaller.java | 10 + .../processors/cache/IgniteCacheProxy.java | 8 +- .../binary/CacheObjectBinaryProcessorImpl.java | 3 + .../cache/query/GridCacheQueryManager.java | 8 +- .../processors/query/GridQueryProcessor.java | 10 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../cache/VisorCacheQueryConfiguration.java | 11 + .../cache/VisorCacheStoreConfiguration.java | 13 +- .../internal/visor/query/VisorQueryJob.java | 6 + .../binary/BinaryMarshallerSelfTest.java | 110 +++++++ .../IgniteCacheBinaryObjectsScanSelfTest.java | 137 +++++++++ .../processors/query/h2/IgniteH2Indexing.java | 118 ++++++-- .../processors/query/h2/sql/GridSqlQuery.java | 3 + .../query/h2/sql/GridSqlQuerySplitter.java | 113 ++++--- .../cache/IgniteCacheAbstractQuerySelfTest.java | 300 +++++++++++++------ ...teCacheFullTextQueryNodeJoiningSelfTest.java | 145 +++++++++ .../IgniteCacheReplicatedQuerySelfTest.java | 10 +- .../local/IgniteCacheLocalQuerySelfTest.java | 2 +- .../query/IgniteSqlSchemaIndexingTest.java | 240 +++++++++++++++ .../query/IgniteSqlSplitterSelfTest.java | 52 ++++ .../query/h2/sql/GridQueryParsingTest.java | 9 +- .../IgniteBinaryCacheQueryTestSuite.java | 5 +- .../IgniteCacheQuerySelfTestSuite.java | 2 + modules/platforms/cpp/common/configure.ac | 2 +- modules/platforms/cpp/core-test/configure.ac | 2 +- modules/platforms/cpp/core/configure.ac | 2 +- modules/platforms/cpp/examples/configure.ac | 2 +- modules/platforms/cpp/ignite/configure.ac | 2 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../Properties/AssemblyInfo.cs | 6 +- .../commands/cache/VisorCacheCommand.scala | 14 +- .../config/benchmark-multicast.properties | 6 +- pom.xml | 2 +- 42 files changed, 1275 insertions(+), 251 deletions(-) ----------------------------------------------------------------------
