Commit 4c781d7e authored by Marc Gravell's avatar Marc Gravell

remove "high priority" code; not marked [Obsolete] yet

parent 9a63d26d
...@@ -305,8 +305,9 @@ internal void MakeMaster(ServerEndPoint server, ReplicationChangeOptions options ...@@ -305,8 +305,9 @@ internal void MakeMaster(ServerEndPoint server, ReplicationChangeOptions options
if (log == null) log = TextWriter.Null; if (log == null) log = TextWriter.Null;
CommandMap.AssertAvailable(RedisCommand.SLAVEOF); CommandMap.AssertAvailable(RedisCommand.SLAVEOF);
#pragma warning disable CS0618
const CommandFlags flags = CommandFlags.NoRedirect | CommandFlags.HighPriority; const CommandFlags flags = CommandFlags.NoRedirect | CommandFlags.HighPriority;
#pragma warning restore CS0618
Message msg; Message msg;
LogLocked(log, "Checking {0} is available...", Format.ToString(srv.EndPoint)); LogLocked(log, "Checking {0} is available...", Format.ToString(srv.EndPoint));
...@@ -1275,8 +1276,9 @@ internal async Task<bool> ReconfigureAsync(bool first, bool reconfigureAll, Text ...@@ -1275,8 +1276,9 @@ internal async Task<bool> ReconfigureAsync(bool first, bool reconfigureAll, Text
{ {
throw new InvalidOperationException("No nodes to consider"); throw new InvalidOperationException("No nodes to consider");
} }
#pragma warning disable CS0618
const CommandFlags flags = CommandFlags.NoRedirect | CommandFlags.HighPriority; const CommandFlags flags = CommandFlags.NoRedirect | CommandFlags.HighPriority;
#pragma warning restore CS0618
List<ServerEndPoint> masters = new List<ServerEndPoint>(endpoints.Count); List<ServerEndPoint> masters = new List<ServerEndPoint>(endpoints.Count);
bool useTieBreakers = !string.IsNullOrWhiteSpace(configuration.TieBreaker); bool useTieBreakers = !string.IsNullOrWhiteSpace(configuration.TieBreaker);
......
...@@ -13,8 +13,9 @@ public enum CommandFlags ...@@ -13,8 +13,9 @@ public enum CommandFlags
/// </summary> /// </summary>
None = 0, None = 0,
/// <summary> /// <summary>
/// This command may jump regular-priority commands that have not yet been written to the redis stream. /// From 2.0, this flag is not used
/// </summary> /// </summary>
// [Obsolete("From 2.0, this flag is not used", false)]
HighPriority = 1, HighPriority = 1,
/// <summary> /// <summary>
/// The caller is not interested in the result; the caller will immediately receive a default-value /// The caller is not interested in the result; the caller will immediately receive a default-value
......
...@@ -65,7 +65,9 @@ internal abstract class Message : ICompletable ...@@ -65,7 +65,9 @@ internal abstract class Message : ICompletable
| CommandFlags.DemandSlave | CommandFlags.DemandSlave
| CommandFlags.PreferMaster | CommandFlags.PreferMaster
| CommandFlags.PreferSlave | CommandFlags.PreferSlave
#pragma warning disable CS0618
| CommandFlags.HighPriority | CommandFlags.HighPriority
#pragma warning restore CS0618
| CommandFlags.FireAndForget | CommandFlags.FireAndForget
| CommandFlags.NoRedirect | CommandFlags.NoRedirect
| CommandFlags.NoScriptCache; | CommandFlags.NoScriptCache;
...@@ -199,9 +201,6 @@ internal void SetScriptUnavailable() ...@@ -199,9 +201,6 @@ internal void SetScriptUnavailable()
} }
public bool IsFireAndForget => (flags & CommandFlags.FireAndForget) != 0; public bool IsFireAndForget => (flags & CommandFlags.FireAndForget) != 0;
public bool IsHighPriority => (flags & CommandFlags.HighPriority) != 0;
public bool IsInternalCall => (flags & InternalCallFlag) != 0; public bool IsInternalCall => (flags & InternalCallFlag) != 0;
public ResultBox ResultBox => resultBox; public ResultBox ResultBox => resultBox;
......
...@@ -261,8 +261,9 @@ internal void AutoConfigure(PhysicalConnection connection) ...@@ -261,8 +261,9 @@ internal void AutoConfigure(PhysicalConnection connection)
} }
var commandMap = Multiplexer.CommandMap; var commandMap = Multiplexer.CommandMap;
#pragma warning disable CS0618
const CommandFlags flags = CommandFlags.FireAndForget | CommandFlags.HighPriority | CommandFlags.NoRedirect; const CommandFlags flags = CommandFlags.FireAndForget | CommandFlags.HighPriority | CommandFlags.NoRedirect;
#pragma warning restore CS0618
var features = GetFeatures(); var features = GetFeatures();
Message msg; Message msg;
...@@ -514,7 +515,9 @@ internal bool CheckInfoReplication() ...@@ -514,7 +515,9 @@ internal bool CheckInfoReplication()
if (version >= RedisFeatures.v2_8_0 && Multiplexer.CommandMap.IsAvailable(RedisCommand.INFO) if (version >= RedisFeatures.v2_8_0 && Multiplexer.CommandMap.IsAvailable(RedisCommand.INFO)
&& (bridge = GetBridge(ConnectionType.Interactive, false)) != null) && (bridge = GetBridge(ConnectionType.Interactive, false)) != null)
{ {
#pragma warning disable CS0618
var msg = Message.Create(-1, CommandFlags.FireAndForget | CommandFlags.HighPriority | CommandFlags.NoRedirect, RedisCommand.INFO, RedisLiterals.replication); var msg = Message.Create(-1, CommandFlags.FireAndForget | CommandFlags.HighPriority | CommandFlags.NoRedirect, RedisCommand.INFO, RedisLiterals.replication);
#pragma warning restore CS0618
msg.SetInternalCall(); msg.SetInternalCall();
WriteDirectFireAndForget(msg, ResultProcessor.AutoConfigure, bridge); WriteDirectFireAndForget(msg, ResultProcessor.AutoConfigure, bridge);
return true; return true;
......
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