zhengchen.tao/ezbookkeeping
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modify method name

Browse Source
This commit is contained in:
MaysWind
2023-08-13 15:30:20 +08:00
parent 957bcf790f
commit 4ac78fe4d1
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/uuid/internal_generator.go
+1 -2
View File
@@ -95,8 +95,7 @@ func (u *InternalUuidGenerator) GenerateUuids(idType UuidType, count uint8) []in
return uuids return uuids
} }
// ParseUuidInfo returns a info struct which contains all information in uuid func (u *InternalUuidGenerator) parseInternalUuidInfo(uuid int64) *InternalUuidInfo {
func (u *InternalUuidGenerator) ParseUuidInfo(uuid int64) *InternalUuidInfo {
seqId := uint32(uuid & internalUuidSeqIdMask) seqId := uint32(uuid & internalUuidSeqIdMask)
uuid = uuid >> internalUuidSeqIdBits uuid = uuid >> internalUuidSeqIdBits
pkg/uuid/internal_generator_test.go
+10 -10
View File
@@ -18,7 +18,7 @@ func TestGenerateUuid(t *testing.T) {
generator, _ := NewInternalUuidGenerator(&settings.Config{UuidServerId: expectedUuidServerId}) generator, _ := NewInternalUuidGenerator(&settings.Config{UuidServerId: expectedUuidServerId})
uuid := generator.GenerateUuid(expectedUuidType) uuid := generator.GenerateUuid(expectedUuidType)
uuidInfo := generator.ParseUuidInfo(uuid) uuidInfo := generator.parseInternalUuidInfo(uuid)
actualUnixTime := uuidInfo.UnixTime actualUnixTime := uuidInfo.UnixTime
assert.Equal(t, uint32(expectedUnixTime), actualUnixTime) assert.Equal(t, uint32(expectedUnixTime), actualUnixTime)
@@ -37,19 +37,19 @@ func TestGenerateUuid(t *testing.T) {
func TestGenerateUuid_MultiType(t *testing.T) { func TestGenerateUuid_MultiType(t *testing.T) {
generator, _ := NewInternalUuidGenerator(&settings.Config{UuidServerId: 1}) generator, _ := NewInternalUuidGenerator(&settings.Config{UuidServerId: 1})
uuid := generator.GenerateUuid(UUID_TYPE_USER) uuid := generator.GenerateUuid(UUID_TYPE_USER)
uuidInfo := generator.ParseUuidInfo(uuid) uuidInfo := generator.parseInternalUuidInfo(uuid)
expectedSeqId := 0 expectedSeqId := 0
actualSeqId := uuidInfo.SequentialId actualSeqId := uuidInfo.SequentialId
assert.Equal(t, uint32(expectedSeqId), actualSeqId) assert.Equal(t, uint32(expectedSeqId), actualSeqId)
uuid = generator.GenerateUuid(UUID_TYPE_ACCOUNT) uuid = generator.GenerateUuid(UUID_TYPE_ACCOUNT)
uuidInfo = generator.ParseUuidInfo(uuid) uuidInfo = generator.parseInternalUuidInfo(uuid)
actualSeqId = uuidInfo.SequentialId actualSeqId = uuidInfo.SequentialId
assert.Equal(t, uint32(expectedSeqId), actualSeqId) assert.Equal(t, uint32(expectedSeqId), actualSeqId)
uuid = generator.GenerateUuid(UUID_TYPE_TRANSACTION) uuid = generator.GenerateUuid(UUID_TYPE_TRANSACTION)
uuidInfo = generator.ParseUuidInfo(uuid) uuidInfo = generator.parseInternalUuidInfo(uuid)
actualSeqId = uuidInfo.SequentialId actualSeqId = uuidInfo.SequentialId
assert.Equal(t, uint32(expectedSeqId), actualSeqId) assert.Equal(t, uint32(expectedSeqId), actualSeqId)
} }
@@ -60,7 +60,7 @@ func TestGenerateUuid_2000TimesIn2Seconds(t *testing.T) {
for i := 0; i < 1000; i++ { for i := 0; i < 1000; i++ {
uuid := generator.GenerateUuid(UUID_TYPE_USER) uuid := generator.GenerateUuid(UUID_TYPE_USER)
uuidInfo := generator.ParseUuidInfo(uuid) uuidInfo := generator.parseInternalUuidInfo(uuid)
assert.Equal(t, uint32(expectedUnixTime), uuidInfo.UnixTime) assert.Equal(t, uint32(expectedUnixTime), uuidInfo.UnixTime)
assert.Equal(t, uint32(i), uuidInfo.SequentialId) assert.Equal(t, uint32(i), uuidInfo.SequentialId)
@@ -71,7 +71,7 @@ func TestGenerateUuid_2000TimesIn2Seconds(t *testing.T) {
for i := 0; i < 1000; i++ { for i := 0; i < 1000; i++ {
uuid := generator.GenerateUuid(UUID_TYPE_USER) uuid := generator.GenerateUuid(UUID_TYPE_USER)
uuidInfo := generator.ParseUuidInfo(uuid) uuidInfo := generator.parseInternalUuidInfo(uuid)
assert.Equal(t, uint32(expectedUnixTime), uuidInfo.UnixTime) assert.Equal(t, uint32(expectedUnixTime), uuidInfo.UnixTime)
assert.Equal(t, uint32(i), uuidInfo.SequentialId) assert.Equal(t, uint32(i), uuidInfo.SequentialId)
@@ -92,7 +92,7 @@ func TestGenerateUuid_10000TimesConcurrent(t *testing.T) {
for cycle := 0; cycle < 1000; cycle++ { for cycle := 0; cycle < 1000; cycle++ {
expectedUnixTime := time.Now().Unix() expectedUnixTime := time.Now().Unix()
uuid := generator.GenerateUuid(UUID_TYPE_USER) uuid := generator.GenerateUuid(UUID_TYPE_USER)
uuidInfo := generator.ParseUuidInfo(uuid) uuidInfo := generator.parseInternalUuidInfo(uuid)
if uint32(expectedUnixTime) != uuidInfo.UnixTime { if uint32(expectedUnixTime) != uuidInfo.UnixTime {
mutex.Lock() mutex.Lock()
@@ -139,7 +139,7 @@ func TestGenerateUuids_Count255(t *testing.T) {
uuids := generator.GenerateUuids(expectedUuidType, expectedUuidCount) uuids := generator.GenerateUuids(expectedUuidType, expectedUuidCount)
for i := 0; i < int(expectedUuidCount); i++ { for i := 0; i < int(expectedUuidCount); i++ {
uuidInfo := generator.ParseUuidInfo(uuids[i]) uuidInfo := generator.parseInternalUuidInfo(uuids[i])
actualUnixTime := uuidInfo.UnixTime actualUnixTime := uuidInfo.UnixTime
assert.Equal(t, uint32(expectedUnixTime), actualUnixTime) assert.Equal(t, uint32(expectedUnixTime), actualUnixTime)
@@ -171,7 +171,7 @@ func TestGenerateUuids_30TimesIn3Seconds(t *testing.T) {
var firstSeqId uint32 var firstSeqId uint32
for i := 0; i < int(expectedUuidCount); i++ { for i := 0; i < int(expectedUuidCount); i++ {
uuidInfo := generator.ParseUuidInfo(uuids[i]) uuidInfo := generator.parseInternalUuidInfo(uuids[i])
actualUnixTime := uuidInfo.UnixTime actualUnixTime := uuidInfo.UnixTime
assert.Equal(t, uint32(expectedUnixTime), actualUnixTime) assert.Equal(t, uint32(expectedUnixTime), actualUnixTime)
@@ -212,7 +212,7 @@ func TestGenerateUuids_20000TimesConcurrent(t *testing.T) {
uuids := generator.GenerateUuids(UUID_TYPE_USER, expectedUuidCount) uuids := generator.GenerateUuids(UUID_TYPE_USER, expectedUuidCount)
for i := 0; i < int(expectedUuidCount); i++ { for i := 0; i < int(expectedUuidCount); i++ {
uuidInfo := generator.ParseUuidInfo(uuids[i]) uuidInfo := generator.parseInternalUuidInfo(uuids[i])
if uint32(expectedUnixTime) != uuidInfo.UnixTime { if uint32(expectedUnixTime) != uuidInfo.UnixTime {
mutex.Lock() mutex.Lock()