Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1537
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/95b51335 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/95b51335 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/95b51335 Branch: refs/heads/ignite-1537 Commit: 95b51335f197ffd14765da9f838189278b620c03 Parents: f2b1285 d8576b8 Author: sboikov <sboi...@gridgain.com> Authored: Tue Dec 22 09:28:19 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Dec 22 09:28:19 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 44 ++- .../internal/binary/BinaryObjectImpl.java | 20 +- .../processors/cache/IgniteCacheProxy.java | 5 +- .../cache/query/GridCacheQueryManager.java | 8 +- .../processors/query/GridQueryProcessor.java | 10 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../cache/VisorCacheQueryConfiguration.java | 11 + .../internal/visor/query/VisorQueryJob.java | 6 + .../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 +++++++++++++------ .../IgniteCacheReplicatedQuerySelfTest.java | 10 +- .../local/IgniteCacheLocalQuerySelfTest.java | 2 +- .../query/IgniteSqlSchemaIndexingTest.java | 240 +++++++++++++++ .../query/IgniteSqlSplitterSelfTest.java | 52 ++++ .../query/h2/sql/GridQueryParsingTest.java | 9 +- .../IgniteBinaryCacheQueryTestSuite.java | 2 + .../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 | 5 +- .../Properties/AssemblyInfo.cs | 5 +- .../Properties/AssemblyInfo.cs | 5 +- .../Binary/IBinaryRawReader.cs | 4 +- .../Apache.Ignite.Core/Binary/IBinaryReader.cs | 25 +- .../Apache.Ignite.Core/Binary/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Cache/Package-Info.cs | 2 +- .../Cache/Query/Continuous/Package-Info.cs | 2 +- .../Cache/Query/Package-Info.cs | 2 +- .../Cache/Store/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Cluster/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Compute/Package-Info.cs | 2 +- .../Datastream/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Events/Package-Info.cs | 2 +- .../Impl/Binary/BinaryReader.cs | 13 +- .../Impl/Binary/BinaryUtils.cs | 4 +- .../Lifecycle/Package-Info.cs | 2 +- .../Messaging/Package-Info.cs | 2 +- .../dotnet/Apache.Ignite.Core/Package-Info.cs | 2 +- .../Properties/AssemblyInfo.cs | 5 +- .../Apache.Ignite.Core/Resource/Package-Info.cs | 2 +- .../Apache.Ignite.Core/Services/Package-Info.cs | 2 +- .../Transactions/Package-Info.cs | 2 +- .../Apache.Ignite/Properties/AssemblyInfo.cs | 5 +- .../Properties/AssemblyInfo.cs | 5 +- .../Properties/AssemblyInfo.cs | 5 +- .../commands/cache/VisorCacheCommand.scala | 13 +- pom.xml | 42 +-- 53 files changed, 978 insertions(+), 296 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/95b51335/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ----------------------------------------------------------------------
