Skip to content

Replace redis command HMSET (deprecated) with HSET #223

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jbkempf merged 1 commit into from
Jun 17, 2026
Merged

Replace redis command HMSET (deprecated) with HSET #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion database/v1/version1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ func (v *Version1) FixMirrorID(a *actions, m map[int]string) error {
if err != nil {
return err
}
conn.Send("HMSET", fmt.Sprintf("V1_MIRROR_%d", id), "ID", id, "name", name)
conn.Send("HSET", fmt.Sprintf("V1_MIRROR_%d", id), "ID", id, "name", name)
a.rename[fmt.Sprintf("V1_MIRROR_%d", id)] = fmt.Sprintf("MIRROR_%d", id)
a.delete = append(a.delete, fmt.Sprintf("MIRROR_%s", name))
}
Expand Down
4 changes: 2 additions & 2 deletions mirrors/mirrors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ func SetMirrorEnabled(r *database.Redis, id int, state bool) error {
defer conn.Close()

key := fmt.Sprintf("MIRROR_%d", id)
_, err := conn.Do("HMSET", key, "enabled", state)
_, err := conn.Do("HSET", key, "enabled", state)

// Publish update
if err == nil {
Expand Down Expand Up @@ -268,7 +268,7 @@ func SetMirrorState(r *database.Redis, id int, proto Protocol, state bool, reaso
args = append(args, "stateSince", time.Now().Unix())
}

_, err = conn.Do("HMSET", args...)
_, err = conn.Do("HSET", args...)

if err == nil {
// Publish update
Expand Down
22 changes: 11 additions & 11 deletions mirrors/mirrors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,14 +384,14 @@ func TestByExcludeReason_Less(t *testing.T) {
func TestEnableMirror(t *testing.T) {
mock, conn := PrepareRedisTest()

cmdEnable := mock.Command("HMSET", "MIRROR_1", "enabled", true).Expect("ok")
cmdEnable := mock.Command("HSET", "MIRROR_1", "enabled", true).Expect("ok")
EnableMirror(conn, 1)

if mock.Stats(cmdEnable) != 1 {
t.Fatalf("Mirror not enabled")
}

mock.Command("HMSET", "MIRROR_1", "enabled", true).ExpectError(redis.Error("blah"))
mock.Command("HSET", "MIRROR_1", "enabled", true).ExpectError(redis.Error("blah"))
if EnableMirror(conn, 1) == nil {
t.Fatalf("Error expected")
}
Expand All @@ -400,14 +400,14 @@ func TestEnableMirror(t *testing.T) {
func TestDisableMirror(t *testing.T) {
mock, conn := PrepareRedisTest()

cmdDisable := mock.Command("HMSET", "MIRROR_1", "enabled", false).Expect("ok")
cmdDisable := mock.Command("HSET", "MIRROR_1", "enabled", false).Expect("ok")
DisableMirror(conn, 1)

if mock.Stats(cmdDisable) != 1 {
t.Fatalf("Mirror not enabled")
}

mock.Command("HMSET", "MIRROR_1", "enabled", false).ExpectError(redis.Error("blah"))
mock.Command("HSET", "MIRROR_1", "enabled", false).ExpectError(redis.Error("blah"))
if DisableMirror(conn, 1) == nil {
t.Fatalf("Error expected")
}
Expand All @@ -418,7 +418,7 @@ func TestSetMirrorEnabled(t *testing.T) {

cmdPublish := mock.Command("PUBLISH", string(database.MIRROR_UPDATE), redigomock.NewAnyData()).Expect("ok")

cmdEnable := mock.Command("HMSET", "MIRROR_1", "enabled", true).Expect("ok")
cmdEnable := mock.Command("HSET", "MIRROR_1", "enabled", true).Expect("ok")
SetMirrorEnabled(conn, 1, true)

if mock.Stats(cmdEnable) < 1 {
Expand All @@ -431,12 +431,12 @@ func TestSetMirrorEnabled(t *testing.T) {
t.Fatalf("Event MIRROR_UPDATE not published")
}

mock.Command("HMSET", "MIRROR_1", "enabled", true).ExpectError(redis.Error("blah"))
mock.Command("HSET", "MIRROR_1", "enabled", true).ExpectError(redis.Error("blah"))
if SetMirrorEnabled(conn, 1, true) == nil {
t.Fatalf("Error expected")
}

cmdDisable := mock.Command("HMSET", "MIRROR_1", "enabled", false).Expect("ok")
cmdDisable := mock.Command("HSET", "MIRROR_1", "enabled", false).Expect("ok")
SetMirrorEnabled(conn, 1, false)

if mock.Stats(cmdDisable) != 1 {
Expand All @@ -449,7 +449,7 @@ func TestSetMirrorEnabled(t *testing.T) {
t.Fatalf("Event MIRROR_UPDATE not published")
}

mock.Command("HMSET", "MIRROR_1", "enabled", false).ExpectError(redis.Error("blah"))
mock.Command("HSET", "MIRROR_1", "enabled", false).ExpectError(redis.Error("blah"))
if SetMirrorEnabled(conn, 1, false) == nil {
t.Fatalf("Error expected")
}
Expand Down Expand Up @@ -483,8 +483,8 @@ func TestSetMirrorState(t *testing.T) {
/* Set HTTP mirror up */

cmdPreviousState := mock.Command("HGET", "MIRROR_1", "httpUp").Expect(int64(0)).Expect(int64(1))
cmdStateSince := mock.Command("HMSET", "MIRROR_1", "httpUp", true, "httpDownReason", "test1", "stateSince", redigomock.NewAnyInt()).Expect("ok")
cmdState := mock.Command("HMSET", "MIRROR_1", "httpUp", true, "httpDownReason", "test2").Expect("ok")
cmdStateSince := mock.Command("HSET", "MIRROR_1", "httpUp", true, "httpDownReason", "test1", "stateSince", redigomock.NewAnyInt()).Expect("ok")
cmdState := mock.Command("HSET", "MIRROR_1", "httpUp", true, "httpDownReason", "test2").Expect("ok")

if err := SetMirrorState(conn, 1, HTTP, true, "test1"); err != nil {
t.Fatalf("Unexpected error: %s", err)
Expand Down Expand Up @@ -521,7 +521,7 @@ func TestSetMirrorState(t *testing.T) {
/* Set HTTP mirror down */

cmdPreviousState = mock.Command("HGET", "MIRROR_1", "httpUp").Expect(int64(1))
cmdStateSince = mock.Command("HMSET", "MIRROR_1", "httpUp", false, "httpDownReason", "test3", "stateSince", redigomock.NewAnyInt()).Expect("ok")
cmdStateSince = mock.Command("HSET", "MIRROR_1", "httpUp", false, "httpDownReason", "test3", "stateSince", redigomock.NewAnyInt()).Expect("ok")

if err := SetMirrorState(conn, 1, HTTP, false, "test3"); err != nil {
t.Fatalf("Unexpected error: %s", err)
Expand Down
6 changes: 3 additions & 3 deletions rpc/rpc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ func (c *CLI) setMirror(mirror *mirrors.Mirror) error {

// Save the values back into redis
conn.Send("MULTI")
conn.Send("HMSET", fmt.Sprintf("MIRROR_%d", mirror.ID),
conn.Send("HSET", fmt.Sprintf("MIRROR_%d", mirror.ID),
"ID", mirror.ID,
"name", mirror.Name,
"http", mirror.HttpURL,
Expand Down Expand Up @@ -493,10 +493,10 @@ func (c *CLI) setMirror(mirror *mirrors.Mirror) error {

// Reset state to down for unsupported protocol
if strings.HasPrefix(mirror.HttpURL, "http://") {
conn.Send("HMSET", fmt.Sprintf("MIRROR_%d", mirror.ID),
conn.Send("HSET", fmt.Sprintf("MIRROR_%d", mirror.ID),
"httpsUp", false)
} else if strings.HasPrefix(mirror.HttpURL, "https://") {
conn.Send("HMSET", fmt.Sprintf("MIRROR_%d", mirror.ID),
conn.Send("HSET", fmt.Sprintf("MIRROR_%d", mirror.ID),
"httpUp", false)
}

Expand Down
8 changes: 4 additions & 4 deletions scan/scan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func (s *scan) ScannerAddFile(f filedata) {

// Save the size of the current file found on this mirror
ik := fmt.Sprintf("FILEINFO_%d_%s", s.mirrorid, f.path)
s.conn.Send("HMSET", ik, "size", f.size, "modTime", f.modTime)
s.conn.Send("HSET", ik, "size", f.size, "modTime", f.modTime)

// Publish update
database.SendPublish(s.conn, database.MIRROR_FILE_UPDATE, fmt.Sprintf("%d %s", s.mirrorid, f.path))
Expand Down Expand Up @@ -265,7 +265,7 @@ func (s *scan) setLastSync(conn redis.Conn, id int, protocol core.ScannerType, p
precision = core.Precision(time.Second)
}

conn.Send("HMSET", fmt.Sprintf("MIRROR_%d", id),
conn.Send("HSET", fmt.Sprintf("MIRROR_%d", id),
"lastSuccessfulSync", now,
"lastSuccessfulSyncProtocol", protocol,
"lastSuccessfulSyncPrecision", precision)
Expand Down Expand Up @@ -372,7 +372,7 @@ warn:
finish:
// Store the offset in the database
key := fmt.Sprintf("MIRROR_%d", s.mirrorid)
_, err = s.conn.Do("HMSET", key, "tzoffset", ms)
_, err = s.conn.Do("HSET", key, "tzoffset", ms)
if err != nil {
return
}
Expand Down Expand Up @@ -532,7 +532,7 @@ func ScanSource(r *database.Redis, forceRehash bool, stop <-chan struct{}) (err
// Create/Update the files' hash keys with the fresh infos
conn.Send("MULTI")
for _, e := range sourceFiles {
conn.Send("HMSET", fmt.Sprintf("FILE_%s", e.path),
conn.Send("HSET", fmt.Sprintf("FILE_%s", e.path),
"size", e.size,
"modTime", e.modTime,
"sha1", e.sha1,
Expand Down
Loading