Skip to content

Commit 420d2de

Browse files
matteobortolazzomatteobortolazzo
authored
Merge pull request #128 from matteobortolazzo/dev
v3.1.0
2 parents 20cb9f9 + d53bfce commit 420d2de

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+444
-153
lines changed

‎CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# 3.1.0 (2020-03-200)
2+
3+
## Features
4+
5+
* **Views**: Possibility to query multiple views at once. ([#126](https://github.com/matteobortolazzo/couchdb-net/issues/126)) Thanks [Panos](https://github.com/panoukos41)
6+
* **Partitioned database**: It's possible to create partitioned databases. ([#122](https://github.com/matteobortolazzo/couchdb-net/issues/122))
7+
8+
## Bug Fixes
9+
10+
* **Views**: `CouchViewOptions` are serialized correctly when overriding the serializer. ([#125](https://github.com/matteobortolazzo/couchdb-net/issues/125)) Thanks [Panos](https://github.com/panoukos41)
11+
* **PropertyCaseType**: `PropertyCaseType` is not applied on internal properties anymore. ([#127](https://github.com/matteobortolazzo/couchdb-net/issues/127))
12+
113
# 3.0.1 (2020-03-10)
214

315
## Bug Fixes

‎LATEST_CHANGE.md

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
## Bug Fixes
1+
## Features
22

3-
* **Table Splitting**: Fix discriminator. ([#120](https://github.com/matteobortolazzo/couchdb-net/issues/120))
3+
* **Views**: Possibility to query multiple views at once. ([#126](https://github.com/matteobortolazzo/couchdb-net/issues/126)) Thanks [Panos](https://github.com/panoukos41)
4+
* **Partitioned database**: It's possible to create partitioned databases. ([#122](https://github.com/matteobortolazzo/couchdb-net/issues/122))
5+
6+
## Bug Fixes
7+
8+
* **Views**: `CouchViewOptions` are serialized correctly when overriding the serializer. ([#125](https://github.com/matteobortolazzo/couchdb-net/issues/125)) Thanks [Panos](https://github.com/panoukos41)
9+
* **PropertyCaseType**: `PropertyCaseType` is not applied on internal properties anymore. ([#127](https://github.com/matteobortolazzo/couchdb-net/issues/127))

‎README.md

+27
Original file line numberDiff line numberDiff line change
@@ -541,6 +541,33 @@ var viewRows = await _rebels.GetViewAsync<string[], RebelView>("jedi", "by_name"
541541
var details = await _rebels.GetDetailedViewAsync<int, BattleView>("battle", "by_name", options);
542542
```
543543

544+
You can also query a view with multiple options to get multiple results:
545+
```csharp
546+
var lukeOptions = new CouchViewOptions<string[]>
547+
{
548+
Key = new[] {"Luke", "Skywalker"},
549+
IncludeDocs = true
550+
};
551+
var yodaOptions = new CouchViewOptions<string[]>
552+
{
553+
Key = new[] {"Yoda"},
554+
IncludeDocs = true
555+
};
556+
var queries = new[]
557+
{
558+
lukeOptions,
559+
yodaOptions
560+
};
561+
562+
var results = await _rebels.GetViewQueryAsync<string[], RebelView>("jedi", "by_name", queries);
563+
var lukeRows = results[0];
564+
var yodaRows = results[1];
565+
// OR
566+
var details = await _rebels.GetDetailedViewQueryAsync<string[], RebelView>("jedi", "by_name", queries);
567+
var lukeDetails = details[0];
568+
var yodaDetails = details[1];
569+
```
570+
544571
## Local (non-replicating) Documents
545572

546573
The Local (non-replicating) document interface allows you to create local documents that are not replicated to other databases.

‎src/CouchDB.Driver/ChangesFeed/ChangesFeedFilter.cs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Collections.Generic;
33
using System.Linq.Expressions;
44
using CouchDB.Driver.ChangesFeed.Filters;
5-
using CouchDB.Driver.DTOs;
65
using CouchDB.Driver.Types;
76

87
namespace CouchDB.Driver.ChangesFeed

‎src/CouchDB.Driver/CouchClient.cs

+18-13
Original file line numberDiff line numberDiff line change
@@ -117,11 +117,11 @@ public ICouchDatabase<TSource> GetDatabase<TSource>(string database, string? dis
117117

118118
/// <inheritdoc />
119119
public async Task<ICouchDatabase<TSource>> CreateDatabaseAsync<TSource>(string database,
120-
int? shards = null, int? replicas = null, string? discriminator = null, CancellationToken cancellationToken = default)
120+
int? shards = null, int? replicas = null, bool? partitioned = null, string? discriminator = null, CancellationToken cancellationToken = default)
121121
where TSource : CouchDocument
122122
{
123123
QueryContext queryContext = NewQueryContext(database);
124-
IFlurlResponse response = await CreateDatabaseAsync(queryContext, shards, replicas, cancellationToken)
124+
IFlurlResponse response = await CreateDatabaseAsync(queryContext, shards, replicas, partitioned, cancellationToken)
125125
.ConfigureAwait(false);
126126

127127
if (response.IsSuccessful())
@@ -139,11 +139,11 @@ public async Task<ICouchDatabase<TSource>> CreateDatabaseAsync<TSource>(string d
139139

140140
/// <inheritdoc />
141141
public async Task<ICouchDatabase<TSource>> GetOrCreateDatabaseAsync<TSource>(string database,
142-
int? shards = null, int? replicas = null, string? discriminator = null, CancellationToken cancellationToken = default)
142+
int? shards = null, int? replicas = null, bool? partitioned = null, string? discriminator = null, CancellationToken cancellationToken = default)
143143
where TSource : CouchDocument
144144
{
145145
QueryContext queryContext = NewQueryContext(database);
146-
IFlurlResponse response = await CreateDatabaseAsync(queryContext, shards, replicas, cancellationToken)
146+
IFlurlResponse response = await CreateDatabaseAsync(queryContext, shards, replicas, partitioned, cancellationToken)
147147
.ConfigureAwait(false);
148148

149149
if (response.IsSuccessful() || response.StatusCode == (int)HttpStatusCode.PreconditionFailed)
@@ -173,21 +173,26 @@ public async Task DeleteDatabaseAsync(string database, CancellationToken cancell
173173
}
174174

175175
private Task<IFlurlResponse> CreateDatabaseAsync(QueryContext queryContext,
176-
int? shards = null, int? replicas = null, CancellationToken cancellationToken = default)
176+
int? shards = null, int? replicas = null, bool? partitioned = null, CancellationToken cancellationToken = default)
177177
{
178178
IFlurlRequest request = NewRequest()
179179
.AppendPathSegment(queryContext.EscapedDatabaseName);
180180

181-
if (shards.HasValue)
181+
if (shards.HasValue && shards.Value != 8)
182182
{
183183
request = request.SetQueryParam("q", shards.Value);
184184
}
185185

186-
if (replicas.HasValue)
186+
if (replicas.HasValue && replicas.Value != 3)
187187
{
188188
request = request.SetQueryParam("n", replicas.Value);
189189
}
190190

191+
if (partitioned.HasValue && partitioned.Value)
192+
{
193+
request = request.SetQueryParam("partitioned", "true");
194+
}
195+
191196
return request
192197
.AllowHttpStatus(HttpStatusCode.PreconditionFailed)
193198
.PutAsync(null, cancellationToken)
@@ -205,17 +210,17 @@ public ICouchDatabase<TSource> GetDatabase<TSource>() where TSource : CouchDocum
205210
}
206211

207212
/// <inheritdoc />
208-
public Task<ICouchDatabase<TSource>> CreateDatabaseAsync<TSource>(int? shards = null, int? replicas = null, string? discriminator = null,
213+
public Task<ICouchDatabase<TSource>> CreateDatabaseAsync<TSource>(int? shards = null, int? replicas = null, bool? partitioned = null, string? discriminator = null,
209214
CancellationToken cancellationToken = default) where TSource : CouchDocument
210215
{
211-
return CreateDatabaseAsync<TSource>(GetClassName<TSource>(), shards, replicas, discriminator, cancellationToken);
216+
return CreateDatabaseAsync<TSource>(GetClassName<TSource>(), shards, replicas, partitioned, discriminator, cancellationToken);
212217
}
213218

214219
/// <inheritdoc />
215-
public Task<ICouchDatabase<TSource>> GetOrCreateDatabaseAsync<TSource>(int? shards = null, int? replicas = null, string? discriminator = null,
220+
public Task<ICouchDatabase<TSource>> GetOrCreateDatabaseAsync<TSource>(int? shards = null, int? replicas = null, bool? partitioned = null, string? discriminator = null,
216221
CancellationToken cancellationToken = default) where TSource : CouchDocument
217222
{
218-
return GetOrCreateDatabaseAsync<TSource>(GetClassName<TSource>(), shards, replicas, discriminator, cancellationToken);
223+
return GetOrCreateDatabaseAsync<TSource>(GetClassName<TSource>(), shards, replicas, partitioned, discriminator, cancellationToken);
219224
}
220225

221226
/// <inheritdoc />
@@ -243,13 +248,13 @@ public ICouchDatabase<TUser> GetUsersDatabase<TUser>() where TUser : CouchUser
243248
/// <inheritdoc />
244249
public Task<ICouchDatabase<CouchUser>> GetOrCreateUsersDatabaseAsync(CancellationToken cancellationToken = default)
245250
{
246-
return GetOrCreateDatabaseAsync<CouchUser>(null, null, null, cancellationToken);
251+
return GetOrCreateDatabaseAsync<CouchUser>(null, null, null, null, cancellationToken);
247252
}
248253

249254
/// <inheritdoc />
250255
public Task<ICouchDatabase<TUser>> GetOrCreateUsersDatabaseAsync<TUser>(CancellationToken cancellationToken = default) where TUser : CouchUser
251256
{
252-
return GetOrCreateDatabaseAsync<TUser>(null, null, null, cancellationToken);
257+
return GetOrCreateDatabaseAsync<TUser>(null, null, null, null, cancellationToken);
253258
}
254259

255260
#endregion

‎src/CouchDB.Driver/CouchClientAuthentication.cs

-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
using CouchDB.Driver.Exceptions;
33
using Flurl.Http;
44
using System;
5-
using System.Collections.Generic;
65
using System.Linq;
7-
using System.Net.Http;
8-
using System.Text.RegularExpressions;
96
using System.Threading.Tasks;
107
using CouchDB.Driver.Helpers;
118
using CouchDB.Driver.Options;

‎src/CouchDB.Driver/CouchContext.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ private async Task InitDatabaseAsync<TSource>(PropertyInfo propertyInfo, CouchOp
9999
var documentBuilder = (CouchDocumentBuilder<TSource>)databaseBuilder.DocumentBuilders[documentType];
100100
var databaseName = documentBuilder.Database ?? Client.GetClassName(documentType);
101101
database = options.CheckDatabaseExists
102-
? await Client.GetOrCreateDatabaseAsync<TSource>(databaseName, documentBuilder.Shards, documentBuilder.Replicas, documentBuilder.Discriminator).ConfigureAwait(false)
102+
? await Client.GetOrCreateDatabaseAsync<TSource>(databaseName, documentBuilder.Shards, documentBuilder.Replicas, documentBuilder.Partitioned, documentBuilder.Discriminator).ConfigureAwait(false)
103103
: Client.GetDatabase<TSource>(databaseName, documentBuilder.Discriminator);
104104
}
105105
else

‎src/CouchDB.Driver/CouchDatabase.cs

+32
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,38 @@ public Task<CouchViewList<TKey, TValue, TSource>> GetDetailedViewAsync<TKey, TVa
536536
return requestTask.SendRequestAsync();
537537
}
538538

539+
/// <inheritdoc/>
540+
public async Task<List<CouchView<TKey, TValue, TSource>>[]> GetViewQueryAsync<TKey, TValue>(string design, string view,
541+
IList<CouchViewOptions<TKey>> queries, CancellationToken cancellationToken = default)
542+
{
543+
CouchViewList<TKey, TValue, TSource>[] result =
544+
await GetDetailedViewQueryAsync<TKey, TValue>(design, view, queries, cancellationToken)
545+
.ConfigureAwait(false);
546+
547+
return result.Select(x => x.Rows).ToArray();
548+
}
549+
550+
/// <inheritdoc/>
551+
public async Task<CouchViewList<TKey, TValue, TSource>[]> GetDetailedViewQueryAsync<TKey, TValue>(string design, string view,
552+
IList<CouchViewOptions<TKey>> queries, CancellationToken cancellationToken = default)
553+
{
554+
Check.NotNull(design, nameof(design));
555+
Check.NotNull(view, nameof(view));
556+
Check.NotNull(queries, nameof(queries));
557+
558+
IFlurlRequest request = NewRequest()
559+
.AppendPathSegments("_design", design, "_view", view, "queries");
560+
561+
CouchViewQueryResult<TKey, TValue, TSource> result =
562+
await request
563+
.PostJsonAsync(new { queries }, cancellationToken)
564+
.ReceiveJson<CouchViewQueryResult<TKey, TValue, TSource>>()
565+
.SendRequestAsync()
566+
.ConfigureAwait(false);
567+
568+
return result.Results;
569+
}
570+
539571
#endregion
540572

541573
#region Utils

‎src/CouchDB.Driver/DTOs/CouchViewQueryResult.cs

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
using CouchDB.Driver.Types;
2+
using CouchDB.Driver.Views;
3+
using Newtonsoft.Json;
4+
using System.Collections.Generic;
5+
6+
#nullable disable
7+
namespace CouchDB.Driver.DTOs
8+
{
9+
internal class CouchViewQueryResult<TKey, TValue, TDoc>
10+
where TDoc : CouchDocument
11+
{
12+
/// <summary>
13+
/// The results in the same order as the queries.
14+
/// </summary>
15+
[JsonProperty("results")]
16+
public CouchViewList<TKey, TValue, TDoc>[] Results { get; set; }
17+
}
18+
}
19+
#nullable restore

‎src/CouchDB.Driver/Extensions/ExpressionExtensions.cs

+5-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ internal static class ExpressionExtensions
1010
{
1111
public static MemberExpression ToMemberExpression(this Expression selector)
1212
{
13-
if (!(selector is LambdaExpression l) || !(l.Body is MemberExpression m))
13+
if (!(selector is LambdaExpression { Body: MemberExpression m }))
1414
{
1515
throw new ArgumentException("The given expression does not select a property.", nameof(selector));
1616
}
@@ -42,17 +42,16 @@ public static bool ContainsSelector(this Expression expression) =>
4242
expression is MethodCallExpression m && m.Arguments.Count == 2 && m.Arguments[1].IsSelectorExpression();
4343

4444
private static bool IsSelectorExpression(this Expression selector) =>
45-
selector is UnaryExpression u && u.Operand is LambdaExpression l && l.Body is MemberExpression;
45+
selector is UnaryExpression { Operand: LambdaExpression { Body: MemberExpression } };
4646

4747
public static Type GetSelectorType(this MethodCallExpression selector) =>
48-
selector.Arguments[1] is UnaryExpression u && u.Operand is LambdaExpression l &&
49-
l.Body is MemberExpression m
48+
selector.Arguments[1] is UnaryExpression { Operand: LambdaExpression { Body: MemberExpression m } }
5049
? m.Type
5150
: throw new InvalidOperationException(
5251
$"Method {selector.Method.Name} does not select a property.");
5352

5453
public static Delegate GetSelectorDelegate(this MethodCallExpression selector) =>
55-
selector.Arguments[1] is UnaryExpression u && u.Operand is LambdaExpression l
54+
selector.Arguments[1] is UnaryExpression { Operand: LambdaExpression l }
5655
? l.Compile()
5756
: throw new InvalidOperationException(
5857
$"Method {selector.Method.Name} does not select a property.");
@@ -66,7 +65,7 @@ public static LambdaExpression GetLambda(this MethodCallExpression node)
6665
}
6766

6867
public static Expression WrapInLambda(this Expression body, IReadOnlyCollection<ParameterExpression> lambdaParameters)
69-
{
68+
{
7069
LambdaExpression lambdaExpression = Expression.Lambda(body, lambdaParameters);
7170
return Expression.Quote(lambdaExpression);
7271
}

‎src/CouchDB.Driver/Extensions/FlurlRequestExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public static Task<Stream> PostStringStreamAsync(
5050
public static IFlurlRequest ApplyQueryParametersOptions(this IFlurlRequest request, object options)
5151
{
5252
IEnumerable<(string Name, object? Value)> queryParameters = OptionsHelper.ToQueryParameters(options);
53-
foreach (var (name, value) in queryParameters)
53+
foreach ((var name, object? value) in queryParameters)
5454
{
5555
request = request.SetQueryParam(name, value);
5656
}

‎src/CouchDB.Driver/Extensions/MemberInfoExtensions.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ internal static class MemberInfoExtensions
1212
{
1313
public static string GetCouchPropertyName(this MemberInfo memberInfo, PropertyCaseType propertyCaseType)
1414
{
15-
var jsonPropertyAttributes = memberInfo.GetCustomAttributes(typeof(JsonPropertyAttribute), true);
15+
object[] jsonPropertyAttributes = memberInfo.GetCustomAttributes(typeof(JsonPropertyAttribute), true);
1616
JsonPropertyAttribute? jsonProperty = jsonPropertyAttributes.Length > 0
1717
? jsonPropertyAttributes[0] as JsonPropertyAttribute
1818
: null;

‎src/CouchDB.Driver/Extensions/TypeExtensions.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ public static Type GetSequenceType(this Type type)
7373

7474
public static IEnumerable<Type> GetGenericTypeImplementations(this Type type, Type interfaceOrBaseType)
7575
{
76-
var typeInfo = type.GetTypeInfo();
76+
TypeInfo? typeInfo = type.GetTypeInfo();
7777
if (!typeInfo.IsGenericTypeDefinition)
7878
{
79-
var baseTypes = interfaceOrBaseType.GetTypeInfo().IsInterface
79+
IEnumerable<Type> baseTypes = interfaceOrBaseType.GetTypeInfo().IsInterface
8080
? typeInfo.ImplementedInterfaces
8181
: type.GetBaseTypes();
82-
foreach (var baseType in baseTypes)
82+
foreach (Type? baseType in baseTypes)
8383
{
8484
if (baseType.IsGenericType
8585
&& baseType.GetGenericTypeDefinition() == interfaceOrBaseType)
@@ -96,9 +96,9 @@ public static IEnumerable<Type> GetGenericTypeImplementations(this Type type, Ty
9696
}
9797
}
9898

99-
public static IEnumerable<Type> GetBaseTypes(this Type type)
99+
private static IEnumerable<Type> GetBaseTypes(this Type? type)
100100
{
101-
type = type.BaseType;
101+
type = type?.BaseType;
102102

103103
while (type != null)
104104
{

‎src/CouchDB.Driver/Helpers/CouchContractResolver.cs

+3-11
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,10 @@ internal CouchContractResolver(PropertyCaseType propertyCaseType)
2323
JsonProperty property = base.CreateProperty(member, memberSerialization);
2424
if (property != null && !property.Ignored)
2525
{
26-
property.PropertyName = member.GetCouchPropertyName(_propertyCaseType);
27-
28-
DefaultValueAttribute? defaultValueAttribute = member.GetCustomAttribute<DefaultValueAttribute>();
29-
if (defaultValueAttribute != null && member is PropertyInfo propertyInfo)
26+
var declaringNamespace = member.DeclaringType?.Namespace;
27+
if (declaringNamespace != null && !declaringNamespace.Contains("CouchDB.Driver"))
3028
{
31-
property.ShouldSerialize =
32-
instance =>
33-
{
34-
object? value = propertyInfo.GetValue(instance);
35-
var shouldSerialize = !Equals(value, defaultValueAttribute.Value);
36-
return shouldSerialize;
37-
};
29+
property.PropertyName = member.GetCouchPropertyName(_propertyCaseType);
3830
}
3931
}
4032
return property;

‎src/CouchDB.Driver/Helpers/MicrosecondEpochConverter.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace CouchDB.Driver.Helpers
77
[System.Diagnostics.CodeAnalysis.SuppressMessage("Performance", "CA1812:Avoid uninstantiated internal classes")]
88
internal class MicrosecondEpochConverter : DateTimeConverterBase
99
{
10-
private static readonly DateTime Epoch = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
10+
private static readonly DateTime Epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
1111

1212
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
1313
{
@@ -19,7 +19,7 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s
1919
Check.NotNull(reader, nameof(reader));
2020

2121
return reader.Value != null ?
22-
(object)Epoch.AddMilliseconds((long)reader.Value / 1000d) :
22+
Epoch.AddMilliseconds((long)reader.Value / 1000d) as object :
2323
null;
2424
}
2525
}

0 commit comments

Comments
 (0)