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

fix: build failure on clang9 #711

Merged
merged 4 commits into from
Apr 2, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/geo/lib/geo_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@ void geo_client::async_del(const std::string &hash_key,
del_count->fetch_sub(1);
}
if (del_count->load() == 0) {
cb(PERR_OK, std::move(pegasus_client::internal_info()));
cb(PERR_OK, pegasus_client::internal_info());
return;
}

Expand Down
4 changes: 4 additions & 0 deletions src/redis_protocol/proxy_lib/redis_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,17 @@ class rrdb_client;
}
}

class proxy_test;

namespace pegasus {
namespace proxy {

// http://redis.io/topics/protocol
class redis_parser : public proxy_session
{
protected:
friend class ::proxy_test;

struct redis_base_type
{
virtual ~redis_base_type() = default;
Expand Down
2 changes: 2 additions & 0 deletions src/server/capacity_unit_calculator.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ class capacity_unit_calculator : public dsn::replication::replica_base
std::shared_ptr<hotkey_collector> read_hotkey_collector,
std::shared_ptr<hotkey_collector> write_hotkey_collector);

virtual ~capacity_unit_calculator() = default;

void add_get_cu(int32_t status, const dsn::blob &key, const dsn::blob &value);
void add_multi_get_cu(int32_t status,
const dsn::blob &hash_key,
Expand Down
2 changes: 2 additions & 0 deletions src/server/hotkey_collector.h
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ class internal_collector_base : public dsn::replication::replica_base
{
public:
explicit internal_collector_base(replica_base *base) : replica_base(base){};
virtual ~internal_collector_base() = default;

virtual void capture_data(const dsn::blob &hash_key, uint64_t weight) = 0;
virtual void analyse_data(detect_hotkey_result &result) = 0;
virtual void clear() = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/server/pegasus_server_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1539,7 +1539,7 @@ ::dsn::error_code pegasus_server_impl::start(int argc, char **argv)
_update_server_rdb_stat = ::dsn::tasking::enqueue_timer(
LPC_REPLICATION_LONG_COMMON,
nullptr, // TODO: the tracker is nullptr, we will fix it later
[this]() { update_server_rocksdb_statistics(); },
[]() { update_server_rocksdb_statistics(); },
kServerStatUpdateTimeSec);
});

Expand Down
2 changes: 1 addition & 1 deletion src/shell/command_utils.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
namespace dsn {
class rpc_address;
}
class shell_context;
struct shell_context;

inline bool validate_cmd(const argh::parser &cmd,
const std::set<std::string> &params,
Expand Down
2 changes: 0 additions & 2 deletions src/test/bench_test/statistics.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ class statistics
private:
uint32_t report_step(uint64_t current_report) const;

// thread id which controls this statistics
int _tid;
// the start time of benchmark
uint64_t _start;
// the stop time of benchmark
Expand Down