Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7912543 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7912543 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7912543 Branch: refs/heads/ignite-5896 Commit: e79125436e04d1d1fd13ed935e3064d998685d83 Parents: 35d3d61 ce2a98c Author: sboikov <[email protected]> Authored: Tue Sep 5 10:54:31 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Sep 5 10:54:31 2017 +0300 ---------------------------------------------------------------------- .../internal/jdbc2/JdbcMetadataSelfTest.java | 19 + .../jdbc/suite/IgniteJdbcDriverTestSuite.java | 6 + .../thin/JdbcThinComplexDmlDdlSelfTest.java | 486 +++++++++++++++++++ .../JdbcThinMissingLongArrayResultsTest.java | 341 +++++++++++++ .../org/apache/ignite/cache/QueryIndex.java | 5 +- .../configuration/MemoryConfiguration.java | 4 +- .../internal/DuplicateTypeIdException.java | 74 +++ .../apache/ignite/internal/IgniteKernal.java | 22 +- .../ignite/internal/IgniteNodeAttributes.java | 3 + .../ignite/internal/MarshallerContextImpl.java | 24 +- .../ignite/internal/binary/BinaryContext.java | 52 +- .../binary/builder/BinaryObjectBuilderImpl.java | 2 + .../internal/jdbc/JdbcDatabaseMetadata.java | 2 +- .../internal/jdbc/thin/JdbcThinConnection.java | 6 +- .../jdbc/thin/JdbcThinDatabaseMetadata.java | 3 +- .../internal/jdbc/thin/JdbcThinStatement.java | 2 +- .../internal/jdbc2/JdbcDatabaseMetadata.java | 35 +- .../discovery/GridDiscoveryManager.java | 49 +- .../cache/binary/BinaryMetadataTransport.java | 14 +- .../dht/preloader/GridDhtPartitionMap.java | 24 +- .../GridCacheDatabaseSharedManager.java | 39 +- .../processors/odbc/SqlListenerUtils.java | 6 + .../odbc/odbc/OdbcRequestHandler.java | 17 +- .../processors/odbc/odbc/OdbcUtils.java | 22 + .../apache/ignite/internal/util/typedef/X.java | 4 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 16 +- .../BinaryObjectBuilderAdditionalSelfTest.java | 22 + .../binary/BinaryMetadataUpdatesFlowTest.java | 48 ++ ...pClientDiscoveryMarshallerCheckSelfTest.java | 84 +++- modules/platforms/cpp/odbc-test/Makefile.am | 3 +- .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 8 +- .../cpp/odbc-test/src/queries_test.cpp | 126 ++++- .../cpp/odbc/include/ignite/odbc/cursor.h | 7 + modules/platforms/cpp/odbc/src/cursor.cpp | 5 + .../platforms/cpp/odbc/src/query/data_query.cpp | 2 +- modules/platforms/cpp/odbc/src/statement.cpp | 32 +- .../Binary/BinarySelfTest.cs | 7 +- .../Cache/CacheAbstractTest.cs | 50 +- .../Compute/ComputeApiTest.cs | 6 + .../Apache.Ignite.Core.csproj | 2 + .../Configuration/MemoryPolicyConfiguration.cs | 4 +- .../Impl/Binary/BinaryObjectBuilder.cs | 132 ++--- .../Impl/Binary/BinaryObjectSchemaSerializer.cs | 12 +- .../Impl/Binary/BinaryProcessor.cs | 2 +- .../Impl/Binary/BinaryReader.cs | 110 ++--- .../Impl/Binary/BinarySystemHandlers.cs | 157 ++---- .../Impl/Binary/BinaryTypeId.cs | 228 +++++++++ .../Impl/Binary/BinaryUtils.cs | 155 +----- .../Impl/Binary/BinaryWriter.cs | 161 +++--- .../Impl/Binary/BinaryWriterExtensions.cs | 4 +- .../Impl/Binary/Marshaller.cs | 32 +- .../Impl/Binary/Metadata/BinaryType.cs | 62 +-- .../Impl/Cache/CacheAffinityImpl.cs | 2 +- .../Impl/Cache/CacheEntryFilterHolder.cs | 2 +- .../Impl/Cache/CacheEntryProcessorHolder.cs | 4 +- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 2 +- .../Impl/Cache/Store/CacheStoreInternal.cs | 14 +- .../Impl/Cluster/ClusterGroupImpl.cs | 2 +- .../Impl/Compute/Closure/ComputeActionJob.cs | 4 +- .../Impl/Compute/Closure/ComputeFuncJob.cs | 6 +- .../Impl/Compute/Closure/ComputeOutFuncJob.cs | 4 +- .../Closure/ComputeReducingClosureTask.cs | 2 +- .../Compute/Closure/IComputeResourceInjector.cs | 2 +- .../Impl/Compute/ComputeFunc.cs | 2 +- .../Impl/Compute/ComputeJob.cs | 2 +- .../Impl/Compute/ComputeJobHolder.cs | 21 +- .../Impl/Compute/ComputeOutFunc.cs | 2 +- .../Impl/Deployment/PeerAssemblyResolver.cs | 13 +- .../Impl/Deployment/PeerLoadingExtensions.cs | 4 +- .../Impl/Deployment/PeerLoadingObjectHolder.cs | 4 +- .../Apache.Ignite.Core/Impl/ExceptionUtils.cs | 8 +- .../Apache.Ignite.Core/Impl/IIgniteInternal.cs | 69 +++ .../dotnet/Apache.Ignite.Core/Impl/Ignite.cs | 13 +- .../Impl/Messaging/MessageListenerHolder.cs | 4 +- .../Impl/PlatformTargetAdapter.cs | 13 +- .../Impl/Resource/ResourceProcessor.cs | 2 +- .../Impl/Resource/ResourceTypeDescriptor.cs | 2 +- modules/platforms/dotnet/README.md | 2 +- .../cache/jdbc/JdbcAbstractBenchmark.java | 4 +- .../yardstick/cache/jdbc/RdbmsBenchmark.java | 6 +- 80 files changed, 2211 insertions(+), 742 deletions(-) ----------------------------------------------------------------------
