microsoft
diff --git a/‎Version.props‎
Lines changed: 1 addition & 1 deletion b/‎Version.props‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎benchmark/BDN.benchmark/Custom/CustomTxnSet.cs‎
Lines changed: 12 additions & 12 deletions b/‎benchmark/BDN.benchmark/Custom/CustomTxnSet.cs‎
Lines changed: 12 additions & 12 deletions
diff --git a/‎benchmark/Resp.benchmark/OnlineReqGen.cs‎
Lines changed: 7 additions & 13 deletions b/‎benchmark/Resp.benchmark/OnlineReqGen.cs‎
Lines changed: 7 additions & 13 deletions
diff --git a/‎benchmark/Resp.benchmark/Options.cs‎
Lines changed: 0 additions & 3 deletions b/‎benchmark/Resp.benchmark/Options.cs‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎benchmark/Resp.benchmark/PeriodicCheckpointer.cs‎
Lines changed: 2 additions & 1 deletion b/‎benchmark/Resp.benchmark/PeriodicCheckpointer.cs‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎benchmark/Resp.benchmark/ReqGen.cs‎
Lines changed: 1 addition & 0 deletions b/‎benchmark/Resp.benchmark/ReqGen.cs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎benchmark/Resp.benchmark/RespOnlineBench.cs‎
Lines changed: 8 additions & 4 deletions b/‎benchmark/Resp.benchmark/RespOnlineBench.cs‎
Lines changed: 8 additions & 4 deletions
diff --git a/‎benchmark/Resp.benchmark/RespPerfBench.cs‎
Lines changed: 2 additions & 2 deletions b/‎benchmark/Resp.benchmark/RespPerfBench.cs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎benchmark/Resp.benchmark/TxnPerfBench.cs‎
Lines changed: 1 addition & 1 deletion b/‎benchmark/Resp.benchmark/TxnPerfBench.cs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎benchmark/Resp.benchmark/ZipfGenerator.cs‎
Lines changed: 1 addition & 1 deletion b/‎benchmark/Resp.benchmark/ZipfGenerator.cs‎
Lines changed: 1 addition & 1 deletion
@@ -1,6 +1,6 @@
 <Project>
 	<!-- VersionPrefix property for builds and packages -->
 	<PropertyGroup>
-		<VersionPrefix>1.0.91</VersionPrefix>
+		<VersionPrefix>2.0.0-beta.1</VersionPrefix>
 	</PropertyGroup>
 </Project>
@@ -22,15 +22,15 @@ sealed class CustomTxnSet : CustomTransactionProcedure
         /// </summary>
         public const string CommandName = "CTXNSET";
 
-        ArgSlice setA;
-        ArgSlice setB;
-        ArgSlice setC;
-        ArgSlice setD;
+        PinnedSpanByte setA;
+        PinnedSpanByte setB;
+        PinnedSpanByte setC;
+        PinnedSpanByte setD;
 
-        ArgSlice valueA;
-        ArgSlice valueB;
-        ArgSlice valueC;
-        ArgSlice valueD;
+        PinnedSpanByte valueA;
+        PinnedSpanByte valueB;
+        PinnedSpanByte valueC;
+        PinnedSpanByte valueD;
 
         /// <summary>
         ///  CTXNSET key1 key2 key3 key4 value1 value2 value3 value4
@@ -52,10 +52,10 @@ public override bool Prepare<TGarnetReadApi>(TGarnetReadApi api, ref CustomProce
             valueC = GetNextArg(ref procInput, ref offset);
             valueD = GetNextArg(ref procInput, ref offset);
 
-            AddKey(setA, LockType.Exclusive, isObject: false);
-            AddKey(setB, LockType.Exclusive, isObject: false);
-            AddKey(setC, LockType.Exclusive, isObject: false);
-            AddKey(setD, LockType.Exclusive, isObject: false);
+            AddKey(setA, LockType.Exclusive, StoreType.Main);
+            AddKey(setB, LockType.Exclusive, StoreType.Main);
+            AddKey(setC, LockType.Exclusive, StoreType.Main);
+            AddKey(setD, LockType.Exclusive, StoreType.Main);
 
             return true;
         }
 
@@ -20,7 +20,7 @@ public unsafe partial class OnlineReqGen
         /// <summary>
         /// DbSize, ObjectDbSize, NumBuffs
         /// </summary>
-        public readonly int DbSize, ObjectDbSize, NumBuffs;
+        public readonly int DbSize, NumBuffs;
 
         readonly byte[] ascii_chars = Encoding.ASCII.GetBytes("abcdefghijklmnopqrstvuwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789");
         readonly byte[] number_chars = Encoding.ASCII.GetBytes("0123456789");
@@ -35,19 +35,11 @@ public unsafe partial class OnlineReqGen
 
         public readonly int keyLen, valueLen;
 
-        public OnlineReqGen(int thread_id, int DbSize, bool randomGen = true, bool zipf = false, int keyLen = default, int valueLen = default, int objectDbSize = -1)
+        public OnlineReqGen(int thread_id, int DbSize, bool randomGen = true, bool zipf = false, int keyLen = default, int valueLen = default)
         {
             this.randomGen = randomGen;
             this.DbSize = DbSize;
             this.zipf = zipf;
-            if (objectDbSize == -1)
-            {
-                this.ObjectDbSize = DbSize;
-            }
-            else
-            {
-                this.ObjectDbSize = objectDbSize;
-            }
 
             this.keyLen = Math.Max(NumUtils.NumDigits(DbSize), keyLen);
             this.valueLen = valueLen == default ? 8 : valueLen;
@@ -113,7 +105,8 @@ public Memory<byte> GenerateKeyBytesRandom()
         {
             uint key = (uint)(randomGen ? (zipf ? zipfg.Next() : keyRandomGen.Next(DbSize)) : (keyIndex++ % DbSize));
             key *= 20323;
-            for (int i = 0; i < keyLen; i++)
+            keyBuffer[0] = (byte)'S';   // Uniquifier to avoid collisions with object keys.
+            for (int i = 1; i < keyLen; i++)
             {
                 keyBuffer[i] = ascii_chars[key % ascii_chars.Length];
                 key *= 3;
@@ -188,8 +181,9 @@ public Memory<byte> GenerateObjectEntryScoreBytes()
         /// </summary>
         public Memory<byte> GenerateObjectKeyBytesRandom()
         {
-            uint key = (uint)(randomGen ? (zipf ? zipfg.Next() : keyRandomGen.Next(ObjectDbSize)) : (keyIndex++ % ObjectDbSize));
-            for (int i = 0; i < keyLen; i++)
+            uint key = (uint)(randomGen ? (zipf ? zipfg.Next() : keyRandomGen.Next(DbSize)) : (keyIndex++ % DbSize));
+            keyBuffer[0] = (byte)'O';   // Uniquifier to avoid collisions with string keys.
+            for (int i = 1; i < keyLen; i++)
             {
                 keyBuffer[i] = ascii_chars[key % ascii_chars.Length];
                 key *= 3;
 
@@ -102,9 +102,6 @@ public partial class Options
         [Option("op-workload", Separator = ',', Default = new[] { OpType.GET, OpType.SET, OpType.DEL }, HelpText = "Workload of commands for online bench.")]
         public IEnumerable<OpType> OpWorkload { get; set; }
 
-        [Option("object-dbsize", Required = false, Default = -1, HelpText = "Object DB size")]
-        public int ObjectDbSize { get; set; }
-
         [Option("save-freq", Required = false, Default = 0, HelpText = "Save (checkpoint) frequency in seconds")]
         public int SaveFreqSecs { get; set; }
 
 
@@ -26,7 +26,8 @@ public void Start(string address, int port)
             var server = redis.GetServer(address, port);
             while (true)
             {
-                if (cts.IsCancellationRequested) break;
+                if (cts.IsCancellationRequested)
+                    break;
                 Thread.Sleep(periodMs);
                 try
                 {
 
@@ -306,6 +306,7 @@ private void RandomString()
             {
                 for (int i = 0; i < valueBuffer.Length; i++)
                 {
+                    // The first digit of the output string should not be zero.
                     if (i == 0)
                         valueBuffer[i] = ascii_digits[1 + valueRandomGen.Next(ascii_digits.Length - 1)];
                     else
 
@@ -209,7 +209,7 @@ private void InitializeClients()
         private Thread[] InitializeThreadWorkers()
         {
             Thread[] workers = new Thread[NumThreads];
-            for (int idx = 0; idx < NumThreads; ++idx)
+            for (int idx = 0; idx < NumThreads; idx++)
             {
                 int x = idx;
 
@@ -563,7 +563,7 @@ public async void OpRunnerGarnetClientSession(int thread_id)
             _ = Interlocked.Increment(ref workerCount);
             if (opts.BatchSize.First() != 1)
                 throw new Exception("Only batch size 1 supported for online bench");
-            var req = new OnlineReqGen(thread_id, opts.DbSize, true, opts.Zipf, opts.KeyLength, opts.ValueLength, opts.ObjectDbSize);
+            var req = new OnlineReqGen(thread_id, opts.DbSize, true, opts.Zipf, opts.KeyLength, opts.ValueLength);
 
             GarnetClientSession client = null;
             if (!opts.Pool)
@@ -607,8 +607,12 @@ public async void OpRunnerGarnetClientSession(int thread_id)
                         OpType.ZREM => await ZREM(),
                         OpType.ZCARD => await ZCARD(),
                         OpType.READWRITETX => await c.ExecuteAsync("READWRITETX", req.GenerateKey(), req.GenerateKey(), req.GenerateKey(), "1000"),
-                        OpType.SAMPLEUPDATETX => await c.ExecuteAsync("SAMPLEUPDATETX", req.GenerateKeyRandom(), req.GenerateValue(), req.GenerateObjectKeyRandom(), req.GenerateObjectEntry(), req.GenerateObjectEntryScore(), req.GenerateObjectKeyRandom(), req.GenerateObjectEntry(), req.GenerateObjectEntryScore()),
-                        OpType.SAMPLEDELETETX => await c.ExecuteAsync("SAMPLEDELETETX", req.GenerateKeyRandom(), req.GenerateObjectKeyRandom(), req.GenerateObjectEntry(), req.GenerateObjectKeyRandom(), req.GenerateObjectEntry()),
+                        OpType.SAMPLEUPDATETX => await c.ExecuteAsync("SAMPLEUPDATETX", req.GenerateKeyRandom(), req.GenerateValue(),   // stringKey
+                                            req.GenerateObjectKeyRandom(), req.GenerateObjectEntry(), req.GenerateObjectEntryScore(),   // sortedSetKey1
+                                            req.GenerateObjectKeyRandom(), req.GenerateObjectEntry(), req.GenerateObjectEntryScore()),  // sortedSetKey2
+                        OpType.SAMPLEDELETETX => await c.ExecuteAsync("SAMPLEDELETETX", req.GenerateKeyRandom(),    // stringKey
+                                            req.GenerateObjectKeyRandom(), req.GenerateObjectEntry(),               // sortedSetKey1                    
+                                            req.GenerateObjectKeyRandom(), req.GenerateObjectEntry()),              // sortedSetKey2
                         _ => throw new Exception($"opType: {op} benchmark not supported with {opts.Client} ClientType!")
                     };
 
 
@@ -209,7 +209,7 @@ public void PerformMGET(int NumOps, int NumThreads, int BatchSize = 1 << 12)
             Thread[] workers = new Thread[NumThreads];
 
             // Run the experiment.
-            for (int idx = 0; idx < NumThreads; ++idx)
+            for (int idx = 0; idx < NumThreads; idx++)
             {
                 int x = idx;
                 workers[idx] = new Thread(() => MGetThreadRunner(x, NumOps, BatchSize));
@@ -323,7 +323,7 @@ public ReqGen LightOperate(
             Thread[] workers = new Thread[NumThreads];
 
             // Run the experiment.
-            for (int idx = 0; idx < NumThreads; ++idx)
+            for (int idx = 0; idx < NumThreads; idx++)
             {
                 int x = idx;
                 workers[idx] = opts.Client switch
 
@@ -132,7 +132,7 @@ public void Run()
                     redis = Program.redis;
                 }
             }
-            for (int idx = 0; idx < NumThreads; ++idx)
+            for (int idx = 0; idx < NumThreads; idx++)
             {
                 int x = idx;
 
 
@@ -29,7 +29,7 @@ public ZipfGenerator(RandomGenerator rng, int size, double theta = 0.99)
         private static double Zeta(int count, double theta)
         {
             double zetaN = 0.0;
-            for (var ii = 1; ii <= count; ++ii)
+            for (var ii = 1; ii <= count; ii++)
                 zetaN += 1.0 / Math.Pow(ii, theta);
             return zetaN;
         }
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,8 @@ public void Start(string address, int port)`
`26`	`26`	`var server = redis.GetServer(address, port);`
`27`	`27`	`while (true)`
`28`	`28`	`{`
`29`		`- if (cts.IsCancellationRequested) break;`
	`29`	`+ if (cts.IsCancellationRequested)`
	`30`	`+ break;`
`30`	`31`	`Thread.Sleep(periodMs);`
`31`	`32`	`try`
`32`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -306,6 +306,7 @@ private void RandomString()`
`306`	`306`	`{`
`307`	`307`	`for (int i = 0; i < valueBuffer.Length; i++)`
`308`	`308`	`{`
	`309`	`+ // The first digit of the output string should not be zero.`
`309`	`310`	`if (i == 0)`
`310`	`311`	`valueBuffer[i] = ascii_digits[1 + valueRandomGen.Next(ascii_digits.Length - 1)];`
`311`	`312`	`else`
Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ public void Run()`
`132`	`132`	`redis = Program.redis;`
`133`	`133`	`}`
`134`	`134`	`}`
`135`		`- for (int idx = 0; idx < NumThreads; ++idx)`
	`135`	`+ for (int idx = 0; idx < NumThreads; idx++)`
`136`	`136`	`{`
`137`	`137`	`int x = idx;`
`138`	`138`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public ZipfGenerator(RandomGenerator rng, int size, double theta = 0.99)`
`29`	`29`	`private static double Zeta(int count, double theta)`
`30`	`30`	`{`
`31`	`31`	`double zetaN = 0.0;`
`32`		`- for (var ii = 1; ii <= count; ++ii)`
	`32`	`+ for (var ii = 1; ii <= count; ii++)`
`33`	`33`	`zetaN += 1.0 / Math.Pow(ii, theta);`
`34`	`34`	`return zetaN;`
`35`	`35`	`}`