Merge branch 'main' into new/BZMPOP-BZPOPMAX-MIN-commands

microsoft · Dec 20, 2024 · 85008cc · 85008cc
2 parents 4a0e996 + 76532eb
commit 85008cc
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 29 deletions.
diff --git a/.github/workflows/ci-bdnbenchmark.yml b/.github/workflows/ci-bdnbenchmark.yml
@@ -42,7 +42,7 @@ jobs:
         os: [ ubuntu-latest, windows-latest ]
         framework: [ 'net8.0' ]
         configuration: [ 'Release' ]
-        test: [ 'Operations.BasicOperations', 'Operations.ObjectOperations', 'Operations.HashObjectOperations', 'Cluster.ClusterMigrate', 'Cluster.ClusterOperations', 'Lua.LuaScripts', 'Operations.CustomOperations', 'Operations.RawStringOperations', 'Operations.ScriptOperations' ]
+        test: [ 'Operations.BasicOperations', 'Operations.ObjectOperations', 'Operations.HashObjectOperations', 'Cluster.ClusterMigrate', 'Cluster.ClusterOperations', 'Lua.LuaScripts', 'Operations.CustomOperations', 'Operations.RawStringOperations', 'Operations.ScriptOperations','Network.BasicOperations', 'Network.RawStringOperations' ]
     steps:
       - name: Check out code
         uses: actions/checkout@v4
@@ -76,29 +76,18 @@ jobs:
 
       # Run `github-action-benchmark` action for the Continuous Benchmarking Charts (https://microsoft.github.io/garnet/charts/)
       - name: Store benchmark result for charts
-        if: github.ref == 'refs/heads/main'
         uses: benchmark-action/github-action-benchmark@v1
         with:
           name: ${{matrix.test}} (${{matrix.os}}  ${{matrix.framework}} ${{matrix.configuration}})
           tool: 'benchmarkdotnet'
           output-file-path: ./test/BDNPerfTests/BenchmarkDotNet.Artifacts/results/BDN.benchmark.${{ matrix.test }}-report-full-compressed.json
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          auto-push: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+          save-data-file: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
           summary-always: true
           gh-pages-branch: 'continuousbenchmark'
           benchmark-data-dir-path: 'website/static/charts'
-          auto-push: true
           max-items-in-chart: 50
-
-      # Run `github-action-benchmark` action for the Continuous Benchmarking Summary
-      - name: Generate summary for benchmark result
-        if: github.ref != 'refs/heads/main'
-        uses: benchmark-action/github-action-benchmark@v1
-        with:
-          name: ${{matrix.test}} (${{matrix.os}}  ${{matrix.framework}} ${{matrix.configuration}})
-          tool: 'benchmarkdotnet'
-          output-file-path: ./test/BDNPerfTests/BenchmarkDotNet.Artifacts/results/BDN.benchmark.${{ matrix.test }}-report-full-compressed.json
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          summary-always: true
-          save-data-file: false
-          gh-pages-branch: 'continuousbenchmark'
-          benchmark-data-dir-path: 'website/static/charts'
+          alert-threshold: '10%'
+          comment-always: true
+          fail-on-alert: false
diff --git a/test/BDNPerfTests/BDN_Benchmark_Config.json b/test/BDNPerfTests/BDN_Benchmark_Config.json
@@ -40,7 +40,7 @@
     "expected_HGet_AOF": 6400,
     "expected_HGetAll_AOF": 3200,
     "expected_HIncrby_AOF": 14400,
-    "expected_HIncrbyFloat_AOF": 14800,
+    "expected_HIncrbyFloat_AOF": 14400,
     "expected_HKeys_AOF": 3200,
     "expected_HLen_AOF": 3200,
     "expected_HMGet_AOF": 9600,
@@ -55,7 +55,7 @@
     "expected_HGet_None": 6400,
     "expected_HGetAll_None": 3200,
     "expected_HIncrby_None": 14400,
-    "expected_HIncrbyFloat_None": 14800,
+    "expected_HIncrbyFloat_None": 14400,
     "expected_HKeys_None": 3200,
     "expected_HLen_None": 3200,
     "expected_HMGet_None": 9600,
@@ -85,10 +85,10 @@
     "expected_MSet_None": 0
   },
   "BDN.benchmark.Lua.LuaScripts.*": {
-    "expected_Script1_None": 24,
-    "expected_Script2_None": 144,
-    "expected_Script3_None": 240,
-    "expected_Script4_None": 776
+    "expected_Script1_None": 0,
+    "expected_Script2_None": 24,
+    "expected_Script3_None": 32,
+    "expected_Script4_None": 0
   },
   "BDN.benchmark.Operations.CustomOperations.*": {
     "expected_CustomRawStringCommand_ACL": 0,
@@ -142,15 +142,39 @@
     "expected_ScriptExistsFalse_ACL": 0,
     "expected_Eval_ACL": 0,
     "expected_EvalSha_ACL": 0,
-    "expected_ScriptLoad_AOF": 16000,
+    "expected_SmallScript_ACL": 0,
+    "expected_LargeScript_ACL": 0,
+    "expected_ArrayReturn_ACL": 0,
+    "expected_ScriptLoad_AOF": 9600,
     "expected_ScriptExistsTrue_AOF": 0,
     "expected_ScriptExistsFalse_AOF": 0,
-    "expected_Eval_AOF": 16000,
-    "expected_EvalSha_AOF": 12000,
-    "expected_ScriptLoad_None": 16000,
+    "expected_Eval_AOF": 0,
+    "expected_EvalSha_AOF": 0,
+    "expected_SmallScript_AOF": 0,
+    "expected_LargeScript_AOF": 16,
+    "expected_ArrayReturn_AOF": 0,
+    "expected_ScriptLoad_None": 9600,
     "expected_ScriptExistsTrue_None": 0,
     "expected_ScriptExistsFalse_None": 0,
-    "expected_Eval_None": 16000,
-    "expected_EvalSha_None": 12000
+    "expected_Eval_None": 0,
+    "expected_EvalSha_None": 0,
+    "expected_SmallScript_None": 0,
+    "expected_LargeScript_None": 12,
+    "expected_ArrayReturn_None": 0
+  },
+  "BDN.benchmark.Network.RawStringOperations.*": {
+    "expected_Set_None": 0,
+    "expected_SetEx_None": 0,
+    "expected_SetNx_None": 0,
+    "expected_SetXx_None": 0,
+    "expected_GetFound_None": 0,
+    "expected_GetNotFound_None": 0,
+    "expected_Increment_None": 0,
+    "expected_Decrement_None": 0,
+    "expected_IncrementBy_None": 0,
+    "expected_DecrementBy_None": 0
+  },
+  "BDN.benchmark.Network.BasicOperations.*": {
+    "expected_InlinePing_None": 0
   }
 }