fix ADD + MADD command result difference from Redis

Author: lauk20

src/types/redis_timeseries.cc

@@ -882,6 +882,7 @@ rocksdb::Status TimeSeries::filterSamplesByIgnorePolicy(engine::Context &ctx, co
     if (sample.ts >= latest_sample.ts && sample.ts - latest_sample.ts <= metadata.ignore_max_time_diff &&
         std::abs(sample.v - latest_sample.v) <= metadata.ignore_max_val_diff) {
       add_results[i].type = TSChunk::AddResultType::kSkip;
+      add_results[i].sample.ts = latest_sample.ts;
       continue;
     }
 

src/types/timeseries.cc

@@ -165,7 +165,9 @@ std::vector<TSChunk::AddResult> TSChunk::SampleBatch::GetFinalResults() const {
   res.resize(add_results_.size());
   for (size_t idx = 0; idx < add_results_.size(); idx++) {
     res[indexes_[idx]] = add_results_[idx];
-    res[indexes_[idx]].sample.ts = samples_[idx].ts;
+    if (!(res[indexes_[idx]].type == AddResultType::kSkip && res[indexes_[idx]].sample.ts != 0)) {
+      res[indexes_[idx]].sample.ts = samples_[idx].ts;
+    }
   }
   return res;
 }

tests/gocase/unit/type/timeseries/timeseries_test.go

@@ -208,7 +208,7 @@ func testTimeSeries(t *testing.T, configs util.KvrocksServerConfigs) {
 		require.NoError(t, rdb.Do(ctx, "ts.create", ignoreKey, "duplicate_policy", "last", "ignore", "5", "2").Err())
 
 		require.Equal(t, int64(1000), rdb.Do(ctx, "ts.add", ignoreKey, "1000", "10").Val())
-		require.Equal(t, int64(1003), rdb.Do(ctx, "ts.add", ignoreKey, "1003", "11").Val())
+		require.Equal(t, int64(1000), rdb.Do(ctx, "ts.add", ignoreKey, "1003", "11").Val())
 
 		res := rdb.Do(ctx, "ts.range", ignoreKey, "-", "+").Val().([]interface{})
 		require.Equal(t, 1, len(res))
@@ -257,7 +257,7 @@ func testTimeSeries(t *testing.T, configs util.KvrocksServerConfigs) {
 		require.Equal(t, int64(1000), rdb.Do(ctx, "ts.add", ignoreKey, "1000", "10").Val())
 
 		res := rdb.Do(ctx, "ts.madd", ignoreKey, "1003", "11", ignoreKey, "1004", "13", ignoreKey, "1007", "14").Val().([]interface{})
-		assert.Equal(t, []interface{}{int64(1003), int64(1004), int64(1007)}, res)
+		assert.Equal(t, []interface{}{int64(1000), int64(1004), int64(1004)}, res)
 
 		samples := rdb.Do(ctx, "ts.range", ignoreKey, "-", "+").Val().([]interface{})
 		require.Equal(t, 2, len(samples))