Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
root = true

[*.cs]

csharp_style_expression_bodied_methods = true:suggestion
9 changes: 3 additions & 6 deletions examples/src/BasicExample/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,9 @@ internal class CmdOptions

internal static class Program
{
private static ServiceProvider GetServiceProvider()
{
return new ServiceCollection()
.AddLogging(configure => configure.AddConsole().SetMinimumLevel(LogLevel.Information))
.BuildServiceProvider();
}
private static ServiceProvider GetServiceProvider() => new ServiceCollection()
.AddLogging(configure => configure.AddConsole().SetMinimumLevel(LogLevel.Information))
.BuildServiceProvider();

private static async Task Run(CmdOptions cmdOptions)
{
Expand Down
16 changes: 5 additions & 11 deletions examples/src/Common/AuthUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,10 @@ public static async Task<ICredentialsProvider> MakeCredentialsFromEnv(
throw new InvalidOperationException("Failed to parse credentials from environmet, no valid options found.");
}

public static X509Certificate GetCustomServerCertificate()
{
return YcCerts.GetDefaultServerCertificate();
}
public static X509Certificate GetCustomServerCertificate() => YcCerts.GetDefaultServerCertificate();

private static bool IsTrueValue(string value)
{
return
value == "1" ||
value.ToLower() == "yes" ||
value.ToLower() == "true";
}
private static bool IsTrueValue(string value) =>
value == "1" ||
value.ToLower() == "yes" ||
value.ToLower() == "true";
}
12 changes: 4 additions & 8 deletions examples/src/Common/DataUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,31 +7,27 @@ namespace Ydb.Sdk.Examples;

public record Series(ulong SeriesId, string Title, DateTime ReleaseDate, string Info)
{
public static Series FromRow(Value.ResultSet.Row row)
{
return new Series(
public static Series FromRow(Value.ResultSet.Row row) =>
new(
SeriesId: (ulong)row["series_id"].GetOptionalUint64()!,
Title: (string)row["title"]!,
ReleaseDate: (DateTime)row["release_date"].GetOptionalDate()!,
Info: (string)row["series_info"]!
);
}
}

public record Season(ulong SeriesId, ulong SeasonId, string Title, DateTime FirstAired, DateTime LastAired);

public record Episode(ulong SeriesId, ulong SeasonId, ulong EpisodeId, string Title, DateTime AirDate)
{
public static Episode FromRow(Value.ResultSet.Row row)
{
return new Episode(
public static Episode FromRow(Value.ResultSet.Row row) =>
new(
SeriesId: (ulong)row["series_id"].GetOptionalUint64()!,
SeasonId: (ulong)row["season_id"].GetOptionalUint64()!,
EpisodeId: (ulong)row["episode_id"].GetOptionalUint64()!,
Title: (string)row["title"]!,
AirDate: (DateTime)row["air_date"].GetOptionalDate()!
);
}
}

public static class DataUtils
Expand Down
5 changes: 1 addition & 4 deletions examples/src/Common/TableExampleBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,5 @@ protected TableExampleBase(TableClient client, string database, string path)
BasePath = string.Join('/', database, path);
}

protected string FullTablePath(string table)
{
return string.Join('/', BasePath, table);
}
protected string FullTablePath(string table) => string.Join('/', BasePath, table);
}
5 changes: 1 addition & 4 deletions examples/src/DapperExample/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,5 @@ internal class User
public string Name { get; init; } = null!;
public string Email { get; init; } = null!;

public override string ToString()
{
return $"Id: {Id}, Name: {Name}, Email: {Email}";
}
public override string ToString() => $"Id: {Id}, Name: {Name}, Email: {Email}";
}
6 changes: 2 additions & 4 deletions examples/src/QueryExample/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,10 @@ internal class CmdOptions

internal static class Program
{
private static ServiceProvider GetServiceProvider()
{
return new ServiceCollection()
private static ServiceProvider GetServiceProvider() =>
new ServiceCollection()
.AddLogging(configure => configure.AddConsole().SetMinimumLevel(LogLevel.Information))
.BuildServiceProvider();
}

private static async Task Run(CmdOptions cmdOptions)
{
Expand Down
6 changes: 2 additions & 4 deletions examples/src/QueryExample/QueryExample.cs
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,8 @@ await Client.Exec(
}


private async Task InteractiveTx()
{
await Client.DoTx(async tx =>
private Task InteractiveTx() =>
Client.DoTx(async tx =>
{
var query1 = @$"
PRAGMA TablePathPrefix('{BasePath}');
Expand Down Expand Up @@ -217,7 +216,6 @@ UPSERT INTO seasons (series_id, season_id, first_aired) VALUES
await tx.Exec(query2, parameters2);
}
);
}

private async Task StreamSelect()
{
Expand Down
12 changes: 4 additions & 8 deletions slo/src/Internal/ConfigBinders.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ public class CreateConfigBinder(
Option<int> writeTimeoutOption)
: BinderBase<CreateConfig>
{
protected override CreateConfig GetBoundValue(BindingContext bindingContext)
{
return new CreateConfig(
protected override CreateConfig GetBoundValue(BindingContext bindingContext) =>
new(
bindingContext.ParseResult.GetValueForArgument(endpointArgument),
bindingContext.ParseResult.GetValueForArgument(dbArgument),
bindingContext.ParseResult.GetValueForOption(resourceYdbPath)!,
Expand All @@ -24,7 +23,6 @@ protected override CreateConfig GetBoundValue(BindingContext bindingContext)
bindingContext.ParseResult.GetValueForOption(initialDataCountOption),
bindingContext.ParseResult.GetValueForOption(writeTimeoutOption)
);
}
}

internal class RunConfigBinder(
Expand All @@ -40,9 +38,8 @@ internal class RunConfigBinder(
Option<int> timeOption)
: BinderBase<RunConfig>
{
protected override RunConfig GetBoundValue(BindingContext bindingContext)
{
return new RunConfig(
protected override RunConfig GetBoundValue(BindingContext bindingContext) =>
new(
bindingContext.ParseResult.GetValueForArgument(endpointArgument),
bindingContext.ParseResult.GetValueForArgument(dbArgument),
bindingContext.ParseResult.GetValueForOption(resourceYdbPath)!,
Expand All @@ -54,5 +51,4 @@ protected override RunConfig GetBoundValue(BindingContext bindingContext)
bindingContext.ParseResult.GetValueForOption(writeTimeoutOption),
bindingContext.ParseResult.GetValueForOption(timeOption)
);
}
}
8 changes: 3 additions & 5 deletions slo/src/TableService/SloTableContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,7 @@ protected override async Task Create(TableClient client, string createTableSql,
response.Status.IsSuccess ? response.Result.ResultSets[0].Rows[0][0].GetOptionalInt32() : null);
}

protected override async Task<TableClient> CreateClient(Config config)
{
return new TableClient(await Driver.CreateInitialized(new DriverConfig(config.Endpoint, config.Db),
ISloContext.Factory));
}
protected override async Task<TableClient> CreateClient(Config config) => new(
await Driver.CreateInitialized(new DriverConfig(config.Endpoint, config.Db), ISloContext.Factory)
);
}
10 changes: 4 additions & 6 deletions slo/src/TopicService/SloTopicContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,10 @@ private static void CheckMessage(ConcurrentDictionary<long, ConcurrentQueue<stri
throw new Exception("FAILED SLO TEST: NOT FOUND PARTITION FOR PRODUCER_ID!");
}

private static string PrintLocalStore(ConcurrentDictionary<long, ConcurrentQueue<string>> localStore)
{
return "[" +
string.Join("\n", localStore.Select(pair => pair.Key + ": " + string.Join(", ", pair.Value))) +
"]";
}
private static string PrintLocalStore(ConcurrentDictionary<long, ConcurrentQueue<string>> localStore) =>
"[" +
string.Join("\n", localStore.Select(pair => pair.Key + ": " + string.Join(", ", pair.Value))) +
"]";

private static void AssertMessage(Ydb.Sdk.Services.Topic.Reader.Message<string> message, string expectedMessageData)
{
Expand Down
12 changes: 3 additions & 9 deletions src/Ydb.Sdk/src/Ado/ThrowHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,12 @@ namespace Ydb.Sdk.Ado;

internal static class ThrowHelper
{
internal static T ThrowInvalidCast<T>(YdbValue ydbValue)
{
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)
{
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)
{
internal static void ThrowInvalidCastException(string expectedType, string actualType) =>
throw new InvalidCastException($"Invalid type of YDB value, expected: {expectedType}, actual: {actualType}.");
}
}
51 changes: 15 additions & 36 deletions src/Ydb.Sdk/src/Ado/YdbCommand.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ public override void Cancel()
{
}

public override int ExecuteNonQuery()
{
return ExecuteNonQueryAsync().GetAwaiter().GetResult();
}
public override int ExecuteNonQuery() => ExecuteNonQueryAsync().GetAwaiter().GetResult();

public override async Task<int> ExecuteNonQueryAsync(CancellationToken cancellationToken)
{
Expand All @@ -44,10 +41,7 @@ public override async Task<int> ExecuteNonQueryAsync(CancellationToken cancellat
return dataReader.RecordsAffected;
}

public override object? ExecuteScalar()
{
return ExecuteScalarAsync().GetAwaiter().GetResult();
}
public override object? ExecuteScalar() => ExecuteScalarAsync().GetAwaiter().GetResult();

public override async Task<object?> ExecuteScalarAsync(CancellationToken cancellationToken)
{
Expand Down Expand Up @@ -164,20 +158,13 @@ protected override DbTransaction? DbTransaction

public override bool DesignTimeVisible { get; set; }

protected override YdbParameter CreateDbParameter()
{
return new YdbParameter();
}
protected override YdbParameter CreateDbParameter() => new();

public new YdbDataReader ExecuteReader(CommandBehavior behavior = CommandBehavior.Default)
{
return ExecuteDbDataReader(behavior);
}
public new YdbDataReader ExecuteReader(CommandBehavior behavior = CommandBehavior.Default) =>
ExecuteDbDataReader(behavior);

protected override YdbDataReader ExecuteDbDataReader(CommandBehavior behavior)
{
return ExecuteReaderAsync(behavior).GetAwaiter().GetResult();
}
protected override YdbDataReader ExecuteDbDataReader(CommandBehavior behavior) =>
ExecuteReaderAsync(behavior).GetAwaiter().GetResult();

protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBehavior behavior,
CancellationToken cancellationToken)
Expand Down Expand Up @@ -236,26 +223,18 @@ await YdbConnection.Session.ExecuteQuery(
return ydbDataReader;
}

public new async Task<YdbDataReader> ExecuteReaderAsync()
{
return (YdbDataReader)await ExecuteDbDataReaderAsync(CommandBehavior.Default, CancellationToken.None);
}
public new async Task<YdbDataReader> ExecuteReaderAsync() =>
(YdbDataReader)await ExecuteDbDataReaderAsync(CommandBehavior.Default, CancellationToken.None);

public new Task<YdbDataReader> ExecuteReaderAsync(CancellationToken cancellationToken)
{
return ExecuteReaderAsync(CommandBehavior.Default, cancellationToken);
}
public new Task<YdbDataReader> ExecuteReaderAsync(CancellationToken cancellationToken) =>
ExecuteReaderAsync(CommandBehavior.Default, cancellationToken);

// ReSharper disable once MemberCanBePrivate.Global
public new Task<YdbDataReader> ExecuteReaderAsync(CommandBehavior behavior)
{
return ExecuteReaderAsync(behavior, CancellationToken.None);
}
public new Task<YdbDataReader> ExecuteReaderAsync(CommandBehavior behavior) =>
ExecuteReaderAsync(behavior, CancellationToken.None);

// ReSharper disable once MemberCanBePrivate.Global
public new async Task<YdbDataReader> ExecuteReaderAsync(CommandBehavior behavior,
CancellationToken cancellationToken)
{
return (YdbDataReader)await ExecuteDbDataReaderAsync(behavior, cancellationToken);
}
CancellationToken cancellationToken) =>
(YdbDataReader)await ExecuteDbDataReaderAsync(behavior, cancellationToken);
}
Loading
Loading