thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Alexey Milovidov 2011-04-28 20:20:27 +00:00
parent 9829b84ef5
commit acdb53f933
5 changed files with 4 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libs/libmysqlxx/include/mysqlxx/ResultBase.h
View File

@ -21,8 +21,6 @@ class ResultBase
{ {
public: public:
ResultBase(MYSQL_RES * res_, Connection * conn_, const Query * query_); ResultBase(MYSQL_RES * res_, Connection * conn_, const Query * query_);
ResultBase(const ResultBase & x);
ResultBase & operator= (const ResultBase & x);
Connection * getConnection() { return conn; } Connection * getConnection() { return conn; }
MYSQL_FIELDS getFields() { return fields; } MYSQL_FIELDS getFields() { return fields; }
@ -41,9 +39,6 @@ protected:
const Query * query; const Query * query;
MYSQL_FIELDS fields; MYSQL_FIELDS fields;
unsigned num_fields; unsigned num_fields;
private:
void init();
}; };
} }

5
libs/libmysqlxx/include/mysqlxx/StoreQueryResult.h
View File

@ -26,9 +26,6 @@ class StoreQueryResult : public std::vector<Row>, public ResultBase
public: public:
StoreQueryResult(MYSQL_RES * res_, Connection * conn_, const Query * query_); StoreQueryResult(MYSQL_RES * res_, Connection * conn_, const Query * query_);
StoreQueryResult(const StoreQueryResult & x);
StoreQueryResult & operator= (const StoreQueryResult & x);
size_t num_rows() const { return size(); } size_t num_rows() const { return size(); }
private: private:
@ -42,8 +39,6 @@ private:
*/ */
typedef std::vector<MYSQL_LENGTH> Lengths; typedef std::vector<MYSQL_LENGTH> Lengths;
Lengths lengths; Lengths lengths;
void init();
}; };
} }

7
libs/libmysqlxx/include/mysqlxx/UseQueryResult.h
View File

@ -27,13 +27,6 @@ class UseQueryResult : public ResultBase
public: public:
UseQueryResult(MYSQL_RES * res_, Connection * conn_, const Query * query_); UseQueryResult(MYSQL_RES * res_, Connection * conn_, const Query * query_);
UseQueryResult(const UseQueryResult & x) : ResultBase(x) {}
UseQueryResult & operator= (const UseQueryResult & x)
{
ResultBase::operator=(x);
return *this;
}
Row fetch(); Row fetch();
/// Для совместимости /// Для совместимости

28
libs/libmysqlxx/src/ResultBase.cpp
View File

@ -5,36 +5,10 @@
namespace mysqlxx namespace mysqlxx
{ {
void ResultBase::init() ResultBase::ResultBase(MYSQL_RES * res_, Connection * conn_, const Query * query_) : res(res_), conn(conn_), query(query_)
{ {
fields = mysql_fetch_fields(res); fields = mysql_fetch_fields(res);
num_fields = mysql_num_fields(res); num_fields = mysql_num_fields(res);
} }
ResultBase::ResultBase(MYSQL_RES * res_, Connection * conn_, const Query * query_) : res(res_), conn(conn_), query(query_)
{
init();
}
ResultBase::ResultBase(const ResultBase & x)
{
res = x.res;
conn = x.conn;
query = x.query;
init();
}
ResultBase & ResultBase::operator= (const ResultBase & x)
{
mysql_free_result(res);
res = x.res;
conn = x.conn;
query = x.query;
init();
return *this;
}
} }

27
libs/libmysqlxx/src/StoreQueryResult.cpp
View File

@ -5,42 +5,21 @@
namespace mysqlxx namespace mysqlxx
{ {
void StoreQueryResult::init() StoreQueryResult::StoreQueryResult(MYSQL_RES * res_, Connection * conn_, const Query * query_) : ResultBase(res_, conn_, query_)
{ {
UInt64 rows = mysql_num_rows(res); UInt64 rows = mysql_num_rows(res);
UInt32 fields = getNumFields(); UInt32 fields = getNumFields();
reserve(rows); reserve(rows);
lengths.resize(rows * fields); lengths.resize(rows * fields);
for (UInt64 i = 0; MYSQL_ROW row = mysql_fetch_row(res); ++i) for (UInt64 i = 0; MYSQL_ROW row = mysql_fetch_row(res); ++i)
{ {
MYSQL_LENGTHS lengths_for_row = mysql_fetch_lengths(res); MYSQL_LENGTHS lengths_for_row = mysql_fetch_lengths(res);
memcpy(&lengths[i * fields], lengths_for_row, sizeof(lengths[0]) * fields); memcpy(&lengths[i * fields], lengths_for_row, sizeof(lengths[0]) * fields);
push_back(Row(row, this, &lengths[i * fields])); push_back(Row(row, this, &lengths[i * fields]));
} }
checkError(conn->getDriver()); checkError(conn->getDriver());
} }
StoreQueryResult::StoreQueryResult(MYSQL_RES * res_, Connection * conn_, const Query * query_) : ResultBase(res_, conn_, query_)
{
init();
}
StoreQueryResult::StoreQueryResult(const StoreQueryResult & x) : ResultBase(x)
{
init();
}
StoreQueryResult & StoreQueryResult::operator= (const StoreQueryResult & x)
{
ResultBase::operator=(x);
clear();
lengths.clear();
init();
return *this;
}
} }