Repository: ignite Updated Branches: refs/heads/ignite-2.3 76fd90b00 -> 6df7ebc43
IGNITE-6621 .NET: Disable thin client This closes #2846 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6df7ebc4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6df7ebc4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6df7ebc4 Branch: refs/heads/ignite-2.3 Commit: 6df7ebc430cf5a099474361b61b2593a5884992b Parents: 76fd90b Author: Pavel Tupitsyn <ptupit...@apache.org> Authored: Fri Oct 13 16:00:18 2017 +0300 Committer: Pavel Tupitsyn <ptupit...@apache.org> Committed: Fri Oct 13 16:00:18 2017 +0300 ---------------------------------------------------------------------- .../internal/processors/odbc/ClientListenerNioListener.java | 7 ------- .../dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTest.cs | 3 ++- .../Apache.Ignite.Core.Tests/Client/Cache/CacheTestNoMeta.cs | 3 ++- .../Apache.Ignite.Core.Tests/Client/Cache/ScanQueryTest.cs | 3 ++- .../Apache.Ignite.Core.Tests/Client/ClientConnectionTest.cs | 3 ++- .../dotnet/Apache.Ignite.Core.Tests/Client/ClientTestBase.cs | 2 +- .../Client/IgniteClientConfigurationTest.cs | 3 ++- .../dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs | 3 ++- .../dotnet/Apache.Ignite.Core/Client/Cache/ICacheClient.cs | 2 +- .../dotnet/Apache.Ignite.Core/Client/IIgniteClient.cs | 2 +- .../Apache.Ignite.Core/Client/IgniteClientConfiguration.cs | 2 +- .../dotnet/Apache.Ignite.Core/Client/IgniteClientException.cs | 2 +- modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs | 2 +- 13 files changed, 18 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java index faecab3..11f5a8c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/ClientListenerNioListener.java @@ -27,7 +27,6 @@ import org.apache.ignite.internal.binary.streams.BinaryHeapOutputStream; import org.apache.ignite.internal.binary.streams.BinaryInputStream; import org.apache.ignite.internal.processors.odbc.jdbc.JdbcConnectionContext; import org.apache.ignite.internal.processors.odbc.odbc.OdbcConnectionContext; -import org.apache.ignite.internal.processors.platform.client.ClientConnectionContext; import org.apache.ignite.internal.util.GridSpinBusyLock; import org.apache.ignite.internal.util.nio.GridNioServerListenerAdapter; import org.apache.ignite.internal.util.nio.GridNioSession; @@ -44,9 +43,6 @@ public class ClientListenerNioListener extends GridNioServerListenerAdapter<byte /** JDBC driver handshake code. */ public static final byte JDBC_CLIENT = 1; - /** Thin client handshake code. */ - public static final byte THIN_CLIENT = 2; - /** Connection-related metadata key. */ private static final int CONN_CTX_META_KEY = GridNioSessionMetaKey.nextUniqueKey(); @@ -235,9 +231,6 @@ public class ClientListenerNioListener extends GridNioServerListenerAdapter<byte case JDBC_CLIENT: return new JdbcConnectionContext(ctx, busyLock, maxCursors); - case THIN_CLIENT: - return new ClientConnectionContext(ctx, maxCursors); - default: throw new IgniteException("Unknown client type: " + clientType); } http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTest.cs index 083038a..a659d5f 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTest.cs @@ -31,7 +31,8 @@ namespace Apache.Ignite.Core.Tests.Client.Cache /// <summary> /// Thin client cache test. /// </summary> - public sealed class CacheTest : ClientTestBase + [Ignore] + internal sealed class CacheTest : ClientTestBase { /// <summary> /// Tests the cache put / get with primitive data types. http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTestNoMeta.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTestNoMeta.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTestNoMeta.cs index 782e3cc..cb276e4 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTestNoMeta.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/CacheTestNoMeta.cs @@ -31,7 +31,8 @@ namespace Apache.Ignite.Core.Tests.Client.Cache /// <summary> /// Client cache test without metadata (no-op binary processor). /// </summary> - public class CacheTestNoMeta : ClientTestBase + [Ignore] + internal class CacheTestNoMeta : ClientTestBase { /// <summary> /// Tests the cache put / get with user data types. http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/ScanQueryTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/ScanQueryTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/ScanQueryTest.cs index 17a2b3f..77f8aa8 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/ScanQueryTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/ScanQueryTest.cs @@ -32,7 +32,8 @@ namespace Apache.Ignite.Core.Tests.Client.Cache /// <summary> /// Tests scan queries. /// </summary> - public class ScanQueryTest : ClientTestBase + [Ignore] + internal class ScanQueryTest : ClientTestBase { /// <summary> /// Initializes a new instance of the <see cref="ScanQueryTest"/> class. http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientConnectionTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientConnectionTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientConnectionTest.cs index 66aa844..9878724 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientConnectionTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientConnectionTest.cs @@ -29,7 +29,8 @@ namespace Apache.Ignite.Core.Tests.Client /// <summary> /// Tests client connection: port ranges, version checks, etc. /// </summary> - public class ClientConnectionTest + [Ignore] + internal class ClientConnectionTest { /// <summary> /// Fixture tear down. http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientTestBase.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientTestBase.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientTestBase.cs index 408eb73..d25dfc5 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientTestBase.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientTestBase.cs @@ -25,7 +25,7 @@ namespace Apache.Ignite.Core.Tests.Client /// <summary> /// Base class for client tests. /// </summary> - public class ClientTestBase + internal class ClientTestBase { /** Cache name. */ protected const string CacheName = "cache"; http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/IgniteClientConfigurationTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/IgniteClientConfigurationTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/IgniteClientConfigurationTest.cs index 0734f42..08164a9 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/IgniteClientConfigurationTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/IgniteClientConfigurationTest.cs @@ -23,7 +23,8 @@ namespace Apache.Ignite.Core.Tests.Client /// <summary> /// Tests for <see cref="IgniteClientConfiguration"/>. /// </summary> - public class IgniteClientConfigurationTest + [Ignore] + internal class IgniteClientConfigurationTest { /// <summary> /// Tests the defaults. http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs index b637e88..b5eac6b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/RawSocketTest.cs @@ -30,7 +30,8 @@ namespace Apache.Ignite.Core.Tests.Client /// <summary> /// Tests the thin client mode with a raw socket. /// </summary> - public class RawSocketTest : ClientTestBase + [Ignore] + internal class RawSocketTest : ClientTestBase { /// <summary> /// Tests the socket handshake connection. http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core/Client/Cache/ICacheClient.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Client/Cache/ICacheClient.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Client/Cache/ICacheClient.cs index d772ba6..c881809 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Client/Cache/ICacheClient.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Client/Cache/ICacheClient.cs @@ -25,7 +25,7 @@ namespace Apache.Ignite.Core.Client.Cache /// Client cache API. See <see cref="IIgniteClient.GetCache{K, V}"/>. /// </summary> // ReSharper disable once TypeParameterCanBeVariant (ICache shoul not be variant, more methods will be added) - public interface ICacheClient<TK, TV> + internal interface ICacheClient<TK, TV> { /// <summary> /// Name of this cache (<c>null</c> for default cache). http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core/Client/IIgniteClient.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Client/IIgniteClient.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Client/IIgniteClient.cs index ceb8f26..4a37989 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Client/IIgniteClient.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Client/IIgniteClient.cs @@ -24,7 +24,7 @@ namespace Apache.Ignite.Core.Client /// Main entry point for Ignite Thin Client APIs. /// You can obtain an instance of <see cref="IIgniteClient"/> through <see cref="Ignition.StartClient"/>. /// </summary> - public interface IIgniteClient : IDisposable + internal interface IIgniteClient : IDisposable { /// <summary> /// Gets the cache instance for the given name to work with keys and values of specified types. http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientConfiguration.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientConfiguration.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientConfiguration.cs index 8c9b6a1..4a191d7 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientConfiguration.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientConfiguration.cs @@ -28,7 +28,7 @@ namespace Apache.Ignite.Core.Client /// This configuration should correspond to <see cref="IgniteConfiguration.ClientConnectorConfiguration"/> /// on a target node. /// </summary> - public class IgniteClientConfiguration + internal class IgniteClientConfiguration { /// <summary> /// Default port. http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientException.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientException.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientException.cs index 2df3d1b..205041e 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientException.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientException.cs @@ -26,7 +26,7 @@ namespace Apache.Ignite.Core.Client /// Ignite thin client exception. /// </summary> [Serializable] - public class IgniteClientException : IgniteException + internal class IgniteClientException : IgniteException { /** Error code field. */ private const string ErrorCodeField = "ErrorCode"; http://git-wip-us.apache.org/repos/asf/ignite/blob/6df7ebc4/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs ---------------------------------------------------------------------- diff --git a/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs index 4e5eae5..cb6e83b 100644 --- a/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs +++ b/modules/platforms/dotnet/Apache.Ignite.Core/Ignition.cs @@ -742,7 +742,7 @@ namespace Apache.Ignite.Core /// </summary> /// <param name="clientConfiguration">The client configuration.</param> /// <returns>Ignite instance.</returns> - public static IIgniteClient StartClient(IgniteClientConfiguration clientConfiguration) + internal static IIgniteClient StartClient(IgniteClientConfiguration clientConfiguration) { IgniteArgumentCheck.NotNull(clientConfiguration, "clientConfiguration"); IgniteArgumentCheck.NotNull(clientConfiguration.Host, "clientConfiguration.Host");