You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2020/07/22 03:19:41 UTC
[shardingsphere] branch master updated: Revise for code style and
spell error (#6388)
This is an automated email from the ASF dual-hosted git repository.
panjuan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new c399b41 Revise for code style and spell error (#6388)
c399b41 is described below
commit c399b417609087c1786c04771c0c0fb7be4b7b2c
Author: Liang Zhang <te...@163.com>
AuthorDate: Wed Jul 22 11:19:27 2020 +0800
Revise for code style and spell error (#6388)
* For checkstyle
* For spell error
* For code style
* Fix test cases
---
RELEASE-NOTES.md | 2 +-
docs/blog/content/material/CNCF.en.md | 2 +-
docs/blog/content/material/ElasticJob.en.md | 4 +-
docs/blog/content/material/community.en.md | 2 +-
docs/blog/content/material/database.en.md | 4 +-
docs/blog/content/material/proxy.cn.md | 2 +-
docs/blog/content/material/realization.cn.md | 2 +-
docs/blog/content/material/solution.cn.md | 4 +-
docs/blog/content/material/solution.en.md | 10 ++--
.../content/contribute/document-contributor.en.md | 4 +-
.../content/features/encrypt/principle.en.md | 2 +-
.../features/sharding/principle/execute.en.md | 2 +-
.../features/sharding/principle/merge.en.md | 8 +--
.../features/sharding/use-norms/pagination.en.md | 2 +-
.../content/features/sharding/use-norms/sql.en.md | 2 +-
.../features/test-engine/parse-test-engine.en.md | 2 +-
.../shardingsphere-proxy/usage/transaction.en.md | 2 +-
.../example/core/api/entity/Address.java | 4 +-
.../core/jdbc/service/ShadowUserServiceImpl.java | 2 -
.../mybatis/service/ShadowUserServiceImpl.java | 1 -
.../application-sharding-databases-tables.xml | 4 +-
.../application-sharding-databases-tables.xml | 4 +-
.../META-INF/application-sharding-databases.xml | 4 +-
.../example/proxy/hint/ExampleMain.java | 2 +-
.../heartbeat/event/HeartbeatEventType.java | 2 +-
.../heartbeat/detect/HeartbeatHandlerTest.java | 2 +-
.../cluster/state/enums/NodeState.java | 2 +-
.../exception/OrchestrationExceptionTest.java | 8 +--
.../listener/DataChangedEventListenerTest.java | 8 +--
.../yaml/RuleSchemaMetaDataYamlSwapper.java | 2 +-
.../registrycenter/RegistryCenterNodeStatus.java | 2 +-
.../packet/command/MySQLCommandPacketType.java | 14 ++---
.../impl/EncryptInsertValueParameterRewriter.java | 14 ++---
.../rule/MasterSlaveDataSourceRuleTest.java | 2 +-
.../shadow/log/ShadowConfigurationLoggerTest.java | 2 +-
.../sharding/rewrite/token/pojo/TableToken.java | 10 ++--
.../shardingsphere/dbtest/engine/SingleIT.java | 1 -
.../dql/dataset/db/select_with_case_expression.xml | 2 +-
.../select_with_case_expression.xml | 2 +-
.../masterslave/select_with_case_expression.xml | 2 +-
.../dataset/shadow/select_with_case_expression.xml | 2 +-
.../dataset/tbl/select_with_case_expression.xml | 2 +-
.../cases/dql/dql-integrate-test-cases.xml | 2 +-
.../core/datasource/ShardingSphereDataSource.java | 2 +-
.../OrchestrationShardingSphereDataSource.java | 4 +-
.../fixture/FirstTestConfigCenterRepository.java | 5 +-
.../fixture/FirstTestMetaDataCenterRepository.java | 5 +-
.../proxy/config/ProxyConfiguration.java | 11 ++--
.../mysql/command/MySQLCommandExecuteEngine.java | 2 +-
.../scaling/mysql/MySQLDataSourceChecker.java | 5 +-
.../scaling/mysql/client/MySQLClient.java | 2 +-
.../sql/parser/mysql/visitor/MySQLVisitor.java | 26 ++++-----
.../parser/mysql/visitor/impl/MySQLDDLVisitor.java | 4 +-
.../sql/parser/oracle/visitor/OracleVisitor.java | 27 +++++-----
.../postgresql/visitor/PostgreSQLVisitor.java | 57 ++++++++------------
.../visitor/impl/PostgreSQLDDLVisitor.java | 7 +--
.../visitor/impl/PostgreSQLDMLVisitor.java | 60 ++++++---------------
.../sql/parser/sql92/visitor/SQL92Visitor.java | 26 ++++-----
.../parser/sqlserver/visitor/SQLServerVisitor.java | 26 ++++-----
.../parser/sql/util/WhereSegmentExtractUtils.java | 61 +++++++++++-----------
.../test/resources/case/dml/select-expression.xml | 39 +++++++-------
.../sql/supported/dml/select-expression.xml | 2 +-
62 files changed, 237 insertions(+), 292 deletions(-)
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 7af9890..f412b2a 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -36,7 +36,7 @@
1. Support `allow.range.query.with.inline.sharding` option
1. The docker of ShardingSphere-Proxy supports loading external lib packages
1. Support integration with Spring using @ShardingTransactionType
-1. Enhance ShardingDataSource to compatiable with Seata in micro-sevice distribution transaction
+1. Enhance ShardingDataSource to compatible with Seata in micro-service distribution transaction
### Refactor
diff --git a/docs/blog/content/material/CNCF.en.md b/docs/blog/content/material/CNCF.en.md
index b1bdf3f..53adc16 100644
--- a/docs/blog/content/material/CNCF.en.md
+++ b/docs/blog/content/material/CNCF.en.md
@@ -8,7 +8,7 @@ chapter = true
### CNCF
-(Cloud Native Computing Foundation)，is a cloud native computing open source software foundation founded by Google. It is committed to the popularization and sustainable development of Cloud Native technology. Cloud native technology helps enterprises and organizations to build and run agile and scalable applications in modern dynamic environments (such as public clouds, private clouds, and hybrid clouds) through a series of software, specifications, and standards. The representative clou [...]
+(Cloud Native Computing Foundation)，is a cloud native computing open source software foundation founded by Google. It is committed to the popularization and sustainable development of Cloud Native technology. Cloud native technology helps enterprises and organizations to build and run agile and scalable applications in modern dynamic environments (such as public clouds, private clouds, and hybrid clouds) through a series of software, specifications, and standards. The representative clou [...]
### CNCF Landscape
diff --git a/docs/blog/content/material/ElasticJob.en.md b/docs/blog/content/material/ElasticJob.en.md
index 9d907a6..17ec9e2 100644
--- a/docs/blog/content/material/ElasticJob.en.md
+++ b/docs/blog/content/material/ElasticJob.en.md
@@ -18,9 +18,9 @@ chapter = true
ElasticJob can fully meet enterprise user's requirements on scheduling and processing ability for task management and batch jobs.
-ElasticJob began to open it's source code at end of 2014. Since richness functions, quite completed documents and easy to use, it earns a lot of loyal users and good word of mouth in the past five years. ElasticJob is one of the most popular distributed scheduling framwork and gains more than 5.8K star on github.
+ElasticJob began to open it's source code at end of 2014. Since richness functions, quite completed documents and easy to use, it earns a lot of loyal users and good word of mouth in the past five years. ElasticJob is one of the most popular distributed scheduling framework and gains more than 5.8K star on github.
-In the last two years, the core developer spent much time maintaining and contributing to Apache ShardingSphere, which caused ElasticJob to develop slowly. But with the developement of Apache ShardingSphere on distributed domain, we need a distributed scheduling component to support distributed management of multi cluster, data migration and scaling. So Apache ShardingSphere community put forward a proposal to make ElasticJob as a subproject, that makes sure ElasticJob could be maintaine [...]
+In the last two years, the core developer spent much time maintaining and contributing to Apache ShardingSphere, which caused ElasticJob to develop slowly. But with the development of Apache ShardingSphere on distributed domain, we need a distributed scheduling component to support distributed management of multi cluster, data migration and scaling. So Apache ShardingSphere community put forward a proposal to make ElasticJob as a sub-project, that makes sure ElasticJob could be maintaine [...]
We are pleased to announce the good news at the first time, and there would be more news about ElasticJob in the future.
diff --git a/docs/blog/content/material/community.en.md b/docs/blog/content/material/community.en.md
index e45597a..e7fe4e4 100644
--- a/docs/blog/content/material/community.en.md
+++ b/docs/blog/content/material/community.en.md
@@ -59,7 +59,7 @@ There were only 11 initial committers during an extended period. This situation
3. Automated Testing. More contributors, more Pull requests. In this situation, it is hard to guarantee the effectiveness and efficiency of the project by manual. Therefore, we decide to rely on automated testing to evaluate each Pull request, which helps contributors and reviewers merely focus on their work.
-4. Self-service first. More questions get increased with more and more users. How to handle these questions efficiently? Our solution is to build user self-service channels firstly and provide other communication ways. In general, users can solve some of the common issues with documents and FAQ pages by themselves. If that does not work, users can raize their special issues on GitHub or discuss them by email.
+4. Self-service first. More questions get increased with more and more users. How to handle these questions efficiently? Our solution is to build user self-service channels firstly and provide other communication ways. In general, users can solve some of the common issues with documents and FAQ pages by themselves. If that does not work, users can raise their special issues on GitHub or discuss them by email.
5. Public and online working mode. Public work means the issue only discussed in public is valid—otherwise, invalid and no chance to be solved. Online work means most of the discussions are online and asynchronous, requiring participants to provide information as detailed as possible.
diff --git a/docs/blog/content/material/database.en.md b/docs/blog/content/material/database.en.md
index 52bad1a..cfbbe38 100644
--- a/docs/blog/content/material/database.en.md
+++ b/docs/blog/content/material/database.en.md
@@ -24,7 +24,7 @@ Author | Liang Zhang
- Elastic scaling: You can dynamically expand and shrink data storage nodes anytime, anywhere without affecting existing applications;
-- Multiple replica: Automatically copy the data to multiple copies across datacenters in a strong and consistent manner to ensure the absolute security of the data;
+- Multiple replica: Automatically copy the data to multiple copies across data centers in a strong and consistent manner to ensure the absolute security of the data;
- HTAP: The same set of products is used to mix transactional operations of OLTP and analytical operations of OLAP.
@@ -296,4 +296,4 @@ Zhang Liang, head of data research and development at JD.com, initiator of Apach
Love open source, leading open source projects ShardingSphere (formerly known as Sharding-JDBC) and Elastic-Job. Good at using java as the main distributed architecture, admiring elegant code, and having more research on how to write expressive code.
-At present, the main energy is invested in making ShardingSphere and JDTX into the industry's first-class financial data solutions. ShardingSphere has entered the Apache incubator. It is the first open source project of the Jingdong Group to enter the Apache Foundation and the first distributed database middleware of the Apache Foundation.
+At present, the main energy is invested in making ShardingSphere and JDTX into the industry's first-class financial data solutions. ShardingSphere has entered the Apache incubator. It is the first open source project of the JingDong Group to enter the Apache Foundation and the first distributed database middleware of the Apache Foundation.
diff --git a/docs/blog/content/material/proxy.cn.md b/docs/blog/content/material/proxy.cn.md
index 10b797b..d427655 100644
--- a/docs/blog/content/material/proxy.cn.md
+++ b/docs/blog/content/material/proxy.cn.md
@@ -103,7 +103,7 @@ useServerPrepStmts=true&cachePrepStmts=true
从第5条消息开始，每次查询只传参数值就可以了，终于达到了一次编译多次运行的效果，MySQL的效率得到了提高。而且由于ExecuteStatement只传了参数的值，消息长度上比完整的SQL短了很多，网络IO的效率也得到了提升。
-原来cachePrepStmts=true这个参数的意思是告诉JDBC缓存需要prepare的SQL，比如“SELECT*FROMt_orderWHEREuser_id=?”，运行过一次后，下次再运行就跳过PreparedStatement，直接用ExecuteStatement设置参数值。
+原来cachePrepStmts=true这个参数的意思是告诉JDBC缓存需要prepare的SQL，比如“SELECT * FROM t_order WHERE user_id=?”，运行过一次后，下次再运行就跳过PreparedStatement，直接用ExecuteStatement设置参数值。
明白原理后，就知道该怎么优化Proxy了。Proxy采用的是Hikari数据库连接池，在初始化的时候为其设置上面的两个参数：
diff --git a/docs/blog/content/material/realization.cn.md b/docs/blog/content/material/realization.cn.md
index f9996af..8afd4aa 100644
--- a/docs/blog/content/material/realization.cn.md
+++ b/docs/blog/content/material/realization.cn.md
@@ -275,7 +275,7 @@ Atomikos事务管理器原理分析
Atomikos的事务管理器可以内嵌到业务进程中，当应用调用TransactionManager.begin时，将会创建本次XA事务，并且与当前线程关联。同时Atomikos也对DataSource中的connection做了二次封装，代理connection中含有本次事务相关信息的状态，并且拦截了connection的JDBC操作。
-在createStatement时，调用XAResource.start进行资源注册；在close时，调用XAResource.end让XA事务处于idel可提交状态；在commit或rollback时，依次调用prepare和commit进行二阶段提交。
+在createStatement时，调用XAResource.start进行资源注册；在close时，调用XAResource.end让XA事务处于idle可提交状态；在commit或rollback时，依次调用prepare和commit进行二阶段提交。
**Sharding-Sphere的Saga事务实现**
diff --git a/docs/blog/content/material/solution.cn.md b/docs/blog/content/material/solution.cn.md
index ce7f433..71bffcc 100644
--- a/docs/blog/content/material/solution.cn.md
+++ b/docs/blog/content/material/solution.cn.md
@@ -21,7 +21,7 @@ chapter = true
---
-冯征，红帽软件工程师。2009年加入红帽软件公司，主要从事事务管理器方面的工作，做为核心开发人员参与了Narayan和Blacktie项目，在与多个应用服务器（Wildfly, Karaf, Tomcat）和框架（Common DBCP, Spring Boot）的事务处理集成方面有过贡献。从2017年开始参与了Apache ServiceComb项目，目前是PMC成员之一。对于分布式事务处理以及微服务环境中的事务处理，有过深入的研究。
+冯征，红帽软件工程师。2009年加入红帽软件公司，主要从事事务管理器方面的工作，做为核心开发人员参与了 Narayana 和 BlackTie 项目，在与多个应用服务器（Wildfly, Karaf, Tomcat）和框架（Common DBCP, Spring Boot）的事务处理集成方面有过贡献。从2017年开始参与了Apache ServiceComb项目，目前是PMC成员之一。对于分布式事务处理以及微服务环境中的事务处理，有过深入的研究。
### 导读
@@ -137,7 +137,7 @@ sharding-transaction模块由sharding-transaction-core，sharding-transaction-2p
Sharding-transaction-xa模块进一步定义了面向XA事务管理器开发者的SPI，开发者仅需实现SPI定义的接口，即可自动加入至Apache ShardingSphere（Incubating）生态，作为其XA事务管理器。
-Apache ShardingSphere（Incubating）官方目前实现了基于Atomikos和Bitronix的SPI，并且邀请了Radhat JBoss的XA事务引擎Narayana [https://github.com/jbosstm/narayana] 开发团队实现了JBoss的SPI。用户可以自行的在Atomikos，Bitronix和Narayana间选择自己喜欢的XA事务管理器。
+Apache ShardingSphere（Incubating）官方目前实现了基于Atomikos和Bitronix的SPI，并且邀请了 Redhat JBoss 的XA事务引擎Narayana [https://github.com/jbosstm/narayana] 开发团队实现了JBoss的SPI。用户可以自行的在Atomikos，Bitronix和Narayana间选择自己喜欢的XA事务管理器。
diff --git a/docs/blog/content/material/solution.en.md b/docs/blog/content/material/solution.en.md
index 94698cf..cfb090e 100644
--- a/docs/blog/content/material/solution.en.md
+++ b/docs/blog/content/material/solution.en.md
@@ -15,13 +15,13 @@ Love open source, currently leading open source project ShardingSphere (formerly
At present, focus on improving ShardingSphere to be the industry's first-class financial data solution. ShardingSphere has entered the Apache Incubator, is the first open source project of the Jingdong Group to enter the Apache Software Foundation, and is also the first distributed database middleware of the Apache Software Foundation.
---
-Ning Jiang，Technical expert of Huawei Open Source Competency Center, project leader of Apache ServiceComb. Former chief software engineer of Red Hat Software. He has more than ten years of experience in enterprise-level open source middleware development, rich experience in Java development, and also is the enthusiast of functional programming. Since 2006, he has been engaged in the development of the Apache open source middleware projects, and has participated in the development of Apac [...]
+Ning Jiang，Technical expert of Huawei Open Source Competency Center, project leader of Apache ServiceComb. Former chief software engineer of Red Hat Software. He has more than ten years of experience in enterprise-level open source middleware development, rich experience in Java development, and also is the enthusiast of functional programming. Since 2006, he has been engaged in the development of the Apache open source middleware projects, and has participated in the development of Apac [...]
Blog site：https://willemjiang.github.io/
---
-Zheng Feng is a software engineer at Red Hat, joined Red Hat Software in 2009, mainly engaged in the work of the transaction manager. As a core developer, he participated in the Narayan and Blacktie projects. He had contributed to the integration of transaction processing of multiple application servers (Wildfly, Karaf, Tomcat) and frameworks (Common DBCP, Spring Boot ). Since 2017, he has participated in the Apache ServiceComb project and is currently a member of PMC. He has in-depth re [...]
+Zheng Feng is a software engineer at Red Hat, joined Red Hat Software in 2009, mainly engaged in the work of the transaction manager. As a core developer, he participated in the Narayan and Blacktie projects. He had contributed to the integration of transaction processing of multiple application servers (Wildfly, Karaf, Tomcat) and frameworks (Common DBCP, Spring Boot ). Since 2017, he has participated in the Apache ServiceComb project and is currently a member of PMC. He has in-depth re [...]
### Guide
@@ -41,7 +41,7 @@ Database transactions need to meet the four characteristics of ACID (Atomicity,
- Durability Refers to the committed transaction modification data will be persisted.
-In a single data node, the transaction is limited to the access control of a single database resource, called local transaction. Almost all mature relational databases provide native support for local transactions. However, in a distributed application environment based on microservices, more and more application scenarios require that access to multiple services and corresponding multiple database resources can be incorporated into the same transaction, then the distributed transactions [...]
+In a single data node, the transaction is limited to the access control of a single database resource, called local transaction. Almost all mature relational databases provide native support for local transactions. However, in a distributed application environment based on micro-services, more and more application scenarios require that access to multiple services and corresponding multiple database resources can be incorporated into the same transaction, then the distributed transaction [...]
Although the relational database provides perfect ACID native support for local transactions. But in a distributed scenario, it has become a shackle in system performance. How to make the database meet the characteristics of ACID or find corresponding alternatives in a distributed scenario is the focus of distributed transactions.
@@ -133,7 +133,7 @@ There are many mature XA transaction managers. Apache ShardingSphere (Incubating
The Sharding-transaction-xa module further defines the SPI for XA transaction manager developers. Developers only need to implement the SPI-defined interface to automatically join the Apache ShardingSphere (Incubating) ecosystem as their XA transaction manager.
-Apache ShardingSphere (Incubating) officially implements SPI based on Atomikos and Bitronix, and invited the Radhat JBoss XA transaction engine Narayana [https://github.com/jbosstm/narayana] development team to implement JBoss SPI. Users can choose their favorite XA transaction manager among Atomikos, Bitronix and Narayana.
+Apache ShardingSphere (Incubating) officially implements SPI based on Atomikos and Bitronix, and invited the Redhat JBoss XA transaction engine Narayana [https://github.com/jbosstm/narayana] development team to implement JBoss SPI. Users can choose their favorite XA transaction manager among Atomikos, Bitronix and Narayana.
@@ -210,7 +210,7 @@ Since the native transaction interface does not support transaction types, Shard
### Future plan
-The distributed transaction module in the development branch of github [https://github.com/apache/incubator-shardingsphere] is basically available and will be released with the version of 4.0.0.M1, which will also be the first release version when ShardingSphere into the Apache Foundation incubator. Distributed transactions are an important part of data sharding and microservice architecture. They are also the focus of Apache ShardingSphere (Incubating). After the release, they will cont [...]
+The distributed transaction module in the development branch of github [https://github.com/apache/incubator-shardingsphere] is basically available and will be released with the version of 4.0.0.M1, which will also be the first release version when ShardingSphere into the Apache Foundation incubator. Distributed transactions are an important part of data sharding and micro-service architecture. They are also the focus of Apache ShardingSphere (Incubating). After the release, they will con [...]
#### Transaction isolation engine
diff --git a/docs/community/content/contribute/document-contributor.en.md b/docs/community/content/contribute/document-contributor.en.md
index 2518b73..9ba3b95 100644
--- a/docs/community/content/contribute/document-contributor.en.md
+++ b/docs/community/content/contribute/document-contributor.en.md
@@ -14,8 +14,8 @@ In the contributor guide, we have mentioned how to submit Issues and pull reques
- Familiar with [Markdown](https://www.markdownguide.org/getting-started)
- Familiar with [Hugo](https://gohugo.io/)
-## Fock document
-Fock the master branch of [ShardingSphere](https://github.com/apache/shardingsphere).
+## Fork document
+Fork the master branch of [ShardingSphere](https://github.com/apache/shardingsphere).
## Directory structure description
diff --git a/docs/document/content/features/encrypt/principle.en.md b/docs/document/content/features/encrypt/principle.en.md
index cade7fd..ff927ab 100644
--- a/docs/document/content/features/encrypt/principle.en.md
+++ b/docs/document/content/features/encrypt/principle.en.md
@@ -69,7 +69,7 @@ As shown below:
This is also the core meaning of Apache ShardingSphere, which is to separate user SQL from the underlying data table structure according to the encryption rules provided by the user,
-so that the SQL writter by user no longer depends on the actual database table structure.
+so that the SQL writer by user no longer depends on the actual database table structure.
The connection, mapping, and conversion between the user and the underlying database are handled by Apache ShardingSphere.
Why should we do this?
It is still the same : in order to enable the online business to seamlessly, transparently and safely perform data encryption migration.
diff --git a/docs/document/content/features/sharding/principle/execute.en.md b/docs/document/content/features/sharding/principle/execute.en.md
index 287e9b1..8184c38 100644
--- a/docs/document/content/features/sharding/principle/execute.en.md
+++ b/docs/document/content/features/sharding/principle/execute.en.md
@@ -78,7 +78,7 @@ Most OLTP operations use sharding keys to route to the only data node, which wil
Applied in actually SQL execution, this phrase can be divided into two steps: group execution and merger result generation.
-Group execution can distribute execution unit groups generated in preparation phrase to the underlying concurrency engine and send events according to each key steps during the execution process, such as starting, successful and failed execution events. Execution engine only focuses on message sending rather than subscribers of the event. Other ShardingSphere modulars, such as distributed transactions, invoked chain tracing and so on, will subscribe focusing events and do corresponding o [...]
+Group execution can distribute execution unit groups generated in preparation phrase to the underlying concurrency engine and send events according to each key steps during the execution process, such as starting, successful and failed execution events. Execution engine only focuses on message sending rather than subscribers of the event. Other ShardingSphere modules, such as distributed transactions, invoked chain tracing and so on, will subscribe focusing events and do corresponding op [...]
The overall structure of execution engine is shown as the following picture:
diff --git a/docs/document/content/features/sharding/principle/merge.en.md b/docs/document/content/features/sharding/principle/merge.en.md
index fd9fd56..f0b0ac9 100644
--- a/docs/document/content/features/sharding/principle/merge.en.md
+++ b/docs/document/content/features/sharding/principle/merge.en.md
@@ -30,7 +30,7 @@ When merging order inquiries, ShardingSphere will compare current data values in
Here is an instance to explain ShardingSphere's order-by merger. The following picture is an illustration of ordering by the score. Data result sets returned by 3 tables are shown in the example and each one of them has already been ordered according to the score, but there is no order between 3 data result sets. Order the data value that the result set cursor currently points to in these 3 result sets. Then put them into the priority queue. the data value of t_score_0 is the biggest, f [...]
-
+
This diagram illustrates how the order-by merger works when using next invocation. We can see from the diagram that when using next invocation, t_score_0 at the first of the queue will be popped out. After returning the data value currently pointed by the cursor (i.e., 100) to the client end, the cursor will be moved down and t_score_0 will be put back to the queue.
@@ -38,7 +38,7 @@ While the priority queue will also be ordered according to the t_score_0 data va
In the second next operation, t_score_2 in the first position is popped out of the queue. Its value pointed by the cursor of the data result set is returned to the client end, with its cursor moved down to rejoin the queue, and the following will be in the same way. If there is no data in the result set, it will not rejoin the queue.
-
+
It can be seen that, under the circumstance that data in each result set is ordered while result sets are disordered, ShardingSphere does not need to upload all the data to the memory to order. In the order-by merger method, each next operation only acquires the right piece of data each time, which saves the memory consumption to a large extent.
@@ -56,11 +56,11 @@ SELECT name, SUM(score) FROM t_score GROUP BY name ORDER BY name;
When order-by item and group-by item are totally consistent, the data obtained is continuous. The data to group are all stored in the data value that data result set cursor currently points to, stream group-by merger can be used, as illustrated by the diagram:
-
+
The merging logic is similar to that of order-by merger. The following picture shows how stream group-by merger works in next invocation.
-
+
We can see from the picture, in the first next invocation, t_score_java in the first position, along with other result set data also having the grouping value of “Jetty”, will be popped out of the queue. After acquiring all the students’ scores with the name of “Jetty”, the accumulation operation will be proceeded. Hence, after the first next invocation is finished, the result set acquired is the sum of Jetty’s scores. In the same time, all the cursors in data result sets will be moved d [...]
diff --git a/docs/document/content/features/sharding/use-norms/pagination.en.md b/docs/document/content/features/sharding/use-norms/pagination.en.md
index 8d8b155..292791b 100644
--- a/docs/document/content/features/sharding/use-norms/pagination.en.md
+++ b/docs/document/content/features/sharding/use-norms/pagination.en.md
@@ -48,7 +48,7 @@ SELECT * FROM t_order WHERE id > 100000 LIMIT 10
## Pagination Sub-query
-Both Oracle and SQLServer paginations need to be processed by sub-query, ShardingSphere supports pagination related sub-query.
+Both Oracle and SQLServer pagination need to be processed by sub-query, ShardingSphere supports pagination related sub-query.
- Oracle
diff --git a/docs/document/content/features/sharding/use-norms/sql.en.md b/docs/document/content/features/sharding/use-norms/sql.en.md
index f47ffff..d3225ec 100644
--- a/docs/document/content/features/sharding/use-norms/sql.en.md
+++ b/docs/document/content/features/sharding/use-norms/sql.en.md
@@ -3,7 +3,7 @@ title = "SQL"
weight = 1
+++
-Since the SQL syntax is flexible and complex and distributed databases and stand-alone databases do not have identical query sceanrios, SQLs incompatible with stand-alone databases are hard to avoid.
+Since the SQL syntax is flexible and complex and distributed databases and stand-alone databases do not have identical query scenarios, SQLs incompatible with stand-alone databases are hard to avoid.
This document has listed identified supported SQL types and unsupported SQL types, trying to avoid traps for users.
diff --git a/docs/document/content/features/test-engine/parse-test-engine.en.md b/docs/document/content/features/test-engine/parse-test-engine.en.md
index c7e6e33..808d7fb 100644
--- a/docs/document/content/features/test-engine/parse-test-engine.en.md
+++ b/docs/document/content/features/test-engine/parse-test-engine.en.md
@@ -6,7 +6,7 @@ weight = 3
## Prepare Data
-Not like Integration test, SQL parse test doesn't need a specific database environment, just define the sql to parse, and the assert data:
+Not like Integration test, SQL parse test does not need a specific database environment, just define the sql to parse, and the assert data:
### SQL Data
diff --git a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
index f523c7e..4e800a9 100644
--- a/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
+++ b/docs/document/content/user-manual/shardingsphere-proxy/usage/transaction.en.md
@@ -7,7 +7,7 @@ ShardingSphere-Proxy supports LOCAL, XA, BASE transactions, LOCAL transaction is
## XA transaction
-Default XA transaction manager of ShardingSphere is Atomikos. Users can customize Atomikos configuration items through adding `jta.properties` in conf catelog of ShardingSphere-Proxy. Please refer to [Official Documents](https://www.atomikos.com/Documentation/JtaProperties) of Atomikos for detailed configurations.
+Default XA transaction manager of ShardingSphere is Atomikos. Users can customize Atomikos configuration items through adding `jta.properties` in conf catalog of ShardingSphere-Proxy. Please refer to [Official Documents](https://www.atomikos.com/Documentation/JtaProperties) of Atomikos for detailed configurations.
## BASE Transaction
diff --git a/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/Address.java b/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/Address.java
index 96c6bd2..fca3e5f 100644
--- a/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/Address.java
+++ b/examples/example-core/example-api/src/main/java/org/apache/shardingsphere/example/core/api/entity/Address.java
@@ -17,7 +17,9 @@
package org.apache.shardingsphere.example.core.api.entity;
-public class Address {
+import java.io.Serializable;
+
+public class Address implements Serializable {
private static final long serialVersionUID = 661434701950670670L;
diff --git a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/ShadowUserServiceImpl.java b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/ShadowUserServiceImpl.java
index b44216b..d733db8 100644
--- a/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/ShadowUserServiceImpl.java
+++ b/examples/example-core/example-raw-jdbc/src/main/java/org/apache/shardingsphere/example/core/jdbc/service/ShadowUserServiceImpl.java
@@ -18,9 +18,7 @@
package org.apache.shardingsphere.example.core.jdbc.service;
import org.apache.shardingsphere.example.core.api.entity.ShadowUser;
-import org.apache.shardingsphere.example.core.api.entity.User;
import org.apache.shardingsphere.example.core.api.repository.ShadowUserRepository;
-import org.apache.shardingsphere.example.core.api.repository.UserRepository;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
import java.sql.SQLException;
diff --git a/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/ShadowUserServiceImpl.java b/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/ShadowUserServiceImpl.java
index 0f5ba2e..f5e06c5 100644
--- a/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/ShadowUserServiceImpl.java
+++ b/examples/example-core/example-spring-mybatis/src/main/java/org/apache/shardingsphere/example/core/mybatis/service/ShadowUserServiceImpl.java
@@ -18,7 +18,6 @@
package org.apache.shardingsphere.example.core.mybatis.service;
import org.apache.shardingsphere.example.core.api.entity.ShadowUser;
-import org.apache.shardingsphere.example.core.api.entity.User;
import org.apache.shardingsphere.example.core.api.repository.ShadowUserRepository;
import org.apache.shardingsphere.example.core.api.service.ExampleService;
import org.springframework.stereotype.Service;
diff --git a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
index 2bd2978..e47aa76 100644
--- a/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/orchestration-example/orchestration-spring-namespace-example/src/main/resources/META-INF/zookeeper/local/application-sharding-databases-tables.xml
@@ -52,7 +52,7 @@
<property name="password" value=""/>
</bean>
- <sharding:sharding-algorithm id="databaseIineStrategyShardingAlgorithm" type="INLINE">
+ <sharding:sharding-algorithm id="databaseInlineStrategyShardingAlgorithm" type="INLINE">
<props>
<prop key="algorithm.expression">demo_ds_${user_id % 2}</prop>
</props>
@@ -70,7 +70,7 @@
</props>
</sharding:sharding-algorithm>
- <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseIineStrategyShardingAlgorithm"/>
+ <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseInlineStrategyShardingAlgorithm"/>
<sharding:standard-strategy id="orderTableStrategy" sharding-column="order_id" algorithm-ref="orderInlineStrategyShardingAlgorithm"/>
diff --git a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases-tables.xml b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
index 7bf6448..1e0efba 100644
--- a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
+++ b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases-tables.xml
@@ -56,13 +56,13 @@
<prop key="algorithm.expression">demo_ds_${user_id % 2}</prop>
</bean:properties>
- <sharding:sharding-algorithm id="databaseIineStrategyShardingAlgorithm" type="INLINE">
+ <sharding:sharding-algorithm id="databaseInlineStrategyShardingAlgorithm" type="INLINE">
<props>
<prop key="algorithm.expression">demo_ds_${user_id % 2}</prop>
</props>
</sharding:sharding-algorithm>
- <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseIineStrategyShardingAlgorithm"/>
+ <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseInlineStrategyShardingAlgorithm"/>
<sharding:sharding-algorithm id="orderInlineStrategyShardingAlgorithm" type="INLINE">
<props>
diff --git a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases.xml b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases.xml
index 88bc918..aea8669 100644
--- a/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases.xml
+++ b/examples/shardingsphere-jdbc-example/transaction-example/transaction-2pc-xa-spring-namespace-example/src/main/resources/META-INF/application-sharding-databases.xml
@@ -49,13 +49,13 @@
<property name="password" value=""/>
</bean>
- <sharding:sharding-algorithm id="databaseIineStrategyShardingAlgorithm" type="INLINE">
+ <sharding:sharding-algorithm id="databaseInlineStrategyShardingAlgorithm" type="INLINE">
<props>
<prop key="algorithm.expression">demo_ds_${user_id % 2}</prop>
</props>
</sharding:sharding-algorithm>
- <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseIineStrategyShardingAlgorithm"/>
+ <sharding:standard-strategy id="databaseStrategy" sharding-column="user_id" algorithm-ref="databaseInlineStrategyShardingAlgorithm"/>
<sharding:key-generate-algorithm id="snowflakeAlgorithm" type="SNOWFLAKE">
<props>
diff --git a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ExampleMain.java b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ExampleMain.java
index 21c422a..12512ff 100644
--- a/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ExampleMain.java
+++ b/examples/shardingsphere-proxy-example/shardingsphere-proxy-hint-example/src/main/java/org/apache/shardingsphere/example/proxy/hint/ExampleMain.java
@@ -42,7 +42,7 @@ public class ExampleMain {
exampleService.cleanEnvironment();
}
- private static DataSource getDataSource() throws IOException, SQLException {
+ private static DataSource getDataSource() throws IOException {
switch (TYPE) {
case DATABASE_TABLES:
return YamlDataSourceFactory.createDataSource(getFile("/META-INF/hint-databases-tables.yaml"));
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/event/HeartbeatEventType.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/event/HeartbeatEventType.java
index 7c813a8..42ebb54 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/event/HeartbeatEventType.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/main/java/org/apache/shardingsphere/cluster/heartbeat/event/HeartbeatEventType.java
@@ -22,5 +22,5 @@ package org.apache.shardingsphere.cluster.heartbeat.event;
*/
public enum HeartbeatEventType {
- NOTICE_DETECT;
+ NOTICE_DETECT
}
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatHandlerTest.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatHandlerTest.java
index adf9fa1..5a4df53 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatHandlerTest.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-heartbeat/src/test/java/org/apache/shardingsphere/cluster/heartbeat/detect/HeartbeatHandlerTest.java
@@ -137,7 +137,7 @@ public final class HeartbeatHandlerTest {
Assert.assertNotNull(response.getHeartbeatResultMap());
assertTrue(response.getHeartbeatResultMap().keySet().contains(SCHEMA_NAME));
assertThat(response.getHeartbeatResultMap().get(SCHEMA_NAME).size(), is(2));
- assertTrue(response.getHeartbeatResultMap().get(SCHEMA_NAME).stream().map(each -> each.getDataSourceName())
+ assertTrue(response.getHeartbeatResultMap().get(SCHEMA_NAME).stream().map(HeartbeatResult::getDataSourceName)
.collect(Collectors.toList()).containsAll(Arrays.asList(DATA_SOURCE_0, DATA_SOURCE_1)));
response.getHeartbeatResultMap().get(SCHEMA_NAME).iterator().forEachRemaining(each -> assertTrue(each.getEnable()));
}
diff --git a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-state/src/main/java/org/apache/shardingsphere/cluster/state/enums/NodeState.java b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-state/src/main/java/org/apache/shardingsphere/cluster/state/enums/NodeState.java
index d96a808..08914e6 100644
--- a/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-state/src/main/java/org/apache/shardingsphere/cluster/state/enums/NodeState.java
+++ b/shardingsphere-control-panel/shardingsphere-cluster/shardingsphere-cluster-state/src/main/java/org/apache/shardingsphere/cluster/state/enums/NodeState.java
@@ -22,5 +22,5 @@ package org.apache.shardingsphere.cluster.state.enums;
*/
public enum NodeState {
- ONLINE, INTERRUPT, OFFLINE, DISABLED, UNKNOWN;
+ ONLINE, INTERRUPT, OFFLINE, DISABLED, UNKNOWN
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-center/shardingsphere-orchestration-center-api/src/test/java/org/apache/shardingsphere/orchestration/center/exception/OrchestrationExceptionTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-center/shardingsphere-orchestration-center-api/src/test/java/org/apache/shardingsphere/orchestration/center/exception/OrchestrationExceptionTest.java
index 3bec09f..ce6a740 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-center/shardingsphere-orchestration-center-api/src/test/java/org/apache/shardingsphere/orchestration/center/exception/OrchestrationExceptionTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-center/shardingsphere-orchestration-center-api/src/test/java/org/apache/shardingsphere/orchestration/center/exception/OrchestrationExceptionTest.java
@@ -22,13 +22,13 @@ import org.junit.Test;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public class OrchestrationExceptionTest {
-
+public final class OrchestrationExceptionTest {
+
@Test
public void assertException() {
OrchestrationException exception = new OrchestrationException(new RuntimeException("error"));
assertThat(exception.getCause().getMessage(), is("error"));
- exception = new OrchestrationException("error: %s", "orch");
- assertThat(exception.getMessage(), is("error: orch"));
+ exception = new OrchestrationException("error: %s", "Orchestration");
+ assertThat(exception.getMessage(), is("error: Orchestration"));
}
}
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-center/shardingsphere-orchestration-center-api/src/test/java/org/apache/shardingsphere/orchestration/center/listener/DataChangedEventListenerTest.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-center/shardingsphere-orchestration-center-api/src/test/java/org/apache/shardingsphere/orchestration/center/listener/DataChangedEventListenerTest.java
index 5169f86..2ac971a 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-center/shardingsphere-orchestration-center-api/src/test/java/org/apache/shardingsphere/orchestration/center/listener/DataChangedEventListenerTest.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-center/shardingsphere-orchestration-center-api/src/test/java/org/apache/shardingsphere/orchestration/center/listener/DataChangedEventListenerTest.java
@@ -28,13 +28,7 @@ public class DataChangedEventListenerTest {
@Test
public void assertFixture() {
FirstTestCenterRepository centerRepository = new FirstTestCenterRepository();
- DataChangedEventListener listener = new DataChangedEventListener() {
-
- @Override
- public void onChange(final DataChangedEvent dataChangedEvent) {
- assertThat(dataChangedEvent.getChangedType().name(), is(dataChangedEvent.getValue()));
- }
- };
+ DataChangedEventListener listener = dataChangedEvent -> assertThat(dataChangedEvent.getChangedType().name(), is(dataChangedEvent.getValue()));
centerRepository.watch("UPDATED", listener);
centerRepository.watch("DELETED", listener);
centerRepository.watch("IGNORED", listener);
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-metadatacenter/src/main/java/org/apache/shardingsphere/orchestration/core/metadatacenter/yaml/RuleSchemaMetaDataYamlSwapper.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-metadatacenter/src/main/java/org/apache/shardingsphere/orchestration/core/metadatacenter/yaml/Rul [...]
index 455eb34..af48842 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-metadatacenter/src/main/java/org/apache/shardingsphere/orchestration/core/metadatacenter/yaml/RuleSchemaMetaDataYamlSwapper.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-metadatacenter/src/main/java/org/apache/shardingsphere/orchestration/core/metadatacenter/yaml/RuleSchemaMetaDataYamlSwapper.java
@@ -49,7 +49,7 @@ public final class RuleSchemaMetaDataYamlSwapper implements YamlSwapper<YamlRule
@Override
public RuleSchemaMetaData swapToObject(final YamlRuleSchemaMetaData yaml) {
- SchemaMetaData configured = Optional.ofNullable(yaml.getConfiguredSchemaMetaData()).map(e -> this.convertSchema(e)).orElse(new SchemaMetaData(new HashMap<>()));
+ SchemaMetaData configured = Optional.ofNullable(yaml.getConfiguredSchemaMetaData()).map(this::convertSchema).orElse(new SchemaMetaData(new HashMap<>()));
Map<String, SchemaMetaData> unconfigured = Optional.ofNullable(yaml.getUnconfiguredSchemaMetaDataMap()).map(e -> e.entrySet().stream()
.collect(Collectors.toMap(Entry::getKey, entry -> convertSchema(entry.getValue())))).orElse(new HashMap<>());
return new RuleSchemaMetaData(configured, unconfigured);
diff --git a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registrycenter/src/main/java/org/apache/shardingsphere/orchestration/core/registrycenter/RegistryCenterNodeStatus.java b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registrycenter/src/main/java/org/apache/shardingsphere/orchestration/core/registrycenter/RegistryCenterNode [...]
index b392c57..7be5958 100644
--- a/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registrycenter/src/main/java/org/apache/shardingsphere/orchestration/core/registrycenter/RegistryCenterNodeStatus.java
+++ b/shardingsphere-control-panel/shardingsphere-orchestration/shardingsphere-orchestration-core/shardingsphere-orchestration-core-registrycenter/src/main/java/org/apache/shardingsphere/orchestration/core/registrycenter/RegistryCenterNodeStatus.java
@@ -35,5 +35,5 @@ public enum RegistryCenterNodeStatus {
/**
* Offline state.
*/
- OFFLINE;
+ OFFLINE
}
diff --git a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/MySQLCommandPacketType.java b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/MySQLCommandPacketType.java
index b92366f..ee4ac04 100644
--- a/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/MySQLCommandPacketType.java
+++ b/shardingsphere-db-protocol/shardingsphere-db-protocol-mysql/src/main/java/org/apache/shardingsphere/db/protocol/mysql/packet/command/MySQLCommandPacketType.java
@@ -255,16 +255,16 @@ public enum MySQLCommandPacketType implements CommandPacketType {
*/
COM_RESET_CONNECTION(0x1f);
- private static final Map<Integer, MySQLCommandPacketType> MYSQL_COMMAND_PACKET_TYPE_CACHE = new HashMap<Integer, MySQLCommandPacketType>() {
- {
- for (MySQLCommandPacketType each : MySQLCommandPacketType.values()) {
- this.put(each.value, each);
- }
- }
- };
+ private static final Map<Integer, MySQLCommandPacketType> MYSQL_COMMAND_PACKET_TYPE_CACHE = new HashMap<>();
private final int value;
+ static {
+ for (MySQLCommandPacketType each : MySQLCommandPacketType.values()) {
+ MYSQL_COMMAND_PACKET_TYPE_CACHE.put(each.getValue(), each);
+ }
+ }
+
/**
* Value of integer.
*
diff --git a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/impl/EncryptInsertValueParameterRewriter.java b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/impl/EncryptInsertValueParameterRewriter.java
index 0f1632f..2cf00e3 100644
--- a/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/impl/EncryptInsertValueParameterRewriter.java
+++ b/shardingsphere-features/shardingsphere-encrypt/shardingsphere-encrypt-rewrite/src/main/java/org/apache/shardingsphere/encrypt/rewrite/parameter/impl/EncryptInsertValueParameterRewriter.java
@@ -62,13 +62,13 @@ public final class EncryptInsertValueParameterRewriter extends EncryptParameterR
int columnIndex = getColumnIndex(parameterBuilder, insertStatementContext, encryptLogicColumnName);
int count = 0;
for (List<Object> each : insertStatementContext.getGroupedParameters()) {
- int paramterIndex = insertStatementContext.getInsertValueContexts().get(count).getParameterIndex(columnIndex);
+ int parameterIndex = insertStatementContext.getInsertValueContexts().get(count).getParameterIndex(columnIndex);
if (!each.isEmpty()) {
StandardParameterBuilder standardParameterBuilder = parameterBuilder.getParameterBuilders().get(count);
ExpressionSegment expressionSegment = insertStatementContext.getInsertValueContexts().get(count).getValueExpressions().get(columnIndex);
if (expressionSegment instanceof ParameterMarkerExpressionSegment) {
encryptInsertValue(
- encryptAlgorithm, tableName, paramterIndex, insertStatementContext.getInsertValueContexts().get(count).getValue(columnIndex),
+ encryptAlgorithm, tableName, parameterIndex, insertStatementContext.getInsertValueContexts().get(count).getValue(columnIndex),
standardParameterBuilder, encryptLogicColumnName);
}
}
@@ -87,9 +87,9 @@ public final class EncryptInsertValueParameterRewriter extends EncryptParameterR
return columnNames.indexOf(encryptLogicColumnName);
}
- private void encryptInsertValue(final EncryptAlgorithm encryptAlgorithm, final String tableName, final int paramterIndex,
+ private void encryptInsertValue(final EncryptAlgorithm encryptAlgorithm, final String tableName, final int parameterIndex,
final Object originalValue, final StandardParameterBuilder parameterBuilder, final String encryptLogicColumnName) {
- parameterBuilder.addReplacedParameters(paramterIndex, encryptAlgorithm.encrypt(originalValue));
+ parameterBuilder.addReplacedParameters(parameterIndex, encryptAlgorithm.encrypt(originalValue));
Collection<Object> addedParameters = new LinkedList<>();
if (encryptAlgorithm instanceof QueryAssistedEncryptAlgorithm) {
Optional<String> assistedColumnName = getEncryptRule().findAssistedQueryColumn(tableName, encryptLogicColumnName);
@@ -100,10 +100,10 @@ public final class EncryptInsertValueParameterRewriter extends EncryptParameterR
addedParameters.add(originalValue);
}
if (!addedParameters.isEmpty()) {
- if (!parameterBuilder.getAddedIndexAndParameters().containsKey(paramterIndex + 1)) {
- parameterBuilder.getAddedIndexAndParameters().put(paramterIndex + 1, new LinkedList<>());
+ if (!parameterBuilder.getAddedIndexAndParameters().containsKey(parameterIndex + 1)) {
+ parameterBuilder.getAddedIndexAndParameters().put(parameterIndex + 1, new LinkedList<>());
}
- parameterBuilder.getAddedIndexAndParameters().get(paramterIndex + 1).addAll(addedParameters);
+ parameterBuilder.getAddedIndexAndParameters().get(parameterIndex + 1).addAll(addedParameters);
}
}
}
diff --git a/shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-common/src/test/java/org/apache/shardingsphere/masterslave/rule/MasterSlaveDataSourceRuleTest.java b/shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-common/src/test/java/org/apache/shardingsphere/masterslave/rule/MasterSlaveDataSourceRuleTest.java
index 95eb769..03753eb 100644
--- a/shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-common/src/test/java/org/apache/shardingsphere/masterslave/rule/MasterSlaveDataSourceRuleTest.java
+++ b/shardingsphere-features/shardingsphere-master-slave/shardingsphere-master-slave-common/src/test/java/org/apache/shardingsphere/masterslave/rule/MasterSlaveDataSourceRuleTest.java
@@ -31,7 +31,7 @@ import static org.junit.Assert.assertThat;
public final class MasterSlaveDataSourceRuleTest {
private final MasterSlaveDataSourceRule masterSlaveDataSourceRule = new MasterSlaveDataSourceRule(
- new MasterSlaveDataSourceRuleConfiguration("test_ms", "master_db", Arrays.asList("slave_db_0", "slave_db_1"), "ramdon"), new RandomMasterSlaveLoadBalanceAlgorithm());
+ new MasterSlaveDataSourceRuleConfiguration("test_ms", "master_db", Arrays.asList("slave_db_0", "slave_db_1"), "random"), new RandomMasterSlaveLoadBalanceAlgorithm());
@Test(expected = IllegalArgumentException.class)
public void assertNewMasterSlaveDataSourceRuleWithoutName() {
diff --git a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/log/ShadowConfigurationLoggerTest.java b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/log/ShadowConfigurationLoggerTest.java
index d078f43..416faeb 100644
--- a/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/log/ShadowConfigurationLoggerTest.java
+++ b/shardingsphere-features/shardingsphere-shadow/shardingsphere-shadow-common/src/test/java/org/apache/shardingsphere/shadow/log/ShadowConfigurationLoggerTest.java
@@ -58,7 +58,7 @@ public final class ShadowConfigurationLoggerTest {
}
@Test
- public void assertLogShadowuleConfiguration() {
+ public void assertLogShadowRuleConfiguration() {
String yaml = "rules:\n"
+ "- !SHADOW\n"
+ " column: shadow\n"
diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/TableToken.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/TableToken.java
index a97fab2..3bf6493 100644
--- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/TableToken.java
+++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-rewrite/src/main/java/org/apache/shardingsphere/sharding/rewrite/token/pojo/TableToken.java
@@ -41,7 +41,7 @@ public final class TableToken extends SQLToken implements Substitutable, RouteUn
@Getter
private final int stopIndex;
- private final IdentifierValue tablename;
+ private final IdentifierValue tableName;
private final IdentifierValue owner;
@@ -52,7 +52,7 @@ public final class TableToken extends SQLToken implements Substitutable, RouteUn
public TableToken(final int startIndex, final int stopIndex, final SimpleTableSegment tableSegment, final SQLStatementContext sqlStatementContext, final ShardingRule shardingRule) {
super(startIndex);
this.stopIndex = stopIndex;
- this.tablename = tableSegment.getTableName().getIdentifier();
+ this.tableName = tableSegment.getTableName().getIdentifier();
this.sqlStatementContext = sqlStatementContext;
this.owner = tableSegment.getOwner().isPresent() ? tableSegment.getOwner().get().getIdentifier() : null;
this.shardingRule = shardingRule;
@@ -60,13 +60,13 @@ public final class TableToken extends SQLToken implements Substitutable, RouteUn
@Override
public String toString(final RouteUnit routeUnit) {
- String actualTableName = getLogicAndActualTables(routeUnit).get(tablename.getValue().toLowerCase());
- actualTableName = null == actualTableName ? tablename.getValue().toLowerCase() : actualTableName;
+ String actualTableName = getLogicAndActualTables(routeUnit).get(tableName.getValue().toLowerCase());
+ actualTableName = null == actualTableName ? tableName.getValue().toLowerCase() : actualTableName;
String owner = "";
if (null != this.owner && routeUnit.getDataSourceMapper().getLogicName().equals(this.owner.getValue())) {
owner = this.owner.getQuoteCharacter().getStartDelimiter() + routeUnit.getDataSourceMapper().getActualName() + this.owner.getQuoteCharacter().getEndDelimiter() + ".";
}
- return Joiner.on("").join(owner, tablename.getQuoteCharacter().getStartDelimiter(), actualTableName, tablename.getQuoteCharacter().getEndDelimiter());
+ return Joiner.on("").join(owner, tableName.getQuoteCharacter().getStartDelimiter(), actualTableName, tableName.getQuoteCharacter().getEndDelimiter());
}
private Map<String, String> getLogicAndActualTables(final RouteUnit routeUnit) {
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/SingleIT.java b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/SingleIT.java
index 453bfaa..d83aef4 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/SingleIT.java
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/java/org/apache/shardingsphere/dbtest/engine/SingleIT.java
@@ -67,4 +67,3 @@ public abstract class SingleIT extends BaseIT {
.replace("%%", "%").replace("'%'", "'%%'");
}
}
-
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_with_case_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_with_case_expression.xml
index a3c457e..49297cb 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_with_case_expression.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/db/select_with_case_expression.xml
@@ -20,7 +20,7 @@
<column name="order_id" />
<column name="user_id" />
<column name="status" />
- <column name="itemid" />
+ <column name="item_id" />
<column name="stateName" />
</metadata>
<row values="1000,10,init,100001,已启用" />
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_case_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_case_expression.xml
index a198cbb..b2960d3 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_case_expression.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/dbtbl_with_masterslave/select_with_case_expression.xml
@@ -20,7 +20,7 @@
<column name="order_id" />
<column name="user_id" />
<column name="status" />
- <column name="itemid" />
+ <column name="item_id" />
<column name="stateName" />
</metadata>
<row values="1000,10,init_slave,100000,null" />
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_case_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_case_expression.xml
index 03629b9..27841e8 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_case_expression.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/masterslave/select_with_case_expression.xml
@@ -20,7 +20,7 @@
<column name="order_id" />
<column name="user_id" />
<column name="status" />
- <column name="itemid" />
+ <column name="item_id" />
<column name="stateName" />
</metadata>
<row values="1000,10,init_slave,100001,null" />
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/shadow/select_with_case_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/shadow/select_with_case_expression.xml
index a3c457e..49297cb 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/shadow/select_with_case_expression.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/shadow/select_with_case_expression.xml
@@ -20,7 +20,7 @@
<column name="order_id" />
<column name="user_id" />
<column name="status" />
- <column name="itemid" />
+ <column name="item_id" />
<column name="stateName" />
</metadata>
<row values="1000,10,init,100001,已启用" />
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/tbl/select_with_case_expression.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/tbl/select_with_case_expression.xml
index ecee55b..b25c1b7 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/tbl/select_with_case_expression.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dataset/tbl/select_with_case_expression.xml
@@ -20,7 +20,7 @@
<column name="order_id" />
<column name="user_id" />
<column name="status" />
- <column name="itemid" />
+ <column name="item_id" />
<column name="stateName" />
</metadata>
<row values="1000,10,init,100000,已启用" />
diff --git a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dql-integrate-test-cases.xml b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dql-integrate-test-cases.xml
index 9460fff..83daaa0 100644
--- a/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dql-integrate-test-cases.xml
+++ b/shardingsphere-integration-test/shardingsphere-test-suite/src/test/resources/integrate/cases/dql/dql-integrate-test-cases.xml
@@ -500,7 +500,7 @@
<assertion parameters="10:int" expected-data-file="select_for_update.xml" />
</dql-test-case>
- <dql-test-case sql="select t.*,o.item_id as itemid,(case when t.status = 'init' then '已启用' when t.status = 'failed' then '已停用' end) as stateName
+ <dql-test-case sql="select t.*,o.item_id as item_id,(case when t.status = 'init' then '已启用' when t.status = 'failed' then '已停用' end) as stateName
from t_order t left join t_order_item as o on o.order_id =t.order_id where t.order_id=1000 limit 1" db-types="MySQL,H2">
<assertion expected-data-file="select_with_case_expression.xml" />
</dql-test-case>
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
index 0bb5d84..86c82f8 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/jdbc/core/datasource/ShardingSphereDataSource.java
@@ -104,7 +104,7 @@ public final class ShardingSphereDataSource extends AbstractUnsupportedOperation
}
@Override
- public void close() throws Exception {
+ public void close() {
close(getDataSourceMap().keySet());
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSource.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSource.java
index 72c6b26..eb2471b 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSource.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/main/java/org/apache/shardingsphere/driver/orchestration/internal/datasource/OrchestrationShardingSphereDataSource.java
@@ -241,8 +241,8 @@ public class OrchestrationShardingSphereDataSource extends AbstractOrchestration
private void disableDataSources() {
Collection<String> disabledDataSources = ShardingOrchestrationFacade.getInstance().getRegistryCenter().loadDisabledDataSources();
if (!disabledDataSources.isEmpty()) {
- dataSource.getSchemaContexts().getSchemaContexts().entrySet().forEach(entry -> entry.getValue().getSchema().getRules()
- .stream().filter(each -> each instanceof MasterSlaveRule).forEach(e -> disableDataSources((MasterSlaveRule) e, disabledDataSources, entry.getKey())));
+ dataSource.getSchemaContexts().getSchemaContexts().forEach((key, value)
+ -> value.getSchema().getRules().stream().filter(each -> each instanceof MasterSlaveRule).forEach(e -> disableDataSources((MasterSlaveRule) e, disabledDataSources, key)));
}
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestConfigCenterRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestConfigCenterRepository.java
index 7165874..bdfa8cc 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestConfigCenterRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestConfigCenterRepository.java
@@ -43,9 +43,7 @@ public final class FirstTestConfigCenterRepository implements ConfigCenterReposi
@Override
public String get(final String key) {
- final String s = REGISTRY_DATA.get(key);
- System.out.println("get=>\nkey=" + key + "\nvalue=" + s);
- return s;
+ return REGISTRY_DATA.get(key);
}
@Override
@@ -55,7 +53,6 @@ public final class FirstTestConfigCenterRepository implements ConfigCenterReposi
@Override
public void persist(final String key, final String value) {
- System.out.println("put=>\nkey=" + key + "\nvalue=" + value);
REGISTRY_DATA.put(key, value);
}
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestMetaDataCenterRepository.java b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestMetaDataCenterRepository.java
index 2a3ec17..2bcae78 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestMetaDataCenterRepository.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-orchestration/src/test/java/org/apache/shardingsphere/driver/orchestration/fixture/FirstTestMetaDataCenterRepository.java
@@ -43,9 +43,7 @@ public final class FirstTestMetaDataCenterRepository implements ConfigCenterRepo
@Override
public String get(final String key) {
- final String s = REGISTRY_DATA.get(key);
- System.out.println("get=>\nkey=" + key + "\nvalue=" + s);
- return s;
+ return REGISTRY_DATA.get(key);
}
@Override
@@ -55,7 +53,6 @@ public final class FirstTestMetaDataCenterRepository implements ConfigCenterRepo
@Override
public void persist(final String key, final String value) {
- System.out.println("put=>\nkey=" + key + "\nvalue=" + value);
REGISTRY_DATA.put(key, value);
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
index fe6775c..9596000 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-common/src/main/java/org/apache/shardingsphere/proxy/config/ProxyConfiguration.java
@@ -17,10 +17,6 @@
package org.apache.shardingsphere.proxy.config;
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Map;
-import java.util.Properties;
import lombok.Getter;
import lombok.Setter;
import org.apache.shardingsphere.cluster.configuration.config.ClusterConfiguration;
@@ -29,6 +25,11 @@ import org.apache.shardingsphere.infra.config.RuleConfiguration;
import org.apache.shardingsphere.kernel.context.schema.DataSourceParameter;
import org.apache.shardingsphere.metrics.configuration.config.MetricsConfiguration;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Properties;
+
/**
* Proxy configuration.
*/
@@ -36,6 +37,8 @@ import org.apache.shardingsphere.metrics.configuration.config.MetricsConfigurati
@Setter
public final class ProxyConfiguration implements Serializable {
+ private static final long serialVersionUID = 2258701685899056191L;
+
private Authentication authentication;
private Properties props;
diff --git a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
index 806483f..1c4f9b8 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-frontend/shardingsphere-proxy-frontend-mysql/src/main/java/org/apache/shardingsphere/proxy/frontend/mysql/command/MySQLCommandExecuteEngine.java
@@ -73,7 +73,7 @@ public final class MySQLCommandExecuteEngine implements CommandExecuteEngine {
@Override
@SneakyThrows
public void writeQueryData(final ChannelHandlerContext context,
- final BackendConnection backendConnection, final QueryCommandExecutor queryCommandExecutor, final int headerPackagesCount) throws SQLException {
+ final BackendConnection backendConnection, final QueryCommandExecutor queryCommandExecutor, final int headerPackagesCount) {
if (!queryCommandExecutor.isQuery() || !context.channel().isActive()) {
return;
}
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLDataSourceChecker.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLDataSourceChecker.java
index 684937d..1428462 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLDataSourceChecker.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/MySQLDataSourceChecker.java
@@ -41,7 +41,7 @@ public final class MySQLDataSourceChecker extends AbstractDataSourceChecker {
private static final String SHOW_VARIABLES_SQL = "SHOW VARIABLES LIKE '%s'";
- private static final Map<String, String> REQUIRED_VARIABLES = new HashMap(2);
+ private static final Map<String, String> REQUIRED_VARIABLES = new HashMap<>(2);
static {
REQUIRED_VARIABLES.put("LOG_BIN", "ON");
@@ -72,8 +72,7 @@ public final class MySQLDataSourceChecker extends AbstractDataSourceChecker {
}
private boolean matchPrivileges(final String privilege) {
- return Arrays.stream(REQUIRED_PRIVILEGES)
- .anyMatch(requiredPrivileges -> Arrays.stream(requiredPrivileges).allMatch(required -> privilege.contains(required)));
+ return Arrays.stream(REQUIRED_PRIVILEGES).anyMatch(each -> Arrays.stream(each).allMatch(privilege::contains));
}
@Override
diff --git a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/MySQLClient.java b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/MySQLClient.java
index 87e24b8..6d136b4 100644
--- a/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/MySQLClient.java
+++ b/shardingsphere-scaling/shardingsphere-scaling-mysql/src/main/java/org/apache/shardingsphere/scaling/mysql/client/MySQLClient.java
@@ -243,7 +243,7 @@ public final class MySQLClient {
}
@Override
- public void channelInactive(final ChannelHandlerContext ctx) throws Exception {
+ public void channelInactive(final ChannelHandlerContext ctx) {
log.warn("channel inactive");
reconnect();
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/MySQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/MySQLVisitor.java
index a01edaf..aa9b6b3 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/MySQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/MySQLVisitor.java
@@ -612,31 +612,31 @@ public abstract class MySQLVisitor extends MySQLStatementBaseVisitor<ASTNode> {
@Override
public final ASTNode visitDataType(final DataTypeContext ctx) {
- DataTypeSegment dataTypeSegment = new DataTypeSegment();
- dataTypeSegment.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
- dataTypeSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeSegment.setStopIndex(ctx.stop.getStopIndex());
+ DataTypeSegment result = new DataTypeSegment();
+ result.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStopIndex());
if (null != ctx.dataTypeLength()) {
DataTypeLengthSegment dataTypeLengthSegment = (DataTypeLengthSegment) visit(ctx.dataTypeLength());
- dataTypeSegment.setDataLength(dataTypeLengthSegment);
+ result.setDataLength(dataTypeLengthSegment);
}
- return dataTypeSegment;
+ return result;
}
@Override
public final ASTNode visitDataTypeLength(final DataTypeLengthContext ctx) {
- DataTypeLengthSegment dataTypeLengthSegment = new DataTypeLengthSegment();
- dataTypeLengthSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeLengthSegment.setStopIndex(ctx.stop.getStartIndex());
+ DataTypeLengthSegment result = new DataTypeLengthSegment();
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStartIndex());
List<TerminalNode> numbers = ctx.NUMBER_();
if (numbers.size() == 1) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
}
if (numbers.size() == 2) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
- dataTypeLengthSegment.setScale(Integer.parseInt(numbers.get(1).getText()));
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ result.setScale(Integer.parseInt(numbers.get(1).getText()));
}
- return dataTypeLengthSegment;
+ return result;
}
@Override
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDDLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDDLVisitor.java
index a165577..d232a8e 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDDLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-mysql/src/main/java/org/apache/shardingsphere/sql/parser/mysql/visitor/impl/MySQLDDLVisitor.java
@@ -378,8 +378,8 @@ public final class MySQLDDLVisitor extends MySQLVisitor implements DDLVisitor {
@Override
public ASTNode visitKeyParts_(final KeyParts_Context ctx) {
CollectionValue<ColumnSegment> result = new CollectionValue<>();
- List<KeyPart_Context> keyparts = ctx.keyPart_();
- for (KeyPart_Context each : keyparts) {
+ List<KeyPart_Context> keyParts = ctx.keyPart_();
+ for (KeyPart_Context each : keyParts) {
if (null != each.columnName()) {
result.getValue().add((ColumnSegment) visit(each.columnName()));
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/OracleVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/OracleVisitor.java
index 0b8f5f9..91d4632 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/OracleVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-oracle/src/main/java/org/apache/shardingsphere/sql/parser/oracle/visitor/OracleVisitor.java
@@ -512,31 +512,30 @@ public abstract class OracleVisitor extends OracleStatementBaseVisitor<ASTNode>
@Override
public final ASTNode visitDataType(final OracleStatementParser.DataTypeContext ctx) {
- DataTypeSegment dataTypeSegment = new DataTypeSegment();
- dataTypeSegment.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
- dataTypeSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeSegment.setStopIndex(ctx.stop.getStopIndex());
+ DataTypeSegment result = new DataTypeSegment();
+ result.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStopIndex());
if (null != ctx.dataTypeLength()) {
DataTypeLengthSegment dataTypeLengthSegment = (DataTypeLengthSegment) visit(ctx.dataTypeLength());
- dataTypeSegment.setDataLength(dataTypeLengthSegment);
+ result.setDataLength(dataTypeLengthSegment);
}
- return dataTypeSegment;
+ return result;
}
@Override
public final ASTNode visitDataTypeLength(final OracleStatementParser.DataTypeLengthContext ctx) {
- DataTypeLengthSegment dataTypeLengthSegment = new DataTypeLengthSegment();
- dataTypeLengthSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeLengthSegment.setStopIndex(ctx.stop.getStartIndex());
+ DataTypeLengthSegment result = new DataTypeLengthSegment();
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStartIndex());
List<TerminalNode> numbers = ctx.NUMBER_();
if (numbers.size() == 1) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
}
if (numbers.size() == 2) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
- dataTypeLengthSegment.setScale(Integer.parseInt(numbers.get(1).getText()));
-
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ result.setScale(Integer.parseInt(numbers.get(1).getText()));
}
- return dataTypeLengthSegment;
+ return result;
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/PostgreSQLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/PostgreSQLVisitor.java
index 4584dc2..ae2ae92 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/PostgreSQLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/PostgreSQLVisitor.java
@@ -177,28 +177,24 @@ public abstract class PostgreSQLVisitor extends PostgreSQLStatementBaseVisitor<A
if (null != ctx.cExpr()) {
return visit(ctx.cExpr());
}
-
if (null != ctx.BETWEEN() && null == ctx.NOT()) {
return createBetweenSegment(ctx);
}
if (null != ctx.IN() && null == ctx.NOT()) {
return createInSegment(ctx);
}
-
if (null != ctx.comparisonOperator()) {
ASTNode left = visit(ctx.aExpr(0));
if (left instanceof ColumnSegment) {
ColumnSegment columnSegment = (ColumnSegment) left;
ASTNode right = visit(ctx.aExpr(1));
- PredicateRightValue value = right instanceof ColumnSegment ? (PredicateRightValue) right
- : new PredicateCompareRightValue(ctx.comparisonOperator().getText(), (ExpressionSegment) right);
- PredicateSegment predicate = new PredicateSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), columnSegment, value);
- return predicate;
+ PredicateRightValue value = right instanceof ColumnSegment
+ ? (PredicateRightValue) right : new PredicateCompareRightValue(ctx.comparisonOperator().getText(), (ExpressionSegment) right);
+ return new PredicateSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), columnSegment, value);
}
visit(ctx.aExpr(1));
return new LiteralExpressionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ctx.getText());
}
-
if (null != ctx.logicalOperator()) {
return new PredicateBuilder(visit(ctx.aExpr(0)), visit(ctx.aExpr(1)), ctx.logicalOperator().getText()).mergePredicate();
}
@@ -218,7 +214,6 @@ public abstract class PostgreSQLVisitor extends PostgreSQLStatementBaseVisitor<A
if (null != ctx.parameterMarker()) {
return new ParameterMarkerExpressionSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), ((ParameterMarkerValue) visit(ctx.parameterMarker())).getValue());
}
-
if (null != ctx.aexprConst()) {
ASTNode astNode = visit(ctx.aexprConst());
if (astNode instanceof StringLiteralValue || astNode instanceof BooleanLiteralValue || astNode instanceof NumberLiteralValue) {
@@ -256,8 +251,7 @@ public abstract class PostgreSQLVisitor extends PostgreSQLStatementBaseVisitor<A
result.setOwner(owner);
return result;
}
- ColumnSegment result = new ColumnSegment(ctx.colId().start.getStartIndex(), ctx.colId().stop.getStopIndex(), new IdentifierValue(ctx.colId().getText()));
- return result;
+ return new ColumnSegment(ctx.colId().start.getStartIndex(), ctx.colId().stop.getStopIndex(), new IdentifierValue(ctx.colId().getText()));
}
private PredicateSegment createInSegment(final AExprContext ctx) {
@@ -308,7 +302,6 @@ public abstract class PostgreSQLVisitor extends PostgreSQLStatementBaseVisitor<A
if (null != ctx.funcApplication()) {
return generateProjectFromFuncApplication(ctx.funcApplication());
}
-
return generateProjectFromFunctionExprCommonSubexpr(ctx.functionExprCommonSubexpr());
}
@@ -317,7 +310,6 @@ public abstract class PostgreSQLVisitor extends PostgreSQLStatementBaseVisitor<A
if (AggregationType.isAggregationType(aggregationType)) {
return createAggregationSegment(ctx, aggregationType);
}
-
return new ExpressionProjectionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ctx.getText());
}
@@ -333,7 +325,7 @@ public abstract class PostgreSQLVisitor extends PostgreSQLStatementBaseVisitor<A
}
return new AggregationDistinctProjectionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), type, innerExpression, getDistinctExpression(ctx));
}
-
+
private String getDistinctExpression(final FuncApplicationContext ctx) {
StringBuilder result = new StringBuilder();
result.append(ctx.funcArgList().getText());
@@ -364,10 +356,9 @@ public abstract class PostgreSQLVisitor extends PostgreSQLStatementBaseVisitor<A
}
return new OrderBySegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), items);
}
-
+
@Override
public final ASTNode visitSortby(final SortbyContext ctx) {
-
OrderDirection orderDirection = null != ctx.ascDesc() ? generateOrderDirection(ctx.ascDesc()) : OrderDirection.ASC;
ASTNode astNode = visit(ctx.aExpr());
if (astNode instanceof ColumnSegment) {
@@ -376,43 +367,41 @@ public abstract class PostgreSQLVisitor extends PostgreSQLStatementBaseVisitor<A
}
if (astNode instanceof LiteralExpressionSegment) {
LiteralExpressionSegment index = (LiteralExpressionSegment) astNode;
- return new IndexOrderByItemSegment(index.getStartIndex(), index.getStopIndex(),
- Integer.valueOf(index.getLiterals().toString()), orderDirection);
+ return new IndexOrderByItemSegment(index.getStartIndex(), index.getStopIndex(), Integer.valueOf(index.getLiterals().toString()), orderDirection);
}
return new ExpressionOrderByItemSegment(ctx.aExpr().getStart().getStartIndex(), ctx.aExpr().getStop().getStopIndex(), ctx.aExpr().getText(), orderDirection);
}
private OrderDirection generateOrderDirection(final AscDescContext ctx) {
- OrderDirection result = null != ctx.DESC() ? OrderDirection.DESC : OrderDirection.ASC;
- return result;
+ return null == ctx.DESC() ? OrderDirection.ASC : OrderDirection.DESC;
}
@Override
public final ASTNode visitDataType(final DataTypeContext ctx) {
- DataTypeSegment dataTypeSegment = new DataTypeSegment();
- dataTypeSegment.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
- dataTypeSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeSegment.setStopIndex(ctx.stop.getStopIndex());
+ DataTypeSegment result = new DataTypeSegment();
+ result.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStopIndex());
if (null != ctx.dataTypeLength()) {
DataTypeLengthSegment dataTypeLengthSegment = (DataTypeLengthSegment) visit(ctx.dataTypeLength());
- dataTypeSegment.setDataLength(dataTypeLengthSegment);
+ result.setDataLength(dataTypeLengthSegment);
}
- return dataTypeSegment;
+ return result;
}
@Override
public final ASTNode visitDataTypeLength(final DataTypeLengthContext ctx) {
- DataTypeLengthSegment dataTypeLengthSegment = new DataTypeLengthSegment();
- dataTypeLengthSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeLengthSegment.setStopIndex(ctx.stop.getStartIndex());
+ DataTypeLengthSegment result = new DataTypeLengthSegment();
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStartIndex());
List<TerminalNode> numbers = ctx.NUMBER_();
- if (numbers.size() == 1) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ if (1 == numbers.size()) {
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
}
- if (numbers.size() == 2) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
- dataTypeLengthSegment.setScale(Integer.parseInt(numbers.get(1).getText()));
+ if (2 == numbers.size()) {
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ result.setScale(Integer.parseInt(numbers.get(1).getText()));
}
- return dataTypeLengthSegment;
+ return result;
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDDLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDDLVisitor.java
index a5ea5f9..12c1248 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDDLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDDLVisitor.java
@@ -126,7 +126,6 @@ public final class PostgreSQLDDLVisitor extends PostgreSQLVisitor implements DDL
@Override
public ASTNode visitAlterDefinitionClause(final AlterDefinitionClauseContext ctx) {
CollectionValue<AlterDefinitionSegment> result = new CollectionValue<>();
-
if (null != ctx.alterTableActions()) {
for (AlterTableActionContext each : ctx.alterTableActions().alterTableAction()) {
AddColumnSpecificationContext addColumnSpecification = each.addColumnSpecification();
@@ -207,14 +206,12 @@ public final class PostgreSQLDDLVisitor extends PostgreSQLVisitor implements DDL
@Override
public ASTNode visitDropColumnSpecification(final DropColumnSpecificationContext ctx) {
- return new DropColumnDefinitionSegment(
- ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), Collections.singletonList((ColumnSegment) visit(ctx.columnName())));
+ return new DropColumnDefinitionSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), Collections.singletonList((ColumnSegment) visit(ctx.columnName())));
}
@Override
public ASTNode visitRenameColumnSpecification(final RenameColumnSpecificationContext ctx) {
- return new RenameColumnSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(),
- (ColumnSegment) visit(ctx.columnName(0)), (ColumnSegment) visit(ctx.columnName(1)));
+ return new RenameColumnSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), (ColumnSegment) visit(ctx.columnName(0)), (ColumnSegment) visit(ctx.columnName(1)));
}
@SuppressWarnings("unchecked")
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
index d14485f..30dda68 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-postgresql/src/main/java/org/apache/shardingsphere/sql/parser/postgresql/visitor/impl/PostgreSQLDMLVisitor.java
@@ -141,7 +141,6 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
TableNameSegment tableName;
if (null != qualifiedName.indirection()) {
ColIdContext colId = ctx.colId();
-
owner = new OwnerSegment(colId.start.getStartIndex(), colId.stop.getStopIndex(), new IdentifierValue(colId.getText()));
AttrNameContext attrName = qualifiedName.indirection().indirectionEl().attrName();
tableName = new TableNameSegment(attrName.start.getStartIndex(), attrName.stop.getStopIndex(), new IdentifierValue(attrName.getText()));
@@ -187,14 +186,13 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
@Override
public ASTNode visitInsertColumnItem(final InsertColumnItemContext ctx) {
if (null != ctx.optIndirection().indirectionEl()) {
- ColumnSegment columnSegment = new ColumnSegment(ctx.colId().start.getStartIndex(), ctx.optIndirection().stop.getStopIndex(),
+ ColumnSegment result = new ColumnSegment(ctx.colId().start.getStartIndex(), ctx.optIndirection().stop.getStopIndex(),
new IdentifierValue(ctx.optIndirection().indirectionEl().attrName().getText()));
- columnSegment.setOwner(new OwnerSegment(ctx.colId().start.getStartIndex(), ctx.colId().stop.getStopIndex(), new IdentifierValue(ctx.colId().getText())));
- return columnSegment;
+ result.setOwner(new OwnerSegment(ctx.colId().start.getStartIndex(), ctx.colId().stop.getStopIndex(), new IdentifierValue(ctx.colId().getText())));
+ return result;
} else {
- ColumnSegment columnSegment = new ColumnSegment(ctx.colId().start.getStartIndex(), ctx.colId().stop.getStopIndex(), new IdentifierValue(ctx.colId().getText()));
- return columnSegment;
+ return new ColumnSegment(ctx.colId().start.getStartIndex(), ctx.colId().stop.getStopIndex(), new IdentifierValue(ctx.colId().getText()));
}
}
@@ -212,7 +210,6 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
private Collection<ExpressionSegment> createInsertValuesSegments(final ExprListContext ctx) {
Collection<ExpressionSegment> result = new LinkedList<>();
-
if (null != ctx.exprList()) {
Collection<ExpressionSegment> tmpResult = createInsertValuesSegments(ctx.exprList());
result.addAll(tmpResult);
@@ -239,8 +236,7 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
ColumnSegment columnSegment = (ColumnSegment) visit(ctx.setTarget());
SQLSegment sqlSegment = (SQLSegment) visit(ctx.aExpr());
ExpressionSegment expressionSegment = new CommonExpressionSegment(sqlSegment.getStartIndex(), sqlSegment.getStopIndex(), sqlSegment.toString());
- AssignmentSegment result = new AssignmentSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), columnSegment, expressionSegment);
- return result;
+ return new AssignmentSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), columnSegment, expressionSegment);
}
@Override
@@ -289,8 +285,7 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
@Override
public ASTNode visitSetClauseList(final SetClauseListContext ctx) {
Collection<AssignmentSegment> assignments = generateAssignmentSegments(ctx);
- SetAssignmentSegment result = new SetAssignmentSegment(ctx.start.getStartIndex() - 4, ctx.stop.getStopIndex(), assignments);
- return result;
+ return new SetAssignmentSegment(ctx.start.getStartIndex() - 4, ctx.stop.getStopIndex(), assignments);
}
@Override
@@ -344,7 +339,6 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
@Override
public ASTNode visitSelectWithParens(final SelectWithParensContext ctx) {
-
if (null != ctx.selectWithParens()) {
return visit(ctx.selectWithParens());
}
@@ -353,11 +347,7 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
@Override
public ASTNode visitSelectClauseN(final SelectClauseNContext ctx) {
- if (null != ctx.simpleSelect()) {
- SelectStatement result = (SelectStatement) visit(ctx.simpleSelect());
- return result;
- }
- return new SelectStatement();
+ return null == ctx.simpleSelect() ? new SelectStatement() : visit(ctx.simpleSelect());
}
@Override
@@ -391,8 +381,7 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
for (GroupByItemContext each : ctx.groupByList().groupByItem()) {
items.add((OrderByItemSegment) visit(each));
}
- GroupBySegment result = new GroupBySegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), items);
- return result;
+ return new GroupBySegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), items);
}
@Override
@@ -400,8 +389,7 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
if (null != ctx.aExpr()) {
ASTNode astNode = visit(ctx.aExpr());
if (astNode instanceof ColumnSegment) {
- OrderByItemSegment result = new ColumnOrderByItemSegment((ColumnSegment) astNode, OrderDirection.ASC);
- return result;
+ return new ColumnOrderByItemSegment((ColumnSegment) astNode, OrderDirection.ASC);
}
if (astNode instanceof LiteralExpressionSegment) {
LiteralExpressionSegment index = (LiteralExpressionSegment) astNode;
@@ -456,7 +444,6 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
}
return projection;
}
-
if (null != expr.cExpr() && null != expr.cExpr().selectWithParens()) {
SelectStatement select = (SelectStatement) visit(expr.cExpr().selectWithParens());
SubquerySegment subquery = new SubquerySegment(expr.cExpr().selectWithParens().start.getStartIndex(), expr.cExpr().selectWithParens().stop.getStopIndex(), select);
@@ -466,13 +453,12 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
projection.setAlias(alias);
return projection;
}
-
- ExpressionProjectionSegment projection = new ExpressionProjectionSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), expr.getText());
+ ExpressionProjectionSegment result = new ExpressionProjectionSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), expr.getText());
if (null != ctx.identifier()) {
AliasSegment alias = new AliasSegment(ctx.identifier().start.getStartIndex(), ctx.identifier().stop.getStopIndex(), new IdentifierValue(ctx.identifier().getText()));
- projection.setAlias(alias);
+ result.setAlias(alias);
}
- return projection;
+ return result;
}
private ColumnProjectionSegment generateColumnProjection(final ColumnrefContext ctx) {
@@ -481,12 +467,10 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
ColumnSegment columnSegment = new ColumnSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), new IdentifierValue(attrName.getText()));
OwnerSegment owner = new OwnerSegment(ctx.colId().start.getStartIndex(), ctx.colId().stop.getStopIndex(), new IdentifierValue(ctx.colId().getText()));
columnSegment.setOwner(owner);
- ColumnProjectionSegment columnProjection = new ColumnProjectionSegment(columnSegment);
- return columnProjection;
+ return new ColumnProjectionSegment(columnSegment);
}
ColumnSegment columnSegment = new ColumnSegment(ctx.colId().start.getStartIndex(), ctx.colId().stop.getStopIndex(), new IdentifierValue(ctx.colId().getText()));
- ColumnProjectionSegment columnProjection = new ColumnProjectionSegment(columnSegment);
- return columnProjection;
+ return new ColumnProjectionSegment(columnSegment);
}
@Override
@@ -506,9 +490,7 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
@Override
public ASTNode visitTableReference(final TableReferenceContext ctx) {
-
if (null != ctx.tableReference()) {
-
TableReferenceSegment result = (TableReferenceSegment) visit(ctx.tableReference());
if (null != ctx.joinedTable()) {
result.getJoinedTables().add((JoinedTableSegment) visit(ctx.joinedTable()));
@@ -587,19 +569,16 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
@Override
public ASTNode visitAliasClause(final AliasClauseContext ctx) {
StringBuilder aliasName = new StringBuilder(ctx.colId().getText());
-
if (null != ctx.nameList()) {
aliasName.append(ctx.LP_().getText());
aliasName.append(ctx.nameList().getText());
aliasName.append(ctx.RP_().getText());
}
- AliasSegment alias = new AliasSegment(ctx.colId().start.getStartIndex(), ctx.stop.getStopIndex(), new IdentifierValue(aliasName.toString()));
- return alias;
+ return new AliasSegment(ctx.colId().start.getStartIndex(), ctx.stop.getStopIndex(), new IdentifierValue(aliasName.toString()));
}
private SimpleTableSegment generateTableFromRelationExpr(final RelationExprContext ctx) {
QualifiedNameContext qualifiedName = ctx.qualifiedName();
-
if (null != qualifiedName.indirection()) {
AttrNameContext tableName = qualifiedName.indirection().indirectionEl().attrName();
SimpleTableSegment table = new SimpleTableSegment(tableName.start.getStartIndex(), tableName.stop.getStopIndex(), new IdentifierValue(tableName.getText()));
@@ -640,9 +619,7 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
if (astNode instanceof ParameterMarkerExpressionSegment) {
return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
}
- LimitValueSegment result = new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
- Long.valueOf(((LiteralExpressionSegment) astNode).getLiterals().toString()));
- return result;
+ return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.valueOf(((LiteralExpressionSegment) astNode).getLiterals().toString()));
}
@Override
@@ -651,9 +628,7 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
if (astNode instanceof ParameterMarkerExpressionSegment) {
return new ParameterMarkerLimitValueSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), ((ParameterMarkerExpressionSegment) astNode).getParameterMarkerIndex());
}
- LimitValueSegment result = new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(),
- Long.valueOf(((LiteralExpressionSegment) astNode).getLiterals().toString()));
- return result;
+ return new NumberLiteralLimitValueSegment(ctx.start.getStartIndex(), ctx.stop.getStopIndex(), Long.valueOf(((LiteralExpressionSegment) astNode).getLiterals().toString()));
}
private LimitSegment createLimitSegmentWhenLimitAndOffset(final SelectLimitContext ctx) {
@@ -685,7 +660,6 @@ public final class PostgreSQLDMLVisitor extends PostgreSQLVisitor implements DML
return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), null, limit);
}
LimitValueSegment offset = (LimitValueSegment) visit(ctx.offsetClause().selectOffsetValue());
-
return new LimitSegment(ctx.getStart().getStartIndex(), ctx.getStop().getStopIndex(), offset, null);
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/SQL92Visitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/SQL92Visitor.java
index ef1cc73..665f936 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/SQL92Visitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sql92/src/main/java/org/apache/shardingsphere/sql/parser/sql92/visitor/SQL92Visitor.java
@@ -498,30 +498,30 @@ public abstract class SQL92Visitor extends SQL92StatementBaseVisitor<ASTNode> {
@Override
public final ASTNode visitDataType(final DataTypeContext ctx) {
- DataTypeSegment dataTypeSegment = new DataTypeSegment();
- dataTypeSegment.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
- dataTypeSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeSegment.setStopIndex(ctx.stop.getStopIndex());
+ DataTypeSegment result = new DataTypeSegment();
+ result.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStopIndex());
if (null != ctx.dataTypeLength()) {
DataTypeLengthSegment dataTypeLengthSegment = (DataTypeLengthSegment) visit(ctx.dataTypeLength());
- dataTypeSegment.setDataLength(dataTypeLengthSegment);
+ result.setDataLength(dataTypeLengthSegment);
}
- return dataTypeSegment;
+ return result;
}
@Override
public final ASTNode visitDataTypeLength(final DataTypeLengthContext ctx) {
- DataTypeLengthSegment dataTypeLengthSegment = new DataTypeLengthSegment();
- dataTypeLengthSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeLengthSegment.setStopIndex(ctx.stop.getStartIndex());
+ DataTypeLengthSegment result = new DataTypeLengthSegment();
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStartIndex());
List<TerminalNode> numbers = ctx.NUMBER_();
if (numbers.size() == 1) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
}
if (numbers.size() == 2) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
- dataTypeLengthSegment.setScale(Integer.parseInt(numbers.get(1).getText()));
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ result.setScale(Integer.parseInt(numbers.get(1).getText()));
}
- return dataTypeLengthSegment;
+ return result;
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/SQLServerVisitor.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/SQLServerVisitor.java
index d0c5958..c466a39 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/SQLServerVisitor.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-dialect/shardingsphere-sql-parser-sqlserver/src/main/java/org/apache/shardingsphere/sql/parser/sqlserver/visitor/SQLServerVisitor.java
@@ -509,30 +509,30 @@ public abstract class SQLServerVisitor extends SQLServerStatementBaseVisitor<AST
@Override
public final ASTNode visitDataType(final DataTypeContext ctx) {
- DataTypeSegment dataTypeSegment = new DataTypeSegment();
- dataTypeSegment.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
- dataTypeSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeSegment.setStopIndex(ctx.stop.getStopIndex());
+ DataTypeSegment result = new DataTypeSegment();
+ result.setDataTypeName(((KeywordValue) visit(ctx.dataTypeName())).getValue());
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStopIndex());
if (null != ctx.dataTypeLength()) {
DataTypeLengthSegment dataTypeLengthSegment = (DataTypeLengthSegment) visit(ctx.dataTypeLength());
- dataTypeSegment.setDataLength(dataTypeLengthSegment);
+ result.setDataLength(dataTypeLengthSegment);
}
- return dataTypeSegment;
+ return result;
}
@Override
public final ASTNode visitDataTypeLength(final DataTypeLengthContext ctx) {
- DataTypeLengthSegment dataTypeLengthSegment = new DataTypeLengthSegment();
- dataTypeLengthSegment.setStartIndex(ctx.start.getStartIndex());
- dataTypeLengthSegment.setStopIndex(ctx.stop.getStartIndex());
+ DataTypeLengthSegment result = new DataTypeLengthSegment();
+ result.setStartIndex(ctx.start.getStartIndex());
+ result.setStopIndex(ctx.stop.getStartIndex());
List<TerminalNode> numbers = ctx.NUMBER_();
if (numbers.size() == 1) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
}
if (numbers.size() == 2) {
- dataTypeLengthSegment.setPrecision(Integer.parseInt(numbers.get(0).getText()));
- dataTypeLengthSegment.setScale(Integer.parseInt(numbers.get(1).getText()));
+ result.setPrecision(Integer.parseInt(numbers.get(0).getText()));
+ result.setScale(Integer.parseInt(numbers.get(1).getText()));
}
- return dataTypeLengthSegment;
+ return result;
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/util/WhereSegmentExtractUtils.java b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/util/WhereSegmentExtractUtils.java
index ebc6660..2251232 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/util/WhereSegmentExtractUtils.java
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-statement/src/main/java/org/apache/shardingsphere/sql/parser/sql/util/WhereSegmentExtractUtils.java
@@ -55,63 +55,62 @@ public final class WhereSegmentExtractUtils {
* @return subquery where segment collection.
*/
public static Collection<WhereSegment> getSubqueryWhereSegments(final SelectStatement selectStatement) {
- Collection<WhereSegment> subqueryWhereSegments = new LinkedList<>();
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromProjections(selectStatement.getProjections()));
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromTableReferences(selectStatement.getTableReferences()));
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromWhere(selectStatement.getWhere().orElse(null)));
- return subqueryWhereSegments;
+ Collection<WhereSegment> result = new LinkedList<>();
+ result.addAll(getSubqueryWhereSegmentsFromProjections(selectStatement.getProjections()));
+ result.addAll(getSubqueryWhereSegmentsFromTableReferences(selectStatement.getTableReferences()));
+ result.addAll(getSubqueryWhereSegmentsFromWhere(selectStatement.getWhere().orElse(null)));
+ return result;
}
private static Collection<WhereSegment> getSubqueryWhereSegmentsFromProjections(final ProjectionsSegment projections) {
if (null == projections || projections.getProjections().isEmpty()) {
return Collections.emptyList();
}
- Collection<WhereSegment> subqueryWhereSegments = new LinkedList<>();
-
+ Collection<WhereSegment> result = new LinkedList<>();
for (ProjectionSegment each : projections.getProjections()) {
if (!(each instanceof SubqueryProjectionSegment)) {
continue;
}
SelectStatement subquerySelect = ((SubqueryProjectionSegment) each).getSubquery().getSelect();
- subquerySelect.getWhere().ifPresent(subqueryWhereSegments::add);
- subqueryWhereSegments.addAll(getSubqueryWhereSegments(subquerySelect));
+ subquerySelect.getWhere().ifPresent(result::add);
+ result.addAll(getSubqueryWhereSegments(subquerySelect));
}
- return subqueryWhereSegments;
+ return result;
}
private static Collection<WhereSegment> getSubqueryWhereSegmentsFromTableReferences(final Collection<TableReferenceSegment> tableReferences) {
if (tableReferences.isEmpty()) {
return Collections.emptyList();
}
- Collection<WhereSegment> subqueryWhereSegments = new LinkedList<>();
+ Collection<WhereSegment> result = new LinkedList<>();
for (TableReferenceSegment each : tableReferences) {
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromTableFactor(each.getTableFactor()));
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromJoinedTable(each.getJoinedTables()));
+ result.addAll(getSubqueryWhereSegmentsFromTableFactor(each.getTableFactor()));
+ result.addAll(getSubqueryWhereSegmentsFromJoinedTable(each.getJoinedTables()));
}
- return subqueryWhereSegments;
+ return result;
}
private static Collection<WhereSegment> getSubqueryWhereSegmentsFromWhere(final WhereSegment where) {
if (null == where || where.getAndPredicates().isEmpty()) {
return Collections.emptyList();
}
- Collection<WhereSegment> subqueryWhereSegments = new LinkedList<>();
+ Collection<WhereSegment> result = new LinkedList<>();
List<PredicateSegment> predicateSegments = where.getAndPredicates().stream().flatMap(andPredicate -> andPredicate.getPredicates().stream()).collect(Collectors.toList());
for (PredicateSegment each : predicateSegments) {
if (each.getRightValue() instanceof PredicateBetweenRightValue) {
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromExpression(((PredicateBetweenRightValue) each.getRightValue()).getBetweenExpression()));
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromExpression(((PredicateBetweenRightValue) each.getRightValue()).getAndExpression()));
+ result.addAll(getSubqueryWhereSegmentsFromExpression(((PredicateBetweenRightValue) each.getRightValue()).getBetweenExpression()));
+ result.addAll(getSubqueryWhereSegmentsFromExpression(((PredicateBetweenRightValue) each.getRightValue()).getAndExpression()));
}
if (each.getRightValue() instanceof PredicateCompareRightValue) {
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromExpression(((PredicateCompareRightValue) each.getRightValue()).getExpression()));
+ result.addAll(getSubqueryWhereSegmentsFromExpression(((PredicateCompareRightValue) each.getRightValue()).getExpression()));
}
if (each.getRightValue() instanceof PredicateInRightValue) {
for (ExpressionSegment sqlExpression : ((PredicateInRightValue) each.getRightValue()).getSqlExpressions()) {
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromExpression(sqlExpression));
+ result.addAll(getSubqueryWhereSegmentsFromExpression(sqlExpression));
}
}
}
- return subqueryWhereSegments;
+ return result;
}
private static Collection<WhereSegment> getSubqueryWhereSegmentsFromTableFactor(final TableFactorSegment tableFactor) {
@@ -125,35 +124,35 @@ public final class WhereSegmentExtractUtils {
if (joinedTables.isEmpty()) {
return Collections.emptyList();
}
- Collection<WhereSegment> subqueryWhereSegments = new LinkedList<>();
+ Collection<WhereSegment> result = new LinkedList<>();
for (JoinedTableSegment joinedTable : joinedTables) {
if (null == joinedTable.getTableFactor()) {
continue;
}
- subqueryWhereSegments.addAll(getSubqueryWhereSegmentsFromTableSegment(joinedTable.getTableFactor().getTable()));
+ result.addAll(getSubqueryWhereSegmentsFromTableSegment(joinedTable.getTableFactor().getTable()));
}
- return subqueryWhereSegments;
+ return result;
}
private static Collection<WhereSegment> getSubqueryWhereSegmentsFromTableSegment(final TableSegment tableSegment) {
if (!(tableSegment instanceof SubqueryTableSegment)) {
return Collections.emptyList();
}
- Collection<WhereSegment> subqueryWhereSegments = new LinkedList<>();
+ Collection<WhereSegment> result = new LinkedList<>();
SelectStatement subquerySelect = ((SubqueryTableSegment) tableSegment).getSubquery().getSelect();
- subquerySelect.getWhere().ifPresent(subqueryWhereSegments::add);
- subqueryWhereSegments.addAll(getSubqueryWhereSegments(subquerySelect));
- return subqueryWhereSegments;
+ subquerySelect.getWhere().ifPresent(result::add);
+ result.addAll(getSubqueryWhereSegments(subquerySelect));
+ return result;
}
private static Collection<WhereSegment> getSubqueryWhereSegmentsFromExpression(final ExpressionSegment expressionSegment) {
if (!(expressionSegment instanceof SubqueryExpressionSegment)) {
return Collections.emptyList();
}
- Collection<WhereSegment> subqueryWhereSegments = new LinkedList<>();
+ Collection<WhereSegment> result = new LinkedList<>();
SelectStatement subquerySelect = ((SubqueryExpressionSegment) expressionSegment).getSubquery().getSelect();
- subquerySelect.getWhere().ifPresent(subqueryWhereSegments::add);
- subqueryWhereSegments.addAll(getSubqueryWhereSegments(subquerySelect));
- return subqueryWhereSegments;
+ subquerySelect.getWhere().ifPresent(result::add);
+ result.addAll(getSubqueryWhereSegments(subquerySelect));
+ return result;
}
}
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/resources/case/dml/select-expression.xml b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/resources/case/dml/select-expression.xml
index d5d9e23..428ec2f 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/resources/case/dml/select-expression.xml
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/resources/case/dml/select-expression.xml
@@ -78,54 +78,53 @@
</where>
</select>
- <select sql-case-id="select_with_case_expression" >
- <projections start-index="7" stop-index="123">
+ <select sql-case-id="select_with_case_expression">
+ <projections start-index="7" stop-index="124">
<shorthand-projection start-index="7" stop-index="9">
<owner start-index="7" stop-index="7" name="t"/>
</shorthand-projection>
- <column-projection start-index="11" stop-index="19" name="item_id" alias="itemid">
+ <column-projection start-index="11" stop-index="19" name="item_id" alias="item_id">
<owner start-index="11" stop-index="11" name="o"/>
</column-projection>
- <expression-projection start-index="32" stop-index="109" alias="stateName" />
+ <expression-projection start-index="33" stop-index="110" alias="stateName" />
</projections>
-
<table-reference>
<table-factor>
- <table start-index="134" stop-index="142" name="t_order" alias="t" />
+ <table start-index="135" stop-index="143" name="t_order" alias="t" />
</table-factor>
<join-table>
<table-factor>
- <table start-index="154" stop-index="170" name="t_order_item" alias="o" />
+ <table start-index="155" stop-index="171" name="t_order_item" alias="o" />
</table-factor>
<joinSpecification>
<and-predicate>
- <predicate start-index="175" stop-index="196">
- <column-left-value name="order_id" start-index="175" stop-index="184">
- <owner name="o" start-index="175" stop-index="175" />
+ <predicate start-index="176" stop-index="197">
+ <column-left-value name="order_id" start-index="176" stop-index="185">
+ <owner name="o" start-index="176" stop-index="176" />
</column-left-value>
- <column-right-value name="order_id" start-index="187" stop-index="196">
- <owner name="t" start-index="187" stop-index="187" />
+ <column-right-value name="order_id" start-index="188" stop-index="197">
+ <owner name="t" start-index="188" stop-index="188" />
</column-right-value>
</predicate>
</and-predicate>
</joinSpecification>
</join-table>
</table-reference>
- <where start-index="198" stop-index="218">
+ <where start-index="198" stop-index="219">
<and-predicate>
- <predicate start-index="204" stop-index="218" >
- <operator type="="/>
- <column-left-value name="order_id" start-index="204" stop-index="213" >
- <owner name="t" start-index="204" stop-index="204" />
+ <predicate start-index="205" stop-index="219" >
+ <operator type="=" />
+ <column-left-value name="order_id" start-index="205" stop-index="214">
+ <owner name="t" start-index="205" stop-index="205" />
</column-left-value>
<compare-right-value operator="=">
- <literal-expression value="1000" start-index="215" stop-index="218"/>
+ <literal-expression value="1000" start-index="216" stop-index="219" />
</compare-right-value>
</predicate>
</and-predicate>
</where>
- <limit start-index="220" stop-index="226">
- <row-count value="1" start-index="226" stop-index="226" />
+ <limit start-index="221" stop-index="227">
+ <row-count value="1" start-index="227" stop-index="227" />
</limit>
</select>
</sql-parser-test-cases>
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/resources/sql/supported/dml/select-expression.xml b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/resources/sql/supported/dml/select-expression.xml
index b9ffd0e..675bd5f 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/resources/sql/supported/dml/select-expression.xml
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-test/src/test/resources/sql/supported/dml/select-expression.xml
@@ -20,6 +20,6 @@
<sql-case id="select_with_expression" value="SELECT o.order_id + 1 * 2 as exp FROM t_order AS o ORDER BY o.order_id" />
<sql-case id="select_with_date_function" value="SELECT DATE(i.creation_date) AS creation_date FROM `t_order_item` AS i ORDER BY DATE(i.creation_date) DESC" db-types="MySQL" />
<sql-case id="select_with_regexp" value="SELECT * FROM t_order_item t WHERE t.status REGEXP ? AND t.item_id IN (?, ?)" db-types="MySQL" />
- <sql-case id="select_with_case_expression" value="select t.*,o.item_id as itemid,(case when t.status = 'init' then '已启用' when t.status = 'failed' then '已停用' end) as stateName
+ <sql-case id="select_with_case_expression" value="select t.*,o.item_id as item_id,(case when t.status = 'init' then '已启用' when t.status = 'failed' then '已停用' end) as stateName
from t_order t left join t_order_item as o on o.order_id =t.order_id where t.order_id=1000 limit 1" db-types="MySQL,H2" />
</sql-cases>