Use TuPack.Encoding directly, instead of using TypeSystem.Tuples or Default

KrzysFR · abdullin · commit 24dc02f2dee1 · 2018-04-27T22:19:11.000+05:00
diff --git a/FoundationDB.Client/FdbDatabase.cs b/FoundationDB.Client/FdbDatabase.cs
@@ -36,6 +36,7 @@ namespace FoundationDB.Client
 	using System.Threading;
 	using System.Threading.Tasks;
 	using Doxense.Async;
+	using Doxense.Collections.Tuples;
 	using Doxense.Diagnostics.Contracts;
 	using Doxense.Memory;
 	using Doxense.Serialization.Encoders;
@@ -456,8 +457,8 @@ internal void ChangeRoot(IKeySubspace subspace, IFdbDirectory directory, bool re
 			lock (this)//TODO: don't use this for locking
 			{
 				m_readOnly = readOnly;
-				m_globalSpace = KeySubspace.Copy(subspace, TypeSystem.Tuples);
-				m_globalSpaceCopy = KeySubspace.Copy(subspace, TypeSystem.Tuples); // keep another copy
+				m_globalSpace = subspace.Copy(TuPack.Encoding);
+				m_globalSpaceCopy = subspace.Copy(TuPack.Encoding); // keep another copy
 				m_directory = directory == null ? null : new FdbDatabasePartition(this, directory);
 			}
 		}
diff --git a/FoundationDB.Client/Layers/Directories/FdbDirectoryLayer.cs b/FoundationDB.Client/Layers/Directories/FdbDirectoryLayer.cs
@@ -156,26 +156,26 @@ internal FdbDirectoryLayer(IDynamicKeySubspace nodeSubspace, IDynamicKeySubspace
 		/// <summary>Create an instance of a Directory Layer located under a specific prefix and path</summary>
 		/// <param name="prefix">Prefix for the content. The nodes will be stored under <paramref name="prefix"/> + &lt;FE&gt;</param>
 		/// <param name="path">Optional path, if the Directory Layer is not located at the root of the database.</param>
-		/// <param name="encoding">Optional key encoding scheme. If not specified, will use the <see cref="TypeSystem.Tuples"/> type system by default.</param>
+		/// <param name="encoding">Optional key encoding scheme. If not specified, will use the <see cref="TuPack"/> encoding by default.</param>
 		[NotNull]
 		public static FdbDirectoryLayer Create(Slice prefix, IEnumerable<string> path = null, IKeyEncoding encoding = null)
 		{
-			var subspace = KeySubspace.CreateDynamic(prefix, encoding ?? TypeSystem.Tuples);
+			var subspace = KeySubspace.CreateDynamic(prefix, encoding ?? TuPack.Encoding);
 			var location = path != null ? ParsePath(path) : STuple.Empty;
 			return new FdbDirectoryLayer(subspace.Partition[FdbKey.Directory], subspace, location);
 		}
 
 		/// <summary>Create an instance of a Directory Layer located under a specific subspace and path</summary>
 		/// <param name="subspace">Subspace for the content. The nodes will be stored under <paramref name="subspace"/>.Key + &lt;FE&gt;</param>
 		/// <param name="path">Optional path, if the Directory Layer is not located at the root of the database.</param>
-		/// <param name="encoding">Optional key encoding scheme. If not specified, will use the <see cref="TypeSystem.Tuples"/> type system by default.</param>
+		/// <param name="encoding">Optional key encoding scheme. If not specified, will use the <see cref="TuPack"/> encoding by default.</param>
 		[NotNull]
 		public static FdbDirectoryLayer Create(IKeySubspace subspace, IEnumerable<string> path = null, IKeyEncoding encoding = null)
 		{
 			if (subspace == null) throw new ArgumentNullException(nameof(subspace));
 
 			var location = path != null ? ParsePath(path) : STuple.Empty;
-			var space = subspace.Using(encoding ?? TypeSystem.Tuples);
+			var space = subspace.AsDynamic(encoding ?? TuPack.Encoding);
 			return new FdbDirectoryLayer(space.Partition[FdbKey.Directory], space, location);
 		}
 
@@ -932,11 +932,11 @@ private FdbDirectorySubspace ContentsOfNode([NotNull] IKeySubspace node, [NotNul
 			var prefix = this.NodeSubspace.Keys.Decode<Slice>(node.GetPrefix());
 			if (layer == FdbDirectoryPartition.LayerId)
 			{
-				return new FdbDirectoryPartition(path, relativePath, prefix, this);
+				return new FdbDirectoryPartition(path, relativePath, prefix, this, TuPack.Encoding);
 			}
 			else
 			{
-				return new FdbDirectorySubspace(path, relativePath, prefix, this, layer, TypeSystem.Default);
+				return new FdbDirectorySubspace(path, relativePath, prefix, this, layer, TuPack.Encoding);
 			}
 		}
 
diff --git a/FoundationDB.Client/Layers/Directories/FdbDirectoryPartition.cs b/FoundationDB.Client/Layers/Directories/FdbDirectoryPartition.cs
@@ -32,15 +32,16 @@ namespace FoundationDB.Layers.Directories
 	using Doxense.Collections.Tuples;
 	using Doxense.Serialization.Encoders;
 	using FoundationDB.Client;
+	using JetBrains.Annotations;
 
 	public class FdbDirectoryPartition : FdbDirectorySubspace
 	{
 
 		/// <summary>Returns a slice with the ASCII string "partition"</summary>
 		public static Slice LayerId => Slice.FromString("partition");
 
-		internal FdbDirectoryPartition(ITuple location, ITuple relativeLocation, Slice prefix, FdbDirectoryLayer directoryLayer)
-			: base(location, relativeLocation, prefix, new FdbDirectoryLayer(FromKey(prefix + FdbKey.Directory).Using(TypeSystem.Default), FromKey(prefix).Using(TypeSystem.Default), location), LayerId, TypeSystem.Default)
+		internal FdbDirectoryPartition([NotNull] ITuple location, [NotNull] ITuple relativeLocation, Slice prefix, [NotNull] FdbDirectoryLayer directoryLayer, [NotNull] IKeyEncoding keyEncoding)
+			: base(location, relativeLocation, prefix, new FdbDirectoryLayer(FromKey(prefix + FdbKey.Directory).AsDynamic(keyEncoding), FromKey(prefix).AsDynamic(keyEncoding), location), LayerId, keyEncoding)
 		{
 			this.ParentDirectoryLayer = directoryLayer;
 		}
diff --git a/FoundationDB.Client/Layers/Directories/FdbDirectorySubspace.cs b/FoundationDB.Client/Layers/Directories/FdbDirectorySubspace.cs
@@ -44,7 +44,7 @@ namespace FoundationDB.Layers.Directories
 	public class FdbDirectorySubspace : DynamicKeySubspace, IFdbDirectory
 	{
 
-		internal FdbDirectorySubspace(ITuple location, ITuple relativeLocation, Slice prefix, FdbDirectoryLayer directoryLayer, Slice layer, IKeyEncoding encoding)
+		internal FdbDirectorySubspace([NotNull] ITuple location, [NotNull] ITuple relativeLocation, Slice prefix, [NotNull] FdbDirectoryLayer directoryLayer, Slice layer, [NotNull] IKeyEncoding encoding)
 			: base(prefix, encoding)
 		{
 			Contract.Requires(location != null && relativeLocation != null && prefix != null && directoryLayer != null);
@@ -153,7 +153,7 @@ public async Task<FdbDirectorySubspace> ChangeLayerAsync(IFdbTransaction trans,
 			// set the layer to the new value
 			await this.DirectoryLayer.ChangeLayerInternalAsync(trans, this.RelativeLocation, newLayer).ConfigureAwait(false);
 			// and return the new version of the subspace
-			return new FdbDirectorySubspace(this.Location, this.RelativeLocation, GetKeyPrefix(), this.DirectoryLayer, newLayer, TypeSystem.Default);
+			return new FdbDirectorySubspace(this.Location, this.RelativeLocation, GetKeyPrefix(), this.DirectoryLayer, newLayer, this.Encoding);
 		}
 
 		/// <summary>Opens a subdirectory with the given <paramref name="path"/>.
diff --git a/FoundationDB.Client/Shared/TypeSystem/Encoders/KeyValueEncoders.Tuples.cs b/FoundationDB.Client/Shared/TypeSystem/Encoders/KeyValueEncoders.Tuples.cs
@@ -50,7 +50,7 @@ internal class TupleEncoder<T> : IKeyEncoder<T>, IValueEncoder<T>
 
 				private TupleEncoder() { }
 
-				public IKeyEncoding Encoding => TypeSystem.Tuples;
+				public IKeyEncoding Encoding => TuPack.Encoding;
 
 				public void WriteKeyTo(ref SliceWriter writer, T key)
 				{
@@ -84,7 +84,7 @@ internal class TupleCompositeEncoder<T1, T2> : CompositeKeyEncoder<T1, T2>
 
 				private TupleCompositeEncoder() { }
 
-				public override IKeyEncoding Encoding => TypeSystem.Tuples;
+				public override IKeyEncoding Encoding => TuPack.Encoding;
 
 				public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2) key)
 				{
@@ -114,7 +114,7 @@ internal class TupleCompositeEncoder<T1, T2, T3> : CompositeKeyEncoder<T1, T2, T
 
 				private TupleCompositeEncoder() { }
 
-				public override IKeyEncoding Encoding => TypeSystem.Tuples;
+				public override IKeyEncoding Encoding => TuPack.Encoding;
 
 				public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2, T3) key)
 				{
@@ -146,7 +146,7 @@ internal class TupleCompositeEncoder<T1, T2, T3, T4> : CompositeKeyEncoder<T1, T
 
 				private TupleCompositeEncoder() { }
 
-				public override IKeyEncoding Encoding => TypeSystem.Tuples;
+				public override IKeyEncoding Encoding => TuPack.Encoding;
 
 				public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2, T3, T4) key)
 				{
@@ -180,7 +180,7 @@ internal class TupleCompositeEncoder<T1, T2, T3, T4, T5> : CompositeKeyEncoder<T
 
 				private TupleCompositeEncoder() { }
 
-				public override IKeyEncoding Encoding => TypeSystem.Tuples;
+				public override IKeyEncoding Encoding => TuPack.Encoding;
 
 				public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2, T3, T4, T5) key)
 				{
@@ -216,7 +216,7 @@ internal class TupleCompositeEncoder<T1, T2, T3, T4, T5, T6> : CompositeKeyEncod
 
 				private TupleCompositeEncoder() { }
 
-				public override IKeyEncoding Encoding => TypeSystem.Tuples;
+				public override IKeyEncoding Encoding => TuPack.Encoding;
 
 				public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2, T3, T4, T5, T6) key)
 				{
diff --git a/FoundationDB.Client/Subspaces/KeySubspace.cs b/FoundationDB.Client/Subspaces/KeySubspace.cs
@@ -74,17 +74,16 @@ public static DynamicKeySubspace CreateDynamic(Slice prefix, [NotNull] IDynamicK
 		/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a dynamic key <paramref name="encoding"/>.</summary>
 		/// <returns>A subspace that can handle keys of any types and size.</returns>
 		[Pure, NotNull]
-		public static DynamicKeySubspace CreateDynamic(Slice prefix, [NotNull] IKeyEncoding encoding)
+		public static DynamicKeySubspace CreateDynamic(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)
 		{
-			Contract.NotNull(encoding, nameof(encoding));
-			return new DynamicKeySubspace(prefix, encoding.GetDynamicEncoder());
+			return new DynamicKeySubspace(prefix, (encoding ?? TuPack.Encoding).GetDynamicEncoder());
 		}
 
 		/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoding"/>.</summary>
 		/// <returns>A subspace that can handle keys of type <typeparamref name="T1"/>.</returns>
 		public static TypedKeySubspace<T1> CreateTyped<T1>(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)
 		{
-			return new TypedKeySubspace<T1>(prefix, (encoding ?? TypeSystem.Tuples).GetEncoder<T1>());
+			return new TypedKeySubspace<T1>(prefix, (encoding ?? TuPack.Encoding).GetEncoder<T1>());
 		}
 
 		/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoder"/>.</summary>
@@ -99,7 +98,7 @@ public static TypedKeySubspace<T1> CreateTyped<T1>(Slice prefix, [NotNull] IKeyE
 		/// <returns>A subspace that can handle composite keys of type (<typeparamref name="T1"/>, <typeparamref name="T2"/>).</returns>
 		public static TypedKeySubspace<T1, T2> CreateTyped<T1, T2>(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)
 		{
-			return new TypedKeySubspace<T1, T2>(prefix, (encoding ?? TypeSystem.Tuples).GetEncoder<T1, T2>());
+			return new TypedKeySubspace<T1, T2>(prefix, (encoding ?? TuPack.Encoding).GetEncoder<T1, T2>());
 		}
 
 		/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoder"/>.</summary>
@@ -114,7 +113,7 @@ public static TypedKeySubspace<T1, T2> CreateTyped<T1, T2>(Slice prefix, [NotNul
 		/// <returns>A subspace that can handle composite keys of type (<typeparamref name="T1"/>, <typeparamref name="T2"/>, <typeparamref name="T3"/>).</returns>
 		public static TypedKeySubspace<T1, T2, T3> CreateTyped<T1, T2, T3>(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)
 		{
-			return new TypedKeySubspace<T1, T2, T3>(prefix, (encoding ?? TypeSystem.Tuples).GetEncoder<T1, T2, T3>());
+			return new TypedKeySubspace<T1, T2, T3>(prefix, (encoding ?? TuPack.Encoding).GetEncoder<T1, T2, T3>());
 		}
 
 		/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoder"/>.</summary>
@@ -129,7 +128,7 @@ public static TypedKeySubspace<T1, T2, T3> CreateTyped<T1, T2, T3>(Slice prefix,
 		/// <returns>A subspace that can handle composite keys of type (<typeparamref name="T1"/>, <typeparamref name="T2"/>, <typeparamref name="T3"/>).</returns>
 		public static TypedKeySubspace<T1, T2, T3, T4> CreateTyped<T1, T2, T3, T4>(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)
 		{
-			return new TypedKeySubspace<T1, T2, T3, T4>(prefix, (encoding ?? TypeSystem.Tuples).GetEncoder<T1, T2, T3, T4>());
+			return new TypedKeySubspace<T1, T2, T3, T4>(prefix, (encoding ?? TuPack.Encoding).GetEncoder<T1, T2, T3, T4>());
 		}
 
 		/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoder"/>.</summary>
diff --git a/FoundationDB.Client/Tuples/Encoding/TupleKeyEncoder.cs b/FoundationDB.Client/Tuples/Encoding/TupleKeyEncoder.cs
@@ -43,7 +43,7 @@ public sealed class TupleKeyEncoder : IDynamicKeyEncoder
 		private TupleKeyEncoder()
 		{ }
 
-		public IKeyEncoding Encoding => TypeSystem.Tuples;
+		public IKeyEncoding Encoding => TuPack.Encoding;
 
 		public void PackKey<TTuple>(ref SliceWriter writer, TTuple items)
 			where TTuple : ITuple
diff --git a/FoundationDB.Client/Tuples/Encoding/TupleKeyEncoding.cs b/FoundationDB.Client/Tuples/Encoding/TupleKeyEncoding.cs
@@ -34,6 +34,9 @@ namespace Doxense.Collections.Tuples.Encoding
 	/// <summary>Encoding that uses the Tuple Binary Encoding format</summary>
 	public sealed class TupleKeyEncoding : IKeyEncoding
 	{
+
+		public static readonly TupleKeyEncoding Instance = new TupleKeyEncoding();
+
 		public IDynamicKeyEncoder GetDynamicEncoder()
 		{
 			return TupleKeyEncoder.Instance;
diff --git a/FoundationDB.Client/Tuples/TuPack.cs b/FoundationDB.Client/Tuples/TuPack.cs
@@ -34,6 +34,7 @@ namespace Doxense.Collections.Tuples
 	using Doxense.Diagnostics.Contracts;
 	using Doxense.Collections.Tuples.Encoding;
 	using Doxense.Memory;
+	using Doxense.Serialization.Encoders;
 	using FoundationDB.Client;
 	using JetBrains.Annotations;
 
@@ -42,6 +43,10 @@ namespace Doxense.Collections.Tuples
 	public static class TuPack
 	{
 
+		/// <summary>Key Encoding that use the Tuple Binary Encoding</summary>
+		[NotNull]
+		public static IKeyEncoding Encoding => TupleKeyEncoding.Instance;
+
 		#region Packing...
 
 		// Without prefix

Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ namespace FoundationDB.Client`
`36`	`36`	`using System.Threading;`
`37`	`37`	`using System.Threading.Tasks;`
`38`	`38`	`using Doxense.Async;`
	`39`	`+ using Doxense.Collections.Tuples;`
`39`	`40`	`using Doxense.Diagnostics.Contracts;`
`40`	`41`	`using Doxense.Memory;`
`41`	`42`	`using Doxense.Serialization.Encoders;`
`@@ -456,8 +457,8 @@ internal void ChangeRoot(IKeySubspace subspace, IFdbDirectory directory, bool re`
`456`	`457`	`lock (this)//TODO: don't use this for locking`
`457`	`458`	`{`
`458`	`459`	`m_readOnly = readOnly;`
`459`		`- m_globalSpace = KeySubspace.Copy(subspace, TypeSystem.Tuples);`
`460`		`- m_globalSpaceCopy = KeySubspace.Copy(subspace, TypeSystem.Tuples); // keep another copy`
	`460`	`+ m_globalSpace = subspace.Copy(TuPack.Encoding);`
	`461`	`+ m_globalSpaceCopy = subspace.Copy(TuPack.Encoding); // keep another copy`
`461`	`462`	`m_directory = directory == null ? null : new FdbDatabasePartition(this, directory);`
`462`	`463`	`}`
`463`	`464`	`}`
Original file line number	Diff line number	Diff line change
`@@ -156,26 +156,26 @@ internal FdbDirectoryLayer(IDynamicKeySubspace nodeSubspace, IDynamicKeySubspace`
`156`	`156`	`/// <summary>Create an instance of a Directory Layer located under a specific prefix and path</summary>`
`157`	`157`	`/// <param name="prefix">Prefix for the content. The nodes will be stored under <paramref name="prefix"/> + <FE></param>`
`158`	`158`	`/// <param name="path">Optional path, if the Directory Layer is not located at the root of the database.</param>`
`159`		`- /// <param name="encoding">Optional key encoding scheme. If not specified, will use the <see cref="TypeSystem.Tuples"/> type system by default.</param>`
	`159`	`+ /// <param name="encoding">Optional key encoding scheme. If not specified, will use the <see cref="TuPack"/> encoding by default.</param>`
`160`	`160`	`[NotNull]`
`161`	`161`	`public static FdbDirectoryLayer Create(Slice prefix, IEnumerable<string> path = null, IKeyEncoding encoding = null)`
`162`	`162`	`{`
`163`		`- var subspace = KeySubspace.CreateDynamic(prefix, encoding ?? TypeSystem.Tuples);`
	`163`	`+ var subspace = KeySubspace.CreateDynamic(prefix, encoding ?? TuPack.Encoding);`
`164`	`164`	`var location = path != null ? ParsePath(path) : STuple.Empty;`
`165`	`165`	`return new FdbDirectoryLayer(subspace.Partition[FdbKey.Directory], subspace, location);`
`166`	`166`	`}`
`167`	`167`
`168`	`168`	`/// <summary>Create an instance of a Directory Layer located under a specific subspace and path</summary>`
`169`	`169`	`/// <param name="subspace">Subspace for the content. The nodes will be stored under <paramref name="subspace"/>.Key + <FE></param>`
`170`	`170`	`/// <param name="path">Optional path, if the Directory Layer is not located at the root of the database.</param>`
`171`		`- /// <param name="encoding">Optional key encoding scheme. If not specified, will use the <see cref="TypeSystem.Tuples"/> type system by default.</param>`
	`171`	`+ /// <param name="encoding">Optional key encoding scheme. If not specified, will use the <see cref="TuPack"/> encoding by default.</param>`
`172`	`172`	`[NotNull]`
`173`	`173`	`public static FdbDirectoryLayer Create(IKeySubspace subspace, IEnumerable<string> path = null, IKeyEncoding encoding = null)`
`174`	`174`	`{`
`175`	`175`	`if (subspace == null) throw new ArgumentNullException(nameof(subspace));`
`176`	`176`
`177`	`177`	`var location = path != null ? ParsePath(path) : STuple.Empty;`
`178`		`- var space = subspace.Using(encoding ?? TypeSystem.Tuples);`
	`178`	`+ var space = subspace.AsDynamic(encoding ?? TuPack.Encoding);`
`179`	`179`	`return new FdbDirectoryLayer(space.Partition[FdbKey.Directory], space, location);`
`180`	`180`	`}`
`181`	`181`
`@@ -932,11 +932,11 @@ private FdbDirectorySubspace ContentsOfNode([NotNull] IKeySubspace node, [NotNul`
`932`	`932`	`var prefix = this.NodeSubspace.Keys.Decode<Slice>(node.GetPrefix());`
`933`	`933`	`if (layer == FdbDirectoryPartition.LayerId)`
`934`	`934`	`{`
`935`		`- return new FdbDirectoryPartition(path, relativePath, prefix, this);`
	`935`	`+ return new FdbDirectoryPartition(path, relativePath, prefix, this, TuPack.Encoding);`
`936`	`936`	`}`
`937`	`937`	`else`
`938`	`938`	`{`
`939`		`- return new FdbDirectorySubspace(path, relativePath, prefix, this, layer, TypeSystem.Default);`
	`939`	`+ return new FdbDirectorySubspace(path, relativePath, prefix, this, layer, TuPack.Encoding);`
`940`	`940`	`}`
`941`	`941`	`}`
`942`	`942`
Original file line number	Diff line number	Diff line change
`@@ -32,15 +32,16 @@ namespace FoundationDB.Layers.Directories`
`32`	`32`	`using Doxense.Collections.Tuples;`
`33`	`33`	`using Doxense.Serialization.Encoders;`
`34`	`34`	`using FoundationDB.Client;`
	`35`	`+ using JetBrains.Annotations;`
`35`	`36`
`36`	`37`	`public class FdbDirectoryPartition : FdbDirectorySubspace`
`37`	`38`	`{`
`38`	`39`
`39`	`40`	`/// <summary>Returns a slice with the ASCII string "partition"</summary>`
`40`	`41`	`public static Slice LayerId => Slice.FromString("partition");`
`41`	`42`
`42`		`- internal FdbDirectoryPartition(ITuple location, ITuple relativeLocation, Slice prefix, FdbDirectoryLayer directoryLayer)`
`43`		`- : base(location, relativeLocation, prefix, new FdbDirectoryLayer(FromKey(prefix + FdbKey.Directory).Using(TypeSystem.Default), FromKey(prefix).Using(TypeSystem.Default), location), LayerId, TypeSystem.Default)`
	`43`	`+ internal FdbDirectoryPartition([NotNull] ITuple location, [NotNull] ITuple relativeLocation, Slice prefix, [NotNull] FdbDirectoryLayer directoryLayer, [NotNull] IKeyEncoding keyEncoding)`
	`44`	`+ : base(location, relativeLocation, prefix, new FdbDirectoryLayer(FromKey(prefix + FdbKey.Directory).AsDynamic(keyEncoding), FromKey(prefix).AsDynamic(keyEncoding), location), LayerId, keyEncoding)`
`44`	`45`	`{`
`45`	`46`	`this.ParentDirectoryLayer = directoryLayer;`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ namespace FoundationDB.Layers.Directories`
`44`	`44`	`public class FdbDirectorySubspace : DynamicKeySubspace, IFdbDirectory`
`45`	`45`	`{`
`46`	`46`
`47`		`- internal FdbDirectorySubspace(ITuple location, ITuple relativeLocation, Slice prefix, FdbDirectoryLayer directoryLayer, Slice layer, IKeyEncoding encoding)`
	`47`	`+ internal FdbDirectorySubspace([NotNull] ITuple location, [NotNull] ITuple relativeLocation, Slice prefix, [NotNull] FdbDirectoryLayer directoryLayer, Slice layer, [NotNull] IKeyEncoding encoding)`
`48`	`48`	`: base(prefix, encoding)`
`49`	`49`	`{`
`50`	`50`	`Contract.Requires(location != null && relativeLocation != null && prefix != null && directoryLayer != null);`
`@@ -153,7 +153,7 @@ public async Task<FdbDirectorySubspace> ChangeLayerAsync(IFdbTransaction trans,`
`153`	`153`	`// set the layer to the new value`
`154`	`154`	`await this.DirectoryLayer.ChangeLayerInternalAsync(trans, this.RelativeLocation, newLayer).ConfigureAwait(false);`
`155`	`155`	`// and return the new version of the subspace`
`156`		`- return new FdbDirectorySubspace(this.Location, this.RelativeLocation, GetKeyPrefix(), this.DirectoryLayer, newLayer, TypeSystem.Default);`
	`156`	`+ return new FdbDirectorySubspace(this.Location, this.RelativeLocation, GetKeyPrefix(), this.DirectoryLayer, newLayer, this.Encoding);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`/// <summary>Opens a subdirectory with the given <paramref name="path"/>.`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ internal class TupleEncoder<T> : IKeyEncoder<T>, IValueEncoder<T>`
`50`	`50`
`51`	`51`	`private TupleEncoder() { }`
`52`	`52`
`53`		`- public IKeyEncoding Encoding => TypeSystem.Tuples;`
	`53`	`+ public IKeyEncoding Encoding => TuPack.Encoding;`
`54`	`54`
`55`	`55`	`public void WriteKeyTo(ref SliceWriter writer, T key)`
`56`	`56`	`{`
`@@ -84,7 +84,7 @@ internal class TupleCompositeEncoder<T1, T2> : CompositeKeyEncoder<T1, T2>`
`84`	`84`
`85`	`85`	`private TupleCompositeEncoder() { }`
`86`	`86`
`87`		`- public override IKeyEncoding Encoding => TypeSystem.Tuples;`
	`87`	`+ public override IKeyEncoding Encoding => TuPack.Encoding;`
`88`	`88`
`89`	`89`	`public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2) key)`
`90`	`90`	`{`
`@@ -114,7 +114,7 @@ internal class TupleCompositeEncoder<T1, T2, T3> : CompositeKeyEncoder<T1, T2, T`
`114`	`114`
`115`	`115`	`private TupleCompositeEncoder() { }`
`116`	`116`
`117`		`- public override IKeyEncoding Encoding => TypeSystem.Tuples;`
	`117`	`+ public override IKeyEncoding Encoding => TuPack.Encoding;`
`118`	`118`
`119`	`119`	`public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2, T3) key)`
`120`	`120`	`{`
`@@ -146,7 +146,7 @@ internal class TupleCompositeEncoder<T1, T2, T3, T4> : CompositeKeyEncoder<T1, T`
`146`	`146`
`147`	`147`	`private TupleCompositeEncoder() { }`
`148`	`148`
`149`		`- public override IKeyEncoding Encoding => TypeSystem.Tuples;`
	`149`	`+ public override IKeyEncoding Encoding => TuPack.Encoding;`
`150`	`150`
`151`	`151`	`public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2, T3, T4) key)`
`152`	`152`	`{`
`@@ -180,7 +180,7 @@ internal class TupleCompositeEncoder<T1, T2, T3, T4, T5> : CompositeKeyEncoder<T`
`180`	`180`
`181`	`181`	`private TupleCompositeEncoder() { }`
`182`	`182`
`183`		`- public override IKeyEncoding Encoding => TypeSystem.Tuples;`
	`183`	`+ public override IKeyEncoding Encoding => TuPack.Encoding;`
`184`	`184`
`185`	`185`	`public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2, T3, T4, T5) key)`
`186`	`186`	`{`
`@@ -216,7 +216,7 @@ internal class TupleCompositeEncoder<T1, T2, T3, T4, T5, T6> : CompositeKeyEncod`
`216`	`216`
`217`	`217`	`private TupleCompositeEncoder() { }`
`218`	`218`
`219`		`- public override IKeyEncoding Encoding => TypeSystem.Tuples;`
	`219`	`+ public override IKeyEncoding Encoding => TuPack.Encoding;`
`220`	`220`
`221`	`221`	`public override void WriteKeyPartsTo(ref SliceWriter writer, int count, ref (T1, T2, T3, T4, T5, T6) key)`
`222`	`222`	`{`
Original file line number	Diff line number	Diff line change
`@@ -74,17 +74,16 @@ public static DynamicKeySubspace CreateDynamic(Slice prefix, [NotNull] IDynamicK`
`74`	`74`	`/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a dynamic key <paramref name="encoding"/>.</summary>`
`75`	`75`	`/// <returns>A subspace that can handle keys of any types and size.</returns>`
`76`	`76`	`[Pure, NotNull]`
`77`		`- public static DynamicKeySubspace CreateDynamic(Slice prefix, [NotNull] IKeyEncoding encoding)`
	`77`	`+ public static DynamicKeySubspace CreateDynamic(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)`
`78`	`78`	`{`
`79`		`- Contract.NotNull(encoding, nameof(encoding));`
`80`		`- return new DynamicKeySubspace(prefix, encoding.GetDynamicEncoder());`
	`79`	`+ return new DynamicKeySubspace(prefix, (encoding ?? TuPack.Encoding).GetDynamicEncoder());`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoding"/>.</summary>`
`84`	`83`	`/// <returns>A subspace that can handle keys of type <typeparamref name="T1"/>.</returns>`
`85`	`84`	`public static TypedKeySubspace<T1> CreateTyped<T1>(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)`
`86`	`85`	`{`
`87`		`- return new TypedKeySubspace<T1>(prefix, (encoding ?? TypeSystem.Tuples).GetEncoder<T1>());`
	`86`	`+ return new TypedKeySubspace<T1>(prefix, (encoding ?? TuPack.Encoding).GetEncoder<T1>());`
`88`	`87`	`}`
`89`	`88`
`90`	`89`	`/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoder"/>.</summary>`
`@@ -99,7 +98,7 @@ public static TypedKeySubspace<T1> CreateTyped<T1>(Slice prefix, [NotNull] IKeyE`
`99`	`98`	`/// <returns>A subspace that can handle composite keys of type (<typeparamref name="T1"/>, <typeparamref name="T2"/>).</returns>`
`100`	`99`	`public static TypedKeySubspace<T1, T2> CreateTyped<T1, T2>(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)`
`101`	`100`	`{`
`102`		`- return new TypedKeySubspace<T1, T2>(prefix, (encoding ?? TypeSystem.Tuples).GetEncoder<T1, T2>());`
	`101`	`+ return new TypedKeySubspace<T1, T2>(prefix, (encoding ?? TuPack.Encoding).GetEncoder<T1, T2>());`
`103`	`102`	`}`
`104`	`103`
`105`	`104`	`/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoder"/>.</summary>`
`@@ -114,7 +113,7 @@ public static TypedKeySubspace<T1, T2> CreateTyped<T1, T2>(Slice prefix, [NotNul`
`114`	`113`	`/// <returns>A subspace that can handle composite keys of type (<typeparamref name="T1"/>, <typeparamref name="T2"/>, <typeparamref name="T3"/>).</returns>`
`115`	`114`	`public static TypedKeySubspace<T1, T2, T3> CreateTyped<T1, T2, T3>(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)`
`116`	`115`	`{`
`117`		`- return new TypedKeySubspace<T1, T2, T3>(prefix, (encoding ?? TypeSystem.Tuples).GetEncoder<T1, T2, T3>());`
	`116`	`+ return new TypedKeySubspace<T1, T2, T3>(prefix, (encoding ?? TuPack.Encoding).GetEncoder<T1, T2, T3>());`
`118`	`117`	`}`
`119`	`118`
`120`	`119`	`/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoder"/>.</summary>`
`@@ -129,7 +128,7 @@ public static TypedKeySubspace<T1, T2, T3> CreateTyped<T1, T2, T3>(Slice prefix,`
`129`	`128`	`/// <returns>A subspace that can handle composite keys of type (<typeparamref name="T1"/>, <typeparamref name="T2"/>, <typeparamref name="T3"/>).</returns>`
`130`	`129`	`public static TypedKeySubspace<T1, T2, T3, T4> CreateTyped<T1, T2, T3, T4>(Slice prefix, [CanBeNull] IKeyEncoding encoding = null)`
`131`	`130`	`{`
`132`		`- return new TypedKeySubspace<T1, T2, T3, T4>(prefix, (encoding ?? TypeSystem.Tuples).GetEncoder<T1, T2, T3, T4>());`
	`131`	`+ return new TypedKeySubspace<T1, T2, T3, T4>(prefix, (encoding ?? TuPack.Encoding).GetEncoder<T1, T2, T3, T4>());`
`133`	`132`	`}`
`134`	`133`
`135`	`134`	`/// <summary>Initializes a new subspace with the given binary <paramref name="prefix"/>, that uses a typed key <paramref name="encoder"/>.</summary>`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ namespace Doxense.Collections.Tuples.Encoding`
`34`	`34`	`/// <summary>Encoding that uses the Tuple Binary Encoding format</summary>`
`35`	`35`	`public sealed class TupleKeyEncoding : IKeyEncoding`
`36`	`36`	`{`
	`37`	`+`
	`38`	`+ public static readonly TupleKeyEncoding Instance = new TupleKeyEncoding();`
	`39`	`+`
`37`	`40`	`public IDynamicKeyEncoder GetDynamicEncoder()`
`38`	`41`	`{`
`39`	`42`	`return TupleKeyEncoder.Instance;`