Skip to content

Commit

Permalink
feat:linelint -a Fix linting errors
Browse files Browse the repository at this point in the history
  • Loading branch information
gongna-au committed Sep 20, 2024
1 parent 0de61d8 commit 84e9cfc
Show file tree
Hide file tree
Showing 19 changed files with 7 additions and 24 deletions.
1 change: 0 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,4 +118,3 @@ release:
- fusion-cli fds --endpoint ${CD_FDS_ENDPOINT} copy bin/gaea fds://${CD_FDS_BUCKET}/${CI_COMMIT_TAG}/gaea
- fusion-cli fds --endpoint ${CD_FDS_ENDPOINT} copy bin/gaea-cc fds://${CD_FDS_BUCKET}/${CI_COMMIT_TAG}/gaea-cc
- fusion-cli fds --endpoint ${CD_FDS_ENDPOINT} copy etc/gaea_online.ini fds://${CD_FDS_BUCKET}/${CI_COMMIT_TAG}/gaea.ini

2 changes: 1 addition & 1 deletion docs/config-reloading.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,4 @@ gaea的配置变更没有针对每个配置项分别进行接口封装,而是

## 集群配置一致性校验

通过两阶段提交配置后,当前所有gaea-proxy的生效配置是相同的。为了方便验证: 1.配置是否发生变化 2.是否所有gaea-proxy的最新配置已经生效,gaea-proxy提供了获取当前配置签名的接口。通过该接口,DBA可以直接通过管理平台查看到各个gaea-proxy前后及当前配置的md5签名,保证配置变更的执行效果符合预期。
通过两阶段提交配置后,当前所有gaea-proxy的生效配置是相同的。为了方便验证: 1.配置是否发生变化 2.是否所有gaea-proxy的最新配置已经生效,gaea-proxy提供了获取当前配置签名的接口。通过该接口,DBA可以直接通过管理平台查看到各个gaea-proxy前后及当前配置的md5签名,保证配置变更的执行效果符合预期。
2 changes: 1 addition & 1 deletion docs/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,4 @@ kill -SIGUSER1 ${gaea_pid}
# 使用 API 热加载
curl -X PUT 'http://127.0.0.1:13307/api/proxy/proxyconfig/reload' \
-H 'Authorization: Basic YWRtaW46YWRtaW4='
```
```
2 changes: 1 addition & 1 deletion docs/multi-tenant.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ type UserManager struct {

## 结语

gaea的多租户确实为部署、运维带来了不少方便,后续也会考虑支持kubernetes的部署、调度多租户等,但是当下的多租户结构不会发生太大变化。
gaea的多租户确实为部署、运维带来了不少方便,后续也会考虑支持kubernetes的部署、调度多租户等,但是当下的多租户结构不会发生太大变化。
2 changes: 1 addition & 1 deletion docs/prepare.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ gaea对于prepare的处理初衷还是考虑协议的兼容和简化处理逻辑

## 参考资料

[mysql prepare statements 官方文档](https://dev.mysql.com/doc/internals/en/prepared-statements.html)
[mysql prepare statements 官方文档](https://dev.mysql.com/doc/internals/en/prepared-statements.html)
1 change: 0 additions & 1 deletion docs/sequence-id.md
Original file line number Diff line number Diff line change
Expand Up @@ -98,4 +98,3 @@ RETURN mycat_seq_currval(seq_name);
END $
DELIMITER ;
```

2 changes: 1 addition & 1 deletion docs/template/gaea_namespace.json
Original file line number Diff line number Diff line change
Expand Up @@ -900,4 +900,4 @@
"title": "gaea-template",
"uid": "000000481",
"version": 12
}
}
2 changes: 1 addition & 1 deletion docs/template/gaea_proxy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1221,4 +1221,4 @@
"title": "gaea_proxy",
"uid": "dW2pRnYmze",
"version": 29
}
}
2 changes: 1 addition & 1 deletion etc/gaea.ini
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,4 @@ encrypt_key=1234abcd5678efg*
server_version=5.6.20-gaea

;auth plugin mysql_native_password or caching_sha2_password or ''
auth_plugin=mysql_native_password
auth_plugin=mysql_native_password
1 change: 0 additions & 1 deletion models/etcdv3/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,3 @@ PR 准备发两次

1. 第一次,送上 Etcd V3 API 的代码和修改旧的 V2 版本的代码,标题为 Etcd API 更新
2. 第二次,数据库中间件接上 Etcd V3 API ,同时修改 Etcd 的接口,标题为整合数据库中间件和 Etcd V3 API

1 change: 0 additions & 1 deletion tests/e2e/shard/case/join/0-slice0-kingshard.sql
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ create table test6_0001(id int(11),C_NAME varchar(20),C_NATIONKEY varchar(20),C_
create table test7_0001(id int(11),C_NAME varchar(20),C_NATIONKEY varchar(20),C_ORDERKEY varchar(20),C_CUSTKEY varchar(20) primary key);
create table test8_0001 (id int(11),O_ORDERKEY varchar(20) primary key,O_CUSTKEY varchar(20),O_TOTALPRICE int(20),MYDATE date);
create table test9_0001 (id int(11),O_ORDERKEY varchar(20) primary key,O_CUSTKEY varchar(20),O_TOTALPRICE int(20),MYDATE date, index ORDERS_FK1 (`O_CUSTKEY`));

1 change: 0 additions & 1 deletion tests/e2e/shard/case/join/mycat/long/unequal.sql
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ select sum(O_TOTALPRICE) as sums,O_CUSTKEY,count(O_ORDERKEY) counts from test9 w
select sum(O_TOTALPRICE) as sums,O_CUSTKEY,count(O_ORDERKEY) counts from test9 where O_CUSTKEY between 'CUSTKEY_002' and 'CUSTKEY_050' group by 2 asc having O_CUSTKEY<(select max(c_custkey) from test7) order by count(O_ORDERKEY) asc,O_CUSTKEY desc limit 1,10;
select sum(O_TOTALPRICE) as sums,O_CUSTKEY,count(O_ORDERKEY) counts from test9 where O_CUSTKEY between 'CUSTKEY_002' and 'CUSTKEY_050' group by 2 asc having O_CUSTKEY<(select max(c_custkey) from test7) order by count(O_ORDERKEY) asc,O_CUSTKEY desc limit 10 offset 1;
select (select name from test1 limit 1);

2 changes: 0 additions & 2 deletions tests/e2e/shard/case/join/mycat/mod/equal.sql
Original file line number Diff line number Diff line change
Expand Up @@ -237,5 +237,3 @@ select * from (select m.id,n.pad from test1 m,sbtest.test2 n where m.id=n.id AND
select a.id,b.id,b.pad,a.t_id from (select id,t_id from test1) a,(select * from sbtest.test2) b where a.t_id=b.o_id;
select co1,co2,co3 from (select id as co1,name as co2,pad as co3 from test1)as tb where co1>1;
select CURRENT_USER FROM test5;


1 change: 0 additions & 1 deletion tests/e2e/shard/case/join/mycat/mod/unequal.sql
Original file line number Diff line number Diff line change
Expand Up @@ -125,4 +125,3 @@ select a.id,b.id,b.pad,a.t_id from (select test1.id,test1.pad,test1.t_id from te
select id,t_id,name,pad from test1 where pad>(select pad from test1 where pad=2);
select (select name from test1 limit 1);
select id,t_id,name,pad from test1 where 2<>some(select id from test1 where pad>1);

3 changes: 0 additions & 3 deletions tests/e2e/shard/case/join/mycat/murmur/equal.sql
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,3 @@ select * from (select m.id,n.pad from test1 m,sbtest.test2 n where m.id=n.id AND
select a.id,b.id,b.pad,a.t_id from (select id,t_id from test1) a,(select * from sbtest.test2) b where a.t_id=b.o_id;
select co1,co2,co3 from (select id as co1,name as co2,pad as co3 from test1)as tb where co1>1;
select CURRENT_USER FROM test5;



2 changes: 0 additions & 2 deletions tests/e2e/shard/case/join/mycat/murmur/unequal.sql
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,3 @@ select id,t_id,name,pad from test1 where pad !=any(select id from test1 where pa
select a.id,b.id,b.pad,a.t_id from (select test1.id,test1.pad,test1.t_id from test1 join sbtest.test3 where test1.pad=sbtest.test3.pad ) a,(select sbtest.test2.id,sbtest.test2.pad from test1 join sbtest.test2 where test1.pad=sbtest.test2.pad) b where a.pad=b.pad;
select id,t_id,name,pad from test1 where pad>(select pad from test1 where pad=2);
select (select name from test1 limit 1);


2 changes: 0 additions & 2 deletions tests/e2e/shard/case/join/mycat/string/unequal.sql
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,3 @@ select group_concat(col2,col1 SEPARATOR ';') from t group by col1;
select * from t full, t1 `row`, t2 abs;
select * from t use index for group by (idx1) use index for order by (idx2), t2;
select (select name from test1 limit 1);


1 change: 0 additions & 1 deletion tests/e2e/unshard/case/join/test_simple.sql
Original file line number Diff line number Diff line change
Expand Up @@ -670,4 +670,3 @@ SELECT 5 DIV 2, -5 DIV 2, 5 DIV -2, -5 DIV -2;
## other
SELECT INSERT('Quadratic', 3, 4, 'What');
SELECT CHAR(65);

1 change: 0 additions & 1 deletion util/mocks/pipeTest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -273,4 +273,3 @@ func TestMariadbConnWithoutDB(t *testing.T) {
})
}
```

0 comments on commit 84e9cfc

Please sign in to comment.