CLIENT-2534 CLIENT-2692 Proxy client

aerospike · Dec 8, 2023 · c9b39e3 · c9b39e3
1 parent ea164b5
commit c9b39e3
Show file tree

Hide file tree

Showing 156 changed files with 12,432 additions and 1,034 deletions.
diff --git a/Aerospike.sln b/Aerospike.sln
@@ -11,7 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AerospikeTest", "AerospikeT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AerospikeClient", "AerospikeClient\AerospikeClient.csproj", "{A1AA3444-EAED-4394-BCCA-96EA0E0A88D1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AerospikeBenchmarks", "AerospikeBenchmarks\AerospikeBenchmarks.csproj", "{09C0B19A-41DD-4B47-A015-B7DFCA0072D3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AerospikeBenchmarks", "AerospikeBenchmarks\AerospikeBenchmarks.csproj", "{09C0B19A-41DD-4B47-A015-B7DFCA0072D3}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/AerospikeClient/AerospikeClient.csproj b/AerospikeClient/AerospikeClient.csproj
@@ -34,15 +34,35 @@
 		<SignAssembly>True</SignAssembly>
 	</PropertyGroup>
 
+	<ItemGroup>
+	  <None Remove="Protos\Kvs\kvs.proto" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<EmbeddedResource Include="LuaResources\aerospike.lua" />
 		<EmbeddedResource Include="LuaResources\aslib.lua" />
 		<EmbeddedResource Include="LuaResources\stream_ops.lua" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Iconic.Zlib.Netstandard" Version="1.0.0" />
+		<Protobuf Include="Protos\Auth\auth.proto" GrpcServices="Client" />
-		<PackageReference Include="NeoLua" Version="1.3.13" />
+		<Protobuf Include="Protos\Kvs\kvs.proto">
+		  <GrpcServices>Client</GrpcServices>
+		</Protobuf>
+		<PackageReference Include="Google.Protobuf" Version="3.25.1" />
+		<PackageReference Include="Grpc.AspNetCore" Version="2.59.0" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.59.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="NeoLua" Version="1.3.14" />
+	</ItemGroup>
+
+	<ItemGroup>
+	  <None Update="Protos\Auth\auth.proto">
+	    <GrpcServices>Client</GrpcServices>
+	  </None>
 	</ItemGroup>
 
 </Project>
diff --git a/AerospikeClient/Async/AsyncBatch.cs b/AerospikeClient/Async/AsyncBatch.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2022 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,8 +14,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System;
-using System.Collections.Generic;
 
 namespace Aerospike.Client
 {

diff --git a/AerospikeClient/Async/AsyncClient.cs b/AerospikeClient/Async/AsyncClient.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2022 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,9 +14,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Aerospike.Client
 {
@@ -1118,7 +1115,7 @@ public Task<Record> Operate(WritePolicy policy, CancellationToken token, Key key
 		/// <exception cref="AerospikeException">if queue is full</exception>
 		public void Operate(WritePolicy policy, RecordListener listener, Key key, params Operation[] ops)
 		{
-			OperateArgs args = new OperateArgs(cluster, policy, writePolicyDefault, operatePolicyReadDefault, key, ops);
+			OperateArgs args = new OperateArgs(policy, writePolicyDefault, operatePolicyReadDefault, key, ops);
 			AsyncOperate async = new AsyncOperate(cluster, listener, key, args);
 			async.Execute();
 		}

diff --git a/AerospikeClient/Async/AsyncCommand.cs b/AerospikeClient/Async/AsyncCommand.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,10 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System;
 using System.Net.Sockets;
-using System.Threading;
-using System.Diagnostics;
 
 namespace Aerospike.Client
 {

diff --git a/AerospikeClient/Async/AsyncDelete.cs b/AerospikeClient/Async/AsyncDelete.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2020 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,6 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+
 namespace Aerospike.Client
 {
 	public sealed class AsyncDelete : AsyncSingleCommand

diff --git a/AerospikeClient/Async/AsyncExecute.cs b/AerospikeClient/Async/AsyncExecute.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2020 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,7 +14,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System.Collections.Generic;
 
 namespace Aerospike.Client
 {

diff --git a/AerospikeClient/Async/AsyncExists.cs b/AerospikeClient/Async/AsyncExists.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2020 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,6 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+
 namespace Aerospike.Client
 {
 	public sealed class AsyncExists : AsyncSingleCommand

diff --git a/AerospikeClient/Async/AsyncNode.cs b/AerospikeClient/Async/AsyncNode.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2022 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,7 +14,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System.Threading;
 
 namespace Aerospike.Client
 {

diff --git a/AerospikeClient/Async/AsyncOperate.cs b/AerospikeClient/Async/AsyncOperate.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2021 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,7 +14,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System.Collections.Generic;
 
 namespace Aerospike.Client
 {
@@ -23,7 +22,7 @@ public sealed class AsyncOperate : AsyncRead
 		private readonly OperateArgs args;
 
 		public AsyncOperate(AsyncCluster cluster, RecordListener listener, Key key, OperateArgs args)
-			: base(cluster, args.writePolicy, listener, key, args.partition, true)
+			: base(cluster, args.writePolicy, listener, key, args.GetPartition(cluster, key), true)
 		{
 			this.args = args;
 		}

diff --git a/AerospikeClient/Async/AsyncRead.cs b/AerospikeClient/Async/AsyncRead.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2021 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,8 +14,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System;
-using System.Collections.Generic;
 
 namespace Aerospike.Client
 {

diff --git a/AerospikeClient/Async/AsyncReadHeader.cs b/AerospikeClient/Async/AsyncReadHeader.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2020 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,7 +14,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System.Collections.Generic;
 
 namespace Aerospike.Client
 {

diff --git a/AerospikeClient/Async/AsyncSingleCommand.cs b/AerospikeClient/Async/AsyncSingleCommand.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2020 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,6 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+
 namespace Aerospike.Client
 {
 	public abstract class AsyncSingleCommand : AsyncCommand

diff --git a/AerospikeClient/Async/AsyncTouch.cs b/AerospikeClient/Async/AsyncTouch.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2020 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,6 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+
 namespace Aerospike.Client
 {
 	public sealed class AsyncTouch : AsyncSingleCommand

diff --git a/AerospikeClient/Async/AsyncWrite.cs b/AerospikeClient/Async/AsyncWrite.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2020 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,6 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
+
 namespace Aerospike.Client
 {
 	public sealed class AsyncWrite : AsyncSingleCommand

diff --git a/AerospikeClient/CDT/ListReturnType.cs b/AerospikeClient/CDT/ListReturnType.cs
@@ -83,7 +83,7 @@ public enum ListReturnType
 		/// <summary>
 		/// Invert meaning of list command and return values.  For example:
 		/// <code>
-		/// ListOperation.RemoveByIndexRange(binName, index, count, ListReturnType.KEY | ListReturnType.INVERTED);
+		/// ListOperation.RemoveByIndexRange(binName, index, count, ListReturnType.INDEX | ListReturnType.INVERTED);
 		/// </code>
 		/// With the INVERTED flag enabled, the keys outside of the specified index range will be removed and returned.
 		/// </summary>

diff --git a/AerospikeClient/Cluster/Connection.cs b/AerospikeClient/Cluster/Connection.cs
@@ -1,5 +1,5 @@
 /* 
- * Copyright 2012-2021 Aerospike, Inc.
+ * Copyright 2012-2023 Aerospike, Inc.
  *
  * Portions may be licensed to Aerospike, Inc. under one or more contributor
  * license agreements.
@@ -14,18 +14,15 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System;
-using System.IO;
 using System.Net;
 using System.Net.Sockets;
-using System.Threading;
 
 namespace Aerospike.Client
 {
 	/// <summary>
 	/// Socket connection wrapper.
 	/// </summary>
-	public class Connection
+	public class Connection : IConnection
 	{
 		protected internal readonly Socket socket;
 		protected internal readonly Pool<Connection> pool;
@@ -177,7 +174,7 @@ public void UpdateLastUsed()
 		/// <summary>
 		/// Shutdown and close socket.
 		/// </summary>
-		public void Close()
+		public virtual void Close()
 		{
 			try
 			{

diff --git a/AerospikeClient/Cluster/IConnection.cs b/AerospikeClient/Cluster/IConnection.cs
@@ -0,0 +1,45 @@
+/* 
+ * Copyright 2012-2023 Aerospike, Inc.
+ *
+ * Portions may be licensed to Aerospike, Inc. under one or more contributor
+ * license agreements.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+namespace Aerospike.Client
+{
+	/// <summary>
+	/// Socket connection wrapper.
+	/// </summary>
+	public interface IConnection
+	{
+		public void SetTimeout(int timeoutMillis);
+
+		public abstract void Write(byte[] buffer, int length);
+
+		public abstract void ReadFully(byte[] buffer, int length);
+
+		public abstract Stream GetStream();
+
+		/// <summary>
+		/// Is socket closed from client perspective only.
+		/// </summary>
+		public bool IsClosed();
+
+		public void UpdateLastUsed();
+
+		/// <summary>
+		/// Shutdown and close socket.
+		/// </summary>
+		public void Close();
+	}
+}
diff --git a/AerospikeClient/Cluster/Partition.cs b/AerospikeClient/Cluster/Partition.cs
@@ -14,9 +14,6 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-using System;
-using System.Collections.Generic;
-using System.Threading;
 
 namespace Aerospike.Client
 {

diff --git a/AerospikeClient/Cluster/TlsConnection.cs b/AerospikeClient/Cluster/TlsConnection.cs
@@ -48,7 +48,7 @@ public TlsConnection(Cluster cluster, string tlsName, IPEndPoint address, int ti
 			}
             catch (Exception)
 			{
-				base.Close();
+				Close();
 				throw;
 			}
 		}
@@ -212,5 +212,14 @@ public override Stream GetStream()
 		{
 			return sslStream;
 		}
+
+		/// <summary>
+		/// Shutdown and close socket.
+		/// </summary>
+		public override void Close()
+		{
+			base.Close();
+			sslStream.Dispose();
+		}
 	}
 }