transactd 3.0.0 → 3.1.0

data/source/bzs/db/engine/mysql/database.cpp

@@ -1,5 +1,5 @@
 /* =================================================================
- Copyright (C) 2012 2013 BizStation Corp All rights reserved.
+ Copyright (C) 2012-2016 BizStation Corp All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -43,7 +43,7 @@ namespace mysql
 using namespace std;
 
 #define KEYLEN_ALLCOPY 0
-#define OPEN_TABLE_TIMEOUT_SEC 2
+
 
 #if (MODE_READ_ONLY != TD_OPEN_READONLY)
 #error "MODE_READ_ONLY != TD_OPEN_READONLY"
@@ -269,12 +269,26 @@ unsigned char* database::getUserSha1Passwd(const char* host, const char* user,
     return retPtr;
 }
 
+bool setGrant(THD* thd, const char* host, const char* user,  const char* db)
+{
+    return (acl_getroot(cp_security_ctx(thd), cp_strdup(user, MYF(0)),
+		cp_strdup(host, MYF(0)), cp_strdup(host, MYF(0)), (char*)db)) == false;
+}
 
+bool copyGrant(THD* thd, THD* thdSrc, const char* db)
+{
+    Security_context* sctx = cp_security_ctx(thdSrc);
+	if (sctx->cp_master_accsess() == (ulong)~NO_ACCESS)
+    {
+        cp_security_ctx(thd)->skip_grants();
+        return true;
+    }
+	return setGrant(thd, sctx->cp_priv_host(), sctx->cp_priv_user(), db);
+}
 // true ok false fail
 bool database::setGrant(const char* host, const char* user)
 {
-	bool ret = (acl_getroot(cp_security_ctx(m_thd), cp_strdup(user, MYF(0)),
-		cp_strdup(host, MYF(0)), cp_strdup(host, MYF(0)), (char*)m_dbname.c_str())) == false;
+	bool ret = mysql::setGrant(m_thd, host, user, m_dbname.c_str());
     if (ret)
         check_access(m_thd, SELECT_ACL, m_dbname.c_str(), &m_privilege, NULL, false, true);
                 
@@ -317,23 +331,23 @@ void database::use() const
 
 void database::prebuildIsoratinMode()
 {
-    cp_thd_set_read_only(m_thd, m_inSnapshot != 0);
-    if (m_inTransaction)
-    {
-        m_thd->tx_isolation = m_iso;
-        m_thd->in_lock_tables = 1;// WITH LOCK
-    }
-    else if(m_inSnapshot)
+    if (m_thd->lock == 0)
     {
-        if (m_iso)
-        {
-            m_thd->in_lock_tables = 1;// WITH LOCK
+        cp_thd_set_read_only(m_thd, m_inSnapshot != 0);
+        if (m_inTransaction)
             m_thd->tx_isolation = m_iso;
-        }else
-            m_thd->tx_isolation = ISO_REPEATABLE_READ;
+        else if(m_inSnapshot)
+        {
+            if (m_iso)
+                m_thd->tx_isolation = m_iso;
+            else
+                m_thd->tx_isolation = ISO_REPEATABLE_READ;
+        }
+        else
+            m_thd->tx_isolation = (enum_tx_isolation)m_thd->variables.tx_isolation;
     }
-    else
-        m_thd->tx_isolation = (enum_tx_isolation)m_thd->variables.tx_isolation;
+    if (m_inTransaction || (m_inSnapshot && m_iso))
+        m_thd->in_lock_tables = 1;// WITH LOCK
 }
 
 void database::prebuildExclusieLockMode(table* tb)
@@ -499,9 +513,7 @@ table* database::useTable(int index, enum_sql_command cmd, rowLockMode* lck)
 
     checkACL(cmd);
     prebuildLocktype(tb, cmd, lck);
-    
-    if (m_thd->lock == 0)
-        prebuildIsoratinMode();
+    prebuildIsoratinMode();
 
     if (tb->isExclusveMode())
         prebuildExclusieLockMode(tb);
@@ -630,6 +642,7 @@ bool database::beginTrn(short type, enum_tx_isolation iso)
         THROW_BZS_ERROR_WITH_CODEMSG(STATUS_ALREADY_INSNAPSHOT, "Snapshot is already beginning.");        
     
     bool ret = false;
+    m_stat = STATUS_SUCCESS;
     if (m_inTransaction == 0)
     {
         m_trnType = type;
@@ -656,6 +669,7 @@ bool database::beginTrn(short type, enum_tx_isolation iso)
 
 bool database::commitTrn()
 {
+    m_stat = STATUS_SUCCESS;
     if (m_inTransaction > 0)
     {
         --m_inTransaction;
@@ -667,6 +681,7 @@ bool database::commitTrn()
 
 bool database::abortTrn()
 {
+    m_stat = STATUS_SUCCESS;
     if (m_inTransaction > 0)
     {
         --m_inTransaction;
@@ -676,12 +691,77 @@ bool database::abortTrn()
     return (m_inTransaction == 0);
 }
 
-bool database::beginSnapshot(enum_tx_isolation iso)
+void database::useAllTables()
+{
+    for (int i = 0; i < (int)m_tables.size(); ++i)
+    {
+        if (m_tables[i])
+            useTable(i, SQLCOM_SELECT, NULL);
+    }
+}
+
+// See USE_BINLOG_GTID and USE_BINLOG_VAR in mysqlInternal.h
+#ifdef NOTUSE_BINLOG_VAR 
+    // Windows MySQL can not use mysql_bin_log variable
+    inline short getBinlogPos(THD* currentThd, binlogPos* bpos)
+    {
+        short result = 0;
+        THD* thd = createThdForThread();
+        attachThd(thd);
+        copyGrant(thd, currentThd, NULL);
+        masterStatus p(thd, bpos); 
+        cp_query_command(thd, "show master status");
+        if (thd->is_error())
+            result = thd->cp_get_sql_error();
+        deleteThdForThread(thd);
+        attachThd(currentThd);
+        return result;
+    }
+#endif
+
+#ifdef USE_BINLOG_GTID
+inline short getBinlogPos(THD* currentThd, binlogPos* bpos)
+{
+    if (mysql_bin_log.is_open())
+    {
+        rpl_gtid gtid;
+        bpos->type = REPL_POSTYPE_MARIA_GTID;
+        if (mysql_bin_log.lookup_domain_in_binlog_state(currentThd->variables.gtid_domain_id,  &gtid))
+        {
+            sprintf_s(bpos->gtid, GTID_SIZE, "%u-%u-%llu", gtid.domain_id, gtid.server_id, gtid.seq_no); 
+            size_t dir_len = dirname_length(mysql_bin_log.get_log_fname());
+			strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
+			bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
+			bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
+        }
+    }
+    return 0;
+}
+#endif
+
+#ifdef USE_BINLOG_VAR
+    // Linux MySQL can access to the mysql_bin_log variable
+    inline short getBinlogPos(THD* , binlogPos* bpos)
+    {
+        if (mysql_bin_log.is_open())
+        {
+			size_t dir_len = dirname_length(mysql_bin_log.get_log_fname());
+			strncpy(bpos->filename, mysql_bin_log.get_log_fname() + dir_len, BINLOGNAME_SIZE);
+			bpos->pos = my_b_tell(mysql_bin_log.get_log_file());
+			bpos->filename[BINLOGNAME_SIZE-1] = 0x00;
+            bpos->type = REPL_POSTYPE_POS;
+        }
+        return 0;
+    }
+#endif //USE_BINLOG_VAR
+
+bool database::beginSnapshot(enum_tx_isolation iso, binlogPos* bpos)
 {
     if (m_inTransaction)
         THROW_BZS_ERROR_WITH_CODEMSG(STATUS_ALREADY_INTRANSACTION, "Transaction is already beginning.");        
-
+    
     bool ret = false;
+    m_stat = STATUS_SUCCESS;
     if (m_inSnapshot == 0)
     {
         m_iso = iso;
@@ -690,11 +770,27 @@ bool database::beginSnapshot(enum_tx_isolation iso)
         ret = true;
     }
     ++m_inSnapshot;
+    if (m_inSnapshot==1)
+    {
+        if (bpos)
+        {
+            safe_commit_lock commit(m_thd);
+            if (!commit.lock()) return false;
+            #ifndef NOTUSE_BINLOG_VAR
+            safe_mysql_mutex_lock lck(mysql_bin_log.get_log_lock());
+            #endif
+            m_stat = getBinlogPos(m_thd, bpos);
+            if (m_stat) return false;
+            useAllTables(); // execute scope in safe_commit_lock  
+        }else
+            useAllTables();
+    }  
     return ret;
 }
 
 bool database::endSnapshot()
 {
+    m_stat = STATUS_SUCCESS;
     if (m_inSnapshot > 0)
     {
         --m_inSnapshot;
@@ -822,6 +918,8 @@ int tableUseCount(const std::vector<boost::shared_ptr<table> >& tables,
 
 void database::closeTable(table* tb)
 {
+    if (m_inSnapshot)
+        THROW_BZS_ERROR_WITH_CODEMSG(STATUS_ALREADY_INSNAPSHOT, "Snapshot is already beginning."); 
     for (int i = (int)m_tables.size() - 1; i >= 0; i--)
     {
         if (m_tables[i] && (m_tables[i].get() == tb))
@@ -882,14 +980,16 @@ void database::closeForReopen()
     m_usingExclusive = 0;
 }
 
-void database::reopen()
+void database::reopen(bool forceReadonly)
 {
     for (size_t i = 0; i < m_tables.size(); i++)
     {
         if (m_tables[i] && (m_tables[i]->m_table == NULL))
         {
+            if (forceReadonly)
+                m_tables[i]->m_mode = TD_OPEN_READONLY;
             TABLE* table = doOpenTable(m_tables[i]->m_name.c_str(),
-                                       m_tables[i]->m_mode, NULL);
+                                        m_tables[i]->m_mode, NULL);
             if (table)
                 m_tables[i]->resetInternalTable(table);
             else
@@ -1050,6 +1150,7 @@ void table::resetInternalTable(TABLE* table)
         m_changed = false;
         m_validCursor = false;
         m_nounlock = false;
+        m_keyconv.setKey(m_table->key_info);
     }
 }
 
@@ -2325,7 +2426,7 @@ __int64 table::insert(bool ncc)
         /* Do not change to m_changed = false */
         m_changed = true;
     }
-    m_nounlock = setCursorStaus();
+    m_nounlock = setCursorStaus(true);
     return autoincValue;
 }
 
@@ -2426,7 +2527,7 @@ void table::update(bool ncc)
                 ++m_updCount;
                 m_changed = true;
             }
-            m_nounlock = setCursorStaus();
+            m_nounlock = setCursorStaus(true);
         }
     }
 }
@@ -2515,8 +2616,9 @@ void table::endBulkInsert()
 {
     if (m_bulkInserting)
     {
-        key_copy(&m_keybuf[0], m_table->record[0], &m_table->key_info[(int)m_keyNum],
-                 KEYLEN_ALLCOPY);
+		if (m_keyNum >= 0 && m_keyNum < (char)m_table->s->keys)
+			key_copy(&m_keybuf[0], m_table->record[0], &m_table->key_info[(int)m_keyNum],
+					KEYLEN_ALLCOPY);
         m_bulkInserting = false;
         m_table->file->ha_release_auto_increment();
         m_table->file->ha_end_bulk_insert();

data/source/bzs/db/engine/mysql/database.h

@@ -1,7 +1,7 @@
 #ifndef BZS_DB_ENGINE_MYSQL_DATABASE_H
 #define BZS_DB_ENGINE_MYSQL_DATABASE_H
 /* =================================================================
- Copyright (C) 2012 2013 BizStation Corp All rights reserved.
+ Copyright (C) 2012-2016 BizStation Corp All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -69,7 +69,7 @@ namespace mysql
 #define MODE_EXCLUSIVE -4
 #define MODE_READ_EXCLUSIVE -6
 
-
+#define OPEN_TABLE_TIMEOUT_SEC 2
 /** bookmark size
  *  btreive API is MAX 4 byte
  */
@@ -133,6 +133,7 @@ private:
     void changeIntentionLock(table* tb, thr_lock_type lock_type);
     void checkACL(enum_sql_command cmd);
     void releaseTable(size_t index);
+    void useAllTables();
 public:
     
 
@@ -165,7 +166,7 @@ public:
         return m_tables;
     }
 
-    bool beginSnapshot(enum_tx_isolation iso);
+    bool beginSnapshot(enum_tx_isolation iso, struct binlogPos* bpos);
     bool endSnapshot();
     table* openTable(const std::string& name, short mode,
                      const char* ownerName);
@@ -178,7 +179,7 @@ public:
     void closeTable(table* tb);
     void unUseTables(bool rollback);
     void closeForReopen();
-    void reopen();
+    void reopen(bool forceReadonly = false);
     void cleanTable();
 
     inline bool canUnlockRow() const
@@ -332,11 +333,12 @@ class table : private boost::noncopyable
     void setKeyValues(const uchar* ptr, int size);
     void setBlobFieldPointer(const bzs::db::blobHeader* hd);
     
-    inline bool setCursorStaus()
+    inline bool setCursorStaus(bool noCount = false)
     {
         if (m_stat == 0)
         {
-            ++m_readCount;
+            if (!noCount)
+                ++m_readCount;
             m_validCursor = true;
             m_cursor = true;
         }else

data/source/bzs/db/engine/mysql/dbManager.cpp

@@ -1,5 +1,5 @@
 /* =================================================================
- Copyright (C) 2012 2013 BizStation Corp All rights reserved.
+ Copyright (C) 2012 2013 2016 BizStation Corp All rights reserved.
 
  This program is free software; you can redistribute it and/or
  modify it under the terms of the GNU General Public License
@@ -32,6 +32,8 @@ namespace engine
 namespace mysql
 {
 
+#define STATUS_ALREADY_INSNAPSHOT       204
+#define STATUS_ALREADY_INTRANSACTION    205
 
 class smartDbsReopen
 {
@@ -44,8 +46,12 @@ public:
     {
         for (size_t i = 0; i < m_dbs.size(); i++)
         {
-            if (m_dbs[i])
+            if (m_dbs[i] && m_dbs[i]->thd() == m_thd)
             {
+                if (m_dbs[i]->inSnapshot())
+                    THROW_BZS_ERROR_WITH_CODEMSG(STATUS_ALREADY_INSNAPSHOT, "Allready in snapshot.");
+                else if (m_dbs[i]->inTransaction())
+                    THROW_BZS_ERROR_WITH_CODEMSG(STATUS_ALREADY_INTRANSACTION, "Allready in transaction.");
                 m_dbs[i]->use();
                 m_dbs[i]->unUseTables(false);
                 m_dbs[i]->closeForReopen();
@@ -58,7 +64,7 @@ public:
     {
         for (size_t i = 0; i < m_dbs.size(); i++)
         {
-            if (m_dbs[i])
+            if (m_dbs[i] && m_dbs[i]->thd() == m_thd)
             {
                 if (removeName != m_dbs[i]->name())
                 {
@@ -222,11 +228,9 @@ int dbManager::addHandle(int dbid, int tableid, int assignid)
 int dbManager::ddl_execSql(THD* thd, const std::string& sql_stmt)
 {
     smartDbsReopen reopen(thd, m_dbs);
-
+    thd->variables.lock_wait_timeout = OPEN_TABLE_TIMEOUT_SEC;
     thd->clear_error();
 	int result = cp_query_command(thd, (char*)sql_stmt.c_str());
-    //if (!thd->cp_isOk())
-    //    result = 1;
     if (thd->is_error())
         result = errorCode(thd->cp_get_sql_error());
     cp_lex_clear(thd); // reset values for insert
@@ -240,18 +244,32 @@ int dbManager::ddl_createDataBase(THD* thd, const std::string& dbname)
 }
 
 int dbManager::ddl_dropDataBase(THD* thd, const std::string& dbname,
-                                const std::string& dbSqlname)
+                                const std::string& dbSqlname, short cid)
 {
     std::string cmd = "drop database `" + dbSqlname + "`";
     smartDbsReopen::removeName = dbname;
     int ret = ddl_execSql(thd, cmd);
     smartDbsReopen::removeName = "";
     boost::mutex::scoped_lock lck(m_mutex);
-    for (int i = (int)m_dbs.size() - 1; i >= 0; i--)
-    {
-        if (m_dbs[i] && (m_dbs[i]->name() == dbname))
-            m_dbs.erase(m_dbs.begin() + i);
-    }
+	if (ret == 0)
+	{
+		int index = -1;
+		for (int i = (int)m_dbs.size() - 1; i >= 0; i--)
+		{
+			if (m_dbs[i] != NULL && (m_dbs[i]->clientID() == cid))
+			{
+				index = i;
+		        break;
+		    }
+		}
+		if (index != -1)
+		{
+			m_dbs[index].reset();
+			for (int i = (int)m_handles.size() - 1; i >= 0; i--)
+			if (m_handles[i].db == index)
+				m_handles.erase(m_handles.begin() + i);
+		}
+	}
     return ret;
 }
 

data/source/bzs/db/engine/mysql/dbManager.h

@@ -76,7 +76,7 @@ protected:
     int ddl_execSql(THD* thd, const std::string& sql_stmt);
     int ddl_createDataBase(THD* thd, const std::string& dbname);
     int ddl_dropDataBase(THD* thd, const std::string& dbname,
-                         const std::string& dbSqlname);
+		const std::string& dbSqlname, short cid);
     int ddl_useDataBase(THD* thd, const std::string& dbSqlname);
     int ddl_dropTable(database* db, const std::string& tbname,
                       const std::string& sqldbname,