transactd 3.1.0 → 3.2.0

data/source/bzs/db/protocol/tdap/tdapcapi.h

@@ -185,6 +185,11 @@ typedef void(__STDCALL* WIN_TPOOL_SHUTDOWN_PTR)();
  */
 #define TD_ASBLOB_ENDROW                -125
 
+/** TD_GET_SCHEMA  sub operations
+ */
+#define SC_SUBOP_BY_SQL                 -1
+#define SC_SUBOP_VIEW_BY_SQL            -2
+
 /** TD_GET_STASTISTICS sub operations
  */
 #define TD_STSTCS_READ                  0
@@ -193,6 +198,10 @@ typedef void(__STDCALL* WIN_TPOOL_SHUTDOWN_PTR)();
 #define TD_STSTCS_DATABASE_LIST         3
 #define TD_STSTCS_SYSTEM_VARIABLES      4
 #define TD_STSTCS_SCHEMA_TABLE_LIST     5
+#define TD_STSTCS_TABLE_LIST            6
+#define TD_STSTCS_VIEW_LIST             7
+#define TD_STSTCS_SLAVE_STATUS          8
+
 /** connect sub operation
  */
 
@@ -201,6 +210,14 @@ typedef void(__STDCALL* WIN_TPOOL_SHUTDOWN_PTR)();
 #define LG_SUBOP_NEWCONNECT             3
 #define LG_SUBOP_RECONNECT              4 
 #define LG_SUBOP_DISCONNECT_EX          5 //for reconnect test
+#define LG_SUBOP_ASSOCIATE              6 
+
+/** TD_STSTCS_TABLE_LIST type list
+*/
+#define TABLE_TYPE_NORMAL_TABLE         1
+#define TABLE_TYPE_VIEW                 2
+#define TABLE_TYPE_TD_SCHEMA            4
+
 
 /** TIMESTAMP_MODE
 */
@@ -455,6 +472,7 @@ enum combineType
 #define STATUS_LMIT_OF_PREPAREED        203
 #define STATUS_ALREADY_INSNAPSHOT       204
 #define STATUS_ALREADY_INTRANSACTION    205
+#define STATUS_ALREADY_INEXCLUSIVE      206
 #define SERVER_CLIENT_NOT_COMPATIBLE    3003
 #define NET_BAD_SRB_FORMAT              3021
 #define ERROR_TD_HOSTNAME_NOT_FOUND     3103
@@ -478,6 +496,8 @@ inline bool canRecoverNetError(short code)
 #define TRANSACTD_SCHEMANAME            _T("transactd_schema")
 #define TYPE_SCHEMA_BDF                 0
 #define TYPE_SCHEMA_DDF                 1
+#define TYPE_SCHEMA_BDF_NOPRELOAD       2
+
 
 #define FILTER_CURRENT_TYPE_NOTINC      0
 #define FILTER_CURRENT_TYPE_INC         1
@@ -593,7 +613,7 @@ struct handshale_t
  If you change this version then you need change The ($TargetName) project options too.
  */
 #define C_INTERFACE_VER_MAJOR "3"//##1 Build marker! Don't remove
-#define C_INTERFACE_VER_MINOR "1"//##2 Build marker! Don't remove
+#define C_INTERFACE_VER_MINOR "2"//##2 Build marker! Don't remove
 #define C_INTERFACE_VER_RELEASE "0"//##3 Build marker! Don't remove
 
 /* dnamic load library name.
@@ -657,7 +677,7 @@ struct handshale_t
  */
 
 #define CPP_INTERFACE_VER_MAJOR "3"//##4 Build marker! Don't remove
-#define CPP_INTERFACE_VER_MINOR "1"//##5 Build marker! Don't remove
+#define CPP_INTERFACE_VER_MINOR "2"//##5 Build marker! Don't remove
 #define CPP_INTERFACE_VER_RELEASE "0"//##6 Build marker! Don't remove
 
 /* use autolink tdclcpp */
@@ -694,7 +714,7 @@ struct handshale_t
 
 
 #define TRANSACTD_VER_MAJOR 3//##7 Build marker! Don't remove
-#define TRANSACTD_VER_MINOR 1//##8 Build marker! Don't remove
+#define TRANSACTD_VER_MINOR 2//##8 Build marker! Don't remove
 #define TRANSACTD_VER_RELEASE 0//##9 Build marker! Don't remove
 
 #endif // BZS_DB_PROTOCOL_TDAP_TDAPCAPI_H

data/source/bzs/db/protocol/tdap/uri.h

@@ -130,6 +130,8 @@ inline const _TCHAR* dbname(const _TCHAR* uri, _TCHAR* buf, size_t size)
             {
                 _tcsncpy_s(buf, size, st, en - st);
                 buf[en - st] = 0x00;
+                int n = (int)(en - st -1);
+                if (n >= 0 && buf[n] == '/') buf[n] = 0x00;
             }
         }
     }
@@ -185,6 +187,27 @@ inline const _TCHAR* passwd(const _TCHAR* uri, _TCHAR* buf, size_t size)
     return buf;
 }
 
+
+{
+    _TCHAR pwd[MAX_PATH];
+    passwd(uri, pwd, MAX_PATH);
+
+    buf[0] = 0x00;
+    const _TCHAR* st = _tcsstr(uri, _T("://"));
+    if (st)
+    {
+        st = _tcsstr(st + 3, _T("/"));
+        _tcsncpy_s(buf, size, uri, ++st - uri);
+        buf[st - uri] = 0x00;
+        if (pwd[0])
+        {
+            _tcscat_s(buf, MAX_PATH, _T("?pwd="));
+            _tcscat_s(buf, MAX_PATH, pwd);
+        }
+
+    }
+    return buf;
+}
 
 inline _TCHAR* stripParam(const _TCHAR* uri, _TCHAR* buf, size_t size)
 {
@@ -239,6 +262,23 @@ inline const _TCHAR* stripAuth(const _TCHAR* uri, _TCHAR* buf, size_t size)
     return buf;
 }
 
+inline const _TCHAR* appendAuth(const _TCHAR* uri, const _TCHAR* user, const _TCHAR* passwd,
+                                    _TCHAR* buf, size_t size)
+{
+    memset(buf, 0, size);
+    if (_tcslen(uri) + _tcslen(user) + _tcslen(passwd) + _tcslen(_T("@&pwd=")) > size -1)
+        return buf;
+
+    const  _TCHAR* st = _tcsstr(uri, _T("://"));
+    _tcsncpy_s(buf, size, uri, st + 3 - uri);
+    _tcscat_s(buf, size, user);
+    _tcscat_s(buf, size, _T("@"));
+    _tcscat_s(buf, size, st+3);
+    _tcscat_s(buf, size, _T("&pwd="));
+    _tcscat_s(buf, size, passwd);
+    return buf;
+}
+
 inline void reorder_digest(boost::uuids::detail::sha1::digest_type val)
 {
     for (int i=0;i<5;++i)

data/source/bzs/db/transactd/appModule.cpp

@@ -305,7 +305,7 @@ public:
  */
 module::module(const boost::asio::ip::tcp::endpoint& endpoint,
                iconnection* connection, bool tpool, int type)
-    : m_endpoint(endpoint), m_connection(connection), m_useThreadPool(tpool)
+    : m_endpoint(endpoint), m_connection(connection), m_useThreadPool(tpool), m_skipGrants(false)
 {
     if (type & PROTOCOL_TYPE_BTRV)
         m_commandExecuter.reset(new protocol::tdap::mysql::commandExecuter(this));
@@ -325,10 +325,12 @@ module::module(const boost::asio::ip::tcp::endpoint& endpoint,
 
 module::~module(void)
 {
-    boost::mutex::scoped_lock lck(modulesMutex);
-    modules.erase(find(modules.begin(), modules.end(), this));
-    delete m_nw;
-    m_commandExecuter.reset();
+    {
+        boost::mutex::scoped_lock lck(modulesMutex);
+        modules.erase(find(modules.begin(), modules.end(), this));
+        delete m_nw;
+        m_commandExecuter.reset();
+    }
     if (m_useThreadPool == false)
     {
         my_thread_end();
@@ -434,6 +436,13 @@ bool module::checkHost(const char* hostCheckname, /*out*/char* hostName, int siz
             p = "localhost";
         strcpy(hostName, p);
     }
+    if (ret)
+    {
+        if (hostCheckname && hostCheckname[0])
+            setUser(hostCheckname);
+        if (hostName && hostName[0])
+            setHost(hostName);
+    }
     return ret;
 }
 

data/source/bzs/db/transactd/appModule.h

@@ -41,13 +41,17 @@ namespace transactd
 class module : public netsvc::server::IAppModule, private boost::noncopyable
 {
     friend class connManager;
+    friend class dbExecuter;
     boost::shared_ptr<protocol::ICommandExecuter> m_commandExecuter;
     const boost::asio::ip::tcp::endpoint m_endpoint;
     bzs::netsvc::server::iconnection* m_connection;
     const char* m_readBuf;
     size_t m_readSize;
     netsvc::server::netWriter* m_nw;
+    std::string m_user;
+    std::string m_host;
     bool m_useThreadPool;
+    bool m_skipGrants;
     bool perseLineEnd(const char* p, size_t size) const;
     size_t onRead(const char* data, size_t size, bool& complete);
     size_t onAccept(char* message, size_t bufsize);
@@ -62,8 +66,13 @@ public:
     bool isShutDown() { return m_commandExecuter->isShutDown(); }
     bool checkHost(const char* hostCheckname, /*out*/char* hostName, int size);
     void disconnect();
+    const char* user() const {return m_user.c_str();}
+    const char* host() const {return m_host.c_str();}
+    void setUser(const char* v) { m_user = v;}
+    void setHost(const char* v) { m_host = v;}
+    void skipGrants(bool v) {m_skipGrants = v;}
+    bool isSkipGrants() const {return m_skipGrants;}
 };
-
 } // namespace transactd
 } // namespace db
 } // namespace bzs

data/source/bzs/db/transactd/connManager.cpp

@@ -21,12 +21,17 @@
 #include <bzs/db/protocol/tdap/mysql/tdapCommandExecuter.h>
 #include "connManager.h"
 #include <bzs/db/engine/mysql/mysqlThd.h>
+#include <bzs/db/engine/mysql/mysqlProtocol.h>
 #include <bzs/db/protocol/tdap/mysql/databaseSchema.h>
 #include <bzs/db/engine/mysql/errorMessage.h>
 
+
 /* implemnts in transactd.cpp */
 extern const char* get_trd_sys_var(int index);
 
+
+extern int getSlaveStatus(THD* thd, bzs::db::transactd::connection::records& recs);
+
 namespace bzs
 {
 using namespace netsvc::server;
@@ -89,38 +94,38 @@ void connManager::getDatabaseList(igetDatabases* dbm, const module* mod) const
             m_records.push_back(connection::record());
             connection::record& rec = m_records[m_records.size() - 1];
             rec.conId = (unsigned __int64)mod;
-            rec.cid = db->clientID();
-            rec.dbid = (unsigned short)j;
+            rec.id = db->clientID();
+            rec.db = (unsigned short)j;
             rec.status = 0;
             rec.inTransaction = db->inTransaction();
             rec.inSnapshot = db->inSnapshot();
             if (rec.inTransaction)
             {
                 if (db->transactionIsolation() == ISO_REPEATABLE_READ)
-                    rec.trnType = MULTILOCK_GAP;
+                    rec.type = MULTILOCK_GAP;
                 else if (db->transactionIsolation() == ISO_READ_COMMITTED)
                 {
                     if (db->transactionType() == TRN_RECORD_LOCK_SINGLE)
-                        rec.trnType = SINGLELOCK_NOGAP;
+                        rec.type = SINGLELOCK_NOGAP;
                     else
-                        rec.trnType = MULTILOCK_NOGAP;
+                        rec.type = MULTILOCK_NOGAP;
                 }
             }
             if (rec.inSnapshot)
             {
                 if (db->transactionIsolation() == 0)
-                    rec.trnType = CONSISTENT_READ;
+                    rec.type = CONSISTENT_READ;
                 else if (db->transactionIsolation() == ISO_REPEATABLE_READ)
-                    rec.trnType = MULTILOCK_GAP_SHARE;
+                    rec.type = MULTILOCK_GAP_SHARE;
                 else if (db->transactionIsolation() == ISO_READ_COMMITTED)
-                    rec.trnType = MULTILOCK_NOGAP_SHARE;
+                    rec.type = MULTILOCK_NOGAP_SHARE;
             }
             strncpy_s(rec.name, 64, dbs[j]->name().c_str(), 64);
         }
     }
 }
 
-const connManager::records& connManager::getRecords(unsigned __int64 conid,
+const connection::records& connManager::getRecords(unsigned __int64 conid,
                                                     int dbid) const
 {
     //Lock module count
@@ -159,8 +164,7 @@ const connManager::records& connManager::getRecords(unsigned __int64 conid,
                             m_records.push_back(connection::record());
                             connection::record& rec =
                                 m_records[m_records.size() - 1];
-                            rec.conId = (unsigned __int64)mod;
-                            rec.cid = tb->id();
+                            rec.id = tb->id();
                             rec.readCount = tb->readCount();
                             rec.updCount = tb->updCount();
                             rec.delCount = tb->delCount();
@@ -180,7 +184,7 @@ const connManager::records& connManager::getRecords(unsigned __int64 conid,
     return m_records;
 }
 
-const connManager::records& connManager::systemVariables() const
+const connection::records& connManager::systemVariables() const
 {
     m_records.clear();
     for (int i = 0 ; i < TD_VAR_SIZE; ++i)
@@ -190,7 +194,7 @@ const connManager::records& connManager::systemVariables() const
         {
             m_records.push_back(connection::record());
             connection::record& rec = m_records[m_records.size() - 1];
-            rec.value_id = i;
+            rec.id = i;
             switch(i)
             {
             case TD_VER_DB:
@@ -214,41 +218,20 @@ const connManager::records& connManager::systemVariables() const
     return m_records;
 }
 
-inline void appenDbList(connManager::records& recs, LEX_STRING* db_name)
-{
-    recs.push_back(connection::record());
-    connection::record& rec = recs[recs.size() - 1];
-    strncpy(rec.name, db_name->str, 64);
-    rec.name[64] = 0x00;
-}
-
-const connManager::records& connManager::getDefinedDatabaseList() const
+const connection::records& connManager::definedDatabases() const
 {
     m_records.clear();
-    THD* thd = createThdForThread();
     try
     {
-        if (thd)
+        boost::shared_ptr<THD> thd(createThdForThread(), deleteThdForThread);
+        if (thd != NULL)
         {
-            cp_security_ctx(thd)->skip_grants();
-            SQL_Strings files;
-            db_list(thd, &files);
-#if (defined(MARIADDB_10_0) || defined(MARIADDB_10_1))
-            for (int i = 0; i < (int)files.elements(); ++i)
-                appenDbList(m_records, files.at(i));
-#else
-            List_iterator_fast<LEX_STRING> it(files);
-            LEX_STRING* db_name;
-            while ((db_name = it++))
-                appenDbList(m_records, db_name);
-#endif
-            deleteThdForThread(thd);
+            cp_security_ctx(thd.get())->skip_grants();
+            readDbList(thd.get(), m_records);
         }
     }
     catch (bzs::rtl::exception& e)
     {
-        if (thd)
-            deleteThdForThread(thd);
         const int* code = getCode(e);
         if (code)
             m_stat = *code;
@@ -261,17 +244,12 @@ const connManager::records& connManager::getDefinedDatabaseList() const
     }
     catch (...)
     {
-        try
-        {
-            m_stat = 20001;
-            deleteThdForThread(thd);
-        }
-        catch(...){}
+        m_stat = 20001;
     }
     return m_records;
 }
 
-const connManager::records& connManager::schemaTableList(const char* dbname)
+const connection::records& connManager::getTableList(const char* dbname, int type) const
 {
     try
     {    
@@ -282,13 +260,14 @@ const connManager::records& connManager::schemaTableList(const char* dbname)
             if (db)
             {
                 std::vector<std::string> tablelist;
-                schemaBuilder::listSchemaTable(db.get(), tablelist);
+                schemaBuilder::listTable(db.get(), tablelist, type);
                 for (int i = 0; i < (int)tablelist.size(); ++i)
                 {
                     m_records.push_back(connection::record());
                     connection::record& rec = m_records[m_records.size() - 1];
                     strncpy(rec.name, tablelist[i].c_str(), 64);
                     rec.name[64] = 0x00;
+                    rec.type = (short)type;
                 }
             }
         }
@@ -312,6 +291,64 @@ const connManager::records& connManager::schemaTableList(const char* dbname)
     return m_records;
 }
 
+const connection::records& connManager::definedTables(const char* dbname, int type) const
+{
+    return getTableList(dbname, type);
+}
+
+const connection::records& connManager::schemaTables(const char* dbname) const
+{
+    return getTableList(dbname, TABLE_TYPE_TD_SCHEMA);
+}
+
+bool connManager::checkGlobalACL(THD* thd, ulong wantAccess) const
+{
+    const module* mod = reinterpret_cast<const module*>(m_me);
+    if (mod->isSkipGrants())
+        cp_security_ctx(thd)->skip_grants();
+    else
+        ::setGrant(thd, mod->host(), mod->user(),  NULL);
+	bool ret = (cp_masterAccess(thd) & wantAccess) != 0;
+    if (!ret)
+        m_stat = STATUS_ACCESS_DENIED;
+    return ret;
+}
+
+const connection::records& connManager::readSlaveStatus() const
+{
+    m_records.clear();
+    try
+    {
+        boost::shared_ptr<THD> thd(createThdForThread(), deleteThdForThread);
+        if (thd == NULL) 
+        {
+            m_stat = 20001;
+            return m_records;
+        }
+        if (!checkGlobalACL(thd.get(), SUPER_ACL | REPL_CLIENT_ACL))
+            return m_records;
+
+        m_stat = errorCode(getSlaveStatus(thd.get(), m_records));
+    }
+    catch (bzs::rtl::exception& e)
+    {
+        const int* code = getCode(e);
+        if (code)
+            m_stat = *code;
+        else
+        {
+            m_stat = 20000;
+            sql_print_error("%s", boost::diagnostic_information(e).c_str());
+        }
+        printWarningMessage(code, getMsg(e));
+    }
+    catch (...)
+    {
+        m_stat = 20001;
+    }
+    return m_records;
+}
+
 void connManager::doDisconnect(unsigned __int64 conid)
 {
     module* mod = const_cast<module*>(getMod(conid));
@@ -321,7 +358,12 @@ void connManager::doDisconnect(unsigned __int64 conid)
             dynamic_cast<igetDatabases*>(mod->m_commandExecuter.get());
         const databases& dbs = dbm->dbs();
         if (dbs.size())
-            mod->disconnect();
+        {
+            if (dbs[0]->checkAcl(SHUTDOWN_ACL))
+                mod->disconnect();
+            else
+                m_stat = STATUS_ACCESS_DENIED; 
+        }
     }
 }
 
@@ -344,12 +386,15 @@ void connManager::disconnect(unsigned __int64 conid)
 
 void connManager::doDisconnectAll()
 {
+    short stat = 0;
     for (size_t i = 0; i < modules.size(); i++)
     {
         const module* mod = dynamic_cast<module*>(modules[i]);
         if (mod && ((unsigned __int64)mod != m_me))
             doDisconnect((unsigned __int64)mod);
+        if (stat == 0) stat = m_stat;
     }
+    m_stat = stat;
 }
 
 void connManager::disconnectAll()

data/source/bzs/db/transactd/connManager.h

@@ -41,10 +41,10 @@ class module;
 class connManager
 {
 public:
-    typedef std::vector<connection::record> records;
+    
 
 private:
-    mutable records m_records;
+    mutable connection::records m_records;
     unsigned __int64 m_me;
     mutable short m_stat;
     void getConnectionList() const;
@@ -54,14 +54,17 @@ private:
                 bzs::db::engine::mysql::igetDatabases* dbm, int dbid) const;
     void doDisconnect(unsigned __int64 conid);
     void doDisconnectAll();
-
+    const connection::records& getTableList(const char* dbname, int type) const;
+    bool checkGlobalACL(THD* thd, ulong wantAccess) const;
 public:
     connManager(unsigned __int64 me) : m_me(me), m_stat(0){};
     virtual ~connManager();
-    const connManager::records& systemVariables() const;
-    const records& getRecords(unsigned __int64 conid, int dbid) const;
-    const records& getDefinedDatabaseList() const;
-    const records& schemaTableList(const char* dbname);
+    const connection::records& systemVariables() const;
+    const connection::records& getRecords(unsigned __int64 conid, int dbid) const;
+    const connection::records& definedDatabases() const;
+    const connection::records& schemaTables(const char* dbname) const;
+    const connection::records& definedTables(const char* dbname, int type) const;
+    const connection::records& readSlaveStatus() const;
     void disconnect(unsigned __int64 conid);
     void disconnectAll();
     short stat() const {return m_stat;}