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.

Sign up for GitHub

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

Jump to bottom

feat: add query app data_version #663

Merged
merged 4 commits into from
Dec 28, 2020
Merged

feat: add query app data_version #663

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de4a8ac
feat: add query app data_version
hycdong Dec 24, 2020
a3c08a9
update rdsn
hycdong Dec 28, 2020
4cd9039
Merge branch 'pegasus' into add_query_table_version
hycdong Dec 28, 2020
b5f20fe
Merge branch 'master' into add_query_table_version
Dec 28, 2020
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 rdsn
Open in desktop
Submodule rdsn updated 43 files
+3 −0 include/dsn/dist/replication/replication_app_base.h
+9 −0 include/dsn/http/http_server.h
+8 −1 run.sh
+1 −1 scripts/linux/clear_zk.sh
+1 −1 scripts/linux/start_zk.sh
+1 −1 scripts/linux/stop_zk.sh
+7 −31 src/block_service/block_service_manager.cpp
+1 −0 src/block_service/block_service_manager.h
+5 −6 src/block_service/test/block_service_manager_test.cpp
+0 −4 src/http/http_server_impl.h
+129 −0 src/meta/meta_http_service.cpp
+44 −0 src/meta/meta_http_service.h
+21 −8 src/meta/test/main.cpp
+102 −19 src/meta/test/meta_http_service_test.cpp
+9 −4 src/replica/bulk_load/replica_bulk_loader.cpp
+42 −0 src/replica/replica.cpp
+16 −0 src/replica/replica.h
+71 −0 src/replica/replica_http_service.cpp
+14 −0 src/replica/replica_http_service.h
+8 −4 src/replica/replica_restore.cpp
+32 −0 src/replica/replica_stub.cpp
+7 −0 src/replica/replica_stub.h
+2 −0 src/replica/storage/simple_kv/simple_kv.server.impl.h
+2 −0 src/replica/storage/simple_kv/test/simple_kv.server.impl.h
+2 −0 src/replica/test/mock_utils.h
+67 −0 src/replica/test/replica_test.cpp
+2 −0 src/runtime/security/access_controller.cpp
+3 −3 src/runtime/security/client_negotiation.cpp
+3 −2 src/runtime/security/client_negotiation.h
+1 −0 src/runtime/security/negotiation.cpp
+3 −2 src/runtime/security/negotiation.h
+9 −7 src/runtime/security/negotiation_manager.cpp
+2 −0 src/runtime/security/negotiation_utils.h
+3 −3 src/runtime/security/replica_access_controller.h
+4 −1 src/runtime/security/sasl_client_wrapper.h
+4 −5 src/runtime/security/sasl_wrapper.cpp
+5 −2 src/runtime/security/sasl_wrapper.h
+1 −1 src/runtime/security/server_negotiation.cpp
+5 −2 src/runtime/security/server_negotiation.h
+5 −15 src/runtime/test/client_negotiation_test.cpp
+14 −12 src/runtime/test/negotiation_manager_test.cpp
+6 −6 src/runtime/test/server_negotiation_test.cpp
+9 −1 thirdparty/CMakeLists.txt
2 changes: 2 additions & 0 deletions src/server/pegasus_server_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2860,5 +2860,7 @@ void pegasus_server_impl::on_detect_hotkey(const dsn::replication::detect_hotkey
collector->handle_rpc(req, resp);
}

uint32_t pegasus_server_impl::query_data_version() const { return _pegasus_data_version; }

} // namespace server
} // namespace pegasus
2 changes: 2 additions & 0 deletions src/server/pegasus_server_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,6 +339,8 @@ class pegasus_server_impl : public pegasus_read_service
void on_detect_hotkey(const dsn::replication::detect_hotkey_request &req,
dsn::replication::detect_hotkey_response &resp) override;

uint32_t query_data_version() const override;

private:
static const std::chrono::seconds kServerStatUpdateTimeSec;
static const std::string COMPRESSION_HEADER;
Expand Down