Merge branch 'ydb-platform:main' into main

Author: messieurMe

.github/scripts/publish.sh

@@ -8,7 +8,7 @@ then
   exit 1;
 fi;
 
-LAST_TAG=$(git tag | tail -n 1);
+LAST_TAG=$(git tag --sort=-creatordate | head -n 1);
 MAJOR=$(echo $LAST_TAG | sed -E 's/v([0-9]+)\..*/\1/');
 MINOR=$(echo $LAST_TAG | sed -E 's/v[0-9]+\.([0-9]+)\..*/\1/');
 PATCH=$(echo $LAST_TAG | sed -E 's/v[0-9]+\.[0-9]+\.([0-9]+)($|-rc[0-9]+)/\1/');

.github/workflows/tests.yml

@@ -38,7 +38,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ydb-version: [ 'trunk' ]
+        ydb-version: [ 'trunk', 'latest' ]
         dotnet-version: [ 6.0.x, 7.0.x ]
         include:
           - dotnet-version: 6.0.x
@@ -54,7 +54,6 @@ jobs:
           - 8765:8765
         env:
           YDB_LOCAL_SURVIVE_RESTART: true
-          YDB_USE_IN_MEMORY_PDISKS: true
         options: '--name ydb-local -h localhost'
     env:
       OS: ubuntu-22.04
@@ -72,7 +71,7 @@ jobs:
         run: |
           docker cp ydb-local:/ydb_certs/ca.pem ~/
           cd src
-          dotnet test --filter "(FullyQualifiedName~Ado) | (FullyQualifiedName~Dapper)" -l "console;verbosity=normal"
+          dotnet test --filter "(FullyQualifiedName~Ado) | (FullyQualifiedName~Dapper)" -f ${{ matrix.dotnet-target-framework }} -l "console;verbosity=normal"
   topic-tests:
     runs-on: ubuntu-22.04
     strategy:
@@ -94,7 +93,6 @@ jobs:
           - 8765:8765
         env:
           YDB_LOCAL_SURVIVE_RESTART: true
-          YDB_USE_IN_MEMORY_PDISKS: true
         options: '--name ydb-local -h localhost'
     env:
       OS: ubuntu-22.04
@@ -112,7 +110,7 @@ jobs:
         run: |
           docker cp ydb-local:/ydb_certs/ca.pem ~/
           cd src
-          dotnet test --filter "FullyQualifiedName~Topic" -l "console;verbosity=normal"  
+          dotnet test --filter "FullyQualifiedName~Topic" -f ${{ matrix.dotnet-target-framework }} -l "console;verbosity=normal"  
   integration-tests:
     runs-on: ubuntu-22.04
     strategy:
@@ -134,7 +132,6 @@ jobs:
           - 8765:8765
         env:
           YDB_LOCAL_SURVIVE_RESTART: true
-          YDB_USE_IN_MEMORY_PDISKS: true
         options: '--name ydb-local -h localhost'
     env:
       OS: ubuntu-22.04

CHANGELOG.md

@@ -1,3 +1,53 @@
+* Fixed: YdbDataReader.GetDataTypeName for optional values.
+* Added support for "Columns" collectionName in YdbConnection.GetSchema(Async).
+
+## v0.12.0
+* GetUint64(int ordinal) returns a ulong for Uint8, Uint16, Uint32, Uint64 YDB types.
+* GetInt64(int ordinal) returns a int for Int8, Int16, Int32, Int64, Uint8, Uint16, Uint32 YDB types.
+* GetUint32(int ordinal) returns a uint for Uint8, Uint16, Uint32 YDB types.
+* GetInt32(int ordinal) returns a int for Int8, Int16, Int32, Uint8, Uint16 YDB types.
+* GetUint16(int ordinal) returns a ushort for Uint8, Uint16 YDB types.
+* GetInt16(int ordinal) returns a short for Int8, Int16, Uint8 YDB types.
+* GetDouble(int ordinal) returns a double for Float and Double YDB types.
+* Throw InvalidCastException on string.Empty in `GetChar(int ordinal)`.
+* Changed Ydb.Sdk.Value.InvalidTypeException to InvalidCastException in YdbValueParser.
+* Changed InvalidCastException to InvalidOperationException in YdbParameter.
+* Added specification tests: YdbCommandTests and YdbParameterTests.
+* YdbConnection.Database returns string.Empty if ConnectionStringBuilder is null.
+* Propagated cancellationToken in Execute[.*]Async methods.
+* When YdbCommand has an open data reader, it throws InvalidOperationException on the setters: CommandText, DbConnection.
+* Added checkers to YdbCommand.Prepare().
+* CommandText getter doesn't throw an exception if the CommandText property has not been initialized.
+
+## v0.11.0
+* Fix bug: GetValue(int ordinal) return DBNull.Value if fetched NULL value.
+* Fix: NextResult() moves to the next result and skip the first ResultSet.
+* Added specification DbDataReaderTests.
+* If dataOffset is larger than the length of data, GetChars and GetBytes methods will return 0.
+* If YdbDataReader is closed: `throw new InvalidOperationException("The reader is closed")`.
+* InvalidOperationException on ConnectionString property has not been initialized.
+* One YdbTransaction per YdbConnection. Otherwise, throw an exception: InvalidOperationException("A transaction is already in progress; nested/concurrent transactions aren't supported.").
+* ConnectionString returns an empty.String when it is not set.
+* When a YdbDataReader is closed, if stream is not empty, a YdbTransaction fails if it is not null. A session also fails due to a possible error SessionBusy race condition with the server.
+* Fixed bug: Fetch txId from the last result set.
+* YdbTransaction CheckDisposed() (invoke rollback if transaction hasn't been committed).
+* Dev: Added specification tests for YdbTransaction.
+
+## v0.10.0
+- Fixed bug in Topic Writer: race condition when session fails, then write operation starts on previous session and new session is created. Messages may be lost. 
+- Supported in ADO.NET GetSchema(Async). CollectionNames: 
+   * Tables
+   * TablesWithCollections
+   * DataSourceInformation
+   * MetaDataCollections
+   * Restrictions
+- Rename field _onStatus -> _onNotSuccessStatus in YdbDataReader
+- If session is not active, do not invoke DeleteNotActiveSession(session)
+- AttachStream: connect stream using NodeId
+- PoolManager: change pool properties on field
+- Delete *Settings.DefaultInstance because it's a singleton object that's changed by tasks when NodeId is set
+- DbConnection.Session.OnStatus(status) in YdbTransaction
+
 ## v0.9.4
 - Do not pessimize the node on Grpc.Core.StatusCode.Cancelled and Grpc.Core.StatusCode.DeadlineExceeded.
 - Dispose of WriterSession using dispose CancellationToken.

README.md

@@ -98,7 +98,7 @@ Example of using a query client to execute a simple query:
 
 ```c#
 // Create QueryClient using Driver instance.
-using var queryClient = new QueryService(driver);
+using var queryClient = new QueryClient(driver);
 
 var row = await queryClient.ReadRow(@"
         DECLARE $id AS Uint64;

src/Ydb.Sdk/src/Ado/PoolManager.cs

@@ -6,10 +6,12 @@ namespace Ydb.Sdk.Ado;
 internal static class PoolManager
 {
     private static readonly SemaphoreSlim SemaphoreSlim = new(1); // async mutex
+    private static readonly ConcurrentDictionary<string, SessionPool> Pools = new();
 
-    private static ConcurrentDictionary<string, SessionPool> Pools { get; } = new();
-
-    internal static async Task<Session> GetSession(YdbConnectionStringBuilder connectionString)
+    internal static async Task<Session> GetSession(
+        YdbConnectionStringBuilder connectionString,
+        CancellationToken cancellationToken
+    )
     {
         if (Pools.TryGetValue(connectionString.ConnectionString, out var sessionPool))
         {
@@ -18,7 +20,7 @@ internal static async Task<Session> GetSession(YdbConnectionStringBuilder connec
 
         try
         {
-            await SemaphoreSlim.WaitAsync();
+            await SemaphoreSlim.WaitAsync(cancellationToken);
 
             if (Pools.TryGetValue(connectionString.ConnectionString, out var pool))
             {

src/Ydb.Sdk/src/Ado/ThrowHelper.cs

@@ -0,0 +1,21 @@
+using Ydb.Sdk.Value;
+
+namespace Ydb.Sdk.Ado;
+
+internal static class ThrowHelper
+{
+    internal static T ThrowInvalidCast<T>(YdbValue ydbValue)
+    {
+        throw new InvalidCastException($"Field YDB type {ydbValue.TypeId} can't be cast to {typeof(T)} type.");
+    }
+
+    internal static void ThrowIndexOutOfRangeException(int columnCount)
+    {
+        throw new IndexOutOfRangeException("Ordinal must be between 0 and " + (columnCount - 1));
+    }
+
+    internal static void ThrowInvalidCastException(string expectedType, string actualType)
+    {
+        throw new InvalidCastException($"Invalid type of YDB value, expected: {expectedType}, actual: {actualType}.");
+    }
+}

src/Ydb.Sdk/src/Ado/YdbCommand.cs

@@ -1,5 +1,6 @@
 using System.Data;
 using System.Data.Common;
+using System.Diagnostics.CodeAnalysis;
 using System.Text;
 using Ydb.Sdk.Ado.Internal;
 using Ydb.Sdk.Services.Query;
@@ -8,18 +9,23 @@ namespace Ydb.Sdk.Ado;
 
 public sealed class YdbCommand : DbCommand
 {
-    private YdbConnection YdbConnection { get; set; }
-
+    private YdbConnection? _ydbConnection;
     private string _commandText = string.Empty;
 
+    private YdbConnection YdbConnection =>
+        _ydbConnection ?? throw new InvalidOperationException("Connection property has not been initialized");
+
+    public YdbCommand()
+    {
+    }
+
     public YdbCommand(YdbConnection ydbConnection)
     {
-        YdbConnection = ydbConnection;
+        _ydbConnection = ydbConnection;
     }
 
     public override void Cancel()
     {
-        throw new NotImplementedException("Currently not supported");
     }
 
     public override int ExecuteNonQuery()
@@ -47,9 +53,7 @@ public override async Task<int> ExecuteNonQueryAsync(CancellationToken cancellat
     {
         await using var dataReader = await ExecuteReaderAsync(CommandBehavior.Default, cancellationToken);
 
-        var data = await dataReader.ReadAsync(cancellationToken)
-            ? dataReader.IsDBNull(0) ? null : dataReader.GetValue(0)
-            : null;
+        var data = await dataReader.ReadAsync(cancellationToken) ? dataReader.GetValue(0) : null;
 
         while (await dataReader.NextResultAsync(cancellationToken))
         {
@@ -60,19 +64,38 @@ public override async Task<int> ExecuteNonQueryAsync(CancellationToken cancellat
 
     public override void Prepare()
     {
-        // Do nothing
+        if (YdbConnection.State == ConnectionState.Closed)
+        {
+            throw new InvalidOperationException("Connection is not open");
+        }
+
+        if (CommandText.Length == 0)
+        {
+            throw new InvalidOperationException("CommandText property has not been initialized");
+        }
+
+        if (YdbConnection.IsBusy)
+        {
+            throw new YdbOperationInProgressException(YdbConnection);
+        }
     }
 
     public override string CommandText
     {
         get => _commandText;
 #pragma warning disable CS8765 // Nullability of type of parameter doesn't match overridden member (possibly because of nullability attributes).
+        [param: AllowNull]
         set
-#pragma warning restore CS8765 // Nullability of type of parameter doesn't match overridden member (possibly because of nullability attributes).
         {
-            _commandText = value ?? throw new ArgumentNullException(nameof(value));
-            DbParameterCollection.Clear();
+            if (_ydbConnection?.IsBusy ?? false)
+            {
+                throw new InvalidOperationException("An open data reader exists for this command");
+            }
+
+            // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
+            _commandText = value ?? string.Empty;
         }
+#pragma warning restore CS8765 // Nullability of type of parameter doesn't match overridden member (possibly because of nullability attributes).
     }
 
     public override int CommandTimeout
@@ -96,17 +119,22 @@ public override int CommandTimeout
 
     protected override DbConnection? DbConnection
     {
-        get => YdbConnection;
+        get => _ydbConnection;
         set
         {
-            if (value is YdbConnection ydbConnection)
+            if (_ydbConnection?.IsBusy ?? false)
             {
-                YdbConnection = ydbConnection;
+                throw new InvalidOperationException("An open data reader exists for this command.");
+            }
+
+            if (value is null or Ado.YdbConnection)
+            {
+                _ydbConnection = (YdbConnection?)value;
             }
             else
             {
                 throw new ArgumentException(
-                    $"Unsupported DbTransaction type: {value?.GetType()}, expected: {typeof(YdbConnection)}");
+                    $"Unsupported DbConnection type: {value.GetType()}, expected: {typeof(YdbConnection)}");
             }
         }
     }
@@ -162,7 +190,11 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha
         YdbConnection.EnsureConnectionOpen();
 
         var ydbParameters = DbParameterCollection.YdbParameters;
-        var (sql, paramNames) = SqlParser.Parse(CommandText);
+        var (sql, paramNames) = SqlParser.Parse(
+            CommandText.Length > 0
+                ? CommandText
+                : throw new InvalidOperationException("CommandText property has not been initialized")
+        );
         var preparedSql = new StringBuilder();
 
         foreach (var paramName in paramNames)
@@ -181,15 +213,22 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha
 
         var execSettings = CommandTimeout > 0
             ? new ExecuteQuerySettings { TransportTimeout = TimeSpan.FromSeconds(CommandTimeout) }
-            : ExecuteQuerySettings.DefaultInstance;
+            : new ExecuteQuerySettings();
+        execSettings.CancellationToken = cancellationToken;
+
+        var transaction = YdbConnection.CurrentTransaction;
+
+        if (Transaction != null && Transaction != transaction) // assert on legacy DbTransaction property
+        {
+            throw new InvalidOperationException("Transaction mismatched! (Maybe using another connection)");
+        }
 
         var ydbDataReader = await YdbDataReader.CreateYdbDataReader(YdbConnection.Session.ExecuteQuery(
-                preparedSql.ToString(), ydbParameters, execSettings, Transaction?.TransactionControl),
-            YdbConnection.Session.OnStatus, Transaction);
+                preparedSql.ToString(), ydbParameters, execSettings, transaction?.TransactionControl),
+            YdbConnection.Session.OnStatus, transaction);
 
         YdbConnection.LastReader = ydbDataReader;
         YdbConnection.LastCommand = CommandText;
-        YdbConnection.LastTransaction = Transaction;
 
         return ydbDataReader;
     }