transactd 1.2.0 → 2.0.0

data/source/bzs/example/createDatabase.cpp

@@ -6,13 +6,12 @@
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 
-
 /**
 @brief create database example
 
 This program  create "test" database and
 "test" table. The table of "test" has schema data.
-And it call "schaem table".
+And it call "schema table".
 
 database name :  'test'
 
@@ -61,14 +60,13 @@ table 'picture' tableid = 3
 
 */
 
-
 /** show database operation error
 */
-void showError(const _TCHAR* caption,const _TCHAR* tableName, short statusCode)
+void showError(const _TCHAR* caption, const _TCHAR* tableName, short statusCode)
 {
-    _TCHAR tmp[1024]={0x00};
+    _TCHAR tmp[1024] = { 0x00 };
     nstable::tdapErr(0x00, statusCode, tableName, tmp);
-    _tprintf(_T("%s error No.%ld %s\n"),caption, statusCode, tmp);
+    _tprintf(_T("[ERROR] %s No.%ld %s\n"), caption, statusCode, tmp);
 }
 
 /** Create mysql database and empty schema table
@@ -102,11 +100,11 @@ bool openDbExclusive(database* db, const _TCHAR* uri)
 bool createUserTableSchema(dbdef* def)
 {
 
-    //Insert table
+    // Insert table
     tabledef td;
     td.setTableName(_T("user"));
     td.setFileName(_T("user.dat"));
-    td.id =1;
+    td.id = 1;
     td.charsetIndex = CHARSET_UTF8B4;
     def->insertTable(&td);
     if (def->stat() != 0)
@@ -115,41 +113,41 @@ bool createUserTableSchema(dbdef* def)
         return false;
     }
 
-    //Insert field
+    // Insert field
     short fieldNum = 0;
-    fielddef* fd =  def->insertField(td.id, fieldNum);
+    fielddef* fd = def->insertField(td.id, fieldNum);
     fd->setName(_T("id"));
     fd->type = ft_integer;
     fd->len = (ushort_td)4;
 
-    fd =  def->insertField(td.id, ++fieldNum);
+    fd = def->insertField(td.id, ++fieldNum);
     fd->setName(_T("name"));
     fd->type = ft_myvarchar;
     fd->setLenByCharnum(32);
 
-    fd =  def->insertField(td.id, ++fieldNum);
+    fd = def->insertField(td.id, ++fieldNum);
     fd->setName(_T("group"));
     fd->type = ft_integer;
     fd->len = (ushort_td)4;
 
-    //Insert index
+    // Insert index
     uchar_td keyNum = 0;
     keydef* kd = def->insertKey(td.id, keyNum);
     kd->segments[0].fieldNum = 0;
-    kd->segments[0].flags.bit8 = true;//extended type
-    kd->segments[0].flags.bit1 = true;//updateable
+    kd->segments[0].flags.bit8 = true; // extended type
+    kd->segments[0].flags.bit1 = true; // updateable
     kd->segmentCount = 1;
     def->tableDefs(td.id)->primaryKeyNum = keyNum;
 
     keyNum = 1;
     kd = def->insertKey(td.id, keyNum);
-    kd->segments[0].fieldNum = 2;//groupid
-    kd->segments[0].flags.bit8 = true;//extended type
-    kd->segments[0].flags.bit1 = true;//updateable
-    kd->segments[0].flags.bit0 = true;//duplicateable
+    kd->segments[0].fieldNum = 2; // groupid
+    kd->segments[0].flags.bit8 = true; // extended type
+    kd->segments[0].flags.bit1 = true; // updateable
+    kd->segments[0].flags.bit0 = true; // duplicateable
     kd->segmentCount = 1;
 
-    //write schema table
+    // write schema table
     def->updateTableDef(td.id);
     if (def->stat() != 0)
     {
@@ -157,7 +155,6 @@ bool createUserTableSchema(dbdef* def)
         return false;
     }
     return true;
-
 }
 
 /** Create group table schema and write
@@ -165,7 +162,7 @@ bool createUserTableSchema(dbdef* def)
 bool createGroupTableSchema(dbdef* def)
 {
 
-    //Insert table
+    // Insert table
     tabledef td;
     td.setTableName(_T("group1"));
     td.setFileName(_T("group1.dat"));
@@ -178,28 +175,28 @@ bool createGroupTableSchema(dbdef* def)
         return false;
     }
 
-    //Insert field
+    // Insert field
     short fieldNum = 0;
-    fielddef* fd =  def->insertField(td.id, fieldNum);
+    fielddef* fd = def->insertField(td.id, fieldNum);
     fd->setName(_T("id"));
     fd->type = ft_integer;
     fd->len = (ushort_td)4;
 
-    fd =  def->insertField(td.id, ++fieldNum);
+    fd = def->insertField(td.id, ++fieldNum);
     fd->setName(_T("name"));
     fd->type = ft_myvarchar;
     fd->setLenByCharnum(32);
 
-    //Insert index
+    // Insert index
     uchar_td keyNum = 0;
     keydef* kd = def->insertKey(td.id, keyNum);
     kd->segments[0].fieldNum = 0;
-    kd->segments[0].flags.bit8 = true;//extended type
-    kd->segments[0].flags.bit1 = true;//updateable
+    kd->segments[0].flags.bit8 = true; // extended type
+    kd->segments[0].flags.bit1 = true; // updateable
     kd->segmentCount = 1;
     def->tableDefs(td.id)->primaryKeyNum = keyNum;
 
-    //write schema table
+    // write schema table
     def->updateTableDef(td.id);
     if (def->stat() != 0)
     {
@@ -207,14 +204,13 @@ bool createGroupTableSchema(dbdef* def)
         return false;
     }
     return true;
-
 }
 
 /** Create picture table schema and write
  */
 bool createPictureTableSchema(dbdef* def)
 {
-    //Insert table
+    // Insert table
     tabledef td;
     td.setTableName(_T("picture"));
     td.setFileName(_T("picture.dat"));
@@ -227,43 +223,41 @@ bool createPictureTableSchema(dbdef* def)
         return false;
     }
 
-    //Insert 3 fields
+    // Insert 3 fields
     short fieldNum = 0;
-    fielddef* fd =  def->insertField(td.id, fieldNum);
+    fielddef* fd = def->insertField(td.id, fieldNum);
     fd->setName(_T("type"));
     fd->type = ft_integer;
     fd->len = (ushort_td)2;
 
-    fd =  def->insertField(td.id, ++fieldNum);
+    fd = def->insertField(td.id, ++fieldNum);
     fd->setName(_T("id"));
     fd->type = ft_integer;
     fd->len = (ushort_td)4;
 
-
-    fd =  def->insertField(td.id, ++fieldNum);
+    fd = def->insertField(td.id, ++fieldNum);
     fd->setName(_T("picture"));
     fd->type = ft_myblob;
     fd->len = (ushort_td)11;
 
-
-    //Insert index
+    // Insert index
     uchar_td keyNum = 0;
     keydef* kd = def->insertKey(td.id, keyNum);
     keySegment* ks = &kd->segments[0];
-    ks->fieldNum = 0; //type
-    ks->flags.bit8 = true;//extended type
-    ks->flags.bit1 = true;//updateable
-    ks->flags.bit4  = true;//segment part
+    ks->fieldNum = 0; // type
+    ks->flags.bit8 = true; // extended type
+    ks->flags.bit1 = true; // updateable
+    ks->flags.bit4 = true; // segment part
 
     ks = &kd->segments[1];
-    ks->fieldNum = 1; //id
-    ks->flags.bit8 = true;//extended type
-    ks->flags.bit1 = true;//updateable
+    ks->fieldNum = 1; // id
+    ks->flags.bit8 = true; // extended type
+    ks->flags.bit1 = true; // updateable
 
     kd->segmentCount = 2;
     def->tableDefs(td.id)->primaryKeyNum = keyNum;
 
-     //write schema table
+    // write schema table
     def->updateTableDef(td.id);
     if (def->stat() != 0)
     {
@@ -271,7 +265,6 @@ bool createPictureTableSchema(dbdef* def)
         return false;
     }
     return true;
-
 }
 
 #pragma argsused

data/source/bzs/example/createDatabase_c.cpp

@@ -5,13 +5,12 @@
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 
-
 /**
 @brief create database example
 
 This program  create "test" database and
 "test" table. The table of "test" has schema data.
-And it is called "schaem table".
+And it is called "schema table".
 
 
 database name :  'test'
@@ -61,17 +60,16 @@ table 'picture' tableid = 3
 
 */
 
-
 /** Create user table schema and write
  */
 void createUserTableSchema(dbdef* def)
 {
-    //Insert table
+    // Insert table
     short tableid = 1;
     const _TCHAR* name = _T("user");
     insertTable(def, tableid, name, CHARSET_UTF8B4);
 
-    //Insert 3 fields
+    // Insert 3 fields
     short fieldNum = 0;
     insertField(def, tableid, fieldNum, _T("id"), ft_integer, 4);
 
@@ -79,105 +77,102 @@ void createUserTableSchema(dbdef* def)
     insertField(def, tableid, ++fieldNum, _T("name"), ft_myvarchar, size);
     insertField(def, tableid, ++fieldNum, _T("group"), ft_integer, 4);
 
-    //Insert index
-    short keyNum = 0;
+    // Insert index
+    uchar_td keyNum = 0;
     keydef* kd = insertKey(def, tableid, keyNum);
     keySegment* ks = &kd->segments[0];
-    ks->fieldNum = 0;//id
-    ks->flags.bit8 = true;//extended type
-    ks->flags.bit1 = true;//updateable
+    ks->fieldNum = 0; // id
+    ks->flags.bit8 = true; // extended type
+    ks->flags.bit1 = true; // updateable
     kd->segmentCount = 1;
     def->tableDefs(tableid)->primaryKeyNum = keyNum;
 
     keyNum = 1;
     kd = insertKey(def, tableid, keyNum);
     ks = &kd->segments[0];
-    ks->fieldNum = 2;//groupid
-    ks->flags.bit8 = true;//extended type
-    ks->flags.bit1 = true;//updateable
-    ks->flags.bit0 = true;//duplicateable
+    ks->fieldNum = 2; // groupid
+    ks->flags.bit8 = true; // extended type
+    ks->flags.bit1 = true; // updateable
+    ks->flags.bit0 = true; // duplicateable
     kd->segmentCount = 1;
 
-
-    //write schema table
+    // write schema table
     updateTableDef(def, tableid);
-
 }
 
 /** Create group table schema and write
  */
 void createGroupTableSchema(dbdef* def)
 {
-    //Insert table
+    // Insert table
     short tableid = 2;
     const _TCHAR* name = _T("group1");
     insertTable(def, tableid, name, CHARSET_UTF8B4);
 
-    //Insert 2 fields
+    // Insert 2 fields
     short fieldNum = 0;
     insertField(def, tableid, fieldNum, _T("id"), ft_integer, 4);
     int size = lenByCharnum(ft_myvarchar, CHARSET_UTF8B4, 32);
     insertField(def, tableid, ++fieldNum, _T("name"), ft_myvarchar, size);
 
-    //Insert index
-    short keyNum = 0;
+    // Insert index
+    uchar_td keyNum = 0;
     keydef* kd = insertKey(def, tableid, keyNum);
     keySegment* ks = &kd->segments[0];
-    ks->fieldNum = 0; //id
-    ks->flags.bit8 = true;//extended type
-    ks->flags.bit1 = true;//updateable
+    ks->fieldNum = 0; // id
+    ks->flags.bit8 = true; // extended type
+    ks->flags.bit1 = true; // updateable
     kd->segmentCount = 1;
     def->tableDefs(tableid)->primaryKeyNum = keyNum;
-    //write schema table
+    // write schema table
     updateTableDef(def, tableid);
-
 }
 
 /** Create picture table schema and write
  */
 void createPictureTableSchema(dbdef* def)
 {
-    //Insert table
+    // Insert table
     short tableid = 3;
     const _TCHAR* name = _T("picture");
     insertTable(def, tableid, name, CHARSET_LATIN1);
 
-    //Insert 3 fields
+    // Insert 3 fields
     short fieldNum = 0;
 
     insertField(def, tableid, fieldNum, _T("type"), ft_integer, 2);
     insertField(def, tableid, ++fieldNum, _T("id"), ft_integer, 4);
     insertField(def, tableid, ++fieldNum, _T("picture"), ft_myblob, 11);
 
-    //Insert index
-    short keyNum = 0;
+    // Insert index
+    uchar_td keyNum = 0;
     keydef* kd = insertKey(def, tableid, keyNum);
     keySegment* ks = &kd->segments[0];
-    ks->fieldNum = 0; //type
-    ks->flags.bit8 = true;//extended type
-    ks->flags.bit1 = true;//updateable
-    ks->flags.bit4  = true;//segment part
+    ks->fieldNum = 0; // type
+    ks->flags.bit8 = true; // extended type
+    ks->flags.bit1 = true; // updateable
+    ks->flags.bit4 = true; // segment part
 
     ks = &kd->segments[1];
-    ks->fieldNum = 1; //id
-    ks->flags.bit8 = true;//extended type
-    ks->flags.bit1 = true;//updateable
+    ks->fieldNum = 1; // id
+    ks->flags.bit8 = true; // extended type
+    ks->flags.bit1 = true; // updateable
 
     kd->segmentCount = 2;
     def->tableDefs(tableid)->primaryKeyNum = keyNum;
 
-    //write schema table
+    // write schema table
     updateTableDef(def, tableid);
-
 }
 
 #pragma argsused
 int _tmain(int argc, _TCHAR* argv[])
 {
-    database_ptr db = createDatadaseObject();
+    database_ptr db = createDatabaseObject();
     try
     {
-        connectParams prams(_T("tdap"), _T("localhost"), _T("test"), _T("test"));
+        connectParams prams(_T("tdap"), _T("localhost"), _T("test"),
+                            _T("test"));
         prams.setMode(TD_OPEN_EXCLUSIVE);
 
         createDatabase(db, prams);
@@ -194,9 +189,9 @@ int _tmain(int argc, _TCHAR* argv[])
         return 0;
     }
 
-    catch(bzs::rtl::exception& e)
+    catch (bzs::rtl::exception& e)
     {
-        std::tcout << *bzs::rtl::getMsg(e) << std::endl;
+        std::tcout << _T("[ERROR] ") << *bzs::rtl::getMsg(e) << std::endl;
     }
     return 1;
 }

data/source/bzs/example/deleteRecords.cpp

@@ -3,18 +3,16 @@
 #include <bzs/db/protocol/tdap/client/table.h>
 #include <bzs/db/protocol/tdap/client/dbDef.h>
 
-
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 
-
 /**
 @brief read and delete example
 
 This program deletes one record of a "user" table.
 
 Please execute "create database" , "change schema" and "insert records" example
-    before execute this example.
+        before execute this example.
 
 */
 
@@ -26,29 +24,26 @@ static const char_td keynum_id = 0;
 
 /** show database operation error
 */
-void showError(const _TCHAR* caption,const _TCHAR* tableName, short statusCode)
+void showError(const _TCHAR* caption, const _TCHAR* tableName, short statusCode)
 {
-    _TCHAR tmp[1024]={0x00};
+    _TCHAR tmp[1024] = { 0x00 };
     nstable::tdapErr(0x00, statusCode, tableName, tmp);
-    _tprintf(_T("%s error No.%ld %s\n"),caption, statusCode, tmp);
+    _tprintf(_T("[ERROR] %s No.%ld %s\n"), caption, statusCode, tmp);
 }
 
-
 bool deleteUser(table* tb)
 {
     tb->clearBuffer();
-    tb->setKeyNum(keynum_id); //use id key
-    tb->setFV(fieldnum_id, 3);//id=3 satoshi
+    tb->setKeyNum(keynum_id); // use id key
+    tb->setFV(fieldnum_id, 3); // id=3 satoshi
     tb->seek();
     if (tb->stat() == 0)
         tb->del();
-    if (tb->stat()!=0)
+    if (tb->stat() != 0)
         showError(_T("update user"), tb->tableDef()->tableName(), tb->stat());
-    return (tb->stat()== 0);
+    return (tb->stat() == 0);
 }
 
-
-
 /** Open database
  */
 bool openDatabase(database* db, const _TCHAR* uri)
@@ -76,9 +71,9 @@ int _tmain(int argc, _TCHAR* argv[])
             showError(_T("open user table"), NULL, db->stat());
         else
         {
-             if (deleteUser(tbu))
+            if (deleteUser(tbu))
                 _tprintf(_T("Delete records success. \n"));
-             tbu->release();
+            tbu->release();
         }
         db->close();
     }

data/source/bzs/example/deleteRecords_c.cpp

@@ -4,7 +4,6 @@
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 
-
 /**
 @brief read and delete example
 
@@ -12,35 +11,32 @@ This program deletes one record of a "user" table.
 
 
 Please execute "create database" , "change schema" and "insert records" example
-    before execute this example.
+        before execute this example.
 
 */
 
-
-
 static const short fieldnum_id = 0;
 static const char_td keynum_id = 0;
 
 void deleteUser(table_ptr tb)
 {
-    //Seek record that user id = 3 "satoshi"
+    // Seek record that user id = 3 "satoshi"
     indexIterator it = readIndex_v(tb, eSeekEqual, keynum_id, 3);
 
-    if (it != indexIterator::eos)
-        deleteRecord(it);  //delete id = 3
+    if (!it.isEnd())
+        deleteRecord(it); // delete id = 3
     else
-       THROW_BZS_ERROR_WITH_MSG(_T("User id = 3 was not found"));
-
+        THROW_BZS_ERROR_WITH_MSG(_T("User id = 3 was not found"));
 }
 
-
 #pragma argsused
 int _tmain(int argc, _TCHAR* argv[])
 {
-    database_ptr db = createDatadaseObject();
+    database_ptr db = createDatabaseObject();
     try
     {
-        connectParams param(_T("tdap"), _T("localhost"), _T("test"), _T("test"));
+        connectParams param(_T("tdap"), _T("localhost"), _T("test"),
+                            _T("test"));
         openDatabase(db, param);
 
         table_ptr tb = openTable(db, _T("user"));
@@ -49,9 +45,9 @@ int _tmain(int argc, _TCHAR* argv[])
         return 0;
     }
 
-    catch(bzs::rtl::exception& e)
+    catch (bzs::rtl::exception& e)
     {
-        std::tcout << *bzs::rtl::getMsg(e) << std::endl;
+        std::tcout << _T("[ERROR] ") << *bzs::rtl::getMsg(e) << std::endl;
     }
     return 1;
 }

data/source/bzs/example/dropDatabase.cpp

@@ -6,25 +6,21 @@
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 
-
 /**
 @brief drop database example
 
 This program  drop "test" database.
 */
 
-
-
 /** show database operation error
 */
-void showError(const _TCHAR* caption,const _TCHAR* tableName, short statusCode)
+void showError(const _TCHAR* caption, const _TCHAR* tableName, short statusCode)
 {
-    _TCHAR tmp[1024]={0x00};
+    _TCHAR tmp[1024] = { 0x00 };
     nstable::tdapErr(0x00, statusCode, tableName, tmp);
-    _tprintf(_T("%s error No.%ld %s\n"),caption, statusCode, tmp);
+    _tprintf(_T("[ERROR] %s No.%ld %s\n"), caption, statusCode, tmp);
 }
 
-
 /** Open database
  */
 bool openDbExclusive(database* db, const _TCHAR* uri)
@@ -38,7 +34,6 @@ bool openDbExclusive(database* db, const _TCHAR* uri)
     return true;
 }
 
-
 #pragma argsused
 int _tmain(int argc, _TCHAR* argv[])
 {
@@ -55,7 +50,6 @@ int _tmain(int argc, _TCHAR* argv[])
         if (result == 0)
             _tprintf(_T("Drop daatabase success. \n"));
         db->close();
-
     }
     database::destroy(db);
     return result;

data/source/bzs/example/dropDatabase_c.cpp

@@ -3,21 +3,20 @@
 using namespace bzs::db::protocol::tdap::client;
 using namespace bzs::db::protocol::tdap;
 
-
 /**
 @brief drop database example
 
 This program  drop "test" database.
 */
 
-
 #pragma argsused
 int _tmain(int argc, _TCHAR* argv[])
 {
-    database_ptr db = createDatadaseObject();
+    database_ptr db = createDatabaseObject();
     try
     {
-        connectParams prams(_T("tdap"), _T("localhost"), _T("test"), _T("test"));
+        connectParams prams(_T("tdap"), _T("localhost"), _T("test"),
+                            _T("test"));
         prams.setMode(TD_OPEN_EXCLUSIVE);
 
         openDatabase(db, prams);
@@ -26,9 +25,9 @@ int _tmain(int argc, _TCHAR* argv[])
         std::cout << "Drop databse success." << std::endl;
         return 0;
     }
-    catch(bzs::rtl::exception& e)
+    catch (bzs::rtl::exception& e)
     {
-        std::tcout << *bzs::rtl::getMsg(e) << std::endl;
+        std::tcout << _T("[ERROR] ") << *bzs::rtl::getMsg(e) << std::endl;
     }
     return 1;
 }