Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
tapir
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Ashlie Martinez
tapir
Commits
c2644a95
Commit
c2644a95
authored
9 years ago
by
Irene Y Zhang
Browse files
Options
Downloads
Patches
Plain Diff
fixing inconsistent calls by removing return
parent
c5444ac4
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
replication/ir/client.cc
+1
-1
1 addition, 1 deletion
replication/ir/client.cc
store/tapirstore/shardclient.cc
+2
-2
2 additions, 2 deletions
store/tapirstore/shardclient.cc
with
3 additions
and
3 deletions
replication/ir/client.cc
+
1
−
1
View file @
c2644a95
...
@@ -331,7 +331,7 @@ IRClient::HandleInconsistentReply(const TransportAddress &remote,
...
@@ -331,7 +331,7 @@ IRClient::HandleInconsistentReply(const TransportAddress &remote,
}
// don't use the confirmation timeout for async replies
}
// don't use the confirmation timeout for async replies
// Return to client
// Return to client
req
->
continuation
(
req
->
request
,
""
);
req
->
continuation
(
req
->
request
);
delete
req
;
delete
req
;
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
store/tapirstore/shardclient.cc
+
2
−
2
View file @
c2644a95
...
@@ -312,7 +312,7 @@ ShardClient::PrepareCallback(const string &request_str, const string &reply_str)
...
@@ -312,7 +312,7 @@ ShardClient::PrepareCallback(const string &request_str, const string &reply_str)
/* Callback from a shard replica on commit operation completion. */
/* Callback from a shard replica on commit operation completion. */
void
void
ShardClient
::
CommitCallback
(
const
string
&
request_str
,
const
string
&
reply_str
)
ShardClient
::
CommitCallback
(
const
string
&
request_str
)
{
{
// COMMITs always succeed.
// COMMITs always succeed.
Reply
reply
;
Reply
reply
;
...
@@ -332,7 +332,7 @@ ShardClient::CommitCallback(const string &request_str, const string &reply_str)
...
@@ -332,7 +332,7 @@ ShardClient::CommitCallback(const string &request_str, const string &reply_str)
/* Callback from a shard replica on abort operation completion. */
/* Callback from a shard replica on abort operation completion. */
void
void
ShardClient
::
AbortCallback
(
const
string
&
request_str
,
const
string
&
reply_str
)
ShardClient
::
AbortCallback
(
const
string
&
request_str
)
{
{
// ABORTs always succeed.
// ABORTs always succeed.
Reply
reply
;
Reply
reply
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment