Koldun/mapserver
1
0
Fork 0
forked from MTSR/mapserver
Code Pull Requests Activity

block convert

Browse Source
This commit is contained in:
NatureFreshMilk 2019-02-14 09:09:04 +01:00
parent a0a8569168
commit c14c8dad0a
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/Makefile
View File

@ -10,6 +10,9 @@ all: build
$(OUT_DIR):
mkdir $@
fmt:
go fmt ./...
test: $(OUT_DIR)
go generate
go build

16
server/db/postgres/postgres.go
View File

@ -37,8 +37,8 @@ func (db *PostgresAccessor) Migrate() error {
return nil
}
func convertRows(pos int64, data []byte, mtime int64) *db.Block {
c := coords.PlainToCoord(pos)
func convertRows(posx, posy, posz int, data []byte, mtime int64) *db.Block {
c := coords.NewMapBlockCoords(posx, posy, posz)
return &db.Block{Pos: c, Data: data, Mtime: mtime}
}
@ -53,16 +53,16 @@ func (this *PostgresAccessor) FindBlocksByMtime(gtmtime int64, limit int) ([]*db
defer rows.Close()
for rows.Next() {
var pos int64
var posx, posy, posz int
var data []byte
var mtime int64
err = rows.Scan(&pos, &data, &mtime)
err = rows.Scan(&posx, &posy, &posz, &data, &mtime)
if err != nil {
return nil, err
}
mb := convertRows(pos, data, mtime)
mb := convertRows(posx, posy, posz, data, mtime)
blocks = append(blocks, mb)
}
@ -100,16 +100,16 @@ func (this *PostgresAccessor) GetBlock(pos *coords.MapBlockCoords) (*db.Block, e
defer rows.Close()
if rows.Next() {
var pos int64
var posx, posy, posz int
var data []byte
var mtime int64
err = rows.Scan(&pos, &data, &mtime)
err = rows.Scan(&posx, &posy, &posz, &data, &mtime)
if err != nil {
return nil, err
}
mb := convertRows(pos, data, mtime)
mb := convertRows(posx, posy, posz, data, mtime)
return mb, nil
}

2
server/db/postgres/sql.go
View File

@ -13,7 +13,7 @@ select count(*) from blocks b where b.mtime >= ? and b.mtime <= ?
`
const getBlockQuery = `
select pos,data,mtime from blocks b
select posx,posy,posz,data,mtime from blocks b
where b.posx = ?
and b.posy = ?
and b.posz = ?