You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by GitBox <gi...@apache.org> on 2022/02/18 10:33:40 UTC

[GitHub] [shardingsphere] lanchengx opened a new pull request #15502: Optimize the display of the `show encrypt rules`

lanchengx opened a new pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502


   Changes proposed in this pull request:
   - Use empty string instead of null
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] RaigorJiang commented on pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
RaigorJiang commented on pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502#issuecomment-1044577073


   @lanchengx 
   There is a CI failed.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] TeslaCN commented on a change in pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
TeslaCN commented on a change in pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502#discussion_r810454939



##########
File path: shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
##########
@@ -58,14 +58,20 @@ public void init(final ShardingSphereMetaData metaData, final SQLStatement sqlSt
         Collection<Collection<Object>> result = new LinkedList<>();
         tableRuleConfiguration.getColumns().forEach(each -> {
             ShardingSphereAlgorithmConfiguration algorithmConfiguration = algorithmMap.get(each.getEncryptorName());
-            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), each.getLogicDataType(), each.getCipherColumn(), each.getCipherDataType(),
-                    each.getPlainColumn(), each.getPlainDataType(), each.getAssistedQueryColumn(), each.getAssistedQueryDataType(),
+            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), nullToEmptyString(each.getLogicDataType()),
+                    each.getCipherColumn(), nullToEmptyString(each.getCipherDataType()),
+                    nullToEmptyString(each.getPlainColumn()), nullToEmptyString(each.getPlainDataType()),
+                    nullToEmptyString(each.getAssistedQueryColumn()), nullToEmptyString(each.getAssistedQueryDataType()),
                     algorithmConfiguration.getType(), PropertiesConverter.convert(algorithmConfiguration.getProps()),
                     Objects.isNull(tableRuleConfiguration.getQueryWithCipherColumn()) ? Boolean.TRUE.toString() : tableRuleConfiguration.getQueryWithCipherColumn().toString()));
         });
         return result;
     }
     
+    private <E> Object nullToEmptyString(final E obj) {
+        return obj == null ? "" : obj;

Review comment:
       ```suggestion
           return null == obj ? "" : obj;
   ```




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] TeslaCN commented on a change in pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
TeslaCN commented on a change in pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502#discussion_r810454348



##########
File path: shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
##########
@@ -58,14 +58,20 @@ public void init(final ShardingSphereMetaData metaData, final SQLStatement sqlSt
         Collection<Collection<Object>> result = new LinkedList<>();
         tableRuleConfiguration.getColumns().forEach(each -> {
             ShardingSphereAlgorithmConfiguration algorithmConfiguration = algorithmMap.get(each.getEncryptorName());
-            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), each.getLogicDataType(), each.getCipherColumn(), each.getCipherDataType(),
-                    each.getPlainColumn(), each.getPlainDataType(), each.getAssistedQueryColumn(), each.getAssistedQueryDataType(),
+            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), nullToEmptyString(each.getLogicDataType()),
+                    each.getCipherColumn(), nullToEmptyString(each.getCipherDataType()),
+                    nullToEmptyString(each.getPlainColumn()), nullToEmptyString(each.getPlainDataType()),
+                    nullToEmptyString(each.getAssistedQueryColumn()), nullToEmptyString(each.getAssistedQueryDataType()),
                     algorithmConfiguration.getType(), PropertiesConverter.convert(algorithmConfiguration.getProps()),
                     Objects.isNull(tableRuleConfiguration.getQueryWithCipherColumn()) ? Boolean.TRUE.toString() : tableRuleConfiguration.getQueryWithCipherColumn().toString()));
         });
         return result;
     }
     
+    private <E> Object nullToEmptyString(final E obj) {

Review comment:
       This method returns `Object`, why not just use `Object` as parameter type?




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] RaigorJiang merged pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
RaigorJiang merged pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] codecov-commenter commented on pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
codecov-commenter commented on pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502#issuecomment-1045017965


   # [Codecov](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
   > Merging [#15502](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (05db7d6) into [master](https://codecov.io/gh/apache/shardingsphere/commit/ea9cf5a0090c143b2e49a02d662f696645ec8583?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (ea9cf5a) will **increase** coverage by `0.01%`.
   > The diff coverage is `100.00%`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/shardingsphere/pull/15502/graphs/tree.svg?width=650&height=150&src=pr&token=ZvlXpWa7so&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
   
   ```diff
   @@             Coverage Diff              @@
   ##             master   #15502      +/-   ##
   ============================================
   + Coverage     60.53%   60.54%   +0.01%     
   - Complexity     1958     1961       +3     
   ============================================
     Files          3228     3223       -5     
     Lines         48352    48366      +14     
     Branches       8257     8246      -11     
   ============================================
   + Hits          29268    29284      +16     
   - Misses        16686    16690       +4     
   + Partials       2398     2392       -6     
   ```
   
   
   | [Impacted Files](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
   |---|---|---|
   | [...stsql/handler/query/EncryptRuleQueryResultSet.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtZmVhdHVyZXMvc2hhcmRpbmdzcGhlcmUtZW5jcnlwdC9zaGFyZGluZ3NwaGVyZS1lbmNyeXB0LWRpc3RzcWwvc2hhcmRpbmdzcGhlcmUtZW5jcnlwdC1kaXN0c3FsLWhhbmRsZXIvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL2VuY3J5cHQvZGlzdHNxbC9oYW5kbGVyL3F1ZXJ5L0VuY3J5cHRSdWxlUXVlcnlSZXN1bHRTZXQuamF2YQ==) | `78.26% <100.00%> (+3.26%)` | :arrow_up: |
   | [.../shardingsphere/spring/boot/util/PropertyUtil.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtamRiYy9zaGFyZGluZ3NwaGVyZS1qZGJjLXNwcmluZy9zaGFyZGluZ3NwaGVyZS1qZGJjLXNwcmluZy1pbmZyYS9zaGFyZGluZ3NwaGVyZS1qZGJjLXNwcmluZy1ib290LXN0YXJ0ZXItaW5mcmEvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL3NwcmluZy9ib290L3V0aWwvUHJvcGVydHlVdGlsLmphdmE=) | `37.09% <0.00%> (-12.91%)` | :arrow_down: |
   | [...persist/service/impl/DataSourcePersistService.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtbW9kZS9zaGFyZGluZ3NwaGVyZS1tb2RlLWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL21vZGUvbWV0YWRhdGEvcGVyc2lzdC9zZXJ2aWNlL2ltcGwvRGF0YVNvdXJjZVBlcnNpc3RTZXJ2aWNlLmphdmE=) | `61.76% <0.00%> (-8.24%)` | :arrow_down: |
   | [...persist/service/impl/SchemaRulePersistService.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtbW9kZS9zaGFyZGluZ3NwaGVyZS1tb2RlLWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL21vZGUvbWV0YWRhdGEvcGVyc2lzdC9zZXJ2aWNlL2ltcGwvU2NoZW1hUnVsZVBlcnNpc3RTZXJ2aWNlLmphdmE=) | `21.05% <0.00%> (-5.62%)` | :arrow_down: |
   | [...he/shardingsphere/mode/manager/ContextManager.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtbW9kZS9zaGFyZGluZ3NwaGVyZS1tb2RlLWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL21vZGUvbWFuYWdlci9Db250ZXh0TWFuYWdlci5qYXZh) | `70.32% <0.00%> (-4.35%)` | :arrow_down: |
   | [.../coordinator/ClusterContextManagerCoordinator.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtbW9kZS9zaGFyZGluZ3NwaGVyZS1tb2RlLXR5cGUvc2hhcmRpbmdzcGhlcmUtY2x1c3Rlci1tb2RlL3NoYXJkaW5nc3BoZXJlLWNsdXN0ZXItbW9kZS1jb3JlL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9tb2RlL21hbmFnZXIvY2x1c3Rlci9jb29yZGluYXRvci9DbHVzdGVyQ29udGV4dE1hbmFnZXJDb29yZGluYXRvci5qYXZh) | `72.60% <0.00%> (-4.21%)` | :arrow_down: |
   | [...istry/metadata/watcher/MetaDataChangedWatcher.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtbW9kZS9zaGFyZGluZ3NwaGVyZS1tb2RlLXR5cGUvc2hhcmRpbmdzcGhlcmUtY2x1c3Rlci1tb2RlL3NoYXJkaW5nc3BoZXJlLWNsdXN0ZXItbW9kZS1jb3JlL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9tb2RlL21hbmFnZXIvY2x1c3Rlci9jb29yZGluYXRvci9yZWdpc3RyeS9tZXRhZGF0YS93YXRjaGVyL01ldGFEYXRhQ2hhbmdlZFdhdGNoZXIuamF2YQ==) | `79.54% <0.00%> (-3.79%)` | :arrow_down: |
   | [...ry/cache/subscriber/ScalingRegistrySubscriber.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtbW9kZS9zaGFyZGluZ3NwaGVyZS1tb2RlLXR5cGUvc2hhcmRpbmdzcGhlcmUtY2x1c3Rlci1tb2RlL3NoYXJkaW5nc3BoZXJlLWNsdXN0ZXItbW9kZS1jb3JlL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9tb2RlL21hbmFnZXIvY2x1c3Rlci9jb29yZGluYXRvci9yZWdpc3RyeS9jYWNoZS9zdWJzY3JpYmVyL1NjYWxpbmdSZWdpc3RyeVN1YnNjcmliZXIuamF2YQ==) | `27.27% <0.00%> (-2.36%)` | :arrow_down: |
   | [...distsql/rdl/rule/RuleDefinitionBackendHandler.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmRsL3J1bGUvUnVsZURlZmluaXRpb25CYWNrZW5kSGFuZGxlci5qYXZh) | `56.92% <0.00%> (-0.89%)` | :arrow_down: |
   | [...a/persist/service/SchemaVersionPersistService.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtbW9kZS9zaGFyZGluZ3NwaGVyZS1tb2RlLWNvcmUvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL21vZGUvbWV0YWRhdGEvcGVyc2lzdC9zZXJ2aWNlL1NjaGVtYVZlcnNpb25QZXJzaXN0U2VydmljZS5qYXZh) | `0.00% <0.00%> (ø)` | |
   | ... and [41 more](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [ea9cf5a...05db7d6](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] codecov-commenter edited a comment on pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
codecov-commenter edited a comment on pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502#issuecomment-1045017965


   # [Codecov](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
   > Merging [#15502](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (daeb5b4) into [master](https://codecov.io/gh/apache/shardingsphere/commit/cf79717f2ddfe74a03834b573a24a2f198e525ae?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (cf79717) will **decrease** coverage by `0.12%`.
   > The diff coverage is `100.00%`.
   
   [![Impacted file tree graph](https://codecov.io/gh/apache/shardingsphere/pull/15502/graphs/tree.svg?width=650&height=150&src=pr&token=ZvlXpWa7so&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
   
   ```diff
   @@             Coverage Diff              @@
   ##             master   #15502      +/-   ##
   ============================================
   - Coverage     60.53%   60.41%   -0.13%     
   - Complexity     1958     1961       +3     
   ============================================
     Files          3223     3233      +10     
     Lines         48399    48584     +185     
     Branches       8262     8298      +36     
   ============================================
   + Hits          29300    29352      +52     
   - Misses        16703    16830     +127     
   - Partials       2396     2402       +6     
   ```
   
   
   | [Impacted Files](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
   |---|---|---|
   | [...stsql/handler/query/EncryptRuleQueryResultSet.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtZmVhdHVyZXMvc2hhcmRpbmdzcGhlcmUtZW5jcnlwdC9zaGFyZGluZ3NwaGVyZS1lbmNyeXB0LWRpc3RzcWwvc2hhcmRpbmdzcGhlcmUtZW5jcnlwdC1kaXN0c3FsLWhhbmRsZXIvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL2VuY3J5cHQvZGlzdHNxbC9oYW5kbGVyL3F1ZXJ5L0VuY3J5cHRSdWxlUXVlcnlSZXN1bHRTZXQuamF2YQ==) | `78.26% <100.00%> (+3.26%)` | :arrow_up: |
   | [...d/text/distsql/ral/common/hint/HintSourceType.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtcHJveHkvc2hhcmRpbmdzcGhlcmUtcHJveHktYmFja2VuZC9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvc2hhcmRpbmdzcGhlcmUvcHJveHkvYmFja2VuZC90ZXh0L2Rpc3RzcWwvcmFsL2NvbW1vbi9oaW50L0hpbnRTb3VyY2VUeXBlLmphdmE=) | `0.00% <0.00%> (-42.86%)` | :arrow_down: |
   | [...ana/config/NarayanaConfigurationFileGenerator.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUta2VybmVsL3NoYXJkaW5nc3BoZXJlLXRyYW5zYWN0aW9uL3NoYXJkaW5nc3BoZXJlLXRyYW5zYWN0aW9uLXR5cGUvc2hhcmRpbmdzcGhlcmUtdHJhbnNhY3Rpb24teGEvc2hhcmRpbmdzcGhlcmUtdHJhbnNhY3Rpb24teGEtcHJvdmlkZXIvc2hhcmRpbmdzcGhlcmUtdHJhbnNhY3Rpb24teGEtbmFyYXlhbmEvc3JjL21haW4vamF2YS9vcmcvYXBhY2hlL3NoYXJkaW5nc3BoZXJlL3RyYW5zYWN0aW9uL3hhL25hcmF5YW5hL2NvbmZpZy9OYXJheWFuYUNvbmZpZ3VyYXRpb25GaWxlR2VuZXJhdG9yLmphdmE=) | `61.22% <0.00%> (-30.45%)` | :arrow_down: |
   | [...a/type/hikari/HikariDataSourceJdbcUrlMetaData.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtaW5mcmEvc2hhcmRpbmdzcGhlcmUtaW5mcmEtY29tbW9uL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9pbmZyYS9kYXRhc291cmNlL3Bvb2wvbWV0YWRhdGEvdHlwZS9oaWthcmkvSGlrYXJpRGF0YVNvdXJjZUpkYmNVcmxNZXRhRGF0YS5qYXZh) | `75.00% <0.00%> (-25.00%)` | :arrow_down: |
   | [...infra/database/type/dialect/MySQLDatabaseType.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtaW5mcmEvc2hhcmRpbmdzcGhlcmUtaW5mcmEtY29tbW9uL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9pbmZyYS9kYXRhYmFzZS90eXBlL2RpYWxlY3QvTXlTUUxEYXRhYmFzZVR5cGUuamF2YQ==) | `83.33% <0.00%> (-16.67%)` | :arrow_down: |
   | [...infra/database/type/dialect/SQL92DatabaseType.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtaW5mcmEvc2hhcmRpbmdzcGhlcmUtaW5mcmEtY29tbW9uL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9pbmZyYS9kYXRhYmFzZS90eXBlL2RpYWxlY3QvU1FMOTJEYXRhYmFzZVR5cGUuamF2YQ==) | `83.33% <0.00%> (-16.67%)` | :arrow_down: |
   | [...a/database/type/dialect/SQLServerDatabaseType.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtaW5mcmEvc2hhcmRpbmdzcGhlcmUtaW5mcmEtY29tbW9uL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9pbmZyYS9kYXRhYmFzZS90eXBlL2RpYWxlY3QvU1FMU2VydmVyRGF0YWJhc2VUeXBlLmphdmE=) | `83.33% <0.00%> (-16.67%)` | :arrow_down: |
   | [.../database/type/dialect/PostgreSQLDatabaseType.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtaW5mcmEvc2hhcmRpbmdzcGhlcmUtaW5mcmEtY29tbW9uL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9pbmZyYS9kYXRhYmFzZS90eXBlL2RpYWxlY3QvUG9zdGdyZVNRTERhdGFiYXNlVHlwZS5qYXZh) | `83.33% <0.00%> (-16.67%)` | :arrow_down: |
   | [...adata/type/dbcp/DBCPDataSourceJdbcUrlMetaData.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtaW5mcmEvc2hhcmRpbmdzcGhlcmUtaW5mcmEtY29tbW9uL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9pbmZyYS9kYXRhc291cmNlL3Bvb2wvbWV0YWRhdGEvdHlwZS9kYmNwL0RCQ1BEYXRhU291cmNlSmRiY1VybE1ldGFEYXRhLmphdmE=) | `72.72% <0.00%> (-16.17%)` | :arrow_down: |
   | [...type/dbcp/TomcatDBCPDataSourceJdbcUrlMetaData.java](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2hhcmRpbmdzcGhlcmUtaW5mcmEvc2hhcmRpbmdzcGhlcmUtaW5mcmEtY29tbW9uL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9zaGFyZGluZ3NwaGVyZS9pbmZyYS9kYXRhc291cmNlL3Bvb2wvbWV0YWRhdGEvdHlwZS9kYmNwL1RvbWNhdERCQ1BEYXRhU291cmNlSmRiY1VybE1ldGFEYXRhLmphdmE=) | `72.72% <0.00%> (-16.17%)` | :arrow_down: |
   | ... and [49 more](https://codecov.io/gh/apache/shardingsphere/pull/15502/diff?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | |
   
   ------
   
   [Continue to review full report at Codecov](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
   > **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
   > `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
   > Powered by [Codecov](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [cf79717...daeb5b4](https://codecov.io/gh/apache/shardingsphere/pull/15502?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] lanchengx closed pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
lanchengx closed pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] lanchengx commented on a change in pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
lanchengx commented on a change in pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502#discussion_r810458453



##########
File path: shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
##########
@@ -58,14 +58,20 @@ public void init(final ShardingSphereMetaData metaData, final SQLStatement sqlSt
         Collection<Collection<Object>> result = new LinkedList<>();
         tableRuleConfiguration.getColumns().forEach(each -> {
             ShardingSphereAlgorithmConfiguration algorithmConfiguration = algorithmMap.get(each.getEncryptorName());
-            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), each.getLogicDataType(), each.getCipherColumn(), each.getCipherDataType(),
-                    each.getPlainColumn(), each.getPlainDataType(), each.getAssistedQueryColumn(), each.getAssistedQueryDataType(),
+            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), nullToEmptyString(each.getLogicDataType()),
+                    each.getCipherColumn(), nullToEmptyString(each.getCipherDataType()),
+                    nullToEmptyString(each.getPlainColumn()), nullToEmptyString(each.getPlainDataType()),
+                    nullToEmptyString(each.getAssistedQueryColumn()), nullToEmptyString(each.getAssistedQueryDataType()),
                     algorithmConfiguration.getType(), PropertiesConverter.convert(algorithmConfiguration.getProps()),
                     Objects.isNull(tableRuleConfiguration.getQueryWithCipherColumn()) ? Boolean.TRUE.toString() : tableRuleConfiguration.getQueryWithCipherColumn().toString()));
         });
         return result;
     }
     
+    private <E> Object nullToEmptyString(final E obj) {

Review comment:
       it is OK




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] lanchengx commented on a change in pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
lanchengx commented on a change in pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502#discussion_r810454005



##########
File path: shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
##########
@@ -58,14 +58,20 @@ public void init(final ShardingSphereMetaData metaData, final SQLStatement sqlSt
         Collection<Collection<Object>> result = new LinkedList<>();
         tableRuleConfiguration.getColumns().forEach(each -> {
             ShardingSphereAlgorithmConfiguration algorithmConfiguration = algorithmMap.get(each.getEncryptorName());
-            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), each.getLogicDataType(), each.getCipherColumn(), each.getCipherDataType(),
-                    each.getPlainColumn(), each.getPlainDataType(), each.getAssistedQueryColumn(), each.getAssistedQueryDataType(),
+            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), nullToEmptyString(each.getLogicDataType()),
+                    each.getCipherColumn(), nullToEmptyString(each.getCipherDataType()),
+                    nullToEmptyString(each.getPlainColumn()), nullToEmptyString(each.getPlainDataType()),
+                    nullToEmptyString(each.getAssistedQueryColumn()), nullToEmptyString(each.getAssistedQueryDataType()),
                     algorithmConfiguration.getType(), PropertiesConverter.convert(algorithmConfiguration.getProps()),
                     Objects.isNull(tableRuleConfiguration.getQueryWithCipherColumn()) ? Boolean.TRUE.toString() : tableRuleConfiguration.getQueryWithCipherColumn().toString()));
         });
         return result;
     }
     
+    private <E> Object nullToEmptyString(final E obj) {

Review comment:
       Represents all types of objects




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org

[GitHub] [shardingsphere] TeslaCN commented on a change in pull request #15502: Optimize the display of the `show encrypt rules`

Posted by GitBox <gi...@apache.org>.
TeslaCN commented on a change in pull request #15502:
URL: https://github.com/apache/shardingsphere/pull/15502#discussion_r810112055



##########
File path: shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-distsql/shardingsphere-encrypt-distsql-handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/EncryptRuleQueryResultSet.java
##########
@@ -58,14 +58,20 @@ public void init(final ShardingSphereMetaData metaData, final SQLStatement sqlSt
         Collection<Collection<Object>> result = new LinkedList<>();
         tableRuleConfiguration.getColumns().forEach(each -> {
             ShardingSphereAlgorithmConfiguration algorithmConfiguration = algorithmMap.get(each.getEncryptorName());
-            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), each.getLogicDataType(), each.getCipherColumn(), each.getCipherDataType(),
-                    each.getPlainColumn(), each.getPlainDataType(), each.getAssistedQueryColumn(), each.getAssistedQueryDataType(),
+            result.add(Arrays.asList(tableRuleConfiguration.getName(), each.getLogicColumn(), nullToEmptyString(each.getLogicDataType()),
+                    each.getCipherColumn(), nullToEmptyString(each.getCipherDataType()),
+                    nullToEmptyString(each.getPlainColumn()), nullToEmptyString(each.getPlainDataType()),
+                    nullToEmptyString(each.getAssistedQueryColumn()), nullToEmptyString(each.getAssistedQueryDataType()),
                     algorithmConfiguration.getType(), PropertiesConverter.convert(algorithmConfiguration.getProps()),
                     Objects.isNull(tableRuleConfiguration.getQueryWithCipherColumn()) ? Boolean.TRUE.toString() : tableRuleConfiguration.getQueryWithCipherColumn().toString()));
         });
         return result;
     }
     
+    private <E> Object nullToEmptyString(final E obj) {

Review comment:
       What is the `<E>` for?




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: notifications-unsubscribe@shardingsphere.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org