Merge pull request #2 from apache/dev

just async

README.md

@@ -100,18 +100,21 @@ Architects can adjust the system architecture to the most applicable one to curr
 
 * Database sharding & Table sharding
 * Read-write splitting
-* Distributed primary key
+* Sharding strategy customization
+* Centre-less Distributed primary key
 
-### Distributed Transaction (Doing)
+### Distributed Transaction
 
+* Unified Transaction API
 * XA transaction
 * BASE transaction
 
 ### Database Orchestration
 
-* Dynamic configuration
-* Fusing & Disabling
-* Tracing
+* Dynamic Configuration
+* Orchestration & Governance
+* Data Encryption
+* Tracing & Observability
 * Elastic scaling out (Planing)
 
 ## Roadmap

README_ZH.md

@@ -96,19 +96,22 @@ ShardingSphere是多接入端共同组成的生态圈。
 
 * 分库 & 分表
 * 读写分离
-* 分布式主键
+* 分片策略定制化
+* 无中心化分布式主键
 
-### 分布式事务(Doing)
+### 分布式事务
 
+* 标准化事务接口
 * XA强一致事务
 * 柔性事务
 
 ### 数据库治理
 
 * 配置动态化
-* 熔断 & 禁用
-* 调用链路追踪
-* 弹性伸缩 (Planing)
+* 编排 & 治理
+* 数据脱敏
+* 可视化链路追踪
+* 弹性伸缩(规划中)
 
 ## Roadmap
 

RELEASE-NOTES.md

@@ -13,7 +13,7 @@ Merge all change logs of version 3.1.0.M1, 3.1.0, 3.1.0.1 and 4.0.0.M1. First ap
 1. XA Transaction available.
 1. All SQL 100% compatible if route to single data node (MySQL Only).
 1. DISTINCT SQL syntax available.
-1. Broadcast table .
+1. Broadcast table.
 1. Solve data lean problem when using DefaultKeyGenerator with low TPS.
 1. Data encrypt available.
 1. Use PostgreSQL protocol access Sharding-Proxy available.

ROADMAP.md

@@ -40,9 +40,16 @@
   - [x] COM_STMT_EXECUTE
   - [x] COM_STMT_CLOSE
   - [x] COM_STMT_RESET
+- [ ] PostgreSQL
+  - [x] Auth
+  - [x] Simple Query
+  - [x] Parse
+  - [x] Bind
+  - [x] Describe
+  - [x] Execute
+  - [x] Sync
 - [ ] Oracle
 - [ ] SQLServer
-- [ ] PostgreSQL
 
 ### Configuration
 - [x] YAML
@@ -142,6 +149,7 @@
 ### Distribute Sequence
 - [x] Strategy API
 - [x] Snowflake algorithm
+- [x] UUID algorithm
 
 ## Orchestration
 
@@ -161,25 +169,25 @@
 - [ ] LoadBalance
 - [ ] Flow Limit
 - [ ] Failover
+- [x] Data Encryption
 
 ### APM
 - [x] Tracing Collector
 - [x] Open Tracing
 
-## BASE Transaction
+## Transaction
 
-### Best Efforts Delivery
-- [x] Post DML event
-- [x] Transaction Journal Storage
-- [x] Synchronized Delivery
-- [x] Asynchronized Delivery
+### BASE
+- [x] BASE Transaction Manager SPI
+- [x] SQL revert
+- [ ] Isolation Engine
+- [x] Saga Integrate
 
-### Try Confirm Cancel
-- [x] Post DML event
-- [ ] Transaction Journal Storage
-- [ ] Try
-- [ ] Confirm
-- [ ] Cancel
+### XA
+- [x] XA Transaction Manager SPI
+- [x] Atomikos Integrate
+- [x] Narayana Integrate
+- [x] Bitronix Integrate
 
 ## Operation Tool
 

shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/LICENSE

@@ -216,6 +216,11 @@ The following components are provided under the Apache License. See project link
 The text of each license is also included at licenses/LICENSE-[project].txt.
 
     groovy 2.4.5-indy: https://github.com/apache/groovy, Apache 2.0
+    atomikos-util 4.0.6: https://www.atomikos.com, Apache 2.0
+    transactions 4.0.6: https://www.atomikos.com, Apache 2.0
+    transactions-api 4.0.6: https://www.atomikos.com, Apache 2.0
+    transactions-jdbc 4.0.6: https://www.atomikos.com, Apache 2.0
+    transactions-jta 4.0.6: https://www.atomikos.com, Apache 2.0
 
 ========================================================================
 Apache 2.0 licenses
@@ -224,7 +229,6 @@ Apache 2.0 licenses
 The following components are provided under the Apache License. See project link for details.
 The text of each license is the standard Apache 2.0 license.
 
-    atomikos-util 4.0.6: https://www.atomikos.com, Apache 2.0
     commons-codec 1.10: https://github.com/apache/commons-codec, Apache 2.0
     commons-collections4 4.2: https://github.com/apache/commons-collections, Apache 2.0
     curator-client 2.10.0:  https://github.com/apache/curator,  Apache 2.0
@@ -238,10 +242,6 @@ The text of each license is the standard Apache 2.0 license.
     opentracing-noop 0.30.0: https://opentracing.io, Apache 2.0
     opentracing-util 0.30.0: https://opentracing.io, Apache 2.0
     SnakeYAML 1.18: http://www.snakeyaml.org , Apache 2.0
-    transactions 4.0.6: https://www.atomikos.com, Apache 2.0
-    transactions-api 4.0.6: https://www.atomikos.com, Apache 2.0
-    transactions-jdbc 4.0.6: https://www.atomikos.com, Apache 2.0
-    transactions-jta 4.0.6: https://www.atomikos.com, Apache 2.0
     zookeeper 3.4.6: https://github.com/apache/zookeeper, Apache 2.0
 
 ========================================================================

shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/NOTICE

@@ -235,6 +235,23 @@ This product contains the Maven wrapper scripts from 'Maven Wrapper', that provi
 
 ========================================================================
 
+Apache groovy NOTICE
+
+========================================================================
+
+Apache Groovy
+Copyright 2003-2018 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This product bundles icons from the famfamfam.com silk icons set
+http://www.famfamfam.com/lab/icons/silk/
+Licensed under the Creative Commons Attribution Licence v2.5
+http://creativecommons.org/licenses/by/2.5/
+
+========================================================================
+
 Apache commons-codec NOTICE
 
 ========================================================================
@@ -259,7 +276,7 @@ Copyright (c) 2008 Alexander Beider & Stephen P. Morse.
 
 ========================================================================
 
-Apache Commons Collections
+Apache Commons Collections NOTICE
 
 ========================================================================
 
@@ -272,7 +289,7 @@ The Apache Software Foundation (http://www.apache.org/).
 
 ========================================================================
 
-Apache Curator
+Apache Curator NOTICE
 
 ========================================================================
 
@@ -284,24 +301,7 @@ The Apache Software Foundation (http://www.apache.org/).
 
 ========================================================================
 
-Apache Groovy
-
-========================================================================
-
-Apache Groovy
-Copyright 2003-2018 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-This product bundles icons from the famfamfam.com silk icons set
-http://www.famfamfam.com/lab/icons/silk/
-Licensed under the Creative Commons Attribution Licence v2.5
-http://creativecommons.org/licenses/by/2.5/
-
-========================================================================
-
-Apache log4j
+Apache log4j NOTICE
 
 ========================================================================
 
@@ -313,7 +313,7 @@ The Apache Software Foundation (http://www.apache.org/).
 
 ========================================================================
 
-Apache ZooKeeper
+Apache ZooKeeper NOTICE
 
 ========================================================================
 

shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-pgjdbc.txt → shardingsphere-distribution/shardingsphere-proxy-distribution/src/main/release-docs/licenses/LICENSE-postgresql.txt

@@ -23,4 +23,4 @@ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
+POSSIBILITY OF SUCH DAMAGE.