query with GetCFWithTS to compare both timestamp and key

Author: mmsqe

versiondb/tsrocksdb/store.go

@@ -262,24 +262,25 @@ func (s Store) fixDataStore(storeName string, dryRun bool) error {
 	prefix := storePrefix(storeName)
 	readOpts := grocksdb.NewDefaultReadOptions()
 	defer readOpts.Destroy()
+
 	for _, pair := range pairs {
 		realKey := cloneAppend(prefix, pair.Key)
 
 		readOpts.SetTimestamp(pair.Timestamp)
-		oldValue, err := s.db.GetCF(readOpts, s.cfHandle, realKey)
+		oldValue, oldTimestamp, err := s.db.GetCFWithTS(readOpts, s.cfHandle, realKey)
 		if err != nil {
 			return err
 		}
 
-		clean := bytes.Equal(oldValue.Data(), pair.Value)
+		clean := bytes.Equal(oldValue.Data(), pair.Value) && bytes.Equal(oldTimestamp.Data(), pair.Timestamp)
 		oldValue.Free()
-
+		oldTimestamp.Free()
 		if clean {
 			continue
 		}
 
 		if dryRun {
-			fmt.Printf("fix data: %s, key: %X, ts: %X\n", storeName, pair.Key, pair.Timestamp)
+			fmt.Printf("fix data: %s, key: %X, ts: %X, %X\n", storeName, pair.Key, pair.Timestamp, pair.Value)
 		} else {
 			batch.PutCFWithTS(s.cfHandle, realKey, pair.Timestamp, pair.Value)
 		}