Date: Wednesday, December 28, 2005 @ 18:15:38
Author: gilles
Path: /cvsroot/carob/libmysequoia
Modified: include/CarobMySQL.hpp (1.15 -> 1.16) proto/libmysequoia.cpp
(1.2 -> 1.3) src/CarobMySQL.cpp (1.24 -> 1.25)
Connection pool removal: finally, no connection pooling will be done in carob.
We let upper layers do the job the way they need to.
Connections to controller are now done directly in Connection constructor,
given some connection parameters (as before). Connection empty contructor has
been removed (put private) to avoid unknown state connections.
------------------------+
include/CarobMySQL.hpp | 3 +--
proto/libmysequoia.cpp | 8 +++-----
src/CarobMySQL.cpp | 4 +---
3 files changed, 5 insertions(+), 10 deletions(-)
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.15
libmysequoia/include/CarobMySQL.hpp:1.16
--- libmysequoia/include/CarobMySQL.hpp:1.15 Sun Dec 18 20:14:20 2005
+++ libmysequoia/include/CarobMySQL.hpp Wed Dec 28 18:15:37 2005
@@ -27,7 +27,7 @@
/* Carob includes */
#include <ConnectionParameters.hpp>
-#include <ConnectionPool.hpp>
+#include <Connection.hpp>
#include <DriverResultSet.hpp>
#include <Statement.hpp>
@@ -202,7 +202,6 @@
private:
MYSQL * mysqlPtr;
CarobNS::Connection * connectionPtr;
- CarobNS::ConnectionPool * connectionPool;
CarobNS::Statement * stmtPtr;
CarobNS::DriverResultSet * drsPtr;
//holds the result set for 'live' type of results
Index: libmysequoia/proto/libmysequoia.cpp
diff -u libmysequoia/proto/libmysequoia.cpp:1.2
libmysequoia/proto/libmysequoia.cpp:1.3
--- libmysequoia/proto/libmysequoia.cpp:1.2 Tue Dec 6 09:25:35 2005
+++ libmysequoia/proto/libmysequoia.cpp Wed Dec 28 18:15:37 2005
@@ -39,7 +39,7 @@
/* Carob includes */
#include <ConnectionParameters.hpp>
-#include <ConnectionPool.hpp>
+#include <Connection.hpp>
#include <DriverResultSet.hpp>
#include <Statement.hpp>
@@ -140,7 +140,6 @@
private:
CMYSQL *mysqlPtr;
Connection *connectionPtr;
- ConnectionPool *connectionPool;
Statement *stmtPtr;
DriverResultSet* drsPtr;
MYSQL_ROW row;
@@ -155,7 +154,6 @@
mysqlPtr = new CMYSQL();
memset(&mysqlPtr->my, 0, sizeof(MYSQL));
mysqlPtr->carob = this;
- connectionPool = &ConnectionPool::getInstance();
}
CarobMYSQL::~CarobMYSQL()
@@ -181,7 +179,7 @@
ConnectionParameters connectionParameters(fromString(host), port ? port
: 25322, fromString(db), fromString(user), fromString(passwd),
DEBUG_LEVEL_DEBUG);
try {
- connectionPtr =
connectionPool->connectToController(connectionParameters);
+ connectionPtr = new Connection(connectionParameters);
stmtPtr = connectionPtr->createStatement();
} catch (...) {
set_mysql_error((MYSQL *)mysqlPtr, CR_CONNECTION_ERROR,
unknown_sqlstate);
@@ -240,7 +238,7 @@
for (unsigned i=0; i<mysqlPtr->my.field_count; i++)
{
char s[200];
- sprintf(s,"%d",drsPtr->getInt(i+1));
+ sprintf(s,"%d",drsPtr->getAsInt(i+1));
row[i] = new char[strlen(s)+1];
strcpy(row[i],s);
}
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.24
libmysequoia/src/CarobMySQL.cpp:1.25
--- libmysequoia/src/CarobMySQL.cpp:1.24 Sun Dec 18 20:14:20 2005
+++ libmysequoia/src/CarobMySQL.cpp Wed Dec 28 18:15:38 2005
@@ -49,8 +49,6 @@
mysqlPtr = mysql;
- connectionPool = &ConnectionPool::getInstance();
-
LOG4CXX_DEBUG(logger, "Leaving constructor.");
}
@@ -127,7 +125,7 @@
ConnectionParameters connectionParameters(fromString(host), port,
fromString(db), fromString(user), fromString(passwd), DEBUG_LEVEL_DEBUG);
- Connection *newConnectionPtr =
connectionPool->connectToController(connectionParameters);
+ Connection *newConnectionPtr = new Connection(connectionParameters);
if (newConnectionPtr)
{
//TODO handle not enough memory
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
