Add code for postgres-stream
Some checks failed
continuous-integration/drone/push Build is failing

This commit is contained in:
Peter Stuifzand 2021-05-11 17:28:52 +02:00
parent 02bc2ab9bc
commit cb9acf31ad
Signed by: peter
GPG Key ID: 374322D56E5209E8
3 changed files with 177 additions and 1 deletions

22
pkg/microsub/database.go Normal file
View File

@ -0,0 +1,22 @@
package microsub
import (
"database/sql/driver"
"encoding/json"
"errors"
)
// Scan helps to scan json data from database
func (item *Item) Scan(value interface{}) error {
b, ok := value.([]byte)
if !ok {
return errors.New("type assertion to []byte failed")
}
return json.Unmarshal(b, &item)
}
// Value helps to add json data to database
func (item *Item) Value() (driver.Value, error) {
return json.Marshal(item)
}

154
pkg/timeline/postgres.go Normal file
View File

@ -0,0 +1,154 @@
package timeline
import (
"database/sql"
"fmt"
"time"
"p83.nl/go/ekster/pkg/microsub"
// load pq for postgres
_ "github.com/lib/pq"
)
type postgresStream struct {
database *sql.DB
channel string
channelID int
}
// Init
func (p *postgresStream) Init() error {
db, err := sql.Open("postgres", "host=database user=postgres password=simple dbname=ekster sslmode=disable")
if err != nil {
return fmt.Errorf("database open failed: %w", err)
}
p.database = db
err = db.Ping()
if err != nil {
return fmt.Errorf("database ping failed: %w", err)
}
_, err = db.Exec(`
CREATE TABLE IF NOT EXISTS "channels" (
"id" int primary key generated always as identity,
"name" varchar(255) unique,
"created_at" timestamp DEFAULT current_timestamp
);
`)
if err != nil {
return fmt.Errorf("create channels table failed: %w", err)
}
_, err = db.Exec(`
CREATE TABLE IF NOT EXISTS "items" (
"id" int primary key generated always as identity,
"channel_id" int references "channels" on delete cascade,
"uid" varchar(512) not null unique,
"is_read" int default 0,
"data" json,
"created_at" timestamp DEFAULT current_timestamp,
"updated_at" timestamp,
"published_at" timestamp
);
`)
if err != nil {
return fmt.Errorf("create items table failed: %w", err)
}
_, err = db.Exec(`INSERT INTO "channels" ("name", "created_at") VALUES ($1, DEFAULT)
ON CONFLICT DO NOTHING`, p.channel)
if err != nil {
return fmt.Errorf("create channel failed: %w", err)
}
rows, err := db.Query(`SELECT "id" FROM "channels" WHERE "name" = $1`, p.channel)
if err != nil {
return fmt.Errorf("fetch channel failed", err)
}
for rows.Next() {
err = rows.Scan(&p.channelID)
if err != nil {
return fmt.Errorf("fetch channel failed while scanning", err)
}
break
}
return nil
}
// Items
func (p *postgresStream) Items(before, after string) (microsub.Timeline, error) {
rows, err := p.database.Query(`SELECT "id", "uid", "data", "created_at", "is_read" FROM "items" WHERE "channel_id" = $1`, p.channel)
if err != nil {
return microsub.Timeline{}, fmt.Errorf("while query: %w", err)
}
var tl microsub.Timeline
for rows.Next() {
var id int
var uid string
var item microsub.Item
var createdAt time.Time
var isRead int
err = rows.Scan(&id, &uid, &item, &createdAt, &isRead)
if err != nil {
return microsub.Timeline{}, fmt.Errorf("while scanning: %w", err)
}
item.Read = isRead == 1
item.ID = uid
tl.Items = append(tl.Items, item)
}
return tl, nil
}
// Count
func (p *postgresStream) Count() (int, error) {
rows, err := p.database.Query("SELECT COUNT(*) FROM items WHERE channel_id = ?", p.channel)
if err != nil {
return 0, err
}
var count int
for rows.Next() {
err = rows.Scan(&count)
if err != nil {
return -1, err
}
break
}
return count, nil
}
// AddItem
func (p *postgresStream) AddItem(item microsub.Item) (bool, error) {
t, err := time.Parse(time.RFC3339, item.Published)
if err != nil {
return false, fmt.Errorf("while adding item: time %q could not be parsed: %w", item.Published, err)
}
_, err = p.database.Exec(`
INSERT INTO "items" ("channel_id", "uid", "data", "published_at", "created_at")
VALUES ($1, $2, $3, $4, DEFAULT)
ON CONFLICT ON CONSTRAINT "items_uid_key" DO UPDATE SET "updated_at" = now()
`, p.channelID, item.ID, &item, t)
if err != nil {
return false, fmt.Errorf("while adding item: %w", err)
}
return true, nil
}
// MarkRead
func (p *postgresStream) MarkRead(uids []string) error {
_, err := p.database.Exec(`UPDATE "items" SET is_read = 1 WHERE "uid" IN ($1)`, uids)
if err != nil {
return fmt.Errorf("while marking as read: %w", err)
}
return nil
}

View File

@ -58,7 +58,7 @@ func Create(channel, timelineType string, pool *redis.Pool) Backend {
} }
if timelineType == "postgres-stream" { if timelineType == "postgres-stream" {
timeline := &PostgresStream{channel: channel} timeline := &postgresStream{channel: channel}
err := timeline.Init() err := timeline.Init()
if err != nil { if err != nil {
log.Printf("Error while creating %s: %v", channel, err) log.Printf("Error while creating %s: %v", channel, err)