From cac6ede6b72bda04bca5acf5fdf3af8413cab8b2 Mon Sep 17 00:00:00 2001 From: zhouzj Date: Sun, 14 Mar 2021 12:13:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BA=A6=E6=9D=9F=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- C#/source/Yitter.IdGenerator/Core/SnowWorkerM1.cs | 2 +- C#/source/Yitter.IdGenerator/DefaultIdGenerator.cs | 9 ++++----- .../java/com/yitter/contract/IdGeneratorOptions.java | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/C#/source/Yitter.IdGenerator/Core/SnowWorkerM1.cs b/C#/source/Yitter.IdGenerator/Core/SnowWorkerM1.cs index 3275047..3a6d6f5 100644 --- a/C#/source/Yitter.IdGenerator/Core/SnowWorkerM1.cs +++ b/C#/source/Yitter.IdGenerator/Core/SnowWorkerM1.cs @@ -100,7 +100,7 @@ namespace Yitter.IdGenerator if (MaxSeqNumber == 0) { - MaxSeqNumber = (int)Math.Pow(2, SeqBitLength); + MaxSeqNumber = (int)Math.Pow(2, SeqBitLength)-1; } _TimestampShift = (byte)(WorkerIdBitLength + SeqBitLength); diff --git a/C#/source/Yitter.IdGenerator/DefaultIdGenerator.cs b/C#/source/Yitter.IdGenerator/DefaultIdGenerator.cs index 01a6acf..6b9ece5 100644 --- a/C#/source/Yitter.IdGenerator/DefaultIdGenerator.cs +++ b/C#/source/Yitter.IdGenerator/DefaultIdGenerator.cs @@ -57,11 +57,10 @@ namespace Yitter.IdGenerator } var maxSeqNumber = Math.Pow(2, options.SeqBitLength) - 1; - if (options.MaxSeqNumber > maxSeqNumber) - { - options.MaxSeqNumber = (int)maxSeqNumber; - } - + //if (options.MaxSeqNumber > maxSeqNumber) + //{ + // options.MaxSeqNumber = (int)maxSeqNumber; + //} if (options.MaxSeqNumber < 0 || options.MaxSeqNumber > maxSeqNumber) { throw new ApplicationException("MaxSeqNumber error. (range:[1, " + maxSeqNumber + "]"); diff --git a/Java/source/src/main/java/com/yitter/contract/IdGeneratorOptions.java b/Java/source/src/main/java/com/yitter/contract/IdGeneratorOptions.java index 7984b7a..0980cd4 100644 --- a/Java/source/src/main/java/com/yitter/contract/IdGeneratorOptions.java +++ b/Java/source/src/main/java/com/yitter/contract/IdGeneratorOptions.java @@ -50,9 +50,9 @@ public class IdGeneratorOptions { /** * 最小序列数(含) - * 默认11,不小于5,不大于MaxSeqNumber-2 + * 默认5,不小于1,不大于MaxSeqNumber-1 */ - public short MinSeqNumber = 11; + public short MinSeqNumber = 5; /** * 最大漂移次数(含) -- GitLab