transactd 1.2.0 → 2.0.0

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

@@ -1,29 +1,29 @@
-/*=================================================================
-   Copyright (C) 2012 2013 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
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
-   02111-1307, USA.
-=================================================================*/
-#ifndef DBMANAGER_H
-#define DBMANAGER_H
+#ifndef BZS_DB_ENGINE_MYSQL_DBMANAGER_H
+#define BZS_DB_ENGINE_MYSQL_DBMANAGER_H
+/* =================================================================
+ Copyright (C) 2012 2013 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
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ ================================================================= */
 
 #include <boost/thread/mutex.hpp>
 #include <bzs/db/engine/mysql/database.h>
 
 /* dbManager original error code */
-#define DBM_ERROR_TABLE_USED HA_ERR_LAST + 1 
+#define DBM_ERROR_TABLE_USED HA_ERR_LAST + 1
 
 namespace bzs
 {
@@ -36,108 +36,119 @@ namespace mysql
 
 struct handle
 {
-	handle(int i, short d, short t):id(i),db(d),tb(t),cid(0){};
-	int id;
-	short db;
-	short tb;
-	short cid;
+    handle(int i, short d, short t) : id(i), db(d), tb(t), cid(0){};
+
+    int id;
+    short db;
+    short tb;
+    short cid;
 };
 
 class smartDbsReopen
 {
-	std::vector<boost::shared_ptr<database> >& m_dbs;
-	
-public:
-	static std::string removeName;
-
-	smartDbsReopen(std::vector<boost::shared_ptr<database> >& dbs)
-		:m_dbs(dbs)
-	{
-		for (size_t i=0;i<m_dbs.size();i++)
-		{
-			if (m_dbs[i])
-			{
-				m_dbs[i]->use();
-				m_dbs[i]->unUseTables(false);
-				m_dbs[i]->closeForReopen();
-			}
-		}
-	}
-
-	~smartDbsReopen()
-	{
-		for (size_t i=0;i<m_dbs.size();i++)
-		{
-			if (m_dbs[i])
-			{
-				if (removeName != m_dbs[i]->name())
-				{
-					m_dbs[i]->use();
-					m_dbs[i]->reopen();
-				}
-			}
-		}
-	}
+    std::vector<boost::shared_ptr<database> >& m_dbs;
 
+public:
+    static std::string removeName;
+
+    smartDbsReopen(std::vector<boost::shared_ptr<database> >& dbs) : m_dbs(dbs)
+    {
+        for (size_t i = 0; i < m_dbs.size(); i++)
+        {
+            if (m_dbs[i])
+            {
+                m_dbs[i]->use();
+                m_dbs[i]->unUseTables(false);
+                m_dbs[i]->closeForReopen();
+            }
+        }
+    }
+
+    ~smartDbsReopen()
+    {
+        for (size_t i = 0; i < m_dbs.size(); i++)
+        {
+            if (m_dbs[i])
+            {
+                if (removeName != m_dbs[i]->name())
+                {
+                    m_dbs[i]->use();
+                    m_dbs[i]->reopen();
+                }
+            }
+        }
+    }
 };
 
 class dbManager;
 
 class dbManager
 {
-	mutable boost::mutex m_mutex;
-	int m_autoHandle;
+    mutable boost::mutex m_mutex;
+
+    int m_autoHandle;
+
 protected:
-	mutable databases m_dbs;
-	mutable std::vector<handle> m_handles;
-	table* m_tb;
-
-	database* createDatabase(const char* dbname, short cid)const;
-	void releaseDatabse(short cid);
-	handle* getHandle(int handle)const;
-	database* getDatabase(const char* dbname, short cid) const ;
-	database* getDatabaseCid(short cid) const ;
-	int getDatabaseID(short cid) const ;
-	table* getTable(int handle, enum_sql_command cmd=SQLCOM_SELECT)const;
-	void checkNewHandle(int newHandle)const;
-	int addHandle(int dbid, int tableid, int assignid=-1);
-	database* useDataBase(int id) const;
-	int closeCacheTable(database* db, const std::string& tbname);
-	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 );
-	int ddl_useDataBase(THD* thd,  const std::string& dbSqlname);
-	int ddl_dropTable(database* db, const std::string& tbname,  const std::string& sqldbname 
-					,  const std::string& sqltbname);
-	int ddl_renameTable(database* db, const std::string& oldName, const std::string& dbSqlName 
-				    , const std::string& oldSqlName, const std::string& newSqlName);
-	int ddl_replaceTable(database* db , const std::string& name1, const std::string& name2
-					, const std::string& dbSqlName, const std::string& nameSql1, const std::string& nameSql2);
-	std::string makeSQLChangeTableComment(const std::string& dbSqlName
-					, const std::string& tableSqlName, const char* comment);
-	std::string makeSQLDropIndex(const std::string& dbSqlName, const std::string& tbSqlName
-					, const char* name);
-	void clenupNoException();
-	virtual int errorCode(int ha_error)=0;
+    mutable databases m_dbs;
+
+    mutable std::vector<handle> m_handles;
+
+    table* m_tb;
+
+    database* createDatabase(const char* dbname, short cid) const;
+    void releaseDatabase(short cid);
+    handle* getHandle(int handle) const;
+    database* getDatabase(const char* dbname, short cid) const;
+    database* getDatabaseCid(short cid) const;
+    int getDatabaseID(short cid) const;
+    table* getTable(int handle, enum_sql_command cmd = SQLCOM_SELECT) const;
+    void checkNewHandle(int newHandle) const;
+    int addHandle(int dbid, int tableid, int assignid = -1);
+    database* useDataBase(int id) const;
+    int closeCacheTable(database* db, const std::string& tbname);
+    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);
+    int ddl_useDataBase(THD* thd, const std::string& dbSqlname);
+    int ddl_dropTable(database* db, const std::string& tbname,
+                      const std::string& sqldbname,
+                      const std::string& sqltbname);
+    int ddl_renameTable(database* db, const std::string& oldName,
+                        const std::string& dbSqlName,
+                        const std::string& oldSqlName,
+                        const std::string& newSqlName);
+    int ddl_replaceTable(database* db, const std::string& name1,
+                         const std::string& name2, const std::string& dbSqlName,
+                         const std::string& nameSql1,
+                         const std::string& nameSql2);
+    std::string makeSQLChangeTableComment(const std::string& dbSqlName,
+                                          const std::string& tableSqlName,
+                                          const char* comment);
+    std::string makeSQLDropIndex(const std::string& dbSqlName,
+                                 const std::string& tbSqlName,
+                                 const char* name);
+    void clenupNoException();
+    virtual int errorCode(int ha_error) = 0;
+
 public:
-	dbManager();
-	virtual ~dbManager();
-	bool isShutDown() const;
-	const databases& dbs()const{return m_dbs;};
+    dbManager();
+    virtual ~dbManager();
+    bool isShutDown() const;
 
+    const databases& dbs() const { return m_dbs; };
 };
 
 class igetDatabases
 {
 public:
-	virtual ~igetDatabases(){};
-	virtual const engine::mysql::databases& dbs() const = 0;
+    virtual ~igetDatabases(){};
+    virtual const engine::mysql::databases& dbs() const = 0;
 };
 
-}//namespace mysql
-}//namespace engine
-}//namespace db
-}//namespace bzs
-
+} // namespace mysql
+} // namespace engine
+} // namespace db
+} // namespace bzs
 
-#endif //DBMANAGER_H
+#endif // BZS_DB_ENGINE_MYSQL_DBMANAGER_H

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

@@ -1,23 +1,24 @@
-/*=================================================================
-   Copyright (C) 2012 2013 BizStation Corp All rights reserved.
+/* =================================================================
+ Copyright (C) 2012 2013 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
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
-   02111-1307, USA.
-=================================================================*/
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ ================================================================= */
 
 #include "errorMessage.h"
+#undef PACKAGE
 #include "mysqlInternal.h"
 #include <bzs/db/protocol/tdap/tdapcapi.h>
 
@@ -32,44 +33,42 @@ namespace mysql
 
 const char* errorMessage(int errorCode)
 {
-	switch(errorCode)
-	{
-	case STATUS_PROGRAM_ERROR:
-		return "Program error";
-	case STATUS_CANNOT_LOCK_TABLE:
-		return "Can not open the table Allrady locked";
-	case STATUS_TABLE_NOTOPEN:
-		return "Can not open the table";
-	case STATUS_INVALID_KEYNAME:
-		return "Invalid key name";
-	case HA_ERR_KEY_NOT_FOUND:
-		return "Did not find key on read or update";
-	case STATUS_INVALID_LOCKTYPE:
-		return "locktype is diffarent to got locks";
-	case STATUS_INVALID_DATASIZE:
-		return "Invalid data buffer size";
-	case STATUS_TABLE_EXISTS_ERROR:
-		return "Can not check if exists table";
-	}
-	return "";
+    switch (errorCode)
+    {
+    case STATUS_PROGRAM_ERROR:
+        return "Program error";
+    case STATUS_CANNOT_LOCK_TABLE:
+        return "Can not open the table Allrady locked";
+    case STATUS_TABLE_NOTOPEN:
+        return "Can not open the table";
+    case STATUS_INVALID_KEYNAME:
+        return "Invalid key name";
+    case HA_ERR_KEY_NOT_FOUND:
+        return "Did not find key on read or update";
+    case STATUS_INVALID_LOCKTYPE:
+        return "locktype is diffarent to got locks";
+    case STATUS_INVALID_DATASIZE:
+        return "Invalid data buffer size";
+    case STATUS_TABLE_EXISTS_ERROR:
+        return "Can not check if exists table";
+    }
+    return "";
 }
 
 void printErrorMessage(const int* errorCode, const std::string* message)
 {
-	int code = errorCode? *errorCode : 0;
-	std::string msg = errorMessage(code); 
-	if (message)
-		msg += " :" + *message;
-	
-	if ((code != STATUS_TABLE_NOTOPEN) && (code != STATUS_INVALID_BOOKMARK))
-	{
-		sql_print_error("%s", msg.c_str());
-	}
-}
-	
+    int code = errorCode ? *errorCode : 0;
+    std::string msg = errorMessage(code);
+    if (message)
+        msg += " :" + *message;
 
-}//namespace mysql
-}//namespace engine
-}//namespace db
-}//namespace bzs
+    if ((code != STATUS_TABLE_NOTOPEN) && (code != STATUS_INVALID_BOOKMARK))
+    {
+        sql_print_error("%s", msg.c_str());
+    }
+}
 
+} // namespace mysql
+} // namespace engine
+} // namespace db
+} // namespace bzs

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

@@ -1,23 +1,23 @@
-#ifndef ERRORMESSAGE_H
-#define ERRORMESSAGE_H
-/*=================================================================
-   Copyright (C) 2012 2013 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
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
-   02111-1307, USA.
-=================================================================*/
+#ifndef BZS_DB_ENGINE_MYSQL_ERRORMESSAGE_H
+#define BZS_DB_ENGINE_MYSQL_ERRORMESSAGE_H
+/* =================================================================
+ Copyright (C) 2012 2013 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
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ ================================================================= */
 
 #include <string>
 #include <bzs/rtl/exception.h>
@@ -33,11 +33,10 @@ namespace mysql
 
 const char* errorMessage(int errorCode);
 void printErrorMessage(const int* errorCode, const std::string* msg);
-	
-}//namespace mysql
-}//namespace engine
-}//namespace db
-}//namespace bzs
 
-#endif //ERRORMESSAGE_H
+} // namespace mysql
+} // namespace engine
+} // namespace db
+} // namespace bzs
 
+#endif // BZS_DB_ENGINE_MYSQL_ERRORMESSAGE_H

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

@@ -1,27 +1,25 @@
-#ifndef FIELDACCESS_H
-#define FIELDACCESS_H
-/*=================================================================
-   Copyright (C) 2013 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
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software 
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  
-   02111-1307, USA.
-=================================================================*/
+#ifndef BZS_DB_ENGINE_MYSQL_FIELDACCESS_H
+#define BZS_DB_ENGINE_MYSQL_FIELDACCESS_H
+/* =================================================================
+ Copyright (C) 2013 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
+ as published by the Free Software Foundation; either version 2
+ of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ 02111-1307, USA.
+ ================================================================= */
 #include "mysqlInternal.h"
 
-
-
 namespace bzs
 {
 namespace db
@@ -31,128 +29,124 @@ namespace engine
 namespace mysql
 {
 
-//-----------------------------------------------------------------------------
-/** 
+/**
  *	var or bolob type sub functions;
  */
-//-----------------------------------------------------------------------------
 inline uint var_bytes(Field* fd)
 {
-	return (uint)HA_VARCHAR_PACKLENGTH(fd->field_length);
+    return (uint)HA_VARCHAR_PACKLENGTH(fd->field_length);
 }
 
 /** sizeof var text body
  */
 inline uint var_strlen(const uchar* ptr, uint varlen)
 {
-	return (varlen==1)? *ptr:*((const unsigned short*)ptr);
+    return (varlen == 1) ? *ptr : *((const unsigned short*)ptr);
 }
 
 inline uint var_strlen(Field* fd)
 {
-	return var_strlen(fd->ptr, var_bytes(fd));
+    return var_strlen(fd->ptr, var_bytes(fd));
 }
 
 /** sizeof var text body + size bytes
  */
 inline uint var_total_len(Field* fd)
 {
-	uint varlen = var_bytes(fd);
-	return var_strlen(fd->ptr, varlen) + varlen;
+    uint varlen = var_bytes(fd);
+    return var_strlen(fd->ptr, varlen) + varlen;
 }
 
 inline uint var_total_len(const uchar* ptr, uint varlen)
 {
-	return var_strlen(ptr, varlen) + varlen;
+    return var_strlen(ptr, varlen) + varlen;
 }
 
-
 /** var text body length on key buffer
  *  size bytes is 2 byte fixed in key buffer.
  */
 inline uint var_strlen_key(const uchar* ptr)
 {
-	return *((const unsigned short*)ptr);
+    return *((const unsigned short*)ptr);
 }
 
 /** return Is type var type
  */
 inline bool isVarType(enum_field_types type)
 {
-	return ((type==MYSQL_TYPE_VAR_STRING) || (type==MYSQL_TYPE_VARCHAR));
+    return ((type == MYSQL_TYPE_VAR_STRING) || (type == MYSQL_TYPE_VARCHAR));
 }
+
 /** return Is type blob type
  */
 inline bool isBlobType(enum_field_types type)
 {
-	return ((type==MYSQL_TYPE_TINY_BLOB) || (type==MYSQL_TYPE_BLOB)
-			|| (type==MYSQL_TYPE_MEDIUM_BLOB) || (type==MYSQL_TYPE_LONG_BLOB));
+    return ((type == MYSQL_TYPE_TINY_BLOB) || (type == MYSQL_TYPE_BLOB) ||
+            (type == MYSQL_TYPE_MEDIUM_BLOB) || (type == MYSQL_TYPE_LONG_BLOB));
 }
 
 inline uint blob_var_bytes(Field* fd)
 {
-	return fd->pack_length() - portable_sizeof_char_ptr;
-	
+    return fd->pack_length() - portable_sizeof_char_ptr;
 }
+
 /** sizeof blob body
  */
 inline uint blob_len(const uchar* ptr, uint varlen)
 {
-	uint v = 0;
-	memcpy(&v, ptr, varlen);
-	return v;
+    uint v = 0;
+    memcpy(&v, ptr, varlen);
+    return v;
 }
 
 inline uint blob_len(Field* fd)
 {
-	return blob_len(fd->ptr, blob_var_bytes(fd));
+    return blob_len(fd->ptr, blob_var_bytes(fd));
 }
 
 /** sizeof blob body ptr + size bytes. not include blob body length
  */
 inline uint blob_total_len(Field* fd)
 {
-	return sizeof(char*) + blob_var_bytes(fd);
+    return sizeof(char*) + blob_var_bytes(fd);
 }
 
 inline uint blob_total_len(uint varlen)
 {
-	return sizeof(char*) + varlen;
+    return sizeof(char*) + varlen;
 }
 
 inline const uchar** blobBodyPtrRef(Field* fd)
 {
-	return (const uchar**)(fd->ptr + blob_var_bytes(fd));	
+    return (const uchar**)(fd->ptr + blob_var_bytes(fd));
 }
 
 inline const uchar* blobBodyPtr(Field* fd)
 {
-	return *(blobBodyPtrRef(fd));	
+    return *(blobBodyPtrRef(fd));
 }
 
 /** return size bytes
  */
 inline uint var_bytes_if(Field* fd)
 {
-	if (isVarType(fd->type()))
-		return var_bytes(fd);
-	else if (isBlobType(fd->type()))
-		return blob_var_bytes(fd);
-	return 0;
+    if (isVarType(fd->type()))
+        return var_bytes(fd);
+    else if (isBlobType(fd->type()))
+        return blob_var_bytes(fd);
+    return 0;
 }
 
 /** Is this field name NIS?
  */
-inline bool isNisField(const char* name) 
+inline bool isNisField(const char* name)
 {
-	return (name[0] && (name[0] == '$')
-		 && name[1] && (name[1] == 'n')
-		 && name[2] && (name[2] == 'f'));
+    return (name[0] && (name[0] == '$') && name[1] && (name[1] == 'n') &&
+            name[2] && (name[2] == 'f'));
 }
 
-}//namespace mysql
-}//namespace engine
-}//namespace db
-}//namespace bzs
-#endif
-
+} // namespace mysql
+} // namespace engine
+} // namespace db
+} // namespace bzs
+#endif // BZS_DB_ENGINE_MYSQL_FIELDACCESS_H