Commit 04a7bf90 authored by Nick Craver's avatar Nick Craver

Further removal of preserveAsyncOrder

This parses the option (so it remains valid), but always returns false in all cases since that's the actual behavior. Also removes outputting it in .ToString().
parent 06f08eb1
...@@ -10,35 +10,26 @@ public class Issue791 : TestBase ...@@ -10,35 +10,26 @@ public class Issue791 : TestBase
[Fact] [Fact]
public void PreserveAsyncOrderImplicitValue_ParsedFromConnectionString() public void PreserveAsyncOrderImplicitValue_ParsedFromConnectionString()
{ {
// We only care that it parses successfully while deprecated
var options = ConfigurationOptions.Parse("preserveAsyncOrder=true"); var options = ConfigurationOptions.Parse("preserveAsyncOrder=true");
#pragma warning disable CS0618 Assert.Equal("", options.ToString());
Assert.True(options.PreserveAsyncOrder);
#pragma warning restore CS0618
Assert.Equal("preserveAsyncOrder=True", options.ToString());
// We only care that it parses successfully while deprecated
options = ConfigurationOptions.Parse("preserveAsyncOrder=false"); options = ConfigurationOptions.Parse("preserveAsyncOrder=false");
#pragma warning disable CS0618 Assert.Equal("", options.ToString());
Assert.False(options.PreserveAsyncOrder);
#pragma warning restore CS0618
Assert.Equal("preserveAsyncOrder=False", options.ToString());
} }
[Fact] [Fact]
public void DefaultValue_IsTrue() public void DefaultValue_IsTrue()
{ {
var options = ConfigurationOptions.Parse("ssl=true"); var options = ConfigurationOptions.Parse("ssl=true");
#pragma warning disable CS0618
Assert.True(options.PreserveAsyncOrder);
#pragma warning restore CS0618
} }
[Fact] [Fact]
public void PreserveAsyncOrder_SetConnectionMultiplexerProperty() public void PreserveAsyncOrder_SetConnectionMultiplexerProperty()
{ {
// We only care that it parses successfully while deprecated
var multiplexer = ConnectionMultiplexer.Connect(TestConfig.Current.MasterServerAndPort + ",preserveAsyncOrder=false"); var multiplexer = ConnectionMultiplexer.Connect(TestConfig.Current.MasterServerAndPort + ",preserveAsyncOrder=false");
#pragma warning disable CS0618
Assert.False(multiplexer.PreserveAsyncOrder);
#pragma warning restore CS0618
} }
} }
} }
...@@ -124,7 +124,7 @@ public static string TryNormalize(string value) ...@@ -124,7 +124,7 @@ public static string TryNormalize(string value)
} }
} }
private bool? allowAdmin, abortOnConnectFail, highPrioritySocketThreads, resolveDns, ssl, preserveAsyncOrder; private bool? allowAdmin, abortOnConnectFail, highPrioritySocketThreads, resolveDns, ssl;
private string tieBreaker, sslHost, configChannel; private string tieBreaker, sslHost, configChannel;
...@@ -261,8 +261,8 @@ public int ConnectTimeout ...@@ -261,8 +261,8 @@ public int ConnectTimeout
[Obsolete("Not supported; if you require ordered pub/sub, please see " + nameof(ChannelMessageQueue), false)] [Obsolete("Not supported; if you require ordered pub/sub, please see " + nameof(ChannelMessageQueue), false)]
public bool PreserveAsyncOrder public bool PreserveAsyncOrder
{ {
get { return preserveAsyncOrder.GetValueOrDefault(true); } get { return false; }
set { preserveAsyncOrder = value; } set { }
} }
/// <summary> /// <summary>
...@@ -400,7 +400,6 @@ public ConfigurationOptions Clone() ...@@ -400,7 +400,6 @@ public ConfigurationOptions Clone()
responseTimeout = responseTimeout, responseTimeout = responseTimeout,
DefaultDatabase = DefaultDatabase, DefaultDatabase = DefaultDatabase,
ReconnectRetryPolicy = reconnectRetryPolicy, ReconnectRetryPolicy = reconnectRetryPolicy,
preserveAsyncOrder = preserveAsyncOrder,
SslProtocols = SslProtocols, SslProtocols = SslProtocols,
}; };
foreach (var item in EndPoints) foreach (var item in EndPoints)
...@@ -458,7 +457,6 @@ public string ToString(bool includePassword) ...@@ -458,7 +457,6 @@ public string ToString(bool includePassword)
Append(sb, OptionKeys.ConfigCheckSeconds, configCheckSeconds); Append(sb, OptionKeys.ConfigCheckSeconds, configCheckSeconds);
Append(sb, OptionKeys.ResponseTimeout, responseTimeout); Append(sb, OptionKeys.ResponseTimeout, responseTimeout);
Append(sb, OptionKeys.DefaultDatabase, DefaultDatabase); Append(sb, OptionKeys.DefaultDatabase, DefaultDatabase);
Append(sb, OptionKeys.PreserveAsyncOrder, preserveAsyncOrder);
commandMap?.AppendDeltas(sb); commandMap?.AppendDeltas(sb);
return sb.ToString(); return sb.ToString();
} }
...@@ -537,7 +535,7 @@ private void Clear() ...@@ -537,7 +535,7 @@ private void Clear()
{ {
ClientName = ServiceName = Password = tieBreaker = sslHost = configChannel = null; ClientName = ServiceName = Password = tieBreaker = sslHost = configChannel = null;
keepAlive = syncTimeout = connectTimeout = writeBuffer = connectRetry = configCheckSeconds = DefaultDatabase = null; keepAlive = syncTimeout = connectTimeout = writeBuffer = connectRetry = configCheckSeconds = DefaultDatabase = null;
allowAdmin = abortOnConnectFail = highPrioritySocketThreads = resolveDns = ssl = preserveAsyncOrder = null; allowAdmin = abortOnConnectFail = highPrioritySocketThreads = resolveDns = ssl = null;
defaultVersion = null; defaultVersion = null;
EndPoints.Clear(); EndPoints.Clear();
commandMap = null; commandMap = null;
...@@ -651,9 +649,6 @@ private void DoParse(string configuration, bool ignoreUnknown) ...@@ -651,9 +649,6 @@ private void DoParse(string configuration, bool ignoreUnknown)
DefaultDatabase = OptionKeys.ParseInt32(key, value); DefaultDatabase = OptionKeys.ParseInt32(key, value);
break; break;
case OptionKeys.PreserveAsyncOrder: case OptionKeys.PreserveAsyncOrder:
#pragma warning disable CS0618
PreserveAsyncOrder = OptionKeys.ParseBoolean(key, value);
#pragma warning restore CS0618
break; break;
case OptionKeys.SslProtocols: case OptionKeys.SslProtocols:
SslProtocols = OptionKeys.ParseSslProtocols(key, value); SslProtocols = OptionKeys.ParseSslProtocols(key, value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment