Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sharding proxy xa transaction #940

Merged
merged 91 commits into from
Jun 19, 2018
Merged

Sharding proxy xa transaction #940

merged 91 commits into from
Jun 19, 2018

Conversation

cherrylzhao
Copy link
Member

commit for swarding-proxy xa transaction branch.

  • modify sharding-proxy-SQLExecuteWorker for xa(ensure get all routed connection before multi-thread executed)
  • modify sharding-proxy resource manage model.
  • close connection when insert/update/delete executed for sharding-proxy.
  • modify StatementExecuteWorker for reuse transaction of xa.
  • refactor StatementExecutor concern function
  • intercept ddl command of sharding-proxy within xa transaction

oracle219 added 30 commits April 23, 2018 19:20
@oracle219
create MySql execute backend handler
1d3ba88
@oracle219
create netty client
5ead408
@oracle219
temp submit
4541261
@oracle219
netty client framework
ddedabd
@oracle219
replace jdbc to netty
4b1f39a
@oracle219
replace jdbc to netty
26c856b
@oracle219
fix some code style
f13c1b9
@oracle219
channelid <-> connectionid
e94b7e7
@oracle219
get connectionid by channel
a3a9b6f
@oracle219
fix some code style.
a92f71b
@oracle219
Merge remote-tracking branch 'upstream/dev' into dev
ae57b07 
# Conflicts:
#	sharding-proxy/pom.xml
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/text/query/ComQueryPacket.java
@oracle219
fix some merge bugs
39a3d5a
@oracle219
fix some merge bugs
f9293a6
@oracle219
gencericResponse and part of handshake
f438fa6
@oracle219
handshake finish
b6227ba
@oracle219
refactor the methond of datasource config
11085a8
@oracle219
Merge remote-tracking branch 'upstream/dev' into dev
d30e4df
@oracle219
debug
d520f9b
@oracle219
handshake test success.
e5e7c5f
@oracle219
some code style fix
b808a94
@oracle219
Merge remote-tracking branch 'remotes/upstream/dev' into dev
cc46897 
# Conflicts:
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/config/RuleRegistry.java
#	sharding-proxy/src/main/resources/conf/sharding-config.yaml
@oracle219
fix some code style
aabcb3e
@oracle219
Merge remote-tracking branch 'remotes/upstream/dev' into dev
0a5e2c9 
# Conflicts:
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/Bootstrap.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/config/RuleRegistry.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/frontend/ShardingProxy.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/frontend/mysql/MySQLFrontendHandler.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/metadata/ProxyShardingMetaData.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLPacketPayload.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacketFactory.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/text/query/ComQueryPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/generic/EofPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/generic/ErrPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/generic/OKPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/HandshakeResponse41Packet.java
#	sharding-proxy/src/main/resources/conf/config.yaml
#	sharding-proxy/src/main/resources/logback.xml
@oracle219
Merge remote-tracking branch 'remotes/upstream/dev' into dev
a184740 
# Conflicts:
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/Bootstrap.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/config/RuleRegistry.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/frontend/ShardingProxy.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/frontend/mysql/MySQLFrontendHandler.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/metadata/ProxyShardingMetaData.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/MySQLPacketPayload.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/CommandPacketFactory.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/command/text/query/ComQueryPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/generic/EofPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/generic/ErrPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/generic/OKPacket.java
#	sharding-proxy/src/main/java/io/shardingjdbc/proxy/transport/mysql/packet/handshake/HandshakeResponse41Packet.java
#	sharding-proxy/src/main/resources/conf/config.yaml
#	sharding-proxy/src/main/resources/logback.xml
@oracle219
Merge remote-tracking branch 'remotes/upstream/dev' into dev
aa20f16
@oracle219
Merge remote-tracking branch 'remotes/upstream/dev' into dev
08c4938 
# Conflicts:
#	sharding-proxy/pom.xml
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/query/ComQueryPacket.java
@oracle219
Merge remote-tracking branch 'remotes/upstream/dev' into dev
f751852 
# Conflicts:
#	sharding-proxy/pom.xml
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/fieldlist/ComFieldListPacket.java
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/query/ComQueryPacket.java
@oracle219
fix some code style
31ea888
@oracle219
added throw new UnsupportedOperationException() for master-slave model
7da164d
@oracle219
fix some code style
4265f20
terrymanu and others added 29 commits June 13, 2018 21:11
@terrymanu
for #601, add masterslave sharding rule type for select_or_with_diffe…
003908d 
…rent_sharding_columns
@terrymanu
for #601, add masterslave sharding rule type for select_or_with_none_…
85086ba 
…sharding_columns
@terrymanu
for #601, add masterslave sharding rule type for select_or_mix_and_fo…
898077f 
…r_simple_pattern
@terrymanu
for #601, add masterslave sharding rule type for select_or_mix_and_fo…
09f4db9 
…r_complex_pattern
@terrymanu
for #601, add masterslave sharding rule type for select_or_mix_and_wi…
d7d22d5 
…th_binding_tables
@terrymanu
for #601, add masterslave sharding rule type for select_or_mix_and_wi…
8021302 
…th_binding_and_broadcast_tables
@terrymanu
for #601, add masterslave sharding rule type for select_order_by_asc_…
e158a7d 
…and_index_desc
@terrymanu
for #601, add masterslave sharding rule type for select_order_by_desc…
c77701a 
…_and_index_asc
@terrymanu
for #601, add masterslave sharding rule type for select_order_by_with…
25cd005 
…_ordered_column
@terrymanu
for #601, add masterslave sharding rule type for select_order_by_with…
58f7ea0 
…_date
@terrymanu
for #601, add masterslave sharding rule type for select_order_by_for_…
a65738c 
…nulls_first&last
@terrymanu
for #601, fix case select_with_date_function
f0eccf6
@chidaodezhongsheng
Merge remote-tracking branch 'remotes/upstream/dev' into dev
9045994
@chidaodezhongsheng
Merge remote-tracking branch 'remotes/upstream/dev' into dev
259718b 
fix errors
@tuohai666
infinite looping is not necessary
6fb31bd
@chidaodezhongsheng
fix compile errors
0223010
@terrymanu
for #601, add select_sub_query_with_group_by for masterslave sharding…
2935aee 
… rule
@terrymanu
for #601, add select_sub_query_with_order_by for masterslave sharding…
4ffa7e1 
… rule
@terrymanu
for #601, add select_sub_query_with_order_by for select_sub_query_wit…
d509481 
…h_single_table sharding rule
@tuohai666
for #930, update mysql-connector-java to 8.0.11
4c2bd79
@tuohai666
Merge pull request #911 from dangdang-arch/dev
c6248c8 
Netty for ShardingSphere
@terrymanu
Merge pull request #933 from tuohai666/dev
4c33143 
infinite looping is not necessary
@terrymanu
for #601, add select_join_using sharding rule
464dc63
@terrymanu
upgrade mysql driver to 8.x
7a4b90e
@cherrylzhao
modify StatementExecuteWorker for reuse transaction of xa.
8b1be1d
@cherrylzhao
for sharding-proxy, resolve can't query from slave after executing dm…
2fc04ee 
…l at first time.

optimize ExecuteWorker, delete master-slave judge logic.
@cherrylzhao
Merge branch 'dev-new' of https://github.com/cherrylzhao/sharding-jdbc …
e6a56f6 
…into sharding-proxy-xa-transaction

# Conflicts:
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteBackendHandler.java
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLExecuteWorker.java
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/StatementExecuteWorker.java
#	sharding-proxy/src/main/java/io/shardingsphere/proxy/transport/mysql/packet/command/text/query/ComQueryPacket.java
@cherrylzhao
refactor StatementExecutor concern function.
d4c72bd
@cherrylzhao
intercept ddl command of sharding-proxy within xa transaction
2c51f52
@cherrylzhao cherrylzhao merged commit b1c5b5c into apache:sharding-proxy-xa-transaction Jun 19, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@cherrylzhao @oracle219 @chidaodezhongsheng @terrymanu @tuohai666