add `CosIdSnowflakeKeyGenerateAlgorithm`/`CosIdSnowflakeIntervalShardingAlgorithm` #15067

Ahoo-Wang · 2022-01-25T14:57:25Z

Changes proposed in this pull request:

add CosIdSnowflakeKeyGenerateAlgorithm
add CosIdSnowflakeIntervalShardingAlgorithm

…I' environment

- add `CosIdSnowflakeIntervalShardingAlgorithm`

codecov-commenter · 2022-01-26T04:22:28Z

Codecov Report

Merging #15067 (8a20ff6) into master (26b7850) will increase coverage by 0.01%.
The diff coverage is 81.63%.

@@             Coverage Diff              @@
##             master   #15067      +/-   ##
============================================
+ Coverage     59.67%   59.69%   +0.01%     
- Complexity     1897     1905       +8     
============================================
  Files          3151     3161      +10     
  Lines         47085    47153      +68     
  Branches       7999     8013      +14     
============================================
+ Hits          28098    28147      +49     
- Misses        16743    16754      +11     
- Partials       2244     2252       +8

Impacted Files	Coverage Δ
...shardingsphere/infra/instance/InstanceContext.java	`0.00% <0.00%> (ø)`
...cosid/CosIdSnowflakeIntervalShardingAlgorithm.java	`52.94% <52.94%> (ø)`
...sharding/cosid/CosIdIntervalShardingAlgorithm.java	`60.00% <58.33%> (-27.50%)`	⬇️
...thm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java	`85.71% <85.71%> (ø)`
...rding/cosid/AbstractIntervalShardingAlgorithm.java	`97.43% <97.43%> (ø)`
...ng/algorithm/keygen/CosIdKeyGenerateAlgorithm.java	`91.66% <100.00%> (+13.09%)`	⬆️
...rding/algorithm/sharding/cosid/PropertiesUtil.java	`66.66% <100.00%> (ø)`
...ral/common/CommonDistSQLBackendHandlerFactory.java	`38.46% <0.00%> (-7.00%)`	⬇️
...ite/parameter/EncryptParameterRewriterBuilder.java	`80.00% <0.00%> (-6.37%)`	⬇️
...te/context/ShardingSQLRewriteContextDecorator.java	`68.75% <0.00%> (-6.25%)`	⬇️
... and 21 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 26b7850...8a20ff6. Read the comment docs.

strongduanmu · 2022-01-26T05:41:19Z

...main/java/org/apache/shardingsphere/sharding/algorithm/keygen/CosIdKeyGenerateAlgorithm.java

+public final class CosIdKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
+
    public static final String TYPE = CosId.COSID.toUpperCase();
-    


@Ahoo-Wang Please keep indents consistent with the previous one.

@Ahoo-Wang Please keep indents consistent with the previous one.

@Ahoo-Wang Please modify these checkstyle problem.

@strongduanmu I'm sorry I didn't find the question about indentation.Do you mean the indentation of empty lines?

@strongduanmu I'm sorry I didn't find the question about indentation.Do you mean the indentation of empty lines?

@Ahoo-Wang Sorry, I was wrong, this is a requirement for code conduct——Keep indents consistent with the previous one.

@strongduanmu Ok,thanks.

pom.xml

strongduanmu · 2022-01-26T05:46:04Z

...main/java/org/apache/shardingsphere/sharding/algorithm/keygen/CosIdKeyGenerateAlgorithm.java

 /**
 * CosId key generate algorithm.
 */
-public final class CosIdKeyGenerateAlgorithm implements KeyGenerateAlgorithm, ShardingSphereInstanceRequiredAlgorithm {


@Ahoo-Wang Why remove ShardingSphereInstanceRequiredAlgorithm interface?

Because the SegmentId algorithm and SegmentChainId algorithm of CosId do not need to depend on WorkerId, so I added CosIdSnowflakeKeyGenerateAlgorithm.

Thank you, I got it.

.../org/apache/shardingsphere/sharding/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java

strongduanmu · 2022-01-26T05:49:15Z

.../org/apache/shardingsphere/sharding/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java

+        String asStringStr = getProps().getProperty(AS_STRING_KEY, Boolean.FALSE.toString());
+        asString = Boolean.parseBoolean(asStringStr);
+        long workerId = 0;
+        if (instanceContext != null) {


@Ahoo-Wang Please put null on the left condition.

strongduanmu · 2022-01-26T05:50:27Z

.../org/apache/shardingsphere/sharding/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java

+
+    public static final String TYPE = CosIdAlgorithm.TYPE_PREFIX + "SNOWFLAKE";
+
+    public static final long DEFAULT_EPOCH = SnowflakeKeyGenerateAlgorithm.EPOCH;


Can we change these public field to private?

DEFAULT_EPOCH should be informed to users.just like SnowflakeKeyGenerateAlgorithm#EPOCH.

TYPE is public to users like documentation conventions.
So I suggest to define as public .

strongduanmu · 2022-01-26T05:51:32Z

...ache/shardingsphere/sharding/algorithm/sharding/cosid/AbstractIntervalShardingAlgorithm.java

+            Range<LocalDateTime> targetRange = (Range<LocalDateTime>) shardingValue;
+            return targetRange;
+        }
+


Please remove useless blank line.

strongduanmu · 2022-01-26T05:51:58Z

...ache/shardingsphere/sharding/algorithm/sharding/cosid/AbstractIntervalShardingAlgorithm.java

+        }
+        Object endpointValue = shardingValue.hasLowerBound() ? shardingValue.lowerEndpoint() : shardingValue.upperEndpoint();
+        if (endpointValue instanceof LocalDateTime) {
+            @SuppressWarnings("unchecked")


@Ahoo-Wang Move this annotation to method?

- upgrade to CosId 1.8.6

strongduanmu · 2022-01-27T01:28:55Z

...main/java/org/apache/shardingsphere/sharding/algorithm/keygen/CosIdKeyGenerateAlgorithm.java

 /**
 * CosId key generate algorithm.
 */
-public final class CosIdKeyGenerateAlgorithm implements KeyGenerateAlgorithm, ShardingSphereInstanceRequiredAlgorithm {


Thank you, I got it.

strongduanmu · 2022-01-27T01:29:38Z

...main/java/org/apache/shardingsphere/sharding/algorithm/keygen/CosIdKeyGenerateAlgorithm.java

+public final class CosIdKeyGenerateAlgorithm implements KeyGenerateAlgorithm {
+
    public static final String TYPE = CosId.COSID.toUpperCase();
-    


@Ahoo-Wang Please keep indents consistent with the previous one.

@Ahoo-Wang Please modify these checkstyle problem.

strongduanmu · 2022-01-27T01:30:07Z

.../org/apache/shardingsphere/sharding/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java

+
+    public static final String TYPE = CosIdAlgorithm.TYPE_PREFIX + "SNOWFLAKE";
+
+    public static final long DEFAULT_EPOCH = SnowflakeKeyGenerateAlgorithm.EPOCH;


strongduanmu

@Ahoo-Wang Thank you for your contribution, this pr looks good to me, @menghaoranss Can you help double check this pr?

menghaoranss · 2022-01-27T05:42:31Z

.../org/apache/shardingsphere/sharding/algorithm/keygen/CosIdSnowflakeKeyGenerateAlgorithm.java

+        asString = Boolean.parseBoolean(asStringStr);
+        long workerId = 0;
+        if (null != instanceContext) {
+            workerId = instanceContext.getWorkerId();


the instanceContext is initialized after init(), so it will always be null here.

Ahoo-Wang added 11 commits January 9, 2022 22:52

Upgrade to CosId 1.7.6

8f4dc6d

Merge branch 'apache:master' into master

13083bb

Fix the unit test failure caused by inconsistent time zones in the 'C…

8a17875

…I' environment

Merge branch 'apache:master' into master

377c3ae

Merge branch 'apache:master' into master

dee8fb8

Merge branch 'apache:master' into master

cc73114

Merge branch 'apache:master' into master

f3ed20a

Merge branch 'apache:master' into master

0ebebd9

Merge branch 'apache:master' into master

9201d09

- add CosIdSnowflakeKeyGenerateAlgorithm

0b01013

- add `CosIdSnowflakeIntervalShardingAlgorithm`

Merge branch 'apache:master' into 14132

8a20ff6

Ahoo-Wang mentioned this pull request Jan 25, 2022

Support automatic generation of instanceId for Memory/Standalone/Cluster mode #14254

Closed

menghaoranss self-requested a review January 26, 2022 01:23

strongduanmu added feature: sharding type: enhancement labels Jan 26, 2022

strongduanmu added this to the 5.1.1 milestone Jan 26, 2022

strongduanmu requested changes Jan 26, 2022

View reviewed changes

- refactor code style

c1d1557

- upgrade to CosId 1.8.6

Ahoo-Wang requested a review from strongduanmu January 26, 2022 14:32

strongduanmu requested changes Jan 27, 2022

View reviewed changes

Keep indents consistent with the previous one.

56504e5

Ahoo-Wang requested a review from strongduanmu January 27, 2022 03:45

strongduanmu approved these changes Jan 27, 2022

View reviewed changes

menghaoranss requested changes Jan 27, 2022

View reviewed changes

fix snowflakeId initialize issue

3eb7f1f

Ahoo-Wang requested a review from menghaoranss January 27, 2022 07:35

menghaoranss approved these changes Jan 27, 2022

View reviewed changes

menghaoranss merged commit 679e04b into apache:master Jan 27, 2022

menghaoranss mentioned this pull request Jan 27, 2022

refactor for code style #15121

Merged

Ahoo-Wang deleted the 14047 branch January 29, 2022 01:55

menghaoranss modified the milestones: 5.1.1, 5.1.0 Feb 8, 2022

		public final class CosIdKeyGenerateAlgorithm implements KeyGenerateAlgorithm {

		public static final String TYPE = CosId.COSID.toUpperCase();


		public static final String TYPE = CosIdAlgorithm.TYPE_PREFIX + "SNOWFLAKE";

		public static final long DEFAULT_EPOCH = SnowflakeKeyGenerateAlgorithm.EPOCH;

add CosIdSnowflakeKeyGenerateAlgorithm/CosIdSnowflakeIntervalShardingAlgorithm #15067

add CosIdSnowflakeKeyGenerateAlgorithm/CosIdSnowflakeIntervalShardingAlgorithm #15067

Uh oh!

Conversation

Ahoo-Wang commented Jan 25, 2022

Uh oh!

codecov-commenter commented Jan 26, 2022

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Ahoo-Wang Jan 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

strongduanmu left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

add `CosIdSnowflakeKeyGenerateAlgorithm`/`CosIdSnowflakeIntervalShardingAlgorithm` #15067

add `CosIdSnowflakeKeyGenerateAlgorithm`/`CosIdSnowflakeIntervalShardingAlgorithm` #15067

Ahoo-Wang Jan 27, 2022 •

edited

Loading