From 4ac78fe4d15e5b52a43d7934aa03062ca80a802b Mon Sep 17 00:00:00 2001 From: MaysWind Date: Sun, 13 Aug 2023 15:30:20 +0800 Subject: [PATCH] modify method name --- pkg/uuid/internal_generator.go | 3 +-- pkg/uuid/internal_generator_test.go | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkg/uuid/internal_generator.go b/pkg/uuid/internal_generator.go index 09c915a6..d882db3c 100644 --- a/pkg/uuid/internal_generator.go +++ b/pkg/uuid/internal_generator.go @@ -95,8 +95,7 @@ func (u *InternalUuidGenerator) GenerateUuids(idType UuidType, count uint8) []in return uuids } -// ParseUuidInfo returns a info struct which contains all information in uuid -func (u *InternalUuidGenerator) ParseUuidInfo(uuid int64) *InternalUuidInfo { +func (u *InternalUuidGenerator) parseInternalUuidInfo(uuid int64) *InternalUuidInfo { seqId := uint32(uuid & internalUuidSeqIdMask) uuid = uuid >> internalUuidSeqIdBits diff --git a/pkg/uuid/internal_generator_test.go b/pkg/uuid/internal_generator_test.go index eda9c410..b670b9d3 100644 --- a/pkg/uuid/internal_generator_test.go +++ b/pkg/uuid/internal_generator_test.go @@ -18,7 +18,7 @@ func TestGenerateUuid(t *testing.T) { generator, _ := NewInternalUuidGenerator(&settings.Config{UuidServerId: expectedUuidServerId}) uuid := generator.GenerateUuid(expectedUuidType) - uuidInfo := generator.ParseUuidInfo(uuid) + uuidInfo := generator.parseInternalUuidInfo(uuid) actualUnixTime := uuidInfo.UnixTime assert.Equal(t, uint32(expectedUnixTime), actualUnixTime) @@ -37,19 +37,19 @@ func TestGenerateUuid(t *testing.T) { func TestGenerateUuid_MultiType(t *testing.T) { generator, _ := NewInternalUuidGenerator(&settings.Config{UuidServerId: 1}) uuid := generator.GenerateUuid(UUID_TYPE_USER) - uuidInfo := generator.ParseUuidInfo(uuid) + uuidInfo := generator.parseInternalUuidInfo(uuid) expectedSeqId := 0 actualSeqId := uuidInfo.SequentialId assert.Equal(t, uint32(expectedSeqId), actualSeqId) uuid = generator.GenerateUuid(UUID_TYPE_ACCOUNT) - uuidInfo = generator.ParseUuidInfo(uuid) + uuidInfo = generator.parseInternalUuidInfo(uuid) actualSeqId = uuidInfo.SequentialId assert.Equal(t, uint32(expectedSeqId), actualSeqId) uuid = generator.GenerateUuid(UUID_TYPE_TRANSACTION) - uuidInfo = generator.ParseUuidInfo(uuid) + uuidInfo = generator.parseInternalUuidInfo(uuid) actualSeqId = uuidInfo.SequentialId assert.Equal(t, uint32(expectedSeqId), actualSeqId) } @@ -60,7 +60,7 @@ func TestGenerateUuid_2000TimesIn2Seconds(t *testing.T) { for i := 0; i < 1000; i++ { 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(i), uuidInfo.SequentialId) @@ -71,7 +71,7 @@ func TestGenerateUuid_2000TimesIn2Seconds(t *testing.T) { for i := 0; i < 1000; i++ { 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(i), uuidInfo.SequentialId) @@ -92,7 +92,7 @@ func TestGenerateUuid_10000TimesConcurrent(t *testing.T) { for cycle := 0; cycle < 1000; cycle++ { expectedUnixTime := time.Now().Unix() uuid := generator.GenerateUuid(UUID_TYPE_USER) - uuidInfo := generator.ParseUuidInfo(uuid) + uuidInfo := generator.parseInternalUuidInfo(uuid) if uint32(expectedUnixTime) != uuidInfo.UnixTime { mutex.Lock() @@ -139,7 +139,7 @@ func TestGenerateUuids_Count255(t *testing.T) { uuids := generator.GenerateUuids(expectedUuidType, expectedUuidCount) for i := 0; i < int(expectedUuidCount); i++ { - uuidInfo := generator.ParseUuidInfo(uuids[i]) + uuidInfo := generator.parseInternalUuidInfo(uuids[i]) actualUnixTime := uuidInfo.UnixTime assert.Equal(t, uint32(expectedUnixTime), actualUnixTime) @@ -171,7 +171,7 @@ func TestGenerateUuids_30TimesIn3Seconds(t *testing.T) { var firstSeqId uint32 for i := 0; i < int(expectedUuidCount); i++ { - uuidInfo := generator.ParseUuidInfo(uuids[i]) + uuidInfo := generator.parseInternalUuidInfo(uuids[i]) actualUnixTime := uuidInfo.UnixTime assert.Equal(t, uint32(expectedUnixTime), actualUnixTime) @@ -212,7 +212,7 @@ func TestGenerateUuids_20000TimesConcurrent(t *testing.T) { uuids := generator.GenerateUuids(UUID_TYPE_USER, expectedUuidCount) for i := 0; i < int(expectedUuidCount); i++ { - uuidInfo := generator.ParseUuidInfo(uuids[i]) + uuidInfo := generator.parseInternalUuidInfo(uuids[i]) if uint32(expectedUnixTime) != uuidInfo.UnixTime { mutex.Lock()