Merge pull request #151 from red-soft-ru/master

Merge for RETURNING Statement support
red-soft-ru · Dec 16, 2024 · 95cfc55 · 95cfc55
2 parents e7157bd + af7316a
commit 95cfc55
Show file tree

Hide file tree

Showing 416 changed files with 2,928 additions and 1,908 deletions.
diff --git a/.github/workflows/nightly-build.yml b/.github/workflows/nightly-build.yml
@@ -19,7 +19,7 @@ name: Nightly - Build
 
 on:
   schedule:
-    - cron: '0 16 */1 * *' # once a day. UTC time
+    - cron: '0 16 * * *' # Once a day. UTC time
   workflow_dispatch:
     inputs:
       commit-id:

diff --git a/.github/workflows/nightly-check.yml b/.github/workflows/nightly-check.yml
@@ -19,7 +19,7 @@ name: Nightly - Check
 
 on:
   schedule:
-    - cron: '0 23 */1 * *' # once a day. UTC time
+    - cron: '0 23 * * 1-5' # Once a day between Monday and Friday. UTC time
   workflow_dispatch:
 
 env:
@@ -126,7 +126,7 @@ jobs:
           days-before-pr-stale: -1
           days-before-close: -1
           stale-issue-label: "stale"
-          any-of-issue-labels: "status: need more info,type: question,type: duplicate"
+          any-of-issue-labels: "status: need more info,type: question,type: duplicate,status: invalid"
           operations-per-run: 100
           remove-stale-when-updated: true
           stale-issue-message: >

diff --git a/.github/workflows/nightly-ci.yml b/.github/workflows/nightly-ci.yml
@@ -19,7 +19,7 @@ name: Nightly - CI
 
 on:
   schedule:
-    - cron: '0 13 */1 * *' # UTC time
+    - cron: '0 13 * * 1-5' # Once a day between Monday and Friday. UTC time
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/nightly-e2e-operation.yml b/.github/workflows/nightly-e2e-operation.yml
@@ -19,7 +19,7 @@ name: Nightly - E2E Operation
 
 on:
   schedule:
-    - cron: '0 20 */1 * *' # UTC time
+    - cron: '0 20 * * 1-5' # Once a day between Monday and Friday. UTC time
   workflow_dispatch:
 
 concurrency:

diff --git a/.github/workflows/nightly-e2e-sql.yml b/.github/workflows/nightly-e2e-sql.yml
@@ -19,7 +19,7 @@ name: Nightly - E2E SQL
 
 on:
   schedule:
-    - cron: '0 15 */1 * *' # once a day. UTC time
+    - cron: '0 15 * * 1-5' # Once a day between Monday and Friday. UTC time
   workflow_dispatch:
 
 concurrency:

diff --git a/.github/workflows/nightly-sql-parser.yml b/.github/workflows/nightly-sql-parser.yml
@@ -19,7 +19,7 @@ name: Nightly - SQL parser loading from external cases
 
 on:
   schedule:
-    - cron: '0 18 */1 * *' # once a day. UTC time
+    - cron: '0 18 * * 1-5' # Once a day between Monday and Friday. UTC time
   workflow_dispatch:
 
 env:

diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -22,19 +22,23 @@
 1. SQL Federation: Upgrade calcite version to 1.38.0 and update all license info in LICENSE file - [#33279](https://github.com/apache/shardingsphere/pull/33279)
 1. Transaction: Bump the minimum Seata Client version for Seata AT integration to 2.2.0 - [#33872](https://github.com/apache/shardingsphere/pull/33872)
 1. JDBC: Add show database name for JDBC when execute SHOW COMPUTE NODES - [#33437](https://github.com/apache/shardingsphere/pull/33437)
+1. Kernel: Add binding to owner table - [#33533](https://github.com/apache/shardingsphere/pull/33533)
+1. SQL Parser: Support parsing Doris EXTRACT\_URL\_PARAMETER - [#33571](https://github.com/apache/shardingsphere/pull/33571)
 1. JDBC: Support ZonedDateTime on ResultSet - [#33660](https://github.com/apache/shardingsphere/issues/33660)
 1. Proxy: Add query parameters and check for MySQL kill processId - [#33274](https://github.com/apache/shardingsphere/pull/33274)
 1. Proxy: Support table not exist exception for PostgreSQL proxy - [#33885](https://github.com/apache/shardingsphere/pull/33274)
 1. Proxy Native: Change the Base Docker Image of ShardingSphere Proxy Native - [#33263](https://github.com/apache/shardingsphere/issues/33263)
 1. Proxy Native: Support connecting to HiveServer2 with ZooKeeper Service Discovery enabled in GraalVM Native Image - [#33768](https://github.com/apache/shardingsphere/pull/33768)
 1. Proxy Native: Support local transactions of ClickHouse under GraalVM Native Image - [#33801](https://github.com/apache/shardingsphere/pull/33801)
-1. Sharding: Support MYSQL GroupConcat function for aggregating multiple shards - [#33808](https://github.com/apache/shardingsphere/pull/33808)
+1. Sharding: Support GroupConcat function for aggregating multiple shards in MySQL, OpenGauss, Doris - [#33808](https://github.com/apache/shardingsphere/pull/33808)
 1. Proxy Native: Support Seata AT integration under Proxy Native in GraalVM Native Image - [#33889](https://github.com/apache/shardingsphere/pull/33889)
 1. Agent: Simplify the use of Agent's Docker Image - [#33356](https://github.com/apache/shardingsphere/pull/33356)
+1. Metadata: Add load-table-metadata-batch-size props to concurrent load table metadata - [#34009](https://github.com/apache/shardingsphere/pull/34009)
 
 ### Bug Fixes
 
 1. Mode: Fixes `JDBCRepository` improper handling of H2-database in memory mode - [#33281](https://github.com/apache/shardingsphere/issues/33281)
+1. Mode: Fixes duplicate column names added when index changed in DDL - [#33982](https://github.com/apache/shardingsphere/issues/33281)
 1. SQL Binder: Fixes table does not exist exception when use HintManager#setDatabaseName to transparent - [#33370](https://github.com/apache/shardingsphere/pull/33370)
 1. SQL Parser: Fixes LiteralExpressionSegment cast exception in SQL parser - [#33332](https://github.com/apache/shardingsphere/pull/33332)
 1. SQL Parser: Fixes PostgreSQL and openGauss time extract function parse week and quarter error - [#33564](https://github.com/apache/shardingsphere/pull/33564)
@@ -49,6 +53,8 @@
 1. Sharding: Fixes SQL COUNT with GROUP BY to prevent incorrect row returns - [#33380](https://github.com/apache/shardingsphere/pull/33380)
 1. Sharding: Fixes avg, sum, min, max function return empty data when no query result return - [#33449](https://github.com/apache/shardingsphere/pull/33449)
 1. Encrypt: Fixes merge exception without encrypt rule in database - [#33708](https://github.com/apache/shardingsphere/pull/33708)
+1. SQL Binder: Fixes the expression segment cannot find the outer table when binding - [#34015](https://github.com/apache/shardingsphere/pull/34015)
+1. Proxy: Fixes "ALL PRIVILEGES ON `DB`.*" is not recognized during SELECT privilege verification for MySQL - [#34037](https://github.com/apache/shardingsphere/pull/34037)
 
 ### Change Logs
 

diff --git a/...hardingsphere/db/protocol/opengauss/constant/OpenGaussProtocolDefaultVersionProvider.java b/...hardingsphere/db/protocol/opengauss/constant/OpenGaussProtocolDefaultVersionProvider.java
@@ -26,7 +26,7 @@ public final class OpenGaussProtocolDefaultVersionProvider implements DatabasePr
 
     @Override
     public String provide() {
-        return "12.3";
+        return "9.2.4";
     }
 
     @Override

diff --git a/docs/document/content/user-manual/common-config/props.cn.md b/docs/document/content/user-manual/common-config/props.cn.md
@@ -17,6 +17,7 @@ Apache ShardingSphere 提供属性配置的方式配置系统级配置。
 | kernel-executor-size (?)           | int     | 用于设置任务处理线程池的大小<br />每个 ShardingSphereDataSource 使用一个独立的线程池，同一个 JVM 的不同数据源不共享线程池                                                     | infinite |
 | max-connections-size-per-query (?) | int     | 一次查询请求在每个数据库实例中所能使用的最大连接数                                                                                                           | 1        |
 | check-table-metadata-enabled (?)   | boolean | 在程序启动和更新时，是否检查分片元数据的结构一致性                                                                                                           | false    |
+| load-table-metadata-batch-size (?) | int     | 在程序启动或刷新元数据时，单个批次加载表元数据的数量                                                                                                          | 1000     |
 
 ## 操作步骤
 

diff --git a/docs/document/content/user-manual/common-config/props.en.md b/docs/document/content/user-manual/common-config/props.en.md
@@ -17,6 +17,7 @@ Apache ShardingSphere provides the way of property configuration to configure sy
 | kernel-executor-size (?)           | int         | The max thread size of worker group to execute SQL. One ShardingSphereDataSource will use a independent thread pool, it does not share thread pool even different data source in same JVM                                                                   | infinite        |
 | max-connections-size-per-query (?) | int         | Max opened connection size for each query                                                                                                                                                                                                                   | 1               |
 | check-table-metadata-enabled (?)   | boolean     | Whether validate table meta data consistency when application startup or updated                                                                                                                                                                            | false           |
+| load-table-metadata-batch-size (?) | int         | The number of table metadata loaded at a time when application startup or refreshes table metadata                                                                                                                                                          | 1000            |
 
 ## Procedure
 

diff --git a/docs/document/content/user-manual/error-code/sql-error-code.cn.md b/docs/document/content/user-manual/error-code/sql-error-code.cn.md
@@ -18,6 +18,8 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
 | 10001       | 42S02     | Schema '%s' does not exist.                                                         |
 | 10002       | 42S02     | Table or view '%s' does not exist.                                                  |
 | 10003       | 42S02     | Unknown column '%s' in '%s'.                                                        |
+| 10004       | 42S02     | Index '%s' does not exist.                                                          |
+| 10005       | 42S01     | Index '%s' already exists.                                                          |
 | 10010       | HY000     | Rule and storage meta data mismatched, reason is: %s.                               |
 | 10100       | HY000     | Can not %s storage units '%s'.                                                      |
 | 10101       | 42S02     | There is no storage unit in database '%s'.                                          |
@@ -151,8 +153,6 @@ SQL 错误码以标准的 SQL State，Vendor Code 和详细错误信息提供，
 | 20004       | 42S02     | Actual table '%s.%s' is not in table rule configuration.                                                                            |
 | 20005       | 42S02     | Can not find binding actual table, data source is '%s', logic table is '%s', other actual table is '%s'.                            |
 | 20006       | 44000     | Actual tables '%s' are in use.                                                                                                      |
-| 20007       | 42S01     | Index '%s' already exists.                                                                                                          |
-| 20008       | 42S02     | Index '%s' does not exist.                                                                                                          |
 | 20009       | 42S01     | View name has to bind to %s tables.                                                                                                 |
 | 20010       | 44000     | Invalid binding table configuration.                                                                                                |
 | 20011       | 44000     | Only allowed 0 or 1 sharding strategy configuration.                                                                                |

diff --git a/docs/document/content/user-manual/error-code/sql-error-code.en.md b/docs/document/content/user-manual/error-code/sql-error-code.en.md
@@ -18,6 +18,8 @@ SQL error codes provide by standard `SQL State`, `Vendor Code` and `Reason`, whi
 | 10001       | 42S02     | Schema '%s' does not exist.                                                         |
 | 10002       | 42S02     | Table or view '%s' does not exist.                                                  |
 | 10003       | 42S02     | Unknown column '%s' in '%s'.                                                        |
+| 10004       | 42S02     | Index '%s' does not exist.                                                          |
+| 10005       | 42S01     | Index '%s' already exists.                                                          |
 | 10010       | HY000     | Rule and storage meta data mismatched, reason is: %s.                               |
 | 10100       | HY000     | Can not %s storage units '%s'.                                                      |
 | 10101       | 42S02     | There is no storage unit in database '%s'.                                          |
@@ -151,8 +153,6 @@ SQL error codes provide by standard `SQL State`, `Vendor Code` and `Reason`, whi
 | 20004       | 42S02     | Actual table '%s.%s' is not in table rule configuration.                                                                            |
 | 20005       | 42S02     | Can not find binding actual table, data source is '%s', logic table is '%s', other actual table is '%s'.                            |
 | 20006       | 44000     | Actual tables '%s' are in use.                                                                                                      |
-| 20007       | 42S01     | Index '%s' already exists.                                                                                                          |
-| 20008       | 42S02     | Index '%s' does not exist.                                                                                                          |
 | 20009       | 42S01     | View name has to bind to %s tables.                                                                                                 |
 | 20010       | 44000     | Invalid binding table configuration.                                                                                                |
 | 20011       | 44000     | Only allowed 0 or 1 sharding strategy configuration.                                                                                |

diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/unsupported.cn.md b/docs/document/content/user-manual/shardingsphere-jdbc/unsupported.cn.md
@@ -3,6 +3,10 @@ title = "不支持项"
 weight = 6
 +++
 
+## 配置
+
+* 不支持配置多个逻辑数据库。
+
 ## DataSource 接口
 
 * 不支持 timeout 相关操作。

diff --git a/docs/document/content/user-manual/shardingsphere-jdbc/unsupported.en.md b/docs/document/content/user-manual/shardingsphere-jdbc/unsupported.en.md
@@ -3,6 +3,10 @@ title = "Unsupported Items"
 weight = 6
 +++
 
+## Configuration
+
+* Do not support configuring multiple logic databases
+
 ## DataSource Interface
 
 * Do not support timeout related operations