[MDEV-28526] Spider: remove conn_kind member variables Created: 2022-05-10  Updated: 2022-12-23  Resolved: 2022-12-23

Status: Closed
Project: MariaDB Server
Component/s: Storage Engine - Spider
Fix Version/s: 11.0.0

Type: Task Priority: Major
Reporter: Nayuta Yanagisawa (Inactive) Assignee: Yuchen Pei
Resolution: Fixed Votes: 0
Labels: None

Issue Links:
Relates
relates to MDEV-26858 Spider: Remove dead code related to H... Closed

 Description   

The conn_kind, which stands for "connection kind", is no longer useful because the HandlerSocket support is deleted and Spider now has only one connection kind, SPIDER_CONN_KIND_MYSQL. Remove conn_kind and related code.



 Comments   
Comment by Yuchen Pei [ 2022-12-01 ]

https://github.com/MariaDB/server/commit/aea4f44cfe2c1b8a2318a27f28512769cda69b50

Comment by Nayuta Yanagisawa (Inactive) [ 2022-12-01 ]

ycp There are still some occurrences of SPIDER_CONN_KIND_MYSQL in the code. Could you also remove the constant SPIDER_CONN_KIND_MYSQL itself and related code fragments? Also, please enrich the commit message, which could be a verbatim copy of the issue description.

By the way, this is my bad, but the fix version should be 10.12, which is the latest development branch.

Comment by Yuchen Pei [ 2022-12-01 ]

nayuta-yanagisawa
> There are still some occurrences of SPIDER_CONN_KIND_MYSQL in the code. Could you also remove the constant SPIDER_CONN_KIND_MYSQL itself and related code fragments? Also, please enrich the commit message, which could be a verbatim copy of the issue description.

Done: https://github.com/MariaDB/server/commit/b7b4375fe73840c5f7e0fc02ee00e51f6e2ae550

PTAL thanks.

Comment by Nayuta Yanagisawa (Inactive) [ 2022-12-02 ]

ycp Mostly looks OK to me except diff on storage/spider/spd_table.cc. Have you applied clang-format or something on the file? Please do not modify parts of the code that are not related to the present task. If you like to format your patch, maybe clang-format-diff works.

Comment by Yuchen Pei [ 2022-12-02 ]

nayuta-yanagisawa
> Mostly looks OK to me except diff on storage/spider/spd_table.cc. Have you applied clang-format or something on the file? Please do not modify parts of the code that are not related to the present task. If you like to format your patch, maybe clang-format-diff works.

Sorry about the problem - I'm still trying to tame the IDE. Here's the updated commit - PTAL:

https://github.com/MariaDB/server/commit/ed3488e3ed040cf27ac3017090dce9bedcc43c8c

Comment by Nayuta Yanagisawa (Inactive) [ 2022-12-02 ]

ycp I've commented on GitHub: https://github.com/MariaDB/server/commit/ed3488e3ed040cf27ac3017090dce9bedcc43c8c#

Comment by Yuchen Pei [ 2022-12-02 ]

nayuta-yanagisawa
Just applied formatting with `git diff -U0 --no-color --relative HEAD^ | clang-format-diff -p1 -i`, and did a sanity check on the result which looked alright to me. PTAL thanks:

https://github.com/MariaDB/server/commit/b7b4375fe73840c5f7e0fc02ee00e51f6e2ae550-

Sorry, should be this one:

-htt
ps://github.com/MariaDB/server/commit/b1ee3d2d08fa5a39dd4fdddfa907bb92b1362356

Sorry, just noticed there's another comment to address. Working on it.

Comment by Yuchen Pei [ 2022-12-02 ]

nayuta-yanagisawa
Addressed both comments, updated commit at:

https://github.com/MariaDB/server/commit/ff19638d863a137acc76ec089d495d8afe3eef20

Comment by Nayuta Yanagisawa (Inactive) [ 2022-12-05 ]

OK to push but please hold on until the latest development branch is created.

Generated at Thu Feb 08 10:01:25 UTC 2024 using Jira 8.20.16#820016-sha1:9d11dbea5f4be3d4cc21f03a88dd11d8c8687422.