diff --git a/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Program.cs b/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Program.cs index 11b878c6..b816e4fd 100644 --- a/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Program.cs +++ b/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Program.cs @@ -1,4 +1,5 @@ using System.Diagnostics; +using Dapper; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; @@ -18,18 +19,17 @@ var stopwatch = Stopwatch.StartNew(); stopwatch.Start(); -await using var dataSource = new YdbDataSource( - new YdbConnectionStringBuilder(connectionString) - { - CredentialsProvider = new MetadataProvider(loggerFactory: loggerFactory), - LoggerFactory = loggerFactory, - DisableDiscovery = true - } -); +await using var ydbDataSource = new YdbDataSource(new YdbConnectionStringBuilder(connectionString) +{ + CredentialsProvider = new MetadataProvider(loggerFactory: loggerFactory), + LoggerFactory = loggerFactory, + DisableDiscovery = true, + EnableImplicitSession = true +}); -await using var ydbCommand = dataSource.CreateCommand(); -ydbCommand.CommandText = "SELECT 'Hello Serverless YDB from Yandex Cloud Serverless Container!'u"; -var scalar = await ydbCommand.ExecuteScalarAsync(); +await using var ydbConnection = await ydbDataSource.OpenRetryableConnectionAsync(); +var scalar = await ydbConnection.ExecuteScalarAsync( + "SELECT 'Hello Serverless YDB from Yandex Cloud Serverless Container!'u"); stopwatch.Stop(); logger.LogInformation("Success request! [Ms: {Ms}], {Select}", stopwatch.ElapsedMilliseconds, scalar); \ No newline at end of file diff --git a/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/README.md b/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/README.md index de6eb3f7..c6ff9392 100644 --- a/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/README.md +++ b/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/README.md @@ -6,23 +6,32 @@ to [Yandex Cloud Serverless Containers](https://yandex.cloud/en/docs/serverless- ## Getting started 1. **Setup** [Yandex Container Registry](https://yandex.cloud/en/docs/container-registry/operations/registry/registry-create). -2. **Build and Push Docker Image** +2. **Configure YDB Connection String**. Update the `appsettings.json` file with your YDB connection details: + ```json + { + "ConnectionStrings": { + "ServerlessYDB": "UseTls=true;Host=;Port=2135;Database=" + } + } + ``` + Replace `` with your YDB endpoint host and `` with your database path (e.g., `/ru-central1/b1g8ejbxxxxxxxx/etn8xxxxxxxx`). +3. **Build and Push Docker Image** ```bash docker build . -t cr.yandex//ado-net-app:latest docker push cr.yandex//ado-net-app:latest ``` Replace with your actual Container Registry ID. -3. **Grant Required Permissions**. To enable your Serverless Container to access both YDB and your container image in +4. **Grant Required Permissions**. To enable your Serverless Container to access both YDB and your container image in the Container Registry, grant the following roles to your Service Account: - `ydb.editor` — access to YDB, - `container-registry.images.puller` — permission to pull images from Container Registry. -4. **Create a new revision**. After pushing your image, create a new version of the Serverless Container as described in +5. **Create a new revision**. After pushing your image, create a new version of the Serverless Container as described in the [official guide](https://yandex.cloud/en/docs/serverless-containers/quickstart/container#create-revision). Specify your image and the necessary environment variables and secrets. -5. **Running the Yandex Serverless Container**. +6. **Running the Yandex Serverless Container**. After the new revision has been rolled out, you can use your container (e.g., for a health check) by executing the following command: ```bash diff --git a/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container.csproj b/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container.csproj index 1ec5fae8..9d38531c 100644 --- a/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container.csproj +++ b/examples/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container/Ydb.Sdk.AdoNet.Yandex.Cloud.Serverless.Container.csproj @@ -15,7 +15,8 @@ - + + PreserveNewest diff --git a/examples/Ydb.Sdk.Topic.QuickStart/Program.cs b/examples/Ydb.Sdk.Topic.QuickStart/Program.cs index 78df4bb7..7d84f2e7 100644 --- a/examples/Ydb.Sdk.Topic.QuickStart/Program.cs +++ b/examples/Ydb.Sdk.Topic.QuickStart/Program.cs @@ -1,8 +1,8 @@ using Microsoft.Extensions.Logging; using Ydb.Sdk; -using Ydb.Sdk.Services.Topic; -using Ydb.Sdk.Services.Topic.Reader; -using Ydb.Sdk.Services.Topic.Writer; +using Ydb.Sdk.Topic; +using Ydb.Sdk.Topic.Reader; +using Ydb.Sdk.Topic.Writer; const int countMessages = 100; const string topicName = "topic_name"; diff --git a/slo/src/TopicService/SloTopicContext.cs b/slo/src/TopicService/SloTopicContext.cs index 1d582dbd..68ca125f 100644 --- a/slo/src/TopicService/SloTopicContext.cs +++ b/slo/src/TopicService/SloTopicContext.cs @@ -4,9 +4,9 @@ using Microsoft.Extensions.Logging; using Ydb.Sdk; using Ydb.Sdk.Ado; -using Ydb.Sdk.Services.Topic; -using Ydb.Sdk.Services.Topic.Reader; -using Ydb.Sdk.Services.Topic.Writer; +using Ydb.Sdk.Topic; +using Ydb.Sdk.Topic.Reader; +using Ydb.Sdk.Topic.Writer; namespace TopicService; @@ -332,7 +332,7 @@ int partitionId } private static void CheckMessage(ConcurrentDictionary> localStore, - Ydb.Sdk.Services.Topic.Reader.Message message) + Ydb.Sdk.Topic.Reader.Message message) { if (localStore.TryGetValue(message.PartitionId, out var partition)) { @@ -363,7 +363,7 @@ private static string PrintLocalStore(ConcurrentDictionary pair.Key + ": " + string.Join(", ", pair.Value))) + "]"; - private static void AssertMessage(Ydb.Sdk.Services.Topic.Reader.Message message, string expectedMessageData) + private static void AssertMessage(Ydb.Sdk.Topic.Reader.Message message, string expectedMessageData) { if (expectedMessageData == message.Data) { diff --git a/src/Ydb.Sdk/CHANGELOG.md b/src/Ydb.Sdk/CHANGELOG.md index cdd465fc..b2e167df 100644 --- a/src/Ydb.Sdk/CHANGELOG.md +++ b/src/Ydb.Sdk/CHANGELOG.md @@ -1,3 +1,5 @@ +- **Breaking Change**: `Ydb.Sdk.Services.Topic` moved to `Ydb.Sdk.Topic`. + ## v0.24.0 - **Breaking Change**: Renamed properties in `YdbConnectionStringBuilder`: @@ -18,7 +20,7 @@ - Fixed bug ADO.NET/PoolManager: `SemaphoreSlim.WaitAsync` over-release on cancellation. - Feat ADO.NET: Mark `YdbConnection.State` as `Broken` when the underlying session is broken, including background deactivation. - Feat ADO.NET: Added YdbDataSource `ExecuteAsync` and `ExecuteInTransaction` convenience methods. -- **Breaking Change**: moved and renamed `Ydb.Sdk.Services.Query.TxMode` -> `Ydb.Sdk.Ado.TransactionMode`. +- **Breaking Change**: `Ydb.Sdk.Services.Query.TxMode` moved to `Ydb.Sdk.Ado.TransactionMode`. - Feat ADO.NET: Cache gRPC transport by `gRPCConnectionString` to reuse channels. - Fixed bug wrap-around ADO.NET: Big parameterized Decimal — `((ulong)bits[1] << 32)` -> `((ulong)(uint)bits[1] << 32)`. - Feat ADO.NET: Parameterized Decimal overflow check: `Precision` and `Scale`. diff --git a/src/Ydb.Sdk/src/Services/Topic/Deserializer.cs b/src/Ydb.Sdk/src/Topic/Deserializer.cs similarity index 98% rename from src/Ydb.Sdk/src/Services/Topic/Deserializer.cs rename to src/Ydb.Sdk/src/Topic/Deserializer.cs index dd1ef324..d7539e18 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Deserializer.cs +++ b/src/Ydb.Sdk/src/Topic/Deserializer.cs @@ -1,6 +1,6 @@ using System.Text; -namespace Ydb.Sdk.Services.Topic; +namespace Ydb.Sdk.Topic; public interface IDeserializer { diff --git a/src/Ydb.Sdk/src/Services/Topic/Exceptions.cs b/src/Ydb.Sdk/src/Topic/Exceptions.cs similarity index 92% rename from src/Ydb.Sdk/src/Services/Topic/Exceptions.cs rename to src/Ydb.Sdk/src/Topic/Exceptions.cs index 6e18e5ea..3a362c95 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Exceptions.cs +++ b/src/Ydb.Sdk/src/Topic/Exceptions.cs @@ -1,4 +1,4 @@ -namespace Ydb.Sdk.Services.Topic; +namespace Ydb.Sdk.Topic; public class WriterException : Exception { diff --git a/src/Ydb.Sdk/src/Services/Topic/IReader.cs b/src/Ydb.Sdk/src/Topic/IReader.cs similarity index 78% rename from src/Ydb.Sdk/src/Services/Topic/IReader.cs rename to src/Ydb.Sdk/src/Topic/IReader.cs index 6ec09452..be7f8553 100644 --- a/src/Ydb.Sdk/src/Services/Topic/IReader.cs +++ b/src/Ydb.Sdk/src/Topic/IReader.cs @@ -1,6 +1,6 @@ -using Ydb.Sdk.Services.Topic.Reader; +using Ydb.Sdk.Topic.Reader; -namespace Ydb.Sdk.Services.Topic; +namespace Ydb.Sdk.Topic; public interface IReader : IAsyncDisposable { diff --git a/src/Ydb.Sdk/src/Services/Topic/IWriter.cs b/src/Ydb.Sdk/src/Topic/IWriter.cs similarity index 87% rename from src/Ydb.Sdk/src/Services/Topic/IWriter.cs rename to src/Ydb.Sdk/src/Topic/IWriter.cs index d9e1ef29..0118b750 100644 --- a/src/Ydb.Sdk/src/Services/Topic/IWriter.cs +++ b/src/Ydb.Sdk/src/Topic/IWriter.cs @@ -1,6 +1,6 @@ -using Ydb.Sdk.Services.Topic.Writer; +using Ydb.Sdk.Topic.Writer; -namespace Ydb.Sdk.Services.Topic; +namespace Ydb.Sdk.Topic; public interface IWriter : IAsyncDisposable { @@ -13,7 +13,7 @@ public interface IWriter : IAsyncDisposable /// A Task which will complete with a delivery report corresponding to the produce request, /// or an exception if an error occured. /// - /// + /// /// Thrown in response to any write request that was unsuccessful for any reason. /// public Task WriteAsync(TValue data, CancellationToken cancellationToken = default); @@ -27,7 +27,7 @@ public interface IWriter : IAsyncDisposable /// A Task which will complete with a delivery report corresponding to the produce request, /// or an exception if an error occured. /// - /// + /// /// Thrown in response to any write request that was unsuccessful for any reason. /// public Task WriteAsync(Message message, CancellationToken cancellationToken = default); diff --git a/src/Ydb.Sdk/src/Services/Topic/Metadata.cs b/src/Ydb.Sdk/src/Topic/Metadata.cs similarity index 60% rename from src/Ydb.Sdk/src/Services/Topic/Metadata.cs rename to src/Ydb.Sdk/src/Topic/Metadata.cs index 9053c937..1b1e22a1 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Metadata.cs +++ b/src/Ydb.Sdk/src/Topic/Metadata.cs @@ -1,3 +1,3 @@ -namespace Ydb.Sdk.Services.Topic; +namespace Ydb.Sdk.Topic; public record Metadata(string Key, byte[] Value); diff --git a/src/Ydb.Sdk/src/Services/Topic/Reader/InternalBatchMessages.cs b/src/Ydb.Sdk/src/Topic/Reader/InternalBatchMessages.cs similarity index 98% rename from src/Ydb.Sdk/src/Services/Topic/Reader/InternalBatchMessages.cs rename to src/Ydb.Sdk/src/Topic/Reader/InternalBatchMessages.cs index 36a2f3f2..de07384b 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Reader/InternalBatchMessages.cs +++ b/src/Ydb.Sdk/src/Topic/Reader/InternalBatchMessages.cs @@ -2,7 +2,7 @@ using System.Diagnostics.CodeAnalysis; using Ydb.Topic; -namespace Ydb.Sdk.Services.Topic.Reader; +namespace Ydb.Sdk.Topic.Reader; internal class InternalBatchMessages { diff --git a/src/Ydb.Sdk/src/Services/Topic/Reader/Message.cs b/src/Ydb.Sdk/src/Topic/Reader/Message.cs similarity index 98% rename from src/Ydb.Sdk/src/Services/Topic/Reader/Message.cs rename to src/Ydb.Sdk/src/Topic/Reader/Message.cs index e8e0bab7..2158c511 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Reader/Message.cs +++ b/src/Ydb.Sdk/src/Topic/Reader/Message.cs @@ -1,7 +1,7 @@ using System.Collections.Immutable; using Ydb.Topic; -namespace Ydb.Sdk.Services.Topic.Reader; +namespace Ydb.Sdk.Topic.Reader; public class Message { diff --git a/src/Ydb.Sdk/src/Services/Topic/Reader/PartitionSession.cs b/src/Ydb.Sdk/src/Topic/Reader/PartitionSession.cs similarity index 98% rename from src/Ydb.Sdk/src/Services/Topic/Reader/PartitionSession.cs rename to src/Ydb.Sdk/src/Topic/Reader/PartitionSession.cs index f53a1851..b678c53e 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Reader/PartitionSession.cs +++ b/src/Ydb.Sdk/src/Topic/Reader/PartitionSession.cs @@ -1,7 +1,7 @@ using System.Collections.Concurrent; using Microsoft.Extensions.Logging; -namespace Ydb.Sdk.Services.Topic.Reader; +namespace Ydb.Sdk.Topic.Reader; internal class PartitionSession { diff --git a/src/Ydb.Sdk/src/Services/Topic/Reader/Reader.cs b/src/Ydb.Sdk/src/Topic/Reader/Reader.cs similarity index 99% rename from src/Ydb.Sdk/src/Services/Topic/Reader/Reader.cs rename to src/Ydb.Sdk/src/Topic/Reader/Reader.cs index 3b7a294b..a017e437 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Reader/Reader.cs +++ b/src/Ydb.Sdk/src/Topic/Reader/Reader.cs @@ -7,7 +7,7 @@ using Ydb.Topic.V1; using static Ydb.Topic.StreamReadMessage.Types.FromServer; -namespace Ydb.Sdk.Services.Topic.Reader; +namespace Ydb.Sdk.Topic.Reader; using MessageFromClient = StreamReadMessage.Types.FromClient; using MessageFromServer = StreamReadMessage.Types.FromServer; diff --git a/src/Ydb.Sdk/src/Services/Topic/Reader/ReaderBuilder.cs b/src/Ydb.Sdk/src/Topic/Reader/ReaderBuilder.cs similarity index 98% rename from src/Ydb.Sdk/src/Services/Topic/Reader/ReaderBuilder.cs rename to src/Ydb.Sdk/src/Topic/Reader/ReaderBuilder.cs index b7daa7d8..45310f05 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Reader/ReaderBuilder.cs +++ b/src/Ydb.Sdk/src/Topic/Reader/ReaderBuilder.cs @@ -1,6 +1,6 @@ using System.Text; -namespace Ydb.Sdk.Services.Topic.Reader; +namespace Ydb.Sdk.Topic.Reader; public class ReaderBuilder { diff --git a/src/Ydb.Sdk/src/Services/Topic/Reader/ReaderConfig.cs b/src/Ydb.Sdk/src/Topic/Reader/ReaderConfig.cs similarity index 96% rename from src/Ydb.Sdk/src/Services/Topic/Reader/ReaderConfig.cs rename to src/Ydb.Sdk/src/Topic/Reader/ReaderConfig.cs index de6287e3..edd529f3 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Reader/ReaderConfig.cs +++ b/src/Ydb.Sdk/src/Topic/Reader/ReaderConfig.cs @@ -1,6 +1,6 @@ using System.Text; -namespace Ydb.Sdk.Services.Topic.Reader; +namespace Ydb.Sdk.Topic.Reader; internal class ReaderConfig { diff --git a/src/Ydb.Sdk/src/Services/Topic/Reader/Utils.cs b/src/Ydb.Sdk/src/Topic/Reader/Utils.cs similarity index 92% rename from src/Ydb.Sdk/src/Services/Topic/Reader/Utils.cs rename to src/Ydb.Sdk/src/Topic/Reader/Utils.cs index 60e3454f..5750a615 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Reader/Utils.cs +++ b/src/Ydb.Sdk/src/Topic/Reader/Utils.cs @@ -1,4 +1,4 @@ -namespace Ydb.Sdk.Services.Topic.Reader; +namespace Ydb.Sdk.Topic.Reader; internal static class Utils { diff --git a/src/Ydb.Sdk/src/Services/Topic/Serializer.cs b/src/Ydb.Sdk/src/Topic/Serializer.cs similarity index 97% rename from src/Ydb.Sdk/src/Services/Topic/Serializer.cs rename to src/Ydb.Sdk/src/Topic/Serializer.cs index ad9d7650..03654301 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Serializer.cs +++ b/src/Ydb.Sdk/src/Topic/Serializer.cs @@ -1,6 +1,6 @@ using System.Text; -namespace Ydb.Sdk.Services.Topic; +namespace Ydb.Sdk.Topic; public interface ISerializer { diff --git a/src/Ydb.Sdk/src/Services/Topic/Settings.cs b/src/Ydb.Sdk/src/Topic/Settings.cs similarity index 99% rename from src/Ydb.Sdk/src/Services/Topic/Settings.cs rename to src/Ydb.Sdk/src/Topic/Settings.cs index 38dd1131..ab44678b 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Settings.cs +++ b/src/Ydb.Sdk/src/Topic/Settings.cs @@ -1,4 +1,4 @@ -namespace Ydb.Sdk.Services.Topic; +namespace Ydb.Sdk.Topic; /// /// Create topic request sent from client to server. diff --git a/src/Ydb.Sdk/src/Services/Topic/TopicClient.cs b/src/Ydb.Sdk/src/Topic/TopicClient.cs similarity index 98% rename from src/Ydb.Sdk/src/Services/Topic/TopicClient.cs rename to src/Ydb.Sdk/src/Topic/TopicClient.cs index 0f27ad01..2a1a12d4 100644 --- a/src/Ydb.Sdk/src/Services/Topic/TopicClient.cs +++ b/src/Ydb.Sdk/src/Topic/TopicClient.cs @@ -2,7 +2,7 @@ using Ydb.Topic; using Ydb.Topic.V1; -namespace Ydb.Sdk.Services.Topic; +namespace Ydb.Sdk.Topic; /// /// Client for YDB Topic service operations. diff --git a/src/Ydb.Sdk/src/Services/Topic/TopicSession.cs b/src/Ydb.Sdk/src/Topic/TopicSession.cs similarity index 98% rename from src/Ydb.Sdk/src/Services/Topic/TopicSession.cs rename to src/Ydb.Sdk/src/Topic/TopicSession.cs index 3739c47c..ea55b018 100644 --- a/src/Ydb.Sdk/src/Services/Topic/TopicSession.cs +++ b/src/Ydb.Sdk/src/Topic/TopicSession.cs @@ -1,6 +1,6 @@ using Microsoft.Extensions.Logging; -namespace Ydb.Sdk.Services.Topic; +namespace Ydb.Sdk.Topic; internal abstract class TopicSession : IAsyncDisposable { diff --git a/src/Ydb.Sdk/src/Services/Topic/Writer/Message.cs b/src/Ydb.Sdk/src/Topic/Writer/Message.cs similarity index 85% rename from src/Ydb.Sdk/src/Services/Topic/Writer/Message.cs rename to src/Ydb.Sdk/src/Topic/Writer/Message.cs index 449119ad..cd7d6813 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Writer/Message.cs +++ b/src/Ydb.Sdk/src/Topic/Writer/Message.cs @@ -1,4 +1,4 @@ -namespace Ydb.Sdk.Services.Topic.Writer; +namespace Ydb.Sdk.Topic.Writer; public class Message { diff --git a/src/Ydb.Sdk/src/Services/Topic/Writer/WriteResult.cs b/src/Ydb.Sdk/src/Topic/Writer/WriteResult.cs similarity index 97% rename from src/Ydb.Sdk/src/Services/Topic/Writer/WriteResult.cs rename to src/Ydb.Sdk/src/Topic/Writer/WriteResult.cs index 0954a7a9..ab4db6f3 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Writer/WriteResult.cs +++ b/src/Ydb.Sdk/src/Topic/Writer/WriteResult.cs @@ -1,6 +1,6 @@ using Ydb.Topic; -namespace Ydb.Sdk.Services.Topic.Writer; +namespace Ydb.Sdk.Topic.Writer; public class WriteResult { diff --git a/src/Ydb.Sdk/src/Services/Topic/Writer/Writer.cs b/src/Ydb.Sdk/src/Topic/Writer/Writer.cs similarity index 99% rename from src/Ydb.Sdk/src/Services/Topic/Writer/Writer.cs rename to src/Ydb.Sdk/src/Topic/Writer/Writer.cs index 44af6fab..9c0fe275 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Writer/Writer.cs +++ b/src/Ydb.Sdk/src/Topic/Writer/Writer.cs @@ -6,7 +6,7 @@ using Ydb.Topic; using Ydb.Topic.V1; -namespace Ydb.Sdk.Services.Topic.Writer; +namespace Ydb.Sdk.Topic.Writer; using MessageData = StreamWriteMessage.Types.WriteRequest.Types.MessageData; using MessageFromClient = StreamWriteMessage.Types.FromClient; diff --git a/src/Ydb.Sdk/src/Services/Topic/Writer/WriterBuilder.cs b/src/Ydb.Sdk/src/Topic/Writer/WriterBuilder.cs similarity index 98% rename from src/Ydb.Sdk/src/Services/Topic/Writer/WriterBuilder.cs rename to src/Ydb.Sdk/src/Topic/Writer/WriterBuilder.cs index 9a69bb96..972c104f 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Writer/WriterBuilder.cs +++ b/src/Ydb.Sdk/src/Topic/Writer/WriterBuilder.cs @@ -1,4 +1,4 @@ -namespace Ydb.Sdk.Services.Topic.Writer; +namespace Ydb.Sdk.Topic.Writer; public class WriterBuilder { diff --git a/src/Ydb.Sdk/src/Services/Topic/Writer/WriterConfig.cs b/src/Ydb.Sdk/src/Topic/Writer/WriterConfig.cs similarity index 96% rename from src/Ydb.Sdk/src/Services/Topic/Writer/WriterConfig.cs rename to src/Ydb.Sdk/src/Topic/Writer/WriterConfig.cs index b06c1ced..d5e14095 100644 --- a/src/Ydb.Sdk/src/Services/Topic/Writer/WriterConfig.cs +++ b/src/Ydb.Sdk/src/Topic/Writer/WriterConfig.cs @@ -1,6 +1,6 @@ using System.Text; -namespace Ydb.Sdk.Services.Topic.Writer; +namespace Ydb.Sdk.Topic.Writer; internal class WriterConfig { diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/ReaderIntegrationTests.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/ReaderIntegrationTests.cs index 3958d46c..37947b32 100644 --- a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/ReaderIntegrationTests.cs +++ b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/ReaderIntegrationTests.cs @@ -1,7 +1,6 @@ using Xunit; -using Ydb.Sdk.Services.Topic; -using Ydb.Sdk.Services.Topic.Reader; -using Ydb.Sdk.Services.Topic.Writer; +using Ydb.Sdk.Topic.Reader; +using Ydb.Sdk.Topic.Writer; namespace Ydb.Sdk.Topic.Tests; diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/ReaderUnitTests.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/ReaderUnitTests.cs index 72ffa91d..9c809f0e 100644 --- a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/ReaderUnitTests.cs +++ b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/ReaderUnitTests.cs @@ -6,8 +6,7 @@ using Xunit; using Ydb.Issue; using Ydb.Sdk.Ado; -using Ydb.Sdk.Services.Topic; -using Ydb.Sdk.Services.Topic.Reader; +using Ydb.Sdk.Topic.Reader; using Ydb.Topic; using Range = Moq.Range; diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/SerializerDeserializerUnitTests.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/SerializerDeserializerUnitTests.cs index ff7c05d6..bc0f0ae2 100644 --- a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/SerializerDeserializerUnitTests.cs +++ b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/SerializerDeserializerUnitTests.cs @@ -1,5 +1,4 @@ using Xunit; -using Ydb.Sdk.Services.Topic; namespace Ydb.Sdk.Topic.Tests; diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/WriterIntegrationTests.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/WriterIntegrationTests.cs index 1feeb78e..ae43e16b 100644 --- a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/WriterIntegrationTests.cs +++ b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/WriterIntegrationTests.cs @@ -1,10 +1,8 @@ using Google.Protobuf.WellKnownTypes; using Xunit; -using Ydb.Sdk.Services.Topic; -using Ydb.Sdk.Services.Topic.Writer; +using Ydb.Sdk.Topic.Writer; using Ydb.Topic; using Ydb.Topic.V1; -using Consumer = Ydb.Sdk.Services.Topic.Consumer; namespace Ydb.Sdk.Topic.Tests; diff --git a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/WriterUnitTests.cs b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/WriterUnitTests.cs index 43c62233..ace73c51 100644 --- a/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/WriterUnitTests.cs +++ b/src/Ydb.Sdk/test/Ydb.Sdk.Topic.Tests/WriterUnitTests.cs @@ -4,10 +4,8 @@ using Xunit; using Ydb.Issue; using Ydb.Sdk.Ado; -using Ydb.Sdk.Services.Topic; -using Ydb.Sdk.Services.Topic.Writer; +using Ydb.Sdk.Topic.Writer; using Ydb.Topic; -using Codec = Ydb.Sdk.Services.Topic.Codec; using Range = Moq.Range; namespace Ydb.Sdk.Topic.Tests;