ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ptupit...@apache.org
Subject [7/7] ignite git commit: Merge branch 'master' into ignite-5896
Date Thu, 31 Aug 2017 15:14:40 GMT
Merge branch 'master' into ignite-5896

# Conflicts:
#	modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4241f5d2
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4241f5d2
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4241f5d2

Branch: refs/heads/ignite-5896
Commit: 4241f5d2cd5a724c3f781de86d472480a2ce1e85
Parents: 085cc80 5738d7e
Author: Pavel Tupitsyn <ptupitsyn@apache.org>
Authored: Thu Aug 31 18:13:08 2017 +0300
Committer: Pavel Tupitsyn <ptupitsyn@apache.org>
Committed: Thu Aug 31 18:13:08 2017 +0300

----------------------------------------------------------------------
 .../jdbc/suite/IgniteJdbcDriverTestSuite.java   |   4 +
 .../thin/JdbcThinComplexDmlDdlSelfTest.java     | 486 +++++++++++++++++++
 .../jdbc/thin/JdbcThinConnectionSelfTest.java   |  22 +
 .../jdbc/thin/JdbcThinNoDefaultSchemaTest.java  |  82 +++-
 .../org/apache/ignite/IgniteJdbcThinDriver.java |  20 +-
 .../internal/jdbc/thin/JdbcThinConnection.java  |  17 +-
 .../jdbc/thin/JdbcThinDatabaseMetadata.java     |   1 -
 .../internal/jdbc/thin/JdbcThinStatement.java   |   2 +-
 .../internal/jdbc/thin/JdbcThinUtils.java       |   2 +-
 .../GridCacheDatabaseSharedManager.java         |  31 +-
 .../IgniteCacheDatabaseSharedManager.java       |   2 +-
 .../db/file/IgnitePdsEvictionTest.java          |   3 +-
 .../Binary/BinarySelfTest.cs                    |   7 +-
 .../Cache/CacheAbstractTest.cs                  |  50 +-
 .../Apache.Ignite.Core.csproj                   |   1 +
 .../Impl/Binary/BinaryObjectSchemaSerializer.cs |  10 +-
 .../Impl/Binary/BinaryWriter.cs                 |   9 +-
 .../Impl/Binary/BinaryWriterExtensions.cs       |   4 +-
 .../Impl/Binary/Marshaller.cs                   |   4 +-
 .../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 +-
 44 files changed, 823 insertions(+), 137 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/4241f5d2/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
----------------------------------------------------------------------
diff --cc modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 8a384fd,ee301be..6666533
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@@ -97,14 -97,9 +97,15 @@@
      <Compile Include="Cache\Configuration\MemoryPolicyConfiguration.cs" />
      <Compile Include="Cache\Configuration\PartitionLossPolicy.cs" />
      <Compile Include="Cache\IMemoryMetrics.cs" />
 +    <Compile Include="Client\IgniteClientConfiguration.cs" />
      <Compile Include="Common\ExceptionFactory.cs" />
      <Compile Include="Configuration\Package-Info.cs" />
+     <Compile Include="Impl\IIgniteInternal.cs" />
 +    <Compile Include="Impl\Cache\CacheClient.cs" />
 +    <Compile Include="Impl\Client\ClientOp.cs" />
 +    <Compile Include="Impl\Client\ClientProtocolVersion.cs" />
 +    <Compile Include="Impl\Client\ClientSocket.cs" />
 +    <Compile Include="Impl\Client\IgniteClient.cs" />
      <Compile Include="Impl\IPlatformTargetInternal.cs" />
      <Compile Include="Impl\PersistentStore\PersistentStoreMetrics.cs" />
      <Compile Include="Impl\PlatformDisposableTargetAdapter.cs" />


Mime
View raw message