lib/wsrep-lib
1
0
Fork 0
mirror of https://github.com/codership/wsrep-lib.git synced 2025-07-30 07:23:07 +03:00
Code Activity

Define undefined id and gtid as const static member variables.

Browse Source 
Use default seqno and id constructors in default gtid ctor
instead of calls to static undefined to initialize.
This commit is contained in:
Teemu Ollakka
2019-01-18 23:57:24 +02:00
parent 55f6c63328
commit aeb5990642
4 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/wsrep/gtid.hpp
View File

@ -31,8 +31,8 @@ namespace wsrep
{ {
public: public:
gtid() gtid()
: id_(wsrep::id::undefined()) : id_()
, seqno_(wsrep::seqno::undefined()) , seqno_()
{ } { }
gtid(const wsrep::id& id, wsrep::seqno seqno) gtid(const wsrep::id& id, wsrep::seqno seqno)
: id_(id) : id_(id)
@ -44,13 +44,12 @@ namespace wsrep
{ {
return (seqno_.is_undefined() && id_.is_undefined()); return (seqno_.is_undefined() && id_.is_undefined());
} }
static wsrep::gtid undefined() static const wsrep::gtid& undefined()
{ {
static const wsrep::gtid ret(wsrep::id::undefined(), return undefined_;
wsrep::seqno::undefined());
return ret;
} }
private: private:
static const wsrep::gtid undefined_;
wsrep::id id_; wsrep::id id_;
wsrep::seqno seqno_; wsrep::seqno seqno_;
}; };

4
include/wsrep/id.hpp
View File

@ -90,10 +90,10 @@ namespace wsrep
static const wsrep::id& undefined() static const wsrep::id& undefined()
{ {
static wsrep::id ret = wsrep::id(); return undefined_;
return ret;
} }
private: private:
static const wsrep::id undefined_;
unsigned char data_[16]; unsigned char data_[16];
}; };

2
src/gtid.cpp
View File

@ -23,6 +23,8 @@
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
const wsrep::gtid wsrep::gtid::undefined_ = wsrep::gtid();
std::ostream& wsrep::operator<<(std::ostream& os, const wsrep::gtid& gtid) std::ostream& wsrep::operator<<(std::ostream& os, const wsrep::gtid& gtid)
{ {
return (os << gtid.id() << ":" << gtid.seqno()); return (os << gtid.id() << ":" << gtid.seqno());

2
src/id.cpp
View File

@ -24,6 +24,8 @@
#include <sstream> #include <sstream>
#include <algorithm> #include <algorithm>
const wsrep::id wsrep::id::undefined_ = wsrep::id();
wsrep::id::id(const std::string& str) wsrep::id::id(const std::string& str)
: data_() : data_()
{ {