Add Command Literal Classes

shacharPash · shacharPash · commit 9d404cd68b01 · 2022-07-13T18:58:42.000+03:00
diff --git a/src/NRedisStack.Core/Bloom/BloomCommands.cs b/src/NRedisStack.Core/Bloom/BloomCommands.cs
@@ -1,3 +1,4 @@
+using NRedisStack.Core.Literals;
 using StackExchange.Redis;
 namespace NRedisStack.Core
 {
@@ -13,22 +14,12 @@ public BloomCommands(IDatabase db)
 
         public RedisResult Add(RedisKey key, string item)
         {
-            return _db.Execute("BF.ADD", key, item);
+            return _db.Execute(BF.ADD, key, item);
         }
         public RedisResult Exists(RedisKey key, string item)
         {
-            return _db.Execute("BF.EXISTS", key, item);
+            return _db.Execute(BF.EXISTS, key, item);
         }
-        /*public static string ADD => "BF.ADD";
-        public static string EXISTS => "BF.EXISTS";
-        public static string INFO => "BF.INFO";
-        public static string INSERT => "BF.INSERT";
-        public static string LOADCHUNK => "BF.LOADCHUNK";
-        public static string MADD => "BF.MADD";
-        public static string MEXISTS => "BF.MEXISTS";
-        public static string RESERVE => "BF.RESERVE";
-        public static string SCANDUMP => "BF.SCANDUMP";*/
-    }
-
 
+    }
 }
diff --git a/src/NRedisStack.Core/Bloom/Literals/CommandArgs.cs b/src/NRedisStack.Core/Bloom/Literals/CommandArgs.cs
@@ -0,0 +1,7 @@
+namespace NRedisStack.Core.Literals
+{
+    internal class BloomArgs
+    {
+
+    }
+}
diff --git a/src/NRedisStack.Core/Bloom/Literals/Commands.cs b/src/NRedisStack.Core/Bloom/Literals/Commands.cs
@@ -0,0 +1,15 @@
+﻿namespace NRedisStack.Core.Literals
+{
+    internal class BF
+    {
+        public static string ADD => "BF.ADD";
+        public static string EXISTS => "BF.EXISTS";
+        public static string INFO => "BF.INFO";
+        public static string INSERT => "BF.INSERT";
+        public static string LOADCHUNK => "BF.LOADCHUNK";
+        public static string MADD => "BF.MADD";
+        public static string MEXISTS => "BF.MEXISTS";
+        public static string RESERVE => "BF.RESERVE";
+        public static string SCANDUMP => "BF.SCANDUMP";
+    }
+}
diff --git a/src/NRedisStack.Core/Json/JsonCommands.cs b/src/NRedisStack.Core/Json/JsonCommands.cs
@@ -1,4 +1,5 @@
-﻿using StackExchange.Redis;
+﻿using NRedisStack.Core.Literals;
+using StackExchange.Redis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -26,11 +27,11 @@ public RedisResult Set(RedisKey key, string path, string json, When when = When.
         switch (when)
         {
             case When.Exists:
-                return _db.Execute("JSON.SET", key, path, json, "XX");
+                return _db.Execute(JSON.SET, key, path, json, "XX");
             case When.NotExists:
-                return _db.Execute("JSON.SET", key, path, json, "NX");
+                return _db.Execute(JSON.SET, key, path, json, "NX");
             default:
-                return _db.Execute("JSON.SET", key, path, json);
+                return _db.Execute(JSON.SET, key, path, json);
         }
     }
 
@@ -41,26 +42,26 @@ public RedisResult Get(RedisKey key, string indent = "",
         subcommands.Add(key);
         if (indent != "")
         {
-            subcommands.Add("INDENT");
+            subcommands.Add(JsonArgs.INDENT);
             subcommands.Add(indent);
         }
 
         if (newLine != "")
         {
-            subcommands.Add("NEWLINE");
+            subcommands.Add(JsonArgs.NEWLINE);
             subcommands.Add(newLine);
         }
 
         if (space != "")
         {
-            subcommands.Add("SPACE");
+            subcommands.Add(JsonArgs.SPACE);
             subcommands.Add(space);
         }
 
         if (path != "")
         {
             subcommands.Add(path);
         }
-        return _db.Execute("JSON.GET", subcommands.ToArray());
+        return _db.Execute(JSON.GET, subcommands.ToArray());
     }
 }
diff --git a/src/NRedisStack.Core/Json/Literals/CommandArgs.cs b/src/NRedisStack.Core/Json/Literals/CommandArgs.cs
@@ -0,0 +1,10 @@
+namespace NRedisStack.Core.Literals
+{
+    internal class JsonArgs
+    {
+        public static string INDENT => "INDENT";
+        public static string NEWLINE => "NEWLINE";
+        public static string SPACE => "SPACE";
+
+    }
+}
diff --git a/src/NRedisStack.Core/Json/Literals/Commands.cs b/src/NRedisStack.Core/Json/Literals/Commands.cs
@@ -0,0 +1,30 @@
+﻿namespace NRedisStack.Core.Literals
+{
+    internal class JSON
+    {
+        public static string ARRAPPEND => "JSON.ARRAPPEND";
+        public static string ARRINDEX => "JSON.ARRINDEX";
+        public static string ARRINSERT => "JSON.ARRINSERT";
+        public static string ARRLEN => "JSON.ARRLEN";
+        public static string ARRPOP => "JSON.ARRPOP";
+        public static string ARRTRIM => "JSON.ARRTRIM";
+        public static string CLEAR => "JSON.CLEAR";
+        public static string DEBUG => "JSON.DEBUG";
+        public static string DEBUG_HELP => "JSON.DEBUG HELP";
+        public static string DEBUG_MEMORY => "JSON.DEBUG MEMORY";
+        public static string DEL => "JSON.DEL";
+        public static string FORGET => "JSON.FORGET";
+        public static string GET => "JSON.GET";
+        public static string MGET => "JSON.MGET";
+        public static string NUMINCRBY => "JSON.NUMINCRBY";
+        public static string NUMMULTBY => "JSON.NUMMULTBY";
+        public static string OBJKEYS => "JSON.OBJKEYS";
+        public static string OBJLEN => "JSON.OBJLEN";
+        public static string RESP => "JSON.RESP";
+        public static string SET => "JSON.SET";
+        public static string STRAPPEND => "JSON.STRAPPEND";
+        public static string STRLEN => "JSON.STRLEN";
+        public static string TOGGLE => "JSON.TOGGLE";
+        public static string TYPE => "JSON.TYPE";
+    }
+}
diff --git a/src/NRedisStack.Core/ModulPrefixes.cs b/src/NRedisStack.Core/ModulPrefixes.cs
@@ -4,6 +4,7 @@ namespace NRedisStack.Core.RedisStackCommands
 {
     public static class ModulPrefixes
     {
+        // Every call, new instance is being created. need to be fix
         static public BloomCommands BF(this IDatabase db)
         {
             return new BloomCommands(db);
diff --git a/src/NRedisStack.Core/Search/Literals/CommandArgs.cs b/src/NRedisStack.Core/Search/Literals/CommandArgs.cs
@@ -0,0 +1,7 @@
+namespace NRedisStack.Core.Literals
+{
+    internal class SearchArgs
+    {
+
+    }
+}
diff --git a/src/NRedisStack.Core/Search/Literals/Commands.cs b/src/NRedisStack.Core/Search/Literals/Commands.cs
@@ -0,0 +1,31 @@
+﻿namespace NRedisStack.Core.Literals
+{
+    internal class FT
+    {
+        public static string _LIST => "FT._LIST";
+        public static string AGGREGATE => "FT.AGGREGATE";
+        public static string ALIASADD => "FT.ALIASADD";
+        public static string ALIASDEL => "FT.ALIASDEL";
+        public static string ALIASUPDATE => "FT.ALIASUPDATE";
+        public static string ALTER => "FT.ALTER";
+        public static string CONFIG_GET => "FT.CONFIG GET";
+        public static string CONFIG_HELP => "FT.CONFIG HELP";
+        public static string CONFIG_SET => "FT.CONFIG SET";
+        public static string CREATE => "FT.CREATE";
+        public static string CURSOR_DEL => "FT.CURSOR DEL";
+        public static string CURSOR_READ => "FT.CURSOR READ";
+        public static string DICTADD => "FT.DICTADD";
+        public static string DICTDEL => "FT.DICTDEL";
+        public static string DICTDUMP => "FT.DICTDUMP";
+        public static string DROPINDEX => "FT.DROPINDEX";
+        public static string EXPLAIN => "FT.EXPLAIN";
+        public static string EXPLAINCLI => "FT.EXPLAINCLI";
+        public static string INFO => "FT.INFO";
+        public static string PROFILE => "FT.PROFILE";
+        public static string SEARCH => "FT.SEARCH";
+        public static string SPELLCHECK => "FT.SPELLCHECK";
+        public static string SYNDUMP => "FT.SYNDUMP";
+        public static string SYNUPDATE => "FT.SYNUPDATE";
+        public static string TAGVALS => "FT.TAGVALS";
+    }
+}
diff --git a/src/NRedisStack.Core/Search/SearchCommands.cs b/src/NRedisStack.Core/Search/SearchCommands.cs
@@ -1,3 +1,4 @@
+using NRedisStack.Core.Literals;
 using StackExchange.Redis;
 namespace NRedisStack.Core
 {
@@ -8,9 +9,9 @@ public SearchCommands(IDatabase db)
         {
             _db = db;
         }
-        public RedisResult FtInfo(string index)
+        public RedisResult Info(string index)
         {
-            return _db.Execute("FT.INFO", index);
+            return _db.Execute(FT.INFO, index);
         }
     }
 }
diff --git a/src/NRedisStack.Core/TimeSeries/Literals/CommandArgs.cs b/src/NRedisStack.Core/TimeSeries/Literals/CommandArgs.cs
@@ -1,6 +1,6 @@
 namespace NRedisStack.Core.Literals
 {
-    internal class CommandArgs
+    internal class TimeSeriesArgs
     {
         public static string RETENTION => "RETENTION";
         public static string LABELS => "LABELS";
diff --git a/src/NRedisStack.Core/TimeSeries/TimeSeriesAux.cs b/src/NRedisStack.Core/TimeSeries/TimeSeriesAux.cs
@@ -13,7 +13,7 @@ public static void AddRetentionTime(this IList<object> args, long? retentionTime
         {
             if (retentionTime.HasValue)
             {
-                args.Add(CommandArgs.RETENTION);
+                args.Add(TimeSeriesArgs.RETENTION);
                 args.Add(retentionTime);
             }
         }
@@ -22,7 +22,7 @@ public static void AddChunkSize(this IList<object> args, long? chunkSize)
         {
             if (chunkSize.HasValue)
             {
-                args.Add(CommandArgs.CHUNK_SIZE);
+                args.Add(TimeSeriesArgs.CHUNK_SIZE);
                 args.Add(chunkSize);
             }
         }
@@ -31,7 +31,7 @@ public static void AddLabels(this IList<object> args, IReadOnlyCollection<TimeSe
         {
             if (labels != null)
             {
-                args.Add(CommandArgs.LABELS);
+                args.Add(TimeSeriesArgs.LABELS);
                 foreach (var label in labels)
                 {
                     args.Add(label.Key);
@@ -44,15 +44,15 @@ public static void AddUncompressed(this IList<object> args, bool? uncompressed)
         {
             if (uncompressed.HasValue)
             {
-                args.Add(CommandArgs.UNCOMPRESSED);
+                args.Add(TimeSeriesArgs.UNCOMPRESSED);
             }
         }
 
         public static void AddCount(this IList<object> args, long? count)
         {
             if (count.HasValue)
             {
-                args.Add(CommandArgs.COUNT);
+                args.Add(TimeSeriesArgs.COUNT);
                 args.Add(count.Value);
             }
         }
@@ -61,7 +61,7 @@ public static void AddDuplicatePolicy(this IList<object> args, TsDuplicatePolicy
         {
             if (policy.HasValue)
             {
-                args.Add(CommandArgs.DUPLICATE_POLICY);
+                args.Add(TimeSeriesArgs.DUPLICATE_POLICY);
                 args.Add(policy.Value.AsArg());
             }
         }
@@ -71,7 +71,7 @@ public static void AddOnDuplicate(this IList<object> args, TsDuplicatePolicy? po
         {
             if (policy.HasValue)
             {
-                args.Add(CommandArgs.ON_DUPLICATE);
+                args.Add(TimeSeriesArgs.ON_DUPLICATE);
                 args.Add(policy.Value.AsArg());
             }
         }
@@ -80,7 +80,7 @@ public static void AddAlign(this IList<object> args, TimeStamp align)
         {
             if(align != null)
             {
-                args.Add(CommandArgs.ALIGN);
+                args.Add(TimeSeriesArgs.ALIGN);
                 args.Add(align.Value);
             }
         }
@@ -89,7 +89,7 @@ public static void AddAggregation(this IList<object> args, TsAggregation? aggreg
         {
             if(aggregation != null)
             {
-                args.Add(CommandArgs.AGGREGATION);
+                args.Add(TimeSeriesArgs.AGGREGATION);
                 args.Add(aggregation.Value.AsArg());
                 if (!timeBucket.HasValue)
                 {
@@ -105,7 +105,7 @@ public static void AddFilters(this List<object> args, IReadOnlyCollection<string
             {
                 throw new ArgumentException("There should be at least one filter on MRANGE/MREVRANGE");
             }
-            args.Add(CommandArgs.FILTER);
+            args.Add(TimeSeriesArgs.FILTER);
             foreach(string f in filter)
             {
                 args.Add(f);
@@ -116,7 +116,7 @@ public static void AddFilterByTs(this List<object> args, IReadOnlyCollection<Tim
         {
             if (filter != null)
             {
-                args.Add(CommandArgs.FILTER_BY_TS);
+                args.Add(TimeSeriesArgs.FILTER_BY_TS);
                 foreach (var ts in filter)
                 {
                     args.Add(ts.Value);
@@ -128,7 +128,7 @@ public static void AddFilterByValue(this List<object> args, (long, long)? filter
         {
             if (filter != null)
             {
-                args.Add(CommandArgs.FILTER_BY_VALUE);
+                args.Add(TimeSeriesArgs.FILTER_BY_VALUE);
                 args.Add(filter.Value.Item1);
                 args.Add(filter.Value.Item2);
             }
@@ -142,11 +142,11 @@ public static void AddWithLabels(this IList<object> args, bool? withLabels, IRea
 
             if(withLabels.HasValue && withLabels.Value)
             {
-                args.Add(CommandArgs.WITHLABELS);
+                args.Add(TimeSeriesArgs.WITHLABELS);
             }
 
             if(selectLabels != null){
-                args.Add(CommandArgs.SELECTEDLABELS);
+                args.Add(TimeSeriesArgs.SELECTEDLABELS);
                 foreach(string label in selectLabels){
                     args.Add(label);
                 }
@@ -157,9 +157,9 @@ public static void AddGroupby(this IList<object> args, (string groupby, TsReduce
         {
             if (groupbyTuple.HasValue)
             {
-                args.Add(CommandArgs.GROPUBY);
+                args.Add(TimeSeriesArgs.GROPUBY);
                 args.Add(groupbyTuple.Value.groupby);
-                args.Add(CommandArgs.REDUCE);
+                args.Add(TimeSeriesArgs.REDUCE);
                 args.Add(groupbyTuple.Value.reduce.AsArg());
             }
         }
@@ -168,15 +168,15 @@ public static void AddTimeStamp(this IList<object> args, TimeStamp timeStamp)
         {
             if(timeStamp != null)
             {
-                args.Add(CommandArgs.TIMESTAMP);
+                args.Add(TimeSeriesArgs.TIMESTAMP);
                 args.Add(timeStamp.Value);
             }
         }
 
         public static void AddRule(this IList<object> args, TimeSeriesRule rule)
         {
             args.Add(rule.DestKey);
-            args.Add(CommandArgs.AGGREGATION);
+            args.Add(TimeSeriesArgs.AGGREGATION);
             args.Add(rule.Aggregation.AsArg());
             args.Add(rule.TimeBucket);
         }

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using NRedisStack.Core.Literals;`
`1`	`2`	`using StackExchange.Redis;`
`2`	`3`	`namespace NRedisStack.Core`
`3`	`4`	`{`
`@@ -13,22 +14,12 @@ public BloomCommands(IDatabase db)`
`13`	`14`
`14`	`15`	`public RedisResult Add(RedisKey key, string item)`
`15`	`16`	`{`
`16`		`- return _db.Execute("BF.ADD", key, item);`
	`17`	`+ return _db.Execute(BF.ADD, key, item);`
`17`	`18`	`}`
`18`	`19`	`public RedisResult Exists(RedisKey key, string item)`
`19`	`20`	`{`
`20`		`- return _db.Execute("BF.EXISTS", key, item);`
	`21`	`+ return _db.Execute(BF.EXISTS, key, item);`
`21`	`22`	`}`
`22`		`- /*public static string ADD => "BF.ADD";`
`23`		`- public static string EXISTS => "BF.EXISTS";`
`24`		`- public static string INFO => "BF.INFO";`
`25`		`- public static string INSERT => "BF.INSERT";`
`26`		`- public static string LOADCHUNK => "BF.LOADCHUNK";`
`27`		`- public static string MADD => "BF.MADD";`
`28`		`- public static string MEXISTS => "BF.MEXISTS";`
`29`		`- public static string RESERVE => "BF.RESERVE";`
`30`		`- public static string SCANDUMP => "BF.SCANDUMP";*/`
`31`		`- }`
`32`		`-`
`33`	`23`
	`24`	`+ }`
`34`	`25`	`}`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +namespace NRedisStack.Core.Literals
 +{
 +    internal class BloomArgs
 +    {
++
 +    }
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using StackExchange.Redis;`
	`1`	`+using NRedisStack.Core.Literals;`
	`2`	`+using StackExchange.Redis;`
`2`	`3`	`using System.Text.Json;`
`3`	`4`	`using System.Text.Json.Serialization;`
`4`	`5`
`@@ -26,11 +27,11 @@ public RedisResult Set(RedisKey key, string path, string json, When when = When.`
`26`	`27`	`switch (when)`
`27`	`28`	`{`
`28`	`29`	`case When.Exists:`
`29`		`- return _db.Execute("JSON.SET", key, path, json, "XX");`
	`30`	`+ return _db.Execute(JSON.SET, key, path, json, "XX");`
`30`	`31`	`case When.NotExists:`
`31`		`- return _db.Execute("JSON.SET", key, path, json, "NX");`
	`32`	`+ return _db.Execute(JSON.SET, key, path, json, "NX");`
`32`	`33`	`default:`
`33`		`- return _db.Execute("JSON.SET", key, path, json);`
	`34`	`+ return _db.Execute(JSON.SET, key, path, json);`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`
`@@ -41,26 +42,26 @@ public RedisResult Get(RedisKey key, string indent = "",`
`41`	`42`	`subcommands.Add(key);`
`42`	`43`	`if (indent != "")`
`43`	`44`	`{`
`44`		`- subcommands.Add("INDENT");`
	`45`	`+ subcommands.Add(JsonArgs.INDENT);`
`45`	`46`	`subcommands.Add(indent);`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`if (newLine != "")`
`49`	`50`	`{`
`50`		`- subcommands.Add("NEWLINE");`
	`51`	`+ subcommands.Add(JsonArgs.NEWLINE);`
`51`	`52`	`subcommands.Add(newLine);`
`52`	`53`	`}`
`53`	`54`
`54`	`55`	`if (space != "")`
`55`	`56`	`{`
`56`		`- subcommands.Add("SPACE");`
	`57`	`+ subcommands.Add(JsonArgs.SPACE);`
`57`	`58`	`subcommands.Add(space);`
`58`	`59`	`}`
`59`	`60`
`60`	`61`	`if (path != "")`
`61`	`62`	`{`
`62`	`63`	`subcommands.Add(path);`
`63`	`64`	`}`
`64`		`- return _db.Execute("JSON.GET", subcommands.ToArray());`
	`65`	`+ return _db.Execute(JSON.GET, subcommands.ToArray());`
`65`	`66`	`}`
`66`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ namespace NRedisStack.Core.RedisStackCommands`
`4`	`4`	`{`
`5`	`5`	`public static class ModulPrefixes`
`6`	`6`	`{`
	`7`	`+ // Every call, new instance is being created. need to be fix`
`7`	`8`	`static public BloomCommands BF(this IDatabase db)`
`8`	`9`	`{`
`9`	`10`	`return new BloomCommands(db);`