sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

+ postgis logging cosmetics

Browse source
This commit is contained in:
Lucio Asnaghi 2010-11-18 23:42:33 +00:00
parent ce3e7e5eeb
commit 2906ba8d0d
5 changed files with 137 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
plugins/input/postgis/connection.hpp
View file

@ -49,13 +49,13 @@ class Connection
conn_=PQconnectdb(connection_str.c_str());
if (PQstatus(conn_) != CONNECTION_OK)
{
std::string s("PSQL error");
std::string s("Postgis Plugin: PSQL error");
if (conn_ )
{
std::string msg = PQerrorMessage( conn_ );
if ( ! msg.empty() )
{
s += ":\n" + msg.substr( 0, msg.size() - 1 );
s << ":" << std::endl << msg.substr( 0, msg.size() - 1 );
}
}
throw mapnik::datasource_exception( s );
@ -83,16 +83,16 @@ class Connection
}
if(!result || PQresultStatus(result) != PGRES_TUPLES_OK)
{
std::string s("PSQL error");
std::string s("Postgis Plugin: PSQL error");
if (conn_ )
{
std::string msg = PQerrorMessage( conn_ );
if ( ! msg.empty() )
{
s += ":\n" + msg.substr( 0, msg.size() - 1 );
s << ":" << std::endl << msg.substr( 0, msg.size() - 1 );
}
s += "\nFull sql was: '" + sql + "'\n";
s << std::endl << "Full sql was: '" + sql + "'" << std::endl;
}
throw mapnik::datasource_exception( s );
}
@ -116,7 +116,7 @@ class Connection
{
PQfinish(conn_);
#ifdef MAPNIK_DEBUG
std::clog << "PostGIS: datasource closed, also closing connection - " << conn_ << "\n";
std::clog << "PostGIS: datasource closed, also closing connection - " << conn_ << std::endl;
#endif
closed_ = true;
}
@ -135,7 +135,7 @@ class Connection
{
PQfinish(conn_);
#ifdef MAPNIK_DEBUG
std::clog << "PostGIS: postgresql connection closed - " << conn_ << "\n";
std::clog << "PostGIS: postgresql connection closed - " << conn_ << std::endl;
#endif
closed_ = true;
}

26
plugins/input/postgis/cursorresultset.hpp
View file

@ -14,29 +14,38 @@ private:
bool is_closed_;
int *refCount_;
void getNextResultSet() {
void getNextResultSet()
{
std::ostringstream s;
s << "FETCH FORWARD " << fetch_size_ << " FROM " << cursorName_;
#ifdef MAPNIK_DEBUG
std::clog << s.str() << "\n";
std::clog << "Postgis Plugin: " << s.str() << std::endl;
#endif
rs_ = conn_->executeQuery(s.str());
is_closed_ = false;
#ifdef MAPNIK_DEBUG
std::clog << "FETCH result (" << cursorName_ << "): " << rs_->size() << " rows\n";
std::clog << "Postgis Plugin: FETCH result (" << cursorName_ << "): " << rs_->size() << " rows" << std::endl;
#endif
}
public:
CursorResultSet(boost::shared_ptr<Connection> const &conn, std::string cursorName, int fetch_count)
:conn_(conn),cursorName_(cursorName),fetch_size_(fetch_count),is_closed_(false),refCount_(new int(1))
: conn_(conn),
cursorName_(cursorName),
fetch_size_(fetch_count),
is_closed_(false),
refCount_(new int(1))
{
getNextResultSet();
}
CursorResultSet(const CursorResultSet& rhs)
:conn_(rhs.conn_),cursorName_(rhs.cursorName_),rs_(rhs.rs_),fetch_size_(rhs.fetch_size_),is_closed_(rhs.is_closed_),
refCount_(rhs.refCount_)
: conn_(rhs.conn_),
cursorName_(rhs.cursorName_),
rs_(rhs.rs_),
fetch_size_(rhs.fetch_size_),
is_closed_(rhs.is_closed_),
refCount_(rhs.refCount_)
{
(*refCount_)++;
}
@ -61,12 +70,13 @@ public:
virtual void close()
{
if (!is_closed_) {
if (!is_closed_)
{
rs_.reset();
std::ostringstream s;
s << "CLOSE " << cursorName_;
#ifdef MAPNIK_DEBUG
std::clog << s.str() << "\n";
std::clog << "Postgis Plugin: " << s.str() << std::endl;
#endif
conn_->execute(s.str());
is_closed_ = true;

113
plugins/input/postgis/postgis.cpp
View file

@ -54,9 +54,6 @@ DATASOURCE_PLUGIN(postgis_datasource)
const std::string postgis_datasource::GEOMETRY_COLUMNS="geometry_columns";
const std::string postgis_datasource::SPATIAL_REF_SYS="spatial_ref_system";
using std::clog;
using std::endl;
using boost::lexical_cast;
using boost::bad_lexical_cast;
using boost::shared_ptr;
@ -91,8 +88,7 @@ postgis_datasource::postgis_datasource(parameters const& params, bool bind)
st_(*params_.get<mapnik::boolean>("st_prefix",false))
//show_queries_(*params_.get<mapnik::boolean>("show_queries",false))
{
if (table_.empty()) throw mapnik::datasource_exception("PostGIS: missing <table> parameter");
if (table_.empty()) throw mapnik::datasource_exception("Postgis Plugin: missing <table> parameter");
multiple_geometries_ = *params_.get<mapnik::boolean>("multiple_geometries",false);
@ -160,10 +156,12 @@ void postgis_datasource::bind() const
if (geometry_field_.length() > 0)
s << " AND f_geometry_column='" << unquote(geometry_field_) << "'";
/*if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}*/
/*
if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}
*/
shared_ptr<ResultSet> rs=conn->executeQuery(s.str());
if (rs->next())
@ -178,7 +176,7 @@ void postgis_datasource::bind() const
}
catch (bad_lexical_cast &ex)
{
clog << "SRID: " << rs->getValue("srid") << ":" << ex.what() << endl;
std::clog << "Postgis Plugin: SRID=" << rs->getValue("srid") << " " << ex.what() << std::endl;
}
}
}
@ -193,10 +191,12 @@ void postgis_datasource::bind() const
s << "SELECT ST_SRID(\"" << geometryColumn_ << "\") AS srid FROM ";
s << populate_tokens(table_) << " WHERE \"" << geometryColumn_ << "\" IS NOT NULL LIMIT 1;";
/*if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}*/
/*
if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}
*/
shared_ptr<ResultSet> rs=conn->executeQuery(s.str());
if (rs->next())
@ -207,7 +207,7 @@ void postgis_datasource::bind() const
}
catch (bad_lexical_cast &ex)
{
clog << "SRID: " << rs->getValue("srid") << ":" << ex.what() << endl;
std::clog << "Postgis Plugin: SRID=" << rs->getValue("srid") << " " << ex.what() << std::endl;
}
}
rs->close();
@ -217,24 +217,26 @@ void postgis_datasource::bind() const
if (srid_ == 0)
{
srid_ = -1;
clog << "PostGIS: SRID warning, using srid=-1" << endl;
std::clog << "Postgis Plugin: SRID warning, using srid=-1" << std::endl;
}
// At this point the geometry_field may still not be known
// but we'll catch that where more useful...
#ifdef MAPNIK_DEBUG
clog << "PostGIS: using SRID=" << srid_ << endl;
clog << "PostGIS: using geometry_column=" << geometryColumn_ << endl;
std::clog << "Postgis Plugin: using SRID=" << srid_ << std::endl;
std::clog << "Postgis Plugin: using geometry_column=" << geometryColumn_ << std::endl;
#endif
// collect attribute desc
std::ostringstream s;
s << "SELECT * FROM " << populate_tokens(table_) << " LIMIT 0";
/*if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}*/
/*
if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}
*/
shared_ptr<ResultSet> rs=conn->executeQuery(s.str());
int count = rs->getNumFields();
@ -263,19 +265,22 @@ void postgis_datasource::bind() const
s.str("");
s << "SELECT oid, typname FROM pg_type WHERE oid = " << type_oid;
/*if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}*/
/*
if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}
*/
shared_ptr<ResultSet> rs_oid = conn->executeQuery(s.str());
if (rs_oid->next())
{
clog << "PostGIS: unknown type = " << rs_oid->getValue("typname") << " (oid:" << rs_oid->getValue("oid") << ")\n";
std::clog << "Postgis Plugin: unknown type = " << rs_oid->getValue("typname")
<< " (oid:" << rs_oid->getValue("oid") << ")" << std::endl;
}
else
{
clog << "PostGIS: unknown oid type =" << type_oid << endl;
std::clog << "Postgis Plugin: unknown oid type =" << type_oid << std::endl;
}
rs_oid->close();
#endif
@ -372,30 +377,37 @@ std::string postgis_datasource::unquote(const std::string& sql)
boost::shared_ptr<IResultSet> postgis_datasource::get_resultset(boost::shared_ptr<Connection> const &conn, const std::string &sql) const
{
if (cursor_fetch_size_ > 0) {
if (cursor_fetch_size_ > 0)
{
// cursor
std::ostringstream csql;
std::string cursor_name = conn->new_cursor_name();
csql << "DECLARE " << cursor_name << " BINARY INSENSITIVE NO SCROLL CURSOR WITH HOLD FOR " << sql << " FOR READ ONLY";
/*if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % csql.str();
}*/
if (!conn->execute(csql.str())) {
throw mapnik::datasource_exception( "PSQL Error: Creating cursor for data select." );
/*
if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % csql.str();
}
*/
if (!conn->execute(csql.str()))
throw mapnik::datasource_exception("Postgis Plugin: error creating cursor for data select." );
return shared_ptr<CursorResultSet>(new CursorResultSet(conn, cursor_name, cursor_fetch_size_));
} else {
}
else
{
// no cursor
/*if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % sql;
}*/
/*
if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % sql;
}
*/
return conn->executeQuery(sql,1);
}
@ -404,6 +416,7 @@ boost::shared_ptr<IResultSet> postgis_datasource::get_resultset(boost::shared_pt
featureset_ptr postgis_datasource::features(const query& q) const
{
if (!is_bound_) bind();
#ifdef MAPNIK_DEBUG
//mapnik::wall_clock_progress_timer timer(clog, "end feature query: ");
#endif
@ -425,7 +438,7 @@ featureset_ptr postgis_datasource::features(const query& q) const
s_error << "PostGIS: geometry name lookup failed for table '" << schema_ << "." << geometry_table_
<< "'. Please manually provide the 'geometry_field' parameter or add an entry "
<< "in the geometry_columns for '" << schema_ << "." << geometry_table_ << "'.";
throw mapnik::datasource_exception(s_error.str());
throw mapnik::datasource_exception("Postgis Plugin: " + s_error.str());
}
std::ostringstream s;
@ -459,7 +472,7 @@ featureset_ptr postgis_datasource::features(const query& q) const
}
else
{
throw mapnik::datasource_exception("bad connection");
throw mapnik::datasource_exception("Postgis Plugin: bad connection");
}
}
return featureset_ptr();
@ -547,7 +560,7 @@ box2d<double> postgis_datasource::envelope() const
<< "\nPlease provide either 1) an 'extent' parameter to skip this query, "
<< "2) a 'geometry_field' and/or 'geometry_table' parameter, or 3) add a "
<< "record to the 'geometry_columns' for your table.";
throw mapnik::datasource_exception(s_error.str());
throw mapnik::datasource_exception("Postgis Plugin: " + s_error.str());
}
if (estimate_extent && *estimate_extent)
@ -586,10 +599,12 @@ box2d<double> postgis_datasource::envelope() const
}
}
/*if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}*/
/*
if (show_queries_)
{
clog << boost::format("PostGIS: sending query: %s\n") % s.str();
}
*/
shared_ptr<ResultSet> rs=conn->executeQuery(s.str());
if (rs->next())
@ -605,7 +620,7 @@ box2d<double> postgis_datasource::envelope() const
}
catch (bad_lexical_cast &ex)
{
clog << boost::format("PostGIS: warning: could not determine extent from query: %s\nError was: '%s'\n") % s.str() % ex.what();
std::clog << boost::format("Postgis Plugin: warning: could not determine extent from query: %s\nError was: '%s'\n") % s.str() % ex.what() << std::endl;
}
}
rs->close();

5
plugins/input/postgis/postgisfs.cpp
View file

@ -34,7 +34,6 @@
using boost::lexical_cast;
using boost::bad_lexical_cast;
using boost::trim_copy;
using std::string;
using mapnik::Feature;
using mapnik::geometry_type;
using mapnik::byte;
@ -163,7 +162,7 @@ feature_ptr postgis_featureset::next()
if (rs_->next())
{
feature_ptr feature(new Feature(count_));
int size=rs_->getFieldLength(0);
int size = rs_->getFieldLength(0);
const char *data = rs_->getValue(0);
geometry_utils::from_wkb(*feature,data,size,multiple_geometries_);
totalGeomSize_+=size;
@ -234,7 +233,7 @@ feature_ptr postgis_featureset::next()
else
{
#ifdef MAPNIK_DEBUG
std::clog << "uknown OID = " << oid << " FIXME \n";
std::clog << "Postgis Plugin: uknown OID = " << oid << " FIXME " << std::endl;
#endif
}
}

89
plugins/input/postgis/resultset.hpp
View file

@ -53,55 +53,58 @@ private:
int pos_;
int numTuples_;
int *refCount_;
public:
ResultSet(PGresult *res)
:res_(res),pos_(-1),refCount_(new int(1))
: res_(res),
pos_(-1),
refCount_(new int(1))
{
numTuples_=PQntuples(res_);
numTuples_=PQntuples(res_);
}
ResultSet(const ResultSet& rhs)
:res_(rhs.res_),
pos_(rhs.pos_),
numTuples_(rhs.numTuples_),
refCount_(rhs.refCount_)
: res_(rhs.res_),
pos_(rhs.pos_),
numTuples_(rhs.numTuples_),
refCount_(rhs.refCount_)
{
(*refCount_)++;
(*refCount_)++;
}
ResultSet& operator=(const ResultSet& rhs)
{
if (this==&rhs) return *this;
if (--(refCount_)==0)
{
close();
delete refCount_,refCount_=0;
}
res_=rhs.res_;
pos_=rhs.pos_;
numTuples_=rhs.numTuples_;
refCount_=rhs.refCount_;
(*refCount_)++;
return *this;
if (this==&rhs) return *this;
if (--(refCount_)==0)
{
close();
delete refCount_,refCount_=0;
}
res_=rhs.res_;
pos_=rhs.pos_;
numTuples_=rhs.numTuples_;
refCount_=rhs.refCount_;
(*refCount_)++;
return *this;
}
virtual void close()
{
PQclear(res_),res_=0;
PQclear(res_),res_=0;
}
virtual ~ResultSet()
{
if (--(*refCount_)==0)
{
PQclear(res_);
delete refCount_,refCount_=0;
}
if (--(*refCount_)==0)
{
PQclear(res_);
delete refCount_,refCount_=0;
}
}
virtual int getNumFields() const
{
return PQnfields(res_);
return PQnfields(res_);
}
int pos() const
@ -116,38 +119,38 @@ public:
virtual bool next()
{
return (++pos_<numTuples_);
return (++pos_<numTuples_);
}
virtual const char* getFieldName(int index) const
{
return PQfname(res_,index);
return PQfname(res_,index);
}
virtual int getFieldLength(int index) const
{
return PQgetlength(res_,pos_,index);
return PQgetlength(res_,pos_,index);
}
virtual int getFieldLength(const char* name) const
{
int col=PQfnumber(res_,name);
if (col>=0)
return PQgetlength(res_,pos_,col);
return 0;
int col=PQfnumber(res_,name);
if (col>=0)
return PQgetlength(res_,pos_,col);
return 0;
}
virtual int getTypeOID(int index) const
{
return PQftype(res_,index);
return PQftype(res_,index);
}
virtual int getTypeOID(const char* name) const
{
int col=PQfnumber(res_,name);
if (col>=0)
return PQftype(res_,col);
return 0;
int col=PQfnumber(res_,name);
if (col>=0)
return PQftype(res_,col);
return 0;
}
virtual bool isNull(int index) const
@ -157,15 +160,15 @@ public:
virtual const char* getValue(int index) const
{
return PQgetvalue(res_,pos_,index);
return PQgetvalue(res_,pos_,index);
}
virtual const char* getValue(const char* name) const
{
int col=PQfnumber(res_,name);
if (col>=0)
return getValue(col);
return 0;
int col=PQfnumber(res_,name);
if (col>=0)
return getValue(col);
return 0;
}
};