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.

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

feat: support cmake for benchmark_client, binlog_sender, manifest_generator, rdb_to_pika, txt_to_pika, pika_to_txt, pika_port #1451

Merged
merged 25 commits into from
May 10, 2023

Conversation

A2ureStone
Copy link
Contributor

@A2ureStone A2ureStone commented May 6, 2023

fix #1341

@lqxhub
Copy link
Collaborator

lqxhub commented May 9, 2023

我觉得还是不把pika-tools下相关的编译 不放到 主的CMakeList里好点, pika-tools下有一个CmakeList, 把所有的工具都编译出来
全放到主的CmakeList里, 一是拖慢编译速度, 二是很多人用不到这些工具, 编译意义不大, 如果需要自行去pika-tools目录下编译就好了

@wanghenshui
Copy link
Collaborator

我觉得还是不把pika-tools下相关的编译 不放到 主的CMakeList里好点, pika-tools下有一个CmakeList, 把所有的工具都编译出来 全放到主的CmakeList里, 一是拖慢编译速度, 二是很多人用不到这些工具, 编译意义不大, 如果需要自行去pika-tools目录下编译就好了

加个BUILD_TOOLS 默认关就行了

@AlexStocks
Copy link
Contributor

@A2ureStone 我觉的在 pika 工程喜爱,有个 pika-tools 的目录,太别扭,信息冗余,改名叫 tools 就行,是吧?你要是觉得我的 idea 好,就顺便把目录改为 tools 吧?

@A2ureStone
Copy link
Contributor Author

@AlexStocks 流水线对pika-tools这个路径有依赖, 需要改一下。

build.sh tools

上面的命令让流水线可以检测tools的编译, 也需要改一下

@A2ureStone A2ureStone changed the title build: support cmake for benchmark_client, binlog_sender, manifest_generator, rdb_to_pika build: support cmake for benchmark_client, binlog_sender, manifest_generator, rdb_to_pika, txt_to_pika, pika_to_txt, pika_port May 9, 2023
virtual std::shared_ptr<net::NetConn> NewNetConn(int connfd, const std::string& ip_port, net::Thread* thread,
void* worker_specific_data,
net::NetMultiplexer* net_mpx = nullptr) const override {
return std::static_pointer_cast<net::NetConn>(std::make_shared<MasterConn>(connfd, ip_port, binlog_receiver_));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AlexStocks 这里需要看一下, NewNetConn改了接口, 这个子类override也要改对应的接口

// We append the master ip port after module name
// To make sure only data from current master is received
int rsync_port = g_conf.local_port + 3000;
int ret = slash::StartRsync(dbsync_path, kDBSyncModule + "_" + ip_port, lip, rsync_port);
int ret = pstd::StartRsync(dbsync_path, kDBSyncModule + "_" + ip_port, lip, rsync_port, g_conf.passwd);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AlexStocks StartRsync新增加了password的密码, 没理解错的话应该是rsync目标的密码, 这里是传数据到master, 用了g_conf.passwd

@wanghenshui
Copy link
Collaborator

你改目录要把流水线的目录一块改了 流水线配置在.github/workflow里

@AlexStocks
Copy link
Contributor

AlexStocks commented May 10, 2023

你改目录要把流水线的目录一块改了 流水线配置在.github/workflow里

@A2ureStone 修改下这俩文件

https://github.com/OpenAtomFoundation/pika/blob/unstable/.github/workflows/operator.yml

https://github.com/OpenAtomFoundation/pika/blob/unstable/.github/workflows/pika_exporter.yml

@AlexStocks AlexStocks merged commit 193e478 into OpenAtomFoundation:unstable May 10, 2023
ForestLH pushed a commit to ForestLH/pika that referenced this pull request May 10, 2023
…nerator, rdb_to_pika, txt_to_pika, pika_to_txt, pika_port (OpenAtomFoundation#1451)

* update README in aof_to_pika

* edit compile commands in aof_to_pika README

* support cmake for binlog_sender

* support cmake for manifest_generator

* support cmake for benchmark_client

* support cmake for rdb_to_pika

* deprecate nemo_to_blackwidow tools

* delete makefile in tools that support cmake

* add button to control compilation of pika-tools

* add build.sh parameter to control compilation

* rename pika-tools to tools

* rename pika-tools in CMakeLists.txt

* use pip to install rdb-tools

* resolve name conflict in cmake after renaming pika-tools to tools

* support cmake for txt_to_pika and pika_to_txt

* remove support for pika_port_2

* support cmake for pika_port_3

* remove redundant makefile

* change workflow working directory

* check tools compile in workflow

---------

Co-authored-by: J1senn <[email protected]>
@yaoyinnan yaoyinnan changed the title build: support cmake for benchmark_client, binlog_sender, manifest_generator, rdb_to_pika, txt_to_pika, pika_to_txt, pika_port feat: support cmake for benchmark_client, binlog_sender, manifest_generator, rdb_to_pika, txt_to_pika, pika_to_txt, pika_port Jul 25, 2023
bigdaronlee163 pushed a commit to bigdaronlee163/pika that referenced this pull request Jun 8, 2024
…nerator, rdb_to_pika, txt_to_pika, pika_to_txt, pika_port (OpenAtomFoundation#1451)

* update README in aof_to_pika

* edit compile commands in aof_to_pika README

* support cmake for binlog_sender

* support cmake for manifest_generator

* support cmake for benchmark_client

* support cmake for rdb_to_pika

* deprecate nemo_to_blackwidow tools

* delete makefile in tools that support cmake

* add button to control compilation of pika-tools

* add build.sh parameter to control compilation

* rename pika-tools to tools

* rename pika-tools in CMakeLists.txt

* use pip to install rdb-tools

* resolve name conflict in cmake after renaming pika-tools to tools

* support cmake for txt_to_pika and pika_to_txt

* remove support for pika_port_2

* support cmake for pika_port_3

* remove redundant makefile

* change workflow working directory

* check tools compile in workflow

---------

Co-authored-by: J1senn <[email protected]>
cheniujh pushed a commit to cheniujh/pika that referenced this pull request Sep 24, 2024
…nerator, rdb_to_pika, txt_to_pika, pika_to_txt, pika_port (OpenAtomFoundation#1451)

* update README in aof_to_pika

* edit compile commands in aof_to_pika README

* support cmake for binlog_sender

* support cmake for manifest_generator

* support cmake for benchmark_client

* support cmake for rdb_to_pika

* deprecate nemo_to_blackwidow tools

* delete makefile in tools that support cmake

* add button to control compilation of pika-tools

* add build.sh parameter to control compilation

* rename pika-tools to tools

* rename pika-tools in CMakeLists.txt

* use pip to install rdb-tools

* resolve name conflict in cmake after renaming pika-tools to tools

* support cmake for txt_to_pika and pika_to_txt

* remove support for pika_port_2

* support cmake for pika_port_3

* remove redundant makefile

* change workflow working directory

* check tools compile in workflow

---------

Co-authored-by: J1senn <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

build pika-tools
5 participants