From fd27b85b004ad13c4139d84a287fd3f3ef444c4b Mon Sep 17 00:00:00 2001
From: randomdan <randomdan@localhost>
Date: Thu, 5 Aug 2010 23:48:05 +0000
Subject: Cache the result of default column compose Use this cache now lots of
 things are const refs

---
 libodbcpp/column.cpp | 30 ++++++++++++++++++++++--------
 1 file changed, 22 insertions(+), 8 deletions(-)

(limited to 'libodbcpp/column.cpp')

diff --git a/libodbcpp/column.cpp b/libodbcpp/column.cpp
index 31e9642..6f45617 100644
--- a/libodbcpp/column.cpp
+++ b/libodbcpp/column.cpp
@@ -7,12 +7,14 @@
 ODBC::Column::Column(const Glib::ustring & n, unsigned int i) :
 	colNo(i),
 	name(n),
+	composeCache(NULL),
 	bindSize(0)
 {
 }
 
 ODBC::Column::~Column()
 {
+	delete composeCache;
 }
 
 bool
@@ -91,10 +93,13 @@ namespace ODBC {
 		return writeToBuf(buf, "%g");
 	}
 	template <>
-	Glib::ustring
+	const Glib::ustring &
 	_Column<SQLDOUBLE>::compose() const
 	{
-		return Glib::ustring::compose("%1", value);
+		if (!composeCache) {
+			composeCache = new Glib::ustring(Glib::ustring::compose("%1", value));
+		}
+		return *composeCache;
 	}
 	template <>
 	Glib::ustring
@@ -115,10 +120,13 @@ namespace ODBC {
 		return writeToBuf(buf, "%ld");
 	}
 	template <>
-	Glib::ustring
+	const Glib::ustring &
 	_Column<SQLINTEGER>::compose() const
 	{
-		return Glib::ustring::compose("%1", value);
+		if (!composeCache) {
+			composeCache = new Glib::ustring(Glib::ustring::compose("%1", value));
+		}
+		return *composeCache;
 	}
 	template <>
 	Glib::ustring
@@ -139,10 +147,13 @@ namespace ODBC {
 		return writeToBuf(buf, "%s");
 	}
 	template <>
-	Glib::ustring
+	const Glib::ustring &
 	_Column<SQLCHAR*>::compose() const
 	{
-		return Glib::ustring((const char *)value);
+		if (!composeCache) {
+			composeCache = new Glib::ustring((const char *)value);
+		}
+		return *composeCache;
 	}
 	template <>
 	Glib::ustring
@@ -176,10 +187,13 @@ namespace ODBC {
 		return Glib::ustring(buf, len);
 	}
 	template <>
-	Glib::ustring
+	const Glib::ustring &
 	_Column<SQL_TIMESTAMP_STRUCT>::compose() const
 	{
-		return compose("%F %T");
+		if (!composeCache) {
+			composeCache = new Glib::ustring(Glib::ustring(compose("%F %T")));
+		}
+		return *composeCache;
 	}
 }
 
-- 
cgit v1.2.3