db.Insert takes OSMElem instead of row

database/database.go

@@ -2,6 +2,7 @@ package database
 
 import (
 	"errors"
+	"imposm3/element"
 	"imposm3/mapping"
 	"strings"
 )
@@ -18,15 +19,15 @@ type DB interface {
 	Abort() error
 	Init() error
 	Close() error
-	RowInserter
+	Inserter
 }
 
 type BulkBeginner interface {
 	BeginBulk() error
 }
 
-type RowInserter interface {
+type Inserter interface {
-	Insert(string, []interface{})
+	Insert(element.OSMElem, mapping.Match)
 }
 
 type Deployer interface {
@@ -81,12 +82,12 @@ func ConnectionType(param string) string {
 
 type NullDb struct{}
 
-func (n *NullDb) Init() error                  { return nil }
+func (n *NullDb) Init() error                           { return nil }
-func (n *NullDb) Begin() error                 { return nil }
+func (n *NullDb) Begin() error                          { return nil }
-func (n *NullDb) End() error                   { return nil }
+func (n *NullDb) End() error                            { return nil }
-func (n *NullDb) Close() error                 { return nil }
+func (n *NullDb) Close() error                          { return nil }
-func (n *NullDb) Abort() error                 { return nil }
+func (n *NullDb) Abort() error                          { return nil }
-func (n *NullDb) Insert(string, []interface{}) {}
+func (n *NullDb) Insert(element.OSMElem, mapping.Match) {}
 
 func NewNullDb(conf Config, m *mapping.Mapping) (DB, error) {
 	return &NullDb{}, nil

database/postgis/postgis.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	pq "github.com/olt/pq"
 	"imposm3/database"
+	"imposm3/element"
 	"imposm3/logging"
 	"imposm3/mapping"
 	"runtime"
@@ -429,8 +430,9 @@ func (pg *PostGIS) Open() error {
 	return nil
 }
 
-func (pg *PostGIS) Insert(table string, row []interface{}) {
+func (pg *PostGIS) Insert(elem element.OSMElem, match mapping.Match) {
-	pg.InputBuffer.Insert(table, row)
+	row := match.Row(&elem)
+	pg.InputBuffer.Insert(match.Table.Name, row)
 }
 
 func (pg *PostGIS) Delete(table string, id int64) error {

writer/nodes.go

@@ -20,15 +20,15 @@ type NodeWriter struct {
 }
 
 func NewNodeWriter(osmCache *cache.OSMCache, nodes chan *element.Node,
-	insertBuffer database.RowInserter, tagMatcher *mapping.TagMatcher, progress *stats.Statistics,
+	inserter database.Inserter, tagMatcher *mapping.TagMatcher, progress *stats.Statistics,
 	srid int) *OsmElemWriter {
 	nw := NodeWriter{
 		OsmElemWriter: OsmElemWriter{
-			osmCache:     osmCache,
+			osmCache: osmCache,
-			progress:     progress,
+			progress: progress,
-			wg:           &sync.WaitGroup{},
+			wg:       &sync.WaitGroup{},
-			insertBuffer: insertBuffer,
+			inserter: inserter,
-			srid:         srid,
+			srid:     srid,
 		},
 		nodes:      nodes,
 		tagMatcher: tagMatcher,

writer/relations.go

@@ -21,16 +21,16 @@ type RelationWriter struct {
 }
 
 func NewRelationWriter(osmCache *cache.OSMCache, diffCache *cache.DiffCache, rel chan *element.Relation,
-	insertBuffer database.RowInserter, tagMatcher *mapping.TagMatcher, progress *stats.Statistics,
+	inserter database.Inserter, tagMatcher *mapping.TagMatcher, progress *stats.Statistics,
 	srid int) *OsmElemWriter {
 	rw := RelationWriter{
 		OsmElemWriter: OsmElemWriter{
-			osmCache:     osmCache,
+			osmCache:  osmCache,
-			diffCache:    diffCache,
+			diffCache: diffCache,
-			progress:     progress,
+			progress:  progress,
-			wg:           &sync.WaitGroup{},
+			wg:        &sync.WaitGroup{},
-			insertBuffer: insertBuffer,
+			inserter:  inserter,
-			srid:         srid,
+			srid:      srid,
 		},
 		rel:        rel,
 		tagMatcher: tagMatcher,

writer/ways.go

@@ -21,16 +21,16 @@ type WayWriter struct {
 }
 
 func NewWayWriter(osmCache *cache.OSMCache, diffCache *cache.DiffCache, ways chan *element.Way,
-	insertBuffer database.RowInserter, lineStringTagMatcher *mapping.TagMatcher,
+	inserter database.Inserter, lineStringTagMatcher *mapping.TagMatcher,
 	polygonTagMatcher *mapping.TagMatcher, progress *stats.Statistics, srid int) *OsmElemWriter {
 	ww := WayWriter{
 		OsmElemWriter: OsmElemWriter{
-			osmCache:     osmCache,
+			osmCache:  osmCache,
-			diffCache:    diffCache,
+			diffCache: diffCache,
-			progress:     progress,
+			progress:  progress,
-			wg:           &sync.WaitGroup{},
+			wg:        &sync.WaitGroup{},
-			insertBuffer: insertBuffer,
+			inserter:  inserter,
-			srid:         srid,
+			srid:      srid,
 		},
 		ways:                 ways,
 		lineStringTagMatcher: lineStringTagMatcher,

writer/writer.go

@@ -21,15 +21,15 @@ type looper interface {
 }
 
 type OsmElemWriter struct {
-	osmCache     *cache.OSMCache
+	osmCache    *cache.OSMCache
-	diffCache    *cache.DiffCache
+	diffCache   *cache.DiffCache
-	progress     *stats.Statistics
+	progress    *stats.Statistics
-	insertBuffer database.RowInserter
+	inserter    database.Inserter
-	wg           *sync.WaitGroup
+	wg          *sync.WaitGroup
-	limiter      *limit.Limiter
+	limiter     *limit.Limiter
-	writer       looper
+	writer      looper
-	srid         int
+	srid        int
-	expireTiles  *expire.Tiles
+	expireTiles *expire.Tiles
 }
 
 func (writer *OsmElemWriter) SetLimiter(limiter *limit.Limiter) {
@@ -53,7 +53,6 @@ func (writer *OsmElemWriter) Close() {
 
 func (writer *OsmElemWriter) insertMatches(elem *element.OSMElem, matches []mapping.Match) {
 	for _, match := range matches {
-		row := match.Row(elem)
+		writer.inserter.Insert(*elem, match)
-		writer.insertBuffer.Insert(match.Table.Name, row)
 	}
 }