Merge pull request #353 from inada-s/feat/64bit-used-ms-mask

use uint64 for used_ms_mask

Author: inada-s

gdxsv/db.go

@@ -90,7 +90,7 @@ type BattleRecord struct {
 	Frame int `db:"frame" json:"frame,omitempty"`
 
 	ReplayURL  string `db:"replay_url" json:"replay_url,omitempty"`
-	UsedMsMask int    `db:"used_ms_mask" json:"used_ms_mask,omitempty"`
+	UsedMsMask uint64 `db:"used_ms_mask" json:"used_ms_mask,omitempty"`
 	UsedMsList string `db:"used_ms_list" json:"used_ms_list,omitempty"`
 	RoundWin   string `db:"round_win" json:"round_win,omitempty"`
 	PlayCount  int    `db:"play_count" json:"play_count,omitempty"`
@@ -278,7 +278,7 @@ type DB interface {
 	SaveBattleRoundWin(battleCode string, roundWin string) error
 
 	// SaveUserUsedMs updates battle_record to set used_ms_mask and used_ms_list for a specific user.
-	SaveUserUsedMs(battleCode string, userID string, usedMsMask int, usedMsList string) error
+	SaveUserUsedMs(battleCode string, userID string, usedMsMask uint64, usedMsList string) error
 
 	// ResetDailyBattleCount clears daily battle count of all users.
 	ResetDailyBattleCount() (err error)

gdxsv/db_sqlite.go

@@ -572,7 +572,7 @@ WHERE
 	return err
 }
 
-func (db SQLiteDB) SaveUserUsedMs(battleCode string, userID string, usedMsMask int, usedMsList string) error {
+func (db SQLiteDB) SaveUserUsedMs(battleCode string, userID string, usedMsMask uint64, usedMsList string) error {
 	_, err := db.Exec(`
 UPDATE battle_record
 SET

gdxsv/lbs_handler.go

@@ -1759,7 +1759,7 @@ var _ = register(lbsP2PMatchingReport, func(p *LbsPeer, m *LbsMessage) {
 					}
 
 					for posIdx, rec := range records {
-						var usedMsMask int
+						var usedMsMask uint64
 						var usedMsParts []string
 						for _, rd := range report.RoundData {
 							msID := 0
@@ -1768,7 +1768,7 @@ var _ = register(lbsP2PMatchingReport, func(p *LbsPeer, m *LbsMessage) {
 							}
 							usedMsParts = append(usedMsParts, strconv.Itoa(msID))
 							if msID > 0 {
-								usedMsMask |= 1 << msID
+								usedMsMask |= 1 << uint(msID)
 							}
 						}
 						usedMsList := strings.Join(usedMsParts, ",")

gdxsv/lbs_handler_test.go

@@ -128,10 +128,10 @@ func TestLbs_P2PMatchingReport(t *testing.T) {
 		assertEq(t, "1,1", rec.RoundWin)
 		if uid == "U1" {
 			assertEq(t, "10,11", rec.UsedMsList)
-			assertEq(t, (1<<10)|(1<<11), rec.UsedMsMask)
+			assertEq(t, uint64((1<<10)|(1<<11)), rec.UsedMsMask)
 		} else {
 			assertEq(t, "20,21", rec.UsedMsList)
-			assertEq(t, (1<<20)|(1<<21), rec.UsedMsMask)
+			assertEq(t, uint64((1<<20)|(1<<21)), rec.UsedMsMask)
 		}
 	}