Merge branches 'ignite-1.5' and 'ignite-gg-10889' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-gg-10889
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/767bb82b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/767bb82b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/767bb82b Branch: refs/heads/ignite-gg-10889 Commit: 767bb82bfb84c6f9e1dad4d55e59110af54bc0d9 Parents: 192762b b6dab09 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Wed Dec 23 09:38:08 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Wed Dec 23 09:38:08 2015 +0700 ---------------------------------------------------------------------- assembly/dependencies-fabric-lgpl.xml | 7 + assembly/dependencies-fabric.xml | 7 + examples/pom.xml | 2 +- examples/schema-import/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/camel/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../configuration/CacheConfiguration.java | 44 ++- .../ignite/internal/IgniteVersionUtils.java | 5 +- .../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 + .../ignite/lang/IgniteProductVersion.java | 2 +- .../core/src/main/resources/ignite.properties | 2 +- .../binary/BinaryMarshallerSelfTest.java | 110 +++++++ .../IgniteCacheBinaryObjectsScanSelfTest.java | 137 +++++++++ .../product/GridProductVersionSelfTest.java | 22 +- modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/flume/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../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/jcl/pom.xml | 2 +- modules/jms11/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/log4j2/pom.xml | 2 +- modules/mesos/pom.xml | 2 +- modules/mqtt/pom.xml | 2 +- modules/osgi-karaf/pom.xml | 2 +- modules/osgi-paxlogging/pom.xml | 2 +- modules/osgi/pom.xml | 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 +- .../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 +- .../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 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/twitter/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- .../commands/cache/VisorCacheCommand.scala | 14 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../config/benchmark-multicast.properties | 6 +- modules/yardstick/pom.xml | 2 +- .../cache/IgnitePutTxImplicitBenchmark.java | 52 ++++ .../cache/IgnitePutTxOffHeapBenchmark.java | 2 +- .../IgnitePutTxOffHeapValuesBenchmark.java | 2 +- modules/yarn/pom.xml | 2 +- modules/zookeeper/pom.xml | 2 +- pom.xml | 44 +-- 116 files changed, 1451 insertions(+), 341 deletions(-) ----------------------------------------------------------------------