This is an automated email from the ASF dual-hosted git repository. laiyingchun pushed a commit to branch branch-1.17.x in repository https://gitbox.apache.org/repos/asf/kudu.git
commit 9f90e2389767459b27ba6c6554d36cef35143eeb Author: Alexey Serbin <[email protected]> AuthorDate: Tue Apr 18 16:49:27 2023 -0700 [client] fix API non-compliance in KuduUpsertIgnore Kudu C++ client API is still assumed to be C++98 compatible. That's an invariant that has been in place in the very beginning of 1.x version history, so it should be kept as-is unless changing the major version. Prior to this patch, client_examples-test.sh would fail while checking a standalone compilation of kudu/client/write_op.h This is a follow-up to ec3a9f75b6924a70ecbf08e3805228ad9b92b9f0. Change-Id: I83f4e65bc3811ac701f5908beb480b39ad413641 Reviewed-on: http://gerrit.cloudera.org:8080/19765 Reviewed-by: Abhishek Chennaka <[email protected]> Tested-by: Alexey Serbin <[email protected]> Reviewed-on: http://gerrit.cloudera.org:8080/19922 Tested-by: Kudu Jenkins Reviewed-by: Yingchun Lai <[email protected]> Reviewed-by: Alexey Serbin <[email protected]> --- src/kudu/client/write_op.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kudu/client/write_op.h b/src/kudu/client/write_op.h index ea30d8a12..32cfa5b55 100644 --- a/src/kudu/client/write_op.h +++ b/src/kudu/client/write_op.h @@ -222,16 +222,16 @@ class KUDU_EXPORT KuduUpsert : public KuduWriteOperation { /// See KuduUpsert for more details. class KUDU_EXPORT KuduUpsertIgnore : public KuduWriteOperation { public: - ~KuduUpsertIgnore() override; + ~KuduUpsertIgnore() OVERRIDE; /// @copydoc KuduWriteOperation::ToString() - std::string ToString() const override { return "UPSERT IGNORE " + row_.ToString(); } + std::string ToString() const OVERRIDE { return "UPSERT IGNORE " + row_.ToString(); } protected: /// @cond PROTECTED_MEMBERS_DOCUMENTED /// @copydoc KuduWriteOperation::type() - Type type() const override { + Type type() const OVERRIDE { return UPSERT_IGNORE; }
