Merge branches 'ignite-3443' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-3443
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4583007b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4583007b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4583007b Branch: refs/heads/ignite-3443 Commit: 4583007bad08e39d0eabccc8ccbf15968cfdaf7d Parents: 8ef730c bbdf145 Author: Alexey Kuznetsov <[email protected]> Authored: Wed Jul 27 17:53:11 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Jul 27 17:53:11 2016 +0700 ---------------------------------------------------------------------- .../jdbc2/JdbcDistributedJoinsQueryTest.java | 319 ++++++++++++++++++ .../JettyRestProcessorAbstractSelfTest.java | 121 ++++++- .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 2 + modules/core/pom.xml | 6 + .../org/apache/ignite/IgniteJdbcDriver.java | 14 +- .../org/apache/ignite/cache/query/SqlQuery.java | 3 + .../org/apache/ignite/internal/IgnitionEx.java | 2 + .../internal/binary/BinaryObjectImpl.java | 11 + .../ignite/internal/jdbc2/JdbcConnection.java | 12 + .../ignite/internal/jdbc2/JdbcQueryTask.java | 9 +- .../ignite/internal/jdbc2/JdbcResultSet.java | 4 +- .../ignite/internal/jdbc2/JdbcStatement.java | 2 +- .../managers/communication/GridIoManager.java | 2 + .../affinity/GridAffinityProcessor.java | 117 ++++--- .../processors/cache/CacheObjectContext.java | 12 + .../processors/cache/GridCacheAdapter.java | 8 +- .../cache/GridCacheAffinityManager.java | 22 +- .../processors/cache/GridCacheContext.java | 26 +- .../processors/cache/GridCacheEntryInfo.java | 2 +- .../processors/cache/KeyCacheObject.java | 7 + .../processors/cache/KeyCacheObjectImpl.java | 8 + .../cache/binary/CacheObjectBinaryContext.java | 10 +- .../binary/CacheObjectBinaryProcessorImpl.java | 38 +-- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 36 +- .../dht/atomic/GridDhtAtomicCache.java | 6 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../cacheobject/IgniteCacheObjectProcessor.java | 15 +- .../IgniteCacheObjectProcessorImpl.java | 69 +++- .../datastreamer/DataStreamerImpl.java | 6 +- .../internal/processors/igfs/IgfsImpl.java | 12 +- .../processors/igfs/IgfsMetaManager.java | 115 ++++--- .../igfs/IgfsSecondaryFileSystemImpl.java | 15 +- .../igfs/IgfsSecondaryFileSystemV2.java | 40 +++ .../platform/cache/PlatformCache.java | 10 +- .../handlers/query/QueryCommandHandler.java | 4 + .../rest/request/RestQueryRequest.java | 17 + .../java/org/jetbrains/annotations/NotNull.java | 38 --- .../org/jetbrains/annotations/Nullable.java | 33 -- .../org/jetbrains/annotations/package-info.java | 27 -- .../affinity/AffinityClientNodeSelfTest.java | 73 ++++- .../binary/BinaryMarshallerSelfTest.java | 7 +- .../BinaryObjectBuilderAdditionalSelfTest.java | 46 ++- .../cache/CacheGetEntryAbstractTest.java | 2 +- .../expiry/IgniteCacheTtlCleanupSelfTest.java | 2 +- .../processors/igfs/IgfsAbstractSelfTest.java | 111 ++++++- .../igfs/IgfsDualAbstractSelfTest.java | 34 ++ .../igfs/IgfsExUniversalFileSystemAdapter.java | 15 + .../igfs/UniversalFileSystemAdapter.java | 11 + .../ServicePredicateAccessCacheTest.java | 4 +- .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 16 +- ...oopFileSystemUniversalFileSystemAdapter.java | 8 + .../processors/query/h2/IgniteH2Indexing.java | 31 +- .../CacheBinaryKeyConcurrentQueryTest.java | 298 +++++++++++++++++ .../cache/CacheIndexingOffheapCleanupTest.java | 178 ++++++++++ .../IgniteCacheWithIndexingTestSuite.java | 4 + .../core/include/ignite/cache/query/query_sql.h | 2 + .../ignite/cache/query/query_sql_fields.h | 3 + .../Apache.Ignite.AspNet.csproj | 1 + .../dotnet/Apache.Ignite.AspNet/Package-Info.cs | 26 ++ .../Apache.Ignite.Core.Tests.csproj | 3 + .../Binary/BinaryBuilderSelfTest.cs | 325 +++++++++++++++---- .../Cache/Query/CacheLinqTest.cs | 20 +- .../Cache/Query/CacheQueriesTest.cs | 252 ++++---------- .../IgniteConfigurationSectionTest.cs | 32 ++ .../IgniteStartStopTest.cs | 3 +- .../Apache.Ignite.Core.Tests/custom_app.config | 34 ++ .../Apache.Ignite.Core.csproj | 6 + .../Binary/IBinaryObjectBuilder.cs | 2 +- .../Cache/Affinity/AffinityFunctionBase.cs | 139 -------- .../Cache/Query/SqlFieldsQuery.cs | 27 +- .../Apache.Ignite.Core/Cache/Query/SqlQuery.cs | 13 + .../Configuration/Package-Info.cs | 26 ++ .../Discovery/Package-Info.cs | 26 ++ .../Discovery/Tcp/Multicast/Package-Info.cs | 26 ++ .../Discovery/Tcp/Package-Info.cs | 26 ++ .../Discovery/Tcp/Static/Package-Info.cs | 26 ++ .../dotnet/Apache.Ignite.Core/Ignition.cs | 40 ++- .../Impl/Binary/BinaryObjectBuilder.cs | 16 +- .../Impl/Binary/BinaryWriter.cs | 133 +++++--- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 3 + .../Apache.Ignite.Core/Interop/Package-Info.cs | 26 ++ .../Apache.Ignite.Linq.csproj | 1 + .../Apache.Ignite.Linq/CacheExtensions.cs | 39 ++- .../Impl/CacheFieldsQueryExecutor.cs | 63 +++- .../Apache.Ignite.Linq/Impl/CacheQueryable.cs | 11 +- .../Impl/CacheQueryableBase.cs | 7 +- .../dotnet/Apache.Ignite.Linq/Package-Info.cs | 26 ++ modules/platforms/dotnet/Apache.Ignite.dxg | 4 +- .../dotnet/Apache.Ignite/Config/Configurator.cs | 11 +- .../http/jetty/GridJettyRestHandler.java | 5 + .../ignite/cache/spring/SpringCacheManager.java | 17 +- .../spring/SpringTransactionManager.java | 59 ++-- .../test/java/config/spring-transactions.xml | 4 +- .../ignite/TestInjectionLifecycleBean.java | 42 +++ .../org/apache/ignite/spring-injection-test.xml | 43 +++ .../SpringCacheManagerContextInjectionTest.java | 126 +++++++ .../testsuites/IgniteSpringTestSuite.java | 5 + ...gTransactionManagerContextInjectionTest.java | 125 +++++++ .../commands/cache/VisorCacheStopCommand.scala | 5 +- .../IgniteCacheRandomOperationBenchmark.java | 2 - parent/pom.xml | 1 + 102 files changed, 3014 insertions(+), 864 deletions(-) ----------------------------------------------------------------------
