⚡️ optimize for single instance of HttpClient without factory

surrealdb · Aug 6, 2023 · 3cd0c7d · 3cd0c7d
1 parent 2c00c4c
commit 3cd0c7d
Show file tree

Hide file tree

Showing 21 changed files with 297 additions and 123 deletions.
diff --git a/SurrealDb.Benchmarks/BaseBenchmark.cs b/SurrealDb.Benchmarks/BaseBenchmark.cs
@@ -7,16 +7,15 @@ public class BaseBenchmark
 	protected string HttpUrl { get; } = "http://localhost:8000";
 	protected string WsUrl { get; } = "ws://localhost:8000/rpc";
 
-	protected async Task InitializeSurrealDbClient(ISurrealDbClient client, DatabaseInfo databaseInfo)
+	protected void InitializeSurrealDbClient(ISurrealDbClient client, DatabaseInfo databaseInfo)
 	{
-		await client.SignIn(new RootAuth { Username = "root", Password = "root" });
-		await client.Use(databaseInfo.Namespace, databaseInfo.Database);
+		client.Configure(databaseInfo.Namespace, databaseInfo.Database, "root", "root");
 	}
 
 	protected async Task CreatePostTable(string url, DatabaseInfo databaseInfo)
 	{
 		var client = new SurrealDbClient(url);
-		await InitializeSurrealDbClient(client, databaseInfo);
+		InitializeSurrealDbClient(client, databaseInfo);
 
 		string query = GetPostQueryContent();
 		await client.Query(query);
@@ -25,7 +24,7 @@ protected async Task CreatePostTable(string url, DatabaseInfo databaseInfo)
 	protected async Task<List<GeneratedPost>> SeedData(string url, DatabaseInfo databaseInfo, int count = 1000)
 	{
 		var client = new SurrealDbClient(url);
-		await InitializeSurrealDbClient(client, databaseInfo);
+		InitializeSurrealDbClient(client, databaseInfo);
 
 		var tasks = new List<Task>();
 
@@ -45,7 +44,7 @@ protected async Task<List<GeneratedPost>> SeedData(string url, DatabaseInfo data
 	protected async Task<Post> GetFirstPost(string httpUrl, DatabaseInfo databaseInfo)
 	{
 		var client = new SurrealDbClient(httpUrl);
-		await InitializeSurrealDbClient(client, databaseInfo);
+		InitializeSurrealDbClient(client, databaseInfo);
 
 		var posts = await client.Select<Post>("post");
 		return posts.First();

diff --git a/SurrealDb.Benchmarks/CreateBench.cs b/SurrealDb.Benchmarks/CreateBench.cs
@@ -27,15 +27,18 @@ public async Task GlobalSetup()
 			{
 				case 0:
 					_surrealdbHttpClient = new SurrealDbClient(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					await _surrealdbHttpClient.Connect();
 					break;
 				case 1:
 					_surrealdbHttpClientWithHttpClientFactory = clientGenerator.Create(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					await _surrealdbHttpClientWithHttpClientFactory.Connect();
 					break;
 				case 2:
 					_surrealdbWsTextClient = new SurrealDbClient(WsUrl);
-					await InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					await _surrealdbWsTextClient.Connect();
 					break;
 			}
 		}

diff --git a/SurrealDb.Benchmarks/DeleteBench.cs b/SurrealDb.Benchmarks/DeleteBench.cs
@@ -22,15 +22,18 @@ public async Task GlobalSetup()
 			{
 				case 0:
 					_surrealdbHttpClient = new SurrealDbClient(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					await _surrealdbHttpClient.Connect();
 					break;
 				case 1:
 					_surrealdbHttpClientWithHttpClientFactory = clientGenerator.Create(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					await _surrealdbHttpClientWithHttpClientFactory.Connect();
 					break;
 				case 2:
 					_surrealdbWsTextClient = new SurrealDbClient(WsUrl);
-					await InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					await _surrealdbWsTextClient.Connect();
 					break;
 			}
 

diff --git a/SurrealDb.Benchmarks/QueryBench.cs b/SurrealDb.Benchmarks/QueryBench.cs
@@ -22,15 +22,18 @@ public async Task GlobalSetup()
 			{
 				case 0:
 					_surrealdbHttpClient = new SurrealDbClient(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					await _surrealdbHttpClient.Connect();
 					break;
 				case 1:
 					_surrealdbHttpClientWithHttpClientFactory = clientGenerator.Create(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					await _surrealdbHttpClientWithHttpClientFactory.Connect();
 					break;
 				case 2:
 					_surrealdbWsTextClient = new SurrealDbClient(WsUrl);
-					await InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					await _surrealdbWsTextClient.Connect();
 					break;
 			}
 

diff --git a/SurrealDb.Benchmarks/SelectBench.cs b/SurrealDb.Benchmarks/SelectBench.cs
@@ -22,15 +22,18 @@ public async Task GlobalSetup()
 			{
 				case 0:
 					_surrealdbHttpClient = new SurrealDbClient(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					await _surrealdbHttpClient.Connect();
 					break;
 				case 1:
 					_surrealdbHttpClientWithHttpClientFactory = clientGenerator.Create(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					await _surrealdbHttpClientWithHttpClientFactory.Connect();
 					break;
 				case 2:
 					_surrealdbWsTextClient = new SurrealDbClient(WsUrl);
-					await InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					await _surrealdbWsTextClient.Connect();
 					break;
 			}
 

diff --git a/SurrealDb.Benchmarks/UpsertBench.cs b/SurrealDb.Benchmarks/UpsertBench.cs
@@ -24,15 +24,18 @@ public async Task GlobalSetup()
 			{
 				case 0:
 					_surrealdbHttpClient = new SurrealDbClient(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClient, dbInfo);
+					await _surrealdbHttpClient.Connect();
 					break;
 				case 1:
 					_surrealdbHttpClientWithHttpClientFactory = clientGenerator.Create(HttpUrl);
-					await InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					InitializeSurrealDbClient(_surrealdbHttpClientWithHttpClientFactory, dbInfo);
+					await _surrealdbHttpClientWithHttpClientFactory.Connect();
 					break;
 				case 2:
 					_surrealdbWsTextClient = new SurrealDbClient(WsUrl);
-					await InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					InitializeSurrealDbClient(_surrealdbWsTextClient, dbInfo);
+					await _surrealdbWsTextClient.Connect();
 					break;
 			}
 

diff --git a/SurrealDb/Internals/Auth/Auth.Basic.cs b/SurrealDb/Internals/Auth/Auth.Basic.cs
@@ -1,7 +1,3 @@
 namespace SurrealDb.Internals.Auth;
 
-internal class BasicAuth : IAuth
-{
-    public string Username { get; set; } = string.Empty;
-    public string? Password { get; set; }
-}
+internal record BasicAuth(string Username, string? Password) : IAuth;
diff --git a/SurrealDb/Internals/Auth/Auth.Bearer.cs b/SurrealDb/Internals/Auth/Auth.Bearer.cs
@@ -1,6 +1,3 @@
 namespace SurrealDb.Internals.Auth;
 
-internal class BearerAuth : IAuth
-{
-    public string Token { get; set; } = string.Empty;
-}
+internal record BearerAuth(string Token) : IAuth;
diff --git a/SurrealDb/Internals/Auth/Auth.None.cs b/SurrealDb/Internals/Auth/Auth.None.cs
@@ -1,3 +1,3 @@
 namespace SurrealDb.Internals.Auth;
 
-internal class NoAuth : IAuth { }
+internal record NoAuth : IAuth;
diff --git a/SurrealDb/Internals/Constants/HttpConstants.cs b/SurrealDb/Internals/Constants/HttpConstants.cs
@@ -0,0 +1,10 @@
+namespace SurrealDb.Internals.Constants;
+
+internal static class HttpConstants
+{
+	public const string ACCEPT_HEADER_NAME = "Accept";
+	public const string NS_HEADER_NAME = "NS";
+	public const string DB_HEADER_NAME = "DB";
+
+	public static readonly string[] ACCEPT_HEADER_VALUES = new[] { "application/json" };
+}
diff --git a/SurrealDb/Internals/Http/HttpClientConfiguration.cs b/SurrealDb/Internals/Http/HttpClientConfiguration.cs
@@ -0,0 +1,5 @@
+using SurrealDb.Internals.Auth;
+
+namespace SurrealDb.Internals.Http;
+
+internal record HttpClientConfiguration(string? Namespace, string? Database, IAuth Auth);
diff --git a/SurrealDb/Internals/Http/HttpClientWrapper.cs b/SurrealDb/Internals/Http/HttpClientWrapper.cs
@@ -0,0 +1,20 @@
+namespace SurrealDb.Internals.Http;
+
+internal class HttpClientWrapper : IDisposable
+{
+	private readonly bool _shouldDispose;
+
+	public HttpClient Instance { get; }
+
+	public HttpClientWrapper(HttpClient httpClient, bool shouldDispose)
+	{
+		Instance = httpClient;
+		_shouldDispose = shouldDispose;
+	}
+
+	public void Dispose()
+	{
+		if (_shouldDispose)
+			Instance.Dispose();
+	}
+}
diff --git a/SurrealDb/Internals/Http/SurrealDbHttpEngineConfig.cs b/SurrealDb/Internals/Http/SurrealDbHttpEngineConfig.cs
@@ -19,12 +19,12 @@ public void Use(string ns, string? db)
 
 	public void SetBasicAuth(string username, string? password)
 	{
-		Auth = new BasicAuth { Username = username, Password = password };
+		Auth = new BasicAuth(username, password);
 	}
 
 	public void SetBearerAuth(string token)
 	{
-		Auth = new BearerAuth { Token = token };
+		Auth = new BearerAuth(token);
 	}
 
 	public void ResetAuth()

diff --git a/SurrealDb/Internals/Http/UseConfiguration.cs b/SurrealDb/Internals/Http/UseConfiguration.cs
@@ -0,0 +1,7 @@
+namespace SurrealDb.Internals.Http;
+
+internal class UseConfiguration
+{
+	public string? Ns { get; set; }
+	public string? Db { get; set; }
+}