add Geodiff Context & Logger

Author: PeterPetrik

geodiff/CMakeLists.txt

@@ -135,6 +135,8 @@ SET(geodiff_src
   src/geodiffrebase.hpp
   src/geodifflogger.cpp
   src/geodifflogger.hpp
+  src/geodiffcontext.cpp
+  src/geodiffcontext.hpp
 
   src/changeset.h
   src/changesetconcat.cpp

geodiff/src/changesetconcat.cpp

@@ -192,7 +192,10 @@ static MergeEntriesResult mergeEntriesForRow( ChangesetEntry *e1, ChangesetEntry
 
 //! Concatenation of multiple changesets, based on the implementation from sqlite3session
 //! (functions sqlite3changegroup_add() and sqlite3changegroup_output())
-void concatChangesets( const std::vector<std::string> &filenames, const std::string &outputChangeset )
+void concatChangesets(
+  Logger &logger,
+  const std::vector<std::string> &filenames,
+  const std::string &outputChangeset )
 {
   // hashtable: table name -> ( fid -> changeset entry )
   std::unordered_map<std::string, TableChanges> result;
@@ -241,7 +244,7 @@ void concatChangesets( const std::vector<std::string> &filenames, const std::str
               break;
             case Unsupported:
               // we are discarding the new entry (there's no sensible way to integrate it)
-              Logger::instance().warn( "concatChangesets: unsupported sequence of entries for a single row - discarding newer entry" );
+              logger.warn( "concatChangesets: unsupported sequence of entries for a single row - discarding newer entry" );
               delete entry0;
               break;
           }

geodiff/src/changesetutils.h

@@ -17,12 +17,13 @@ struct ChangesetEntry;
 struct ChangesetTable;
 struct TableSchema;
 struct Value;
+class Logger;
 
 ChangesetTable schemaToChangesetTable( const std::string &tableName, const TableSchema &tbl );
 
 void invertChangeset( ChangesetReader &reader, ChangesetWriter &writer );
 
-void concatChangesets( const std::vector<std::string> &filenames, const std::string &outputChangeset );
+void concatChangesets( Logger &logger, const std::vector<std::string> &filenames, const std::string &outputChangeset );
 
 std::string changesetEntryToJSON( const ChangesetEntry &entry );
 

geodiff/src/driver.cpp

@@ -17,14 +17,20 @@
 const std::string Driver::SQLITEDRIVERNAME = "sqlite";
 const std::string Driver::POSTGRESDRIVERNAME = "postgres";
 
-Driver::Driver()
+Driver::Driver( Context *context )
+  : mContext( context )
 {
 }
 
 Driver::~Driver()
 {
 }
 
+Context *Driver::context() const
+{
+  return mContext;
+}
+
 std::vector<std::string> Driver::drivers()
 {
   std::vector<std::string> names;
@@ -35,16 +41,16 @@ std::vector<std::string> Driver::drivers()
   return names;
 }
 
-std::unique_ptr<Driver> Driver::createDriver( const std::string &driverName )
+std::unique_ptr<Driver> Driver::createDriver( const std::string &driverName, Context *context )
 {
   if ( driverName == SQLITEDRIVERNAME )
   {
-    return std::unique_ptr<Driver>( new SqliteDriver );
+    return std::unique_ptr<Driver>( new SqliteDriver( context ) );
   }
 #ifdef HAVE_POSTGRES
   if ( driverName == POSTGRESDRIVERNAME )
   {
-    return std::unique_ptr<Driver>( new PostgresDriver );
+    return std::unique_ptr<Driver>( new PostgresDriver( context ) );
   }
 #endif
   return std::unique_ptr<Driver>();

geodiff/src/driver.h

@@ -14,6 +14,7 @@
 #include "geodiff.h"
 #include "tableschema.h"
 
+class Context;
 class ChangesetReader;
 class ChangesetWriter;
 
@@ -51,7 +52,7 @@ class Driver
     /**
      * Returns a new instance of a driver given its name. Returns nullptr if such driver does not exist.
      */
-    static std::unique_ptr<Driver> createDriver( const std::string &driverName );
+    static std::unique_ptr<Driver> createDriver( const std::string &driverName, Context *context );
 
     /**
      * Returns driver parameters for Sqlite driver - it needs filenames of two sqlite databases.
@@ -65,7 +66,7 @@ class Driver
 
     //
 
-    Driver();
+    Driver( Context *context );
     virtual ~Driver();
 
     /**
@@ -131,6 +132,11 @@ class Driver
 
     static const std::string SQLITEDRIVERNAME;
     static const std::string POSTGRESDRIVERNAME;
+
+    Context *context() const;
+
+  private:
+    Context *mContext; // never null
 };
 
 

geodiff/src/drivers/postgresdriver.cpp

@@ -13,6 +13,7 @@
 #include "changesetwriter.h"
 #include "postgresutils.h"
 #include "sqliteutils.h"
+#include "geodiffcontext.hpp"
 
 #include <algorithm>
 #include <iostream>
@@ -62,14 +63,19 @@ class PostgresTransaction
 };
 
 
-static void logApplyConflict( const std::string &type, const ChangesetEntry &entry )
+static void logApplyConflict( Context *context, const std::string &type, const ChangesetEntry &entry )
 {
-  Logger::instance().warn( "CONFLICT: " + type + ":\n" + changesetEntryToJSON( entry ) );
+  context->logger().warn( "CONFLICT: " + type + ":\n" + changesetEntryToJSON( entry ) );
 }
 
 /////
 
 
+PostgresDriver::PostgresDriver( Context *context )
+  : Driver( context )
+{
+}
+
 PostgresDriver::~PostgresDriver()
 {
   close();
@@ -339,7 +345,7 @@ TableSchema PostgresDriver::tableSchema( const std::string &tableName, bool useM
       col.setGeometry( geomTypeName, srsId, hasM, hasZ );
     }
 
-    col.type = columnType( type, Driver::POSTGRESDRIVERNAME, col.isGeometry );
+    col.type = columnType( context()->logger(), type, Driver::POSTGRESDRIVERNAME, col.isGeometry );
     col.isNotNull = ( res.value( i, 3 ) == "t" );
     col.isAutoIncrement = ( res.value( i, 4 ) == "t" );
 
@@ -483,7 +489,7 @@ static bool isColumnGeometry( const TableColumnInfo &col )
   return col.isGeometry;
 }
 
-static Value resultToValue( const PostgresResult &res, int r, size_t i, const TableColumnInfo &col )
+static Value resultToValue( Context *context, const PostgresResult &res, int r, size_t i, const TableColumnInfo &col )
 {
   Value v;
   if ( res.isNull( r, i ) )
@@ -525,7 +531,7 @@ static Value resultToValue( const PostgresResult &res, int r, size_t i, const Ta
       std::string binString = hex2bin( valueStr.substr( 2 ) ); // chop \x prefix
 
       // 2. create binary header
-      std::string binHead = createGpkgHeader( binString, col );
+      std::string binHead = createGpkgHeader( context->logger(), binString, col );
 
       // 3. copy header and body
       std::string gpb( binHead.size() + binString.size(), 0 );
@@ -586,7 +592,7 @@ static std::string valueToSql( const Value &v, const TableColumnInfo &col )
 }
 
 
-static void handleInserted( const std::string &schemaNameBase, const std::string &schemaNameModified, const std::string &tableName, const TableSchema &tbl, bool reverse, PGconn *conn, ChangesetWriter &writer, bool &first )
+static void handleInserted( Context *context, const std::string &schemaNameBase, const std::string &schemaNameModified, const std::string &tableName, const TableSchema &tbl, bool reverse, PGconn *conn, ChangesetWriter &writer, bool &first )
 {
   std::string sqlInserted = sqlFindInserted( schemaNameBase, schemaNameModified, tableName, tbl, reverse );
   PostgresResult res( execSql( conn, sqlInserted ) );
@@ -607,7 +613,7 @@ static void handleInserted( const std::string &schemaNameBase, const std::string
     size_t numColumns = tbl.columns.size();
     for ( size_t i = 0; i < numColumns; ++i )
     {
-      Value v( resultToValue( res, r, i, tbl.columns[i] ) );
+      Value v( resultToValue( context, res, r, i, tbl.columns[i] ) );
       if ( reverse )
         e.oldValues.push_back( v );
       else
@@ -619,7 +625,7 @@ static void handleInserted( const std::string &schemaNameBase, const std::string
 }
 
 
-static void handleUpdated( const std::string &schemaNameBase, const std::string &schemaNameModified, const std::string &tableName, const TableSchema &tbl, PGconn *conn, ChangesetWriter &writer, bool &first )
+static void handleUpdated( Context *context, const std::string &schemaNameBase, const std::string &schemaNameModified, const std::string &tableName, const TableSchema &tbl, PGconn *conn, ChangesetWriter &writer, bool &first )
 {
   std::string sqlModified = sqlFindModified( schemaNameBase, schemaNameModified, tableName, tbl );
   PostgresResult res( execSql( conn, sqlModified ) );
@@ -651,8 +657,8 @@ static void handleUpdated( const std::string &schemaNameBase, const std::string
     size_t numColumns = tbl.columns.size();
     for ( size_t i = 0; i < numColumns; ++i )
     {
-      Value v1( resultToValue( res, r, i + numColumns, tbl.columns[i] ) );
-      Value v2( resultToValue( res, r, i, tbl.columns[i] ) );
+      Value v1( resultToValue( context, res, r, i + numColumns, tbl.columns[i] ) );
+      Value v2( resultToValue( context, res, r, i, tbl.columns[i] ) );
       bool pkey = tbl.columns[i].isPrimaryKey;
       bool updated = v1 != v2;
       e.oldValues.push_back( ( pkey || updated ) ? v1 : Value() );
@@ -696,9 +702,9 @@ void PostgresDriver::createChangeset( ChangesetWriter &writer )
 
     bool first = true;
 
-    handleInserted( mBaseSchema, mModifiedSchema, tableName, tbl, false, mConn, writer, first );  // INSERT
-    handleInserted( mBaseSchema, mModifiedSchema, tableName, tbl, true, mConn, writer, first );   // DELETE
-    handleUpdated( mBaseSchema, mModifiedSchema, tableName, tbl, mConn, writer, first );          // UPDATE
+    handleInserted( context(), mBaseSchema, mModifiedSchema, tableName, tbl, false, mConn, writer, first );  // INSERT
+    handleInserted( context(), mBaseSchema, mModifiedSchema, tableName, tbl, true, mConn, writer, first );   // DELETE
+    handleUpdated( context(), mBaseSchema, mModifiedSchema, tableName, tbl, mConn, writer, first );          // UPDATE
   }
 }
 
@@ -844,9 +850,9 @@ void PostgresDriver::applyChangeset( ChangesetReader &reader )
       PostgresResult res( execSql( mConn, sql ) );
       if ( res.status() != PGRES_COMMAND_OK )
       {
-        logApplyConflict( "insert_failed", entry );
+        logApplyConflict( context(), "insert_failed", entry );
         ++conflictCount;
-        Logger::instance().warn( "Failure doing INSERT: " + res.statusErrorMessage() );
+        context()->logger().warn( "Failure doing INSERT: " + res.statusErrorMessage() );
       }
       if ( res.affectedRows() != "1" )
       {
@@ -868,15 +874,15 @@ void PostgresDriver::applyChangeset( ChangesetReader &reader )
       PostgresResult res( execSql( mConn, sql ) );
       if ( res.status() != PGRES_COMMAND_OK )
       {
-        logApplyConflict( "update_failed", entry );
+        logApplyConflict( context(), "update_failed", entry );
         ++conflictCount;
-        Logger::instance().warn( "Failure doing UPDATE: " + res.statusErrorMessage() );
+        context()->logger().warn( "Failure doing UPDATE: " + res.statusErrorMessage() );
       }
       if ( res.affectedRows() != "1" )
       {
-        logApplyConflict( "update_nothing", entry );
+        logApplyConflict( context(), "update_nothing", entry );
         ++conflictCount;
-        Logger::instance().warn( "Wrong number of affected rows! Expected 1, got: " + res.affectedRows() + "\nSQL: " + sql );
+        context()->logger().warn( "Wrong number of affected rows! Expected 1, got: " + res.affectedRows() + "\nSQL: " + sql );
       }
     }
     else if ( entry.op == ChangesetEntry::OpDelete )
@@ -885,22 +891,22 @@ void PostgresDriver::applyChangeset( ChangesetReader &reader )
       PostgresResult res( execSql( mConn, sql ) );
       if ( res.status() != PGRES_COMMAND_OK )
       {
-        logApplyConflict( "delete_failed", entry );
+        logApplyConflict( context(), "delete_failed", entry );
         ++conflictCount;
-        Logger::instance().warn( "Failure doing DELETE: " + res.statusErrorMessage() );
+        context()->logger().warn( "Failure doing DELETE: " + res.statusErrorMessage() );
       }
       if ( res.affectedRows() != "1" )
       {
-        logApplyConflict( "delete_nothing", entry );
-        Logger::instance().warn( "Wrong number of affected rows! Expected 1, got: " + res.affectedRows() );
+        logApplyConflict( context(), "delete_nothing", entry );
+        context()->logger().warn( "Wrong number of affected rows! Expected 1, got: " + res.affectedRows() );
       }
     }
     else
       throw GeoDiffException( "Unexpected operation" );
   }
 
   // at the end, update any SEQUENCE objects if needed
-  for ( const std::pair<std::string, int64_t> &it : autoIncrementTablesToFix )
+  for ( const auto &it : autoIncrementTablesToFix )
     updateSequenceObject( tableNameToSequenceName[it.first], it.second );
 
   if ( !conflictCount )
@@ -947,7 +953,7 @@ void PostgresDriver::updateSequenceObject( const std::string &seqName, int64_t m
 
   if ( currValue < maxValue )
   {
-    Logger::instance().info( "Updating sequence " + seqName + " from " + std::to_string( currValue ) + " to " + std::to_string( maxValue ) );
+    context()->logger().info( "Updating sequence " + seqName + " from " + std::to_string( currValue ) + " to " + std::to_string( maxValue ) );
 
     std::string sql = "SELECT setval(" + quotedString( seqName ) + ", " + std::to_string( maxValue ) + ")";
     PostgresResult resSetVal( execSql( mConn, sql ) );
@@ -1025,7 +1031,7 @@ void PostgresDriver::dumpData( ChangesetWriter &writer, bool useModified )
       size_t numColumns = tbl.columns.size();
       for ( size_t i = 0; i < numColumns; ++i )
       {
-        e.newValues.push_back( Value( resultToValue( res, r, i, tbl.columns[i] ) ) );
+        e.newValues.push_back( Value( resultToValue( context(), res, r, i, tbl.columns[i] ) ) );
       }
       writer.writeEntry( e );
     }

geodiff/src/drivers/postgresdriver.h

@@ -17,6 +17,7 @@ extern "C"
 class PostgresDriver : public Driver
 {
   public:
+    explicit PostgresDriver( Context *context );
     ~PostgresDriver() override;
 
     void open( const DriverParametersMap &conn ) override;