Skip to content

Commit 7a92db1

Browse files
topilskitopilski
committed
Fix build
1 parent 7261105 commit 7a92db1

File tree

5 files changed

+34
-28
lines changed

5 files changed

+34
-28
lines changed

‎src/gui/workers/load_welcome_page.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,12 @@ class HttpsClient : public common::net::IHttpClient {
5858
common::net::SocketTls* sock = static_cast<common::net::SocketTls*>(GetSocket());
5959
return sock->GetHost();
6060
}
61+
62+
common::ErrnoError SendFile(descriptor_t file_fd, size_t file_size) override {
63+
UNUSED(file_fd);
64+
UNUSED(file_size);
65+
return common::ErrnoError();
66+
}
6167
};
6268

6369
common::Error loadPageRoutine(common::http::HttpResponse* resp) {

‎src/proxy/db/dynomite/driver.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ common::Error Driver::GetCurrentDataBaseInfo(core::IDataBaseInfo** info) {
178178
void Driver::HandleBackupEvent(events::BackupRequestEvent* ev) {
179179
QObject* sender = ev->sender();
180180
NotifyProgress(sender, 0);
181-
events::BackupResponceEvent::value_type res(ev->value());
181+
events::BackupResponseEvent::value_type res(ev->value());
182182
NotifyProgress(sender, 25);
183183
core::FastoObjectCommandIPtr cmd = CreateCommandFast(GEN_CMD_STRING(REDIS_BACKUP_COMMAND), core::C_INNER);
184184
common::Error err = Execute(cmd);
@@ -191,28 +191,28 @@ void Driver::HandleBackupEvent(events::BackupRequestEvent* ev) {
191191
}
192192
}
193193
NotifyProgress(sender, 75);
194-
Reply(sender, new events::BackupResponceEvent(this, res));
194+
Reply(sender, new events::BackupResponseEvent(this, res));
195195
NotifyProgress(sender, 100);
196196
}
197197

198198
void Driver::HandleRestoreEvent(events::RestoreRequestEvent* ev) {
199199
QObject* sender = ev->sender();
200200
NotifyProgress(sender, 0);
201-
events::RestoreResponceEvent::value_type res(ev->value());
201+
events::RestoreResponseEvent::value_type res(ev->value());
202202
NotifyProgress(sender, 25);
203203
common::ErrnoError err = common::file_system::copy_file(res.path, EXPORT_DEFAULT_PATH);
204204
if (err) {
205205
res.setErrorInfo(common::make_error_from_errno(err));
206206
}
207207
NotifyProgress(sender, 75);
208-
Reply(sender, new events::RestoreResponceEvent(this, res));
208+
Reply(sender, new events::RestoreResponseEvent(this, res));
209209
NotifyProgress(sender, 100);
210210
}
211211

212212
void Driver::HandleLoadDatabaseContentEvent(events::LoadDatabaseContentRequestEvent* ev) {
213213
QObject* sender = ev->sender();
214214
NotifyProgress(sender, 0);
215-
events::LoadDatabaseContentResponceEvent::value_type res(ev->value());
215+
events::LoadDatabaseContentResponseEvent::value_type res(ev->value());
216216
const core::command_buffer_t pattern_result = core::GetKeysPattern(res.cursor_in, res.pattern, res.keys_count);
217217
core::FastoObjectCommandIPtr cmd = CreateCommandFast(pattern_result, core::C_INNER);
218218
NotifyProgress(sender, 50);
@@ -305,14 +305,14 @@ void Driver::HandleLoadDatabaseContentEvent(events::LoadDatabaseContentRequestEv
305305
}
306306
done:
307307
NotifyProgress(sender, 75);
308-
Reply(sender, new events::LoadDatabaseContentResponceEvent(this, res));
308+
Reply(sender, new events::LoadDatabaseContentResponseEvent(this, res));
309309
NotifyProgress(sender, 100);
310310
}
311311

312312
void Driver::HandleLoadServerPropertyEvent(events::ServerPropertyInfoRequestEvent* ev) {
313313
QObject* sender = ev->sender();
314314
NotifyProgress(sender, 0);
315-
events::ServerPropertyInfoResponceEvent::value_type res(ev->value());
315+
events::ServerPropertyInfoResponseEvent::value_type res(ev->value());
316316
core::FastoObjectCommandIPtr cmd =
317317
CreateCommandFast(GEN_CMD_STRING(REDIS_GET_PROPERTY_SERVER_COMMAND), core::C_INNER);
318318
NotifyProgress(sender, 50);
@@ -332,14 +332,14 @@ void Driver::HandleLoadServerPropertyEvent(events::ServerPropertyInfoRequestEven
332332
}
333333
}
334334
NotifyProgress(sender, 75);
335-
Reply(sender, new events::ServerPropertyInfoResponceEvent(this, res));
335+
Reply(sender, new events::ServerPropertyInfoResponseEvent(this, res));
336336
NotifyProgress(sender, 100);
337337
}
338338

339339
void Driver::HandleServerPropertyChangeEvent(events::ChangeServerPropertyInfoRequestEvent* ev) {
340340
QObject* sender = ev->sender();
341341
NotifyProgress(sender, 0);
342-
events::ChangeServerPropertyInfoResponceEvent::value_type res(ev->value());
342+
events::ChangeServerPropertyInfoResponseEvent::value_type res(ev->value());
343343

344344
NotifyProgress(sender, 50);
345345
core::command_buffer_writer_t wr;
@@ -353,14 +353,14 @@ void Driver::HandleServerPropertyChangeEvent(events::ChangeServerPropertyInfoReq
353353
res.is_change = true;
354354
}
355355
NotifyProgress(sender, 75);
356-
Reply(sender, new events::ChangeServerPropertyInfoResponceEvent(this, res));
356+
Reply(sender, new events::ChangeServerPropertyInfoResponseEvent(this, res));
357357
NotifyProgress(sender, 100);
358358
}
359359

360360
void Driver::HandleLoadServerChannelsRequestEvent(events::LoadServerChannelsRequestEvent* ev) {
361361
QObject* sender = ev->sender();
362362
NotifyProgress(sender, 0);
363-
events::LoadServerChannelsResponceEvent::value_type res(ev->value());
363+
events::LoadServerChannelsResponseEvent::value_type res(ev->value());
364364

365365
NotifyProgress(sender, 50);
366366
core::command_buffer_writer_t wr;
@@ -438,7 +438,7 @@ void Driver::HandleLoadServerChannelsRequestEvent(events::LoadServerChannelsRequ
438438

439439
done:
440440
NotifyProgress(sender, 75);
441-
Reply(sender, new events::LoadServerChannelsResponceEvent(this, res));
441+
Reply(sender, new events::LoadServerChannelsResponseEvent(this, res));
442442
NotifyProgress(sender, 100);
443443
}
444444

‎src/proxy/db/dynomite/server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ IDatabaseSPtr Server::CreateDatabase(core::IDataBaseInfoSPtr info) {
6363
return IDatabaseSPtr(new redis_compatible::Database(shared_from_this(), info));
6464
}
6565

66-
void Server::HandleLoadServerInfoEvent(events::ServerInfoResponceEvent* ev) {
67-
const events_info::ServerInfoResponce v = ev->value();
66+
void Server::HandleLoadServerInfoEvent(events::ServerInfoResponseEvent* ev) {
67+
const events_info::ServerInfoResponse v = ev->value();
6868
common::Error err = v.errorInfo();
6969
if (err) {
7070
IServer::HandleLoadServerInfoEvent(ev);

‎src/proxy/db/pika/driver.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ common::Error Driver::GetCurrentDataBaseInfo(core::IDataBaseInfo** info) {
178178
void Driver::HandleBackupEvent(events::BackupRequestEvent* ev) {
179179
QObject* sender = ev->sender();
180180
NotifyProgress(sender, 0);
181-
events::BackupResponceEvent::value_type res(ev->value());
181+
events::BackupResponseEvent::value_type res(ev->value());
182182
NotifyProgress(sender, 25);
183183
core::FastoObjectCommandIPtr cmd = CreateCommandFast(GEN_CMD_STRING(REDIS_BACKUP_COMMAND), core::C_INNER);
184184
common::Error err = Execute(cmd);
@@ -191,28 +191,28 @@ void Driver::HandleBackupEvent(events::BackupRequestEvent* ev) {
191191
}
192192
}
193193
NotifyProgress(sender, 75);
194-
Reply(sender, new events::BackupResponceEvent(this, res));
194+
Reply(sender, new events::BackupResponseEvent(this, res));
195195
NotifyProgress(sender, 100);
196196
}
197197

198198
void Driver::HandleRestoreEvent(events::RestoreRequestEvent* ev) {
199199
QObject* sender = ev->sender();
200200
NotifyProgress(sender, 0);
201-
events::RestoreResponceEvent::value_type res(ev->value());
201+
events::RestoreResponseEvent::value_type res(ev->value());
202202
NotifyProgress(sender, 25);
203203
common::ErrnoError err = common::file_system::copy_file(res.path, EXPORT_DEFAULT_PATH);
204204
if (err) {
205205
res.setErrorInfo(common::make_error_from_errno(err));
206206
}
207207
NotifyProgress(sender, 75);
208-
Reply(sender, new events::RestoreResponceEvent(this, res));
208+
Reply(sender, new events::RestoreResponseEvent(this, res));
209209
NotifyProgress(sender, 100);
210210
}
211211

212212
void Driver::HandleLoadDatabaseContentEvent(events::LoadDatabaseContentRequestEvent* ev) {
213213
QObject* sender = ev->sender();
214214
NotifyProgress(sender, 0);
215-
events::LoadDatabaseContentResponceEvent::value_type res(ev->value());
215+
events::LoadDatabaseContentResponseEvent::value_type res(ev->value());
216216
const core::command_buffer_t pattern_result = core::GetKeysPattern(res.cursor_in, res.pattern, res.keys_count);
217217
core::FastoObjectCommandIPtr cmd = CreateCommandFast(pattern_result, core::C_INNER);
218218
NotifyProgress(sender, 50);
@@ -305,14 +305,14 @@ void Driver::HandleLoadDatabaseContentEvent(events::LoadDatabaseContentRequestEv
305305
}
306306
done:
307307
NotifyProgress(sender, 75);
308-
Reply(sender, new events::LoadDatabaseContentResponceEvent(this, res));
308+
Reply(sender, new events::LoadDatabaseContentResponseEvent(this, res));
309309
NotifyProgress(sender, 100);
310310
}
311311

312312
void Driver::HandleLoadServerPropertyEvent(events::ServerPropertyInfoRequestEvent* ev) {
313313
QObject* sender = ev->sender();
314314
NotifyProgress(sender, 0);
315-
events::ServerPropertyInfoResponceEvent::value_type res(ev->value());
315+
events::ServerPropertyInfoResponseEvent::value_type res(ev->value());
316316
core::FastoObjectCommandIPtr cmd =
317317
CreateCommandFast(GEN_CMD_STRING(REDIS_GET_PROPERTY_SERVER_COMMAND), core::C_INNER);
318318
NotifyProgress(sender, 50);
@@ -332,14 +332,14 @@ void Driver::HandleLoadServerPropertyEvent(events::ServerPropertyInfoRequestEven
332332
}
333333
}
334334
NotifyProgress(sender, 75);
335-
Reply(sender, new events::ServerPropertyInfoResponceEvent(this, res));
335+
Reply(sender, new events::ServerPropertyInfoResponseEvent(this, res));
336336
NotifyProgress(sender, 100);
337337
}
338338

339339
void Driver::HandleServerPropertyChangeEvent(events::ChangeServerPropertyInfoRequestEvent* ev) {
340340
QObject* sender = ev->sender();
341341
NotifyProgress(sender, 0);
342-
events::ChangeServerPropertyInfoResponceEvent::value_type res(ev->value());
342+
events::ChangeServerPropertyInfoResponseEvent::value_type res(ev->value());
343343

344344
NotifyProgress(sender, 50);
345345
core::command_buffer_writer_t wr;
@@ -353,14 +353,14 @@ void Driver::HandleServerPropertyChangeEvent(events::ChangeServerPropertyInfoReq
353353
res.is_change = true;
354354
}
355355
NotifyProgress(sender, 75);
356-
Reply(sender, new events::ChangeServerPropertyInfoResponceEvent(this, res));
356+
Reply(sender, new events::ChangeServerPropertyInfoResponseEvent(this, res));
357357
NotifyProgress(sender, 100);
358358
}
359359

360360
void Driver::HandleLoadServerChannelsRequestEvent(events::LoadServerChannelsRequestEvent* ev) {
361361
QObject* sender = ev->sender();
362362
NotifyProgress(sender, 0);
363-
events::LoadServerChannelsResponceEvent::value_type res(ev->value());
363+
events::LoadServerChannelsResponseEvent::value_type res(ev->value());
364364

365365
NotifyProgress(sender, 50);
366366
core::command_buffer_writer_t wr;
@@ -438,7 +438,7 @@ void Driver::HandleLoadServerChannelsRequestEvent(events::LoadServerChannelsRequ
438438

439439
done:
440440
NotifyProgress(sender, 75);
441-
Reply(sender, new events::LoadServerChannelsResponceEvent(this, res));
441+
Reply(sender, new events::LoadServerChannelsResponseEvent(this, res));
442442
NotifyProgress(sender, 100);
443443
}
444444

‎src/proxy/db/pika/server.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ IDatabaseSPtr Server::CreateDatabase(core::IDataBaseInfoSPtr info) {
6363
return IDatabaseSPtr(new redis_compatible::Database(shared_from_this(), info));
6464
}
6565

66-
void Server::HandleLoadServerInfoEvent(events::ServerInfoResponceEvent* ev) {
67-
const events_info::ServerInfoResponce v = ev->value();
66+
void Server::HandleLoadServerInfoEvent(events::ServerInfoResponseEvent* ev) {
67+
const events_info::ServerInfoResponse v = ev->value();
6868
common::Error err = v.errorInfo();
6969
if (err) {
7070
IServer::HandleLoadServerInfoEvent(ev);

0 commit comments

Comments
 (0)