transactd 1.2.0 → 2.0.0

data/source/bzs/db/blobStructs.h

@@ -1,5 +1,5 @@
-#ifndef	BZS_DB_BLOBSTRUCTS_H
-#define	BZS_DB_BLOBSTRUCTS_H
+#ifndef BZS_DB_BLOBSTRUCTS_H
+#define BZS_DB_BLOBSTRUCTS_H
 /*=================================================================
    Copyright (C) 2013 BizStation Corp All rights reserved.
 
@@ -21,12 +21,12 @@
 #include <bzs/env/compiler.h>
 
 namespace bzs
-{	
+{
 namespace db
 {
 
-#pragma option -a-
-pragma_pack1
+#pragma pack(push, 1)
+pragma_pack1;
 
 /** bolob buffer field
  *  size byte is allways 4byte.
@@ -34,52 +34,52 @@ pragma_pack1
  */
 struct blobField
 {
-	unsigned int size;
-	unsigned short fieldNum;
-	inline const char* data()const{return (const char*)(this+1);}
-	inline const blobField* next()const{return (const blobField*)(data()+size+2);};
+    unsigned int size;
+    unsigned short fieldNum;
+    inline const char* data() const { return (const char*)(this + 1); }
+    inline const blobField* next() const
+    {
+        return (const blobField*)(data() + size + 2);
+    }
 };
 
 struct blob
 {
-	inline blob(unsigned int size, unsigned short fnum, const unsigned char* dataptr)
-			:ptr(dataptr)
-	{
-		bf.fieldNum = fnum;
-		bf.size = size;
-	};
-	blobField bf;
-	const unsigned char* ptr;
+    inline blob(unsigned int size, unsigned short fnum,
+                const unsigned char* dataptr)
+        : ptr(dataptr)
+    {
+        bf.fieldNum = fnum;
+        bf.size = size;
+    }
+    blobField bf;
+    const unsigned char* ptr;
 };
 
 /** blob buffer header
- * 
+ *
  */
 struct blobHeader
 {
-	unsigned short rows;
-	unsigned short fieldCount;
-	mutable unsigned short curRow;
-	mutable blobField* nextField;
+    unsigned short rows;
+    unsigned short fieldCount;
+    mutable unsigned short curRow;
+    mutable blobField* nextField;
 #ifndef __x86_64__
-	blobField*  dymmySpace32; //8byte size space for 32bit
+    blobField* dymmySpace32; // 8byte size space for 32bit
 #endif
 
-	inline void resetCur() const
-	{
-		curRow = 0; 
-		nextField = (blobField*)(this+1);
-	}
+    inline void resetCur() const
+    {
+        curRow = 0;
+        nextField = (blobField*)(this + 1);
+    }
 };
 
-#pragma option -a
-pragma_pop
-
-}//namespace db
-}//namespace bzs	
-
-#endif //BZS_DB_BLOBSTRUCTS_H
-
-
+#pragma pack(pop)
+pragma_pop;
 
+} // namespace db
+} // namespace bzs
 
+#endif // BZS_DB_BLOBSTRUCTS_H

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

@@ -1,24 +1,23 @@
-#ifndef IREADRECORDS_H
-#define IREADRECORDS_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_IREADRECORDS_H
+#define BZS_DB_ENGINE_MYSQL_IREADRECORDS_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.
+ ================================================================= */
 
 namespace bzs
 {
@@ -29,24 +28,25 @@ namespace engine
 namespace mysql
 {
 
-#define REC_MACTH			0
-#define REC_NOMACTH			1
-#define REC_NOMACTH_NOMORE  2
+#define REC_MACTH 0
+#define REC_NOMACTH 1
+#define REC_NOMACTH_NOMORE 2
 
 class IReadRecordsHandler
 {
 
 public:
-	virtual ~IReadRecordsHandler(){};
-	virtual int match(bool typeNext) const=0;
-	virtual short write(const unsigned char* bookmark, unsigned int bmlen, short stat=0)=0;
-	virtual unsigned short rejectCount() = 0;
-	virtual unsigned short maxRows() = 0;
+    virtual ~IReadRecordsHandler(){};
+    virtual int match(bool typeNext) const = 0;
+    virtual short write(const unsigned char* bookmark,
+                        unsigned int bmlen /* , short stat=0 */) = 0;
+    virtual unsigned short rejectCount() const = 0;
+    virtual unsigned short maxRows() const = 0;
 };
 
-}//namespace mysql
-}//namespace engine
-}//namespace db
-}//namespace bzs
+} // namespace mysql
+} // namespace engine
+} // namespace db
+} // namespace bzs
 
-#endif //IREADRECORDS_H
+#endif // BZS_DB_ENGINE_MYSQL_IREADRECORDS_H

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

@@ -1,35 +1,34 @@
-#ifndef BOOKMARK_H
-#define BOOKMARK_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_BOOKMARK_H
+#define BZS_DB_ENGINE_MYSQL_BOOKMARK_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 <vector>
 #include <bzs/rtl/exception.h>
 #include "mysqlInternal.h"
 
 #ifdef BOOKMARK_USE_MULTIMAP
-	#include <boost/multi_index_container.hpp>
-	#include <boost/multi_index/member.hpp>
-	#include <boost/multi_index/ordered_index.hpp>
-	using namespace boost::multi_index;
-
-#endif
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/member.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+using namespace boost::multi_index;
+#endif // BOOKMARK_USE_MULTIMAP
 
 namespace bzs
 {
@@ -41,155 +40,159 @@ namespace mysql
 {
 
 #ifdef BOOKMARK_USE_MULTIMAP
-/** The version which can reverse-refer to bookmark from raw ref using multi map 
+/** The version which can reverse-refer to bookmark from raw ref using multi map
  *  In order that this system may use a lot of memories
-    , there is a problem in which the fall of performance occurs.
+ , there is a problem in which the fall of performance occurs.
  */
 
 typedef std::vector<unsigned char> charArray;
-struct bookmark 
+
+struct bookmark
 {
-	unsigned int id;
-	charArray ref;
-	bookmark(unsigned int id, const charArray& ref):id(id), ref(ref){}
+    unsigned int id;
+    charArray ref;
 
+    bookmark(unsigned int id, const charArray& ref) : id(id), ref(ref) {}
 };
 
-struct id {};
-struct ref {};
+struct id
+{
+};
+
+struct ref
+{
+};
 
-typedef multi_index_container< bookmark,
-	indexed_by<ordered_unique<tag<id>, member<bookmark, unsigned int, &bookmark::id> >
-			  ,ordered_unique<tag<ref>, member<bookmark, charArray, &bookmark::ref> > > > bookmarkContainer;
+typedef multi_index_container<
+    bookmark,
+    indexed_by<
+        ordered_unique<tag<id>, member<bookmark, unsigned int, &bookmark::id> >,
+        ordered_unique<tag<ref>, member<bookmark, charArray,
+                                        &bookmark::ref> > > > bookmarkContainer;
 
 typedef bookmarkContainer::index<id>::type id_map;
 typedef bookmarkContainer::index<ref>::type ref_map;
 
 class bookmarks
 {
-	int m_refLen;
-	int m_lastbm;
-	bookmarkContainer m_bms;
-	charArray m_tmpRef;
-	
-public:
-	bookmarks(int refLen):m_refLen(refLen),m_tmpRef(refLen),m_lastbm(0)
-	{
-	}
-
-	/** get integer bookmark pointer by raw ref pointer
-	 */
-	const unsigned char* getBookmarkPtr(unsigned char* rawRefPtr) 
-	{
-		m_tmpRef.clear();
-		m_tmpRef.insert(m_tmpRef.end(), rawRefPtr, rawRefPtr+m_refLen);
-		ref_map& m = m_bms.get<ref>();
-		ref_map::iterator it = m.find(m_tmpRef);
-		if (it == m.end())
-		{
-			m_bms.insert(m_bms.end(), bookmark(++m_lastbm, m_tmpRef));
-			it = m.find(m_tmpRef);
-		}
-		return (const unsigned char*)&it->id;
-	}
-
-	unsigned int getBookmark(unsigned char* rawRefPtr)
-	{
-		return *((unsigned int*)getBookmarkPtr(rawRefPtr));
-	}
-	/** get raw ref pointer by integer bookmark
-	 */
-	const unsigned char* getRefByBm(unsigned int bm)
-	{
-	    id_map& m = m_bms.get<id>();
-		id_map::iterator it = m.find(bm);
-		if (it != m.end())
-			return &(it->ref[0]);
-		THROW_BZS_ERROR_WITH_CODEMSG(STATUS_INVALID_BOOKMARK ,"invalid bookmark.");
-	}
+    int m_refLen;
+    int m_lastbm;
+    bookmarkContainer m_bms;
+    charArray m_tmpRef;
 
+public:
+    bookmarks(int refLen) : m_refLen(refLen), m_tmpRef(refLen), m_lastbm(0) {}
+
+    /** get integer bookmark pointer by raw ref pointer
+     */
+    const unsigned char* getBookmarkPtr(unsigned char* rawRefPtr)
+    {
+        m_tmpRef.clear();
+        m_tmpRef.insert(m_tmpRef.end(), rawRefPtr, rawRefPtr + m_refLen);
+        ref_map& m = m_bms.get<ref>();
+        ref_map::iterator it = m.find(m_tmpRef);
+        if (it == m.end())
+        {
+            m_bms.insert(m_bms.end(), bookmark(++m_lastbm, m_tmpRef));
+            it = m.find(m_tmpRef);
+        }
+        return (const unsigned char*)&it->id;
+    }
+
+    unsigned int getBookmark(unsigned char* rawRefPtr)
+    {
+        return *((unsigned int*)getBookmarkPtr(rawRefPtr));
+    }
+
+    /** get raw ref pointer by integer bookmark
+     */
+    const unsigned char* getRefByBm(unsigned int bm)
+    {
+        id_map& m = m_bms.get<id>();
+        id_map::iterator it = m.find(bm);
+        if (it != m.end())
+            return &(it->ref[0]);
+        THROW_BZS_ERROR_WITH_CODEMSG(STATUS_INVALID_BOOKMARK,
+                                     "invalid bookmark.");
+    }
 };
-#else //BOOKMARK_USE_MULTIMAP
+#else // NOT BOOKMARK_USE_MULTIMAP
 
-/** The version which returns raw ref to bookmark in simple arrangement 
- *  The maximum memory size is specified in MAX_BOOKMARK_MEM_SIZE. 
+/** The version which returns raw ref to bookmark in simple arrangement
+ *  The maximum memory size is specified in MAX_BOOKMARK_MEM_SIZE.
  *  When the memory exceeding it is required, it is considered as an error.
  */
 
-
-
-#define MAX_BOOKMARK_MEM_SIZE 500*1024*1024  //500MB
+#define MAX_BOOKMARK_MEM_SIZE 500 * 1024 * 1024 // 500MB
 #define UNIT_OF_ALLOCCOUNT 10000
 
 class bookmarks
 {
-	size_t m_refLen;
-	size_t m_allocatedCount;
-	size_t m_usedCount;
-	unsigned char* m_ptr;
-	unsigned int m_bookmark;
-
-	void allocBuffer(size_t count)
-	{
-		if (MAX_BOOKMARK_MEM_SIZE < count*m_refLen)
-			THROW_BZS_ERROR_WITH_CODEMSG(STATUS_INVALID_BOOKMARK ,"invalid bookmark.");
-		void* tmp;
-		if (m_ptr == NULL)
-			tmp = (unsigned char*)td_malloc(count*m_refLen, 0);
-		else
-			tmp = td_realloc(m_ptr, count*m_refLen, 0);
-		if (tmp)
-			m_ptr = (unsigned char*)tmp;
-		else
-			THROW_BZS_ERROR_WITH_CODEMSG(STATUS_INVALID_BOOKMARK ,"invalid bookmark.");
-		m_allocatedCount = count;
-	}
+    size_t m_refLen;
+    size_t m_allocatedCount;
+    size_t m_usedCount;
+    unsigned char* m_ptr;
+    unsigned int m_bookmark;
+
+    void allocBuffer(size_t count)
+    {
+        if (MAX_BOOKMARK_MEM_SIZE < count * m_refLen)
+            THROW_BZS_ERROR_WITH_CODEMSG(STATUS_INVALID_BOOKMARK,
+                                         "invalid bookmark.");
+        void* tmp;
+        if (m_ptr == NULL)
+            tmp = (unsigned char*)td_malloc(count * m_refLen, 0);
+        else
+            tmp = td_realloc(m_ptr, count * m_refLen, 0);
+        if (tmp)
+            m_ptr = (unsigned char*)tmp;
+        else
+            THROW_BZS_ERROR_WITH_CODEMSG(STATUS_INVALID_BOOKMARK,
+                                         "invalid bookmark.");
+        m_allocatedCount = count;
+    }
 
 public:
-	bookmarks(size_t refLen):m_refLen(refLen),m_usedCount(0),m_ptr(NULL)
-	{
-		allocBuffer(UNIT_OF_ALLOCCOUNT);	
-	}
-	
-	~bookmarks()
-	{
-		td_free(m_ptr); 
-	}
-	
-	/** get integer bookmark pointer by raw ref pointer
-	 */
-	const unsigned char* getBookmarkPtr(unsigned char* rawRefPtr) 
-	{
-		if (m_usedCount == m_allocatedCount)
-			allocBuffer(m_usedCount+UNIT_OF_ALLOCCOUNT);
-
-		memcpy(m_ptr+m_usedCount*m_refLen, rawRefPtr, m_refLen);
-		m_bookmark = (unsigned int)(++m_usedCount);
-		return (const unsigned char*)&m_bookmark;
-	}
-	
-	unsigned int getBookmark(unsigned char* rawRefPtr)
-	{
-		return *((unsigned int*)getBookmarkPtr(rawRefPtr));
-	}
-	
-	/** get raw ref pointer by integer bookmark
-	 */
-	const unsigned char* getRefByBm(unsigned int bm)
-	{
-	    if ((0==bm) || bm > m_usedCount)
-			THROW_BZS_ERROR_WITH_CODEMSG(STATUS_INVALID_BOOKMARK ,"invalid bookmark.");
-		return m_ptr+(bm-1)*m_refLen;
-	}
-
+    bookmarks(size_t refLen) : m_refLen(refLen), m_usedCount(0), m_ptr(NULL)
+    {
+        allocBuffer(UNIT_OF_ALLOCCOUNT);
+    }
+
+    ~bookmarks() { td_free(m_ptr); }
+
+    /** get integer bookmark pointer by raw ref pointer
+     */
+    const unsigned char* getBookmarkPtr(unsigned char* rawRefPtr)
+    {
+        if (m_usedCount == m_allocatedCount)
+            allocBuffer(m_usedCount + UNIT_OF_ALLOCCOUNT);
+
+        memcpy(m_ptr + m_usedCount * m_refLen, rawRefPtr, m_refLen);
+        m_bookmark = (unsigned int)(++m_usedCount);
+        return (const unsigned char*)&m_bookmark;
+    }
+
+    unsigned int getBookmark(unsigned char* rawRefPtr)
+    {
+        return *((unsigned int*)getBookmarkPtr(rawRefPtr));
+    }
+
+    /** get raw ref pointer by integer bookmark
+     */
+    const unsigned char* getRefByBm(unsigned int bm)
+    {
+        if ((0 == bm) || bm > m_usedCount)
+            THROW_BZS_ERROR_WITH_CODEMSG(STATUS_INVALID_BOOKMARK,
+                                         "invalid bookmark.");
+        return m_ptr + (bm - 1) * m_refLen;
+    }
 };
 
-#endif
-
-}//namespace mysql
-}//namespace engine
-}//namespace db
-}//namespace bzs
+#endif // NOT BOOKMARK_USE_MULTIMAP
 
-#endif //BOOKMARK_H
+} // namespace mysql
+} // namespace engine
+} // namespace db
+} // namespace bzs
 
+#endif // BZS_DB_ENGINE_MYSQL_BOOKMARK_H