Skip to content

Commit 24af7b0

Browse files
committed
Moved FdbFuture<T> to the FoundationDb.Client.Native namespace since it is a concept specific to fdb_c.dll
1 parent 0257e3b commit 24af7b0

File tree

10 files changed

+22
-24
lines changed

10 files changed

+22
-24
lines changed

FoundationDB.Client/FdbWatch.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#region BSD Licence
2-
/* Copyright (c) 2013, Doxense SARL
2+
/* Copyright (c) 2013-2015, Doxense SAS
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -28,6 +28,7 @@ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
2828

2929
namespace FoundationDB.Client
3030
{
31+
using FoundationDB.Client.Native;
3132
using FoundationDB.Client.Utils;
3233
using System;
3334
using System.Diagnostics;
@@ -40,7 +41,7 @@ public struct FdbWatch : IDisposable
4041
{
4142
//REVIEW: sould we change this to a class?
4243

43-
private readonly FdbFuture<Slice> m_future;
44+
private readonly FdbFuture<Slice> m_future; //REVIEW: this is specific to the native handler, we should find a better abstraction for the generic case! (we need a Task-like object that can be cancelled/disposed)
4445
private Slice m_key; //PERF: readonly slice
4546
private Slice m_value;
4647

FoundationDB.Client/FoundationDB.Client.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@
109109
<Compile Include="IFdbReadOnlyRetryable.cs" />
110110
<Compile Include="IFdbDatabase.cs" />
111111
<Compile Include="IFdbRetryable.cs" />
112-
<Compile Include="FdbFuture.cs" />
113-
<Compile Include="FdbFutureArray.cs" />
112+
<Compile Include="Native\FdbFuture.cs" />
113+
<Compile Include="Native\FdbFutureArray.cs" />
114114
<Compile Include="FdbWatch.cs" />
115115
<Compile Include="Fdb.System.cs" />
116116
<Compile Include="FdbConflictRangeType.cs" />
@@ -169,7 +169,7 @@
169169
<Compile Include="FdbTransaction.cs" />
170170
<Compile Include="FdbDatabase.cs" />
171171
<Compile Include="FdbCluster.cs" />
172-
<Compile Include="FdbFutureSingle.cs" />
172+
<Compile Include="Native\FdbFutureSingle.cs" />
173173
<Compile Include="Fdb.cs" />
174174
<Compile Include="Async\IAsyncEnumerator.cs" />
175175
<Compile Include="Async\IAsyncEnumerable.cs" />
@@ -222,12 +222,12 @@
222222
<Compile Include="Utils\SliceWriter.cs" />
223223
<Compile Include="Utils\Contract.cs" />
224224
<Compile Include="Native\FdbKeyValue.cs" />
225-
<Compile Include="Native\TransactionHandle.cs" />
225+
<Compile Include="Native\Handles\TransactionHandle.cs" />
226226
<Compile Include="Native\FdbNative.cs" />
227-
<Compile Include="Native\ClusterHandle.cs" />
228-
<Compile Include="Native\DatabaseHandle.cs" />
229-
<Compile Include="Native\FutureHandle.cs" />
230-
<Compile Include="Native\FdbSafeHandle.cs" />
227+
<Compile Include="Native\Handles\ClusterHandle.cs" />
228+
<Compile Include="Native\Handles\DatabaseHandle.cs" />
229+
<Compile Include="Native\Handles\FutureHandle.cs" />
230+
<Compile Include="Native\Handles\FdbSafeHandle.cs" />
231231
<Compile Include="Native\UnmanagedLibrary.cs" />
232232
<Compile Include="Converters\FdbConverters.cs" />
233233
<Compile Include="Converters\IFdbConverter.cs" />

FoundationDB.Client/FdbFuture.cs renamed to FoundationDB.Client/Native/FdbFuture.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#region BSD Licence
2-
/* Copyright (c) 2013, Doxense SARL
2+
/* Copyright (c) 2013-2015, Doxense SAS
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -29,9 +29,8 @@ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
2929
// enable this to help debug Futures
3030
#undef DEBUG_FUTURES
3131

32-
namespace FoundationDB.Client
32+
namespace FoundationDB.Client.Native
3333
{
34-
using FoundationDB.Client.Native;
3534
using FoundationDB.Client.Utils;
3635
using JetBrains.Annotations;
3736
using System;

FoundationDB.Client/FdbFutureArray.cs renamed to FoundationDB.Client/Native/FdbFutureArray.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#region BSD Licence
2-
/* Copyright (c) 2013-2014, Doxense SAS
2+
/* Copyright (c) 2013-2015, Doxense SAS
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -26,9 +26,8 @@ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
2626
*/
2727
#endregion
2828

29-
namespace FoundationDB.Client
29+
namespace FoundationDB.Client.Native
3030
{
31-
using FoundationDB.Client.Native;
3231
using JetBrains.Annotations;
3332
using System;
3433
using System.Collections.Generic;

FoundationDB.Client/FdbFutureSingle.cs renamed to FoundationDB.Client/Native/FdbFutureSingle.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#region BSD Licence
2-
/* Copyright (c) 2013-2014, Doxense SAS
2+
/* Copyright (c) 2013-2015, Doxense SAS
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without
@@ -28,9 +28,8 @@ DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
2828

2929
#undef DEBUG_FUTURES
3030

31-
namespace FoundationDB.Client
31+
namespace FoundationDB.Client.Native
3232
{
33-
using FoundationDB.Client.Native;
3433
using JetBrains.Annotations;
3534
using System;
3635
using System.Diagnostics;

FoundationDB.Client/Native/ClusterHandle.cs renamed to FoundationDB.Client/Native/Handles/ClusterHandle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#region BSD Licence
2-
/* Copyright (c) 2013, Doxense SARL
2+
/* Copyright (c) 2013-2015, Doxense SAS
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without

FoundationDB.Client/Native/DatabaseHandle.cs renamed to FoundationDB.Client/Native/Handles/DatabaseHandle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#region BSD Licence
2-
/* Copyright (c) 2013, Doxense SARL
2+
/* Copyright (c) 2013-2015, Doxense SAS
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without

FoundationDB.Client/Native/FdbSafeHandle.cs renamed to FoundationDB.Client/Native/Handles/FdbSafeHandle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#region BSD Licence
2-
/* Copyright (c) 2013-2014, Doxense SAS
2+
/* Copyright (c) 2013-2015, Doxense SAS
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without

FoundationDB.Client/Native/FutureHandle.cs renamed to FoundationDB.Client/Native/Handles/FutureHandle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#region BSD Licence
2-
/* Copyright (c) 2013-2014, Doxense SAS
2+
/* Copyright (c) 2013-2015, Doxense SAS
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without

FoundationDB.Client/Native/TransactionHandle.cs renamed to FoundationDB.Client/Native/Handles/TransactionHandle.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#region BSD Licence
2-
/* Copyright (c) 2013-2014, Doxense SAS
2+
/* Copyright (c) 2013-2015, Doxense SAS
33
All rights reserved.
44
55
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)