Skip to content

Commit 687f230

Browse files
junwen12221junwen12221
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # autohandler/pom.xml # booster/pom.xml # common/pom.xml # config/pom.xml # datasource/pom.xml # example/pom.xml # hbt/pom.xml # hbt2/pom.xml # mycat2/pom.xml # pattern/pom.xml # plug/pom.xml # pom.xml # proxy/pom.xml # replica/pom.xml # router/pom.xml # statistic/pom.xml # testsuite/pom.xml
2 parents 233ad67 + 9d20e1b commit 687f230

File tree

20 files changed

+140
-69
lines changed

20 files changed

+140
-69
lines changed

Diff for: ‎autohandler/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>parent</artifactId>
77
<groupId>io.mycat</groupId>
8-
<version>1.09-09</version>
8+
<version>1.09-08</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

Diff for: ‎booster/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>parent</artifactId>
77
<groupId>io.mycat</groupId>
8-
<version>1.09-09</version>
8+
<version>1.09-08</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -21,17 +21,17 @@
2121
<dependency>
2222
<groupId>io.mycat</groupId>
2323
<artifactId>config</artifactId>
24-
<version>1.09-09</version>
24+
<version>1.09-08</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>io.mycat</groupId>
2828
<artifactId>common</artifactId>
29-
<version>1.09-09</version>
29+
<version>1.09-08</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>io.mycat</groupId>
3333
<artifactId>plug</artifactId>
34-
<version>1.09-09</version>
34+
<version>1.09-08</version>
3535
<scope>compile</scope>
3636
</dependency>
3737
</dependencies>

Diff for: ‎common/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>parent</artifactId>
77
<groupId>io.mycat</groupId>
8-
<version>1.09-09</version>
8+
<version>1.09-08</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>io.mycat</groupId>
1717
<artifactId>config</artifactId>
18-
<version>1.09-09</version>
18+
<version>1.09-08</version>
1919
</dependency>
2020
<!-- https://mvnrepository.com/artifact/joda-time/joda-time -->
2121
<dependency>

Diff for: ‎common/src/main/java/io/mycat/ScheduleUtil.java

+9
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,11 @@
2222
import java.util.concurrent.ScheduledExecutorService;
2323
import java.util.concurrent.TimeUnit;
2424
import java.util.concurrent.atomic.AtomicBoolean;
25+
import java.util.concurrent.atomic.AtomicInteger;
2526

2627
public class ScheduleUtil {
2728
final static ScheduledExecutorService timer = Executors.newScheduledThreadPool(1);
29+
final static AtomicInteger COUNTER = new AtomicInteger(0);
2830

2931
public static ScheduledExecutorService getTimer() {
3032
return timer;
@@ -38,6 +40,7 @@ public void close() throws IOException {
3840
closeable.close();
3941
}
4042
};
43+
COUNTER.incrementAndGet();
4144
getTimer().schedule(() -> timerTask.accept(), delay, unit);
4245
return timerTask;
4346
}
@@ -61,6 +64,7 @@ void accept() {
6164
}
6265

6366
public void setFinished() {
67+
COUNTER.decrementAndGet();
6468
finished.set(true);
6569
}
6670

@@ -74,4 +78,9 @@ private void onClose() {
7478
}
7579
}
7680
}
81+
82+
83+
public static int getScheduleCount() {
84+
return COUNTER.get();
85+
}
7786
}

Diff for: ‎config/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>io.mycat</groupId>
77
<artifactId>parent</artifactId>
8-
<version>1.09-09</version>
8+
<version>1.09-08</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

Diff for: ‎datasource/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>parent</artifactId>
77
<groupId>io.mycat</groupId>
8-
<version>1.09-09</version>
8+
<version>1.09-08</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -20,22 +20,22 @@
2020
<dependency>
2121
<groupId>io.mycat</groupId>
2222
<artifactId>config</artifactId>
23-
<version>1.09-09</version>
23+
<version>1.09-08</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>io.mycat</groupId>
2727
<artifactId>common</artifactId>
28-
<version>1.09-09</version>
28+
<version>1.09-08</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>io.mycat</groupId>
3232
<artifactId>plug</artifactId>
33-
<version>1.09-09</version>
33+
<version>1.09-08</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>io.mycat</groupId>
3737
<artifactId>replica</artifactId>
38-
<version>1.09-09</version>
38+
<version>1.09-08</version>
3939
</dependency>
4040
<dependency>
4141
<groupId>com.zaxxer</groupId>

Diff for: ‎doc/101-todo-history-list.md

+72-10
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ HBT与普通sql执行生成目标数据源的sql不只是mysql方言,而是可
9999

100100
###### *information_schema*
101101

102-
1.模仿MySQL服务器把元数据表现成*information_schema* 对象
102+
1.模仿MySQL服务器把元数据表现成*information_schema* 对象(完成)
103103

104-
2.分布式查询引擎能对*information_schema*对象进行sql条件进行查询
104+
2.分布式查询引擎能对*information_schema*对象进行sql条件进行查询(已经完成)
105105

106-
3.DDL能对*information_schema*对象进行修改以及生成对多个数据源的更改sql
106+
3.DDL能对*information_schema*对象进行修改以及生成对多个数据源的更改sql(已经完成create table)
107107

108-
4.实现常用的show语句
108+
4.实现常用的show语句(实现一部分,但是某些客户端兼容性不好)
109109

110110

111111

@@ -125,11 +125,7 @@ HBT与普通sql执行生成目标数据源的sql不只是mysql方言,而是可
125125

126126

127127

128-
###### 分布式查询引擎优化
129128

130-
limit/order下推
131-
132-
全局表与分片表精准下推
133129

134130

135131

@@ -183,13 +179,79 @@ limit/order下推
183179

184180
###### 统计中心,为优化器选择物理执行器提供支持
185181

186-
返回有关要使用的表和列的统计信息,以及统计执行阶段的耗时,多次出现的拉取数据源的sql
182+
已经完成行统计
183+
184+
缺:统计执行阶段的耗时,统计多次出现的拉取数据源的sql
185+
186+
187+
188+
##### 2020.6.15-> 2020.6.19日志
189+
190+
[配置无需配置建表sql](https://github.com/MyCATApache/Mycat2/commit/ec034439a43ec97da1e5e74668c4fad7d4f19225) 自动从dataNode中查询建表语句
191+
192+
[简化配置 ShardingType可以不写,默认自然分片](https://github.com/MyCATApache/Mycat2/commit/706262328682d490c850742f6f4c70d46c0e39ab)
193+
194+
[添加插入语句中出现未知字段的提示](https://github.com/MyCATApache/Mycat2/commit/d1bf9a01caa3440928f49427a48264a27802e9c0)
195+
196+
[修复caclite 内部类型为数字的日期类型 类型转换问题](https://github.com/MyCATApache/Mycat2/commit/c883f60366d69acc6048995b653d3b5c50e52728)
197+
198+
[通过判断是否存在初始化语句加速jdbc获取连接](https://github.com/MyCATApache/Mycat2/commit/b1438d34e698f8ab884675319a5f16a715da98c7)
199+
200+
[修复boolean类型转换](https://github.com/MyCATApache/Mycat2/commit/8d9bf7e9ed2abfbfd74bf917695bac350e3f53c7)
201+
202+
[show @@backend.replica](https://github.com/MyCATApache/Mycat2/commit/d7285cfd4eb24d8b9713a73578fa0e99f4b4c78f)
203+
204+
[show @@backend.datasource 可以显示连接使用数量](https://github.com/MyCATApache/Mycat2/commit/e3aa295288ed15a2b782941ba042a5cf4d3e43fa)
205+
206+
[实现show @](https://github.com/MyCATApache/Mycat2/commit/18f5bc104794a1b9ba1764125c156793c5099bfd)[@connection](https://github.com/connection)
207+
208+
[实现show @@backend.native](https://github.com/MyCATApache/Mycat2/commit/1f0467131d4b30fc548fc0c66811bc8414cbec99)
209+
210+
211+
212+
##### 2020.6.8-> 2020.6.14日志
213+
214+
修复读写分离在跨库情况下有异常
215+
216+
支持枚举类型(以字符串对待)
217+
218+
修复时间类型转换错误
219+
220+
修复sqllog下mycat自研的show column命令导致的崩溃
221+
222+
重构路由,可以支持分片算法返回dataNode
223+
224+
强制native(proxy)使用[NativePassword](https://github.com/MyCATApache/Mycat2/commit/a135181457554199aa072a8f8f097faa6cefa15e)插件,而不再自动可以切换为其他插件
225+
226+
使用druid作为数据源的时候可以使用本地事务
227+
228+
添加本地事务配置例子(druid)
229+
230+
修复使用jdbc查询返回[IllegalArgumentException();](https://github.com/MyCATApache/Mycat2/commit/9afe0dde62912da22839cf040bbc9e06690a5d32)
231+
232+
[忽略SET TRANSACTION READ WRITE;](https://github.com/MyCATApache/Mycat2/commit/1aa50549d1ce4f4467150065314739306cb7ea42)
233+
234+
[带有InformationSchema的表的sql发送到后端数据库](https://github.com/MyCATApache/Mycat2/commit/f3ee1fa64d27ae472dc095479a0f93cefd6c8b4b)
235+
236+
[修复xa测试主键冲突](https://github.com/MyCATApache/Mycat2/commit/6c5cc719ccc075a4828a208b560d52dc8735924b)
237+
238+
[暂时禁用show tables因为mysql8客户端不兼容此实现](https://github.com/MyCATApache/Mycat2/commit/6926e67a5b84946a83343f6be61c0ffd6acc23f1)
239+
240+
[禁用jdbc设置readOnly](https://github.com/MyCATApache/Mycat2/commit/6f9ce86a21c8d2221ff561522dd40a5b64cb2455)
241+
242+
[禁用UnionPullUpConstantsRule](https://github.com/MyCATApache/Mycat2/commit/00454390f52b34c6bb9535347fb6cc0d51d05374)
243+
244+
187245

188246

189247

190248
##### 2020.6.2-> 2020.6.7开发日志
191249

192-
迁移1.6路由
250+
迁移1.6路由(未完成)
251+
252+
limit/order下推
253+
254+
全局表与分片表精准下推
193255

194256

195257

Diff for: ‎example/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>parent</artifactId>
77
<groupId>io.mycat</groupId>
8-
<version>1.09-09</version>
8+
<version>1.09-08</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>io.mycat</groupId>
1717
<artifactId>mycat2</artifactId>
18-
<version>1.09-09</version>
18+
<version>1.09-08</version>
1919
</dependency>
2020
</dependencies>
2121

Diff for: ‎hbt/pom.xml

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>parent</artifactId>
77
<groupId>io.mycat</groupId>
8-
<version>1.09-09</version>
8+
<version>1.09-08</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -16,22 +16,22 @@
1616
<dependency>
1717
<groupId>io.mycat</groupId>
1818
<artifactId>common</artifactId>
19-
<version>1.09-09</version>
19+
<version>1.09-08</version>
2020
</dependency>
2121
<dependency>
2222
<groupId>io.mycat</groupId>
2323
<artifactId>plug</artifactId>
24-
<version>1.09-09</version>
24+
<version>1.09-08</version>
2525
</dependency>
2626
<dependency>
2727
<groupId>io.mycat</groupId>
2828
<artifactId>datasource</artifactId>
29-
<version>1.09-09</version>
29+
<version>1.09-08</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>io.mycat</groupId>
3333
<artifactId>config</artifactId>
34-
<version>1.09-09</version>
34+
<version>1.09-08</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>com.alibaba.fastsql</groupId>

Diff for: ‎hbt2/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>parent</artifactId>
77
<groupId>io.mycat</groupId>
8-
<version>1.09-09</version>
8+
<version>1.09-08</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

@@ -15,7 +15,7 @@
1515
<dependency>
1616
<groupId>io.mycat</groupId>
1717
<artifactId>mycat2</artifactId>
18-
<version>1.09-09</version>
18+
<version>1.09-08</version>
1919
</dependency>
2020
</dependencies>
2121
</project>

Diff for: ‎mycat2/pom.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>parent</artifactId>
77
<groupId>io.mycat</groupId>
8-
<version>1.09-09</version>
8+
<version>1.09-08</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111
<packaging>jar</packaging>
@@ -15,29 +15,29 @@
1515
<dependency>
1616
<groupId>io.mycat</groupId>
1717
<artifactId>proxy</artifactId>
18-
<version>1.09-09</version>
18+
<version>1.09-08</version>
1919
</dependency>
2020
<dependency>
2121
<groupId>io.mycat</groupId>
2222
<artifactId>common</artifactId>
23-
<version>1.09-09</version>
23+
<version>1.09-08</version>
2424
</dependency>
2525
<dependency>
2626
<groupId>io.mycat</groupId>
2727
<artifactId>datasource</artifactId>
28-
<version>1.09-09</version>
28+
<version>1.09-08</version>
2929
</dependency>
3030

3131
<dependency>
3232
<groupId>io.mycat</groupId>
3333
<artifactId>pattern</artifactId>
34-
<version>1.09-09</version>
34+
<version>1.09-08</version>
3535
</dependency>
3636

3737
<dependency>
3838
<groupId>io.mycat</groupId>
3939
<artifactId>proxy</artifactId>
40-
<version>1.09-09</version>
40+
<version>1.09-08</version>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.eclipse.collections</groupId>
@@ -82,13 +82,13 @@
8282
<dependency>
8383
<groupId>io.mycat</groupId>
8484
<artifactId>booster</artifactId>
85-
<version>1.09-09</version>
85+
<version>1.09-08</version>
8686
<scope>compile</scope>
8787
</dependency>
8888
<dependency>
8989
<groupId>io.mycat</groupId>
9090
<artifactId>booster</artifactId>
91-
<version>1.09-09</version>
91+
<version>1.09-08</version>
9292
<scope>compile</scope>
9393
</dependency>
9494
<dependency>

Diff for: ‎mycat2/src/main/resources/version.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
BuildTime 2020-06-11 07:37:30
2-
GitVersion 3ead4a4be3ed7ab16e782d5140185b86d501bc67
3-
MavenVersion 1.08-SNAPSHOT
1+
BuildTime 2020-06-19 07:46:10
2+
GitVersion c29bea50c5aa999bbc95da41ae6b3456c4e087d0
3+
MavenVersion 1.09-02
44
GitUrl https://github.com/MyCATApache/Mycat2.git
55
MyCatSite http://www.mycat.io/
66
QQGroup 332702697

0 commit comments

Comments
 (0)