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

Step 1: Switched to use third-party v3 #3407

Closed
wants to merge 8 commits into from
Closed

Step 1: Switched to use third-party v3 #3407

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
88788e1
Switched to use third-party v3
sherman-the-tank Oct 1, 2021
bd965bb
Fix an unintialized error
sherman-the-tank Dec 22, 2021
fcb3016
Try to fix build issue on centos7 + gcc9.3.0
sherman-the-tank Dec 22, 2021
2cabbb2
Only allow empty functions on a single line
sherman-the-tank Dec 22, 2021
3ab4f4d
Fixed lint errors
sherman-the-tank Dec 23, 2021
f4d04b0
Minor change
sherman-the-tank Dec 23, 2021
058a350
Clear the ccache
sherman-the-tank Dec 23, 2021
9606182
Try to fix "uninitialized" error
sherman-the-tank Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ AllowAllConstructorInitializersOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: All
AllowShortFunctionsOnASingleLine: Empty
AllowShortLambdasOnASingleLine: All
AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLoopsOnASingleLine: true
Expand Down
3 changes: 1 addition & 2 deletions cmake/nebula/ThirdPartyConfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ message(">>>> Configuring third party for '${PROJECT_NAME}' <<<<")
# 4. /opt/vesoft/third-party, if exists
# 5. At last, one copy will be downloaded and installed to ${CMAKE_BINARY_DIR}/third-party/install

set(NEBULA_THIRDPARTY_VERSION "2.0")
set(NEBULA_THIRDPARTY_VERSION "3.0")

if(${DISABLE_CXX11_ABI})
SET(NEBULA_THIRDPARTY_ROOT ${CMAKE_BINARY_DIR}/third-party-98/install)
Expand Down Expand Up @@ -116,7 +116,6 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L ${NEBULA_THIRDPARTY_ROO
# All thrift libraries
set(THRIFT_LIBRARIES
thriftcpp2
rocketupgrade
async
thriftprotocol
transport
Expand Down
332 changes: 167 additions & 165 deletions src/clients/meta/MetaClient.cpp
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions src/clients/meta/MetaClient.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,9 +638,13 @@ class MetaClient {

folly::Future<StatusOr<bool>> ingest(GraphSpaceID spaceId);

HostAddr getMetaLeader() { return leader_; }
HostAddr getMetaLeader() {
return leader_;
}

int64_t HeartbeatTime() { return heartbeatTime_; }
int64_t HeartbeatTime() {
return heartbeatTime_;
}

protected:
// Return true if load succeeded.
Expand Down
18 changes: 9 additions & 9 deletions src/clients/storage/InternalStorageClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ void InternalStorageClient::chainUpdateEdge(cpp2::UpdateEdgeRequest& reversedReq
VLOG(1) << "leader host: " << leader;

cpp2::ChainUpdateEdgeRequest chainReq;
chainReq.set_update_edge_request(reversedRequest);
chainReq.set_term(termOfSrc);
chainReq.update_edge_request_ref() = reversedRequest;
chainReq.term_ref() = termOfSrc;
if (optVersion) {
chainReq.set_edge_version(optVersion.value());
chainReq.edge_version_ref() = optVersion.value();
}
auto resp = getResponse(
evb,
Expand Down Expand Up @@ -120,13 +120,13 @@ cpp2::ChainAddEdgesRequest InternalStorageClient::makeChainAddReq(const cpp2::Ad
TermID termId,
folly::Optional<int64_t> ver) {
cpp2::ChainAddEdgesRequest ret;
ret.set_space_id(req.get_space_id());
ret.set_parts(req.get_parts());
ret.set_prop_names(req.get_prop_names());
ret.set_if_not_exists(req.get_if_not_exists());
ret.set_term(termId);
ret.space_id_ref() = req.get_space_id();
ret.parts_ref() = req.get_parts();
ret.prop_names_ref() = req.get_prop_names();
ret.if_not_exists_ref() = req.get_if_not_exists();
ret.term_ref() = termId;
if (ver) {
ret.set_edge_version(ver.value());
ret.edge_version_ref() = ver.value();
}
return ret;
}
Expand Down
Loading