mtcontrib/mtsatellite
1
0
Fork 0
mirror of https://bitbucket.org/s_l_teichmann/mtsatellite synced 2024-12-24 09:10:17 +01:00
Code Issues Projects Releases Wiki Activity

Fixed endless loop in Z order range query code in SQLite3 backend.

Browse Source
This commit is contained in:
Sascha L. Teichmann 2015-07-21 12:53:55 +02:00
parent 80113b885f
commit 470b47f70a
1 changed files with 35 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/mtredisalize/sqlite.go
View File

@ -327,12 +327,12 @@ func (ss *SqliteSession) interleavedSpatialQuery(first, second []byte, done chan
zmin, zmax = order(zmin, zmax) zmin, zmax = order(zmin, zmax)
cub := common.Cuboid{P1: c1, P2: c2} cub := common.Cuboid{P1: c1, P2: c2}
rangeStmt := ss.txStmt(ss.backend.rangeStmt) rangeStmt := ss.txStmt(ss.backend.rangeStmt)
OUTER:
for {
var ( var (
err error err error
rows *sql.Rows rows *sql.Rows
) )
loop:
// log.Printf("query %d %d\n", zmin, zmax)
if rows, err = rangeStmt.Query(zmin, zmax); err != nil { if rows, err = rangeStmt.Query(zmin, zmax); err != nil {
log.Printf("Error in range query: %s\n", err) log.Printf("Error in range query: %s\n", err)
return return
@ -345,6 +345,7 @@ func (ss *SqliteSession) interleavedSpatialQuery(first, second []byte, done chan
rows.Close() rows.Close()
return return
} }
// log.Printf("zcode: %d\n", zcode)
c := common.InterleavedToCoord(zcode) c := common.InterleavedToCoord(zcode)
if cub.Contains(c) { if cub.Contains(c) {
var encodedKey []byte var encodedKey []byte
@ -360,16 +361,16 @@ func (ss *SqliteSession) interleavedSpatialQuery(first, second []byte, done chan
return return
} }
} else { // Left the cuboid } else { // Left the cuboid
// log.Printf("Left cuboid %d\n", zcode)
rows.Close() rows.Close()
zmin = common.BigMin(zmin, zmax, zcode) zmin = common.BigMin(zmin, zmax, zcode)
continue OUTER goto loop
} }
} }
if err = rows.Err(); err != nil { if err = rows.Err(); err != nil {
log.Printf("Error in range query: %s\n", err) log.Printf("Error in range query: %s\n", err)
} }
rows.Close() rows.Close()
}
}() }()
return return