feat(storage): add native PostgreSQL runtime and verified offline application import
Build and publish container images / images (push) Failing after 12m29s
Build and publish container images / images (push) Failing after 12m29s
This commit is contained in:
1 parent
96065d1e89
commit
0ba1dcfef0
243 files changed
+21441
-3090
No files matched your search
@@ -0,0 +1,66 @@
|
||||
package calendar
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgconn"
|
||||
"pageswiki/internal/db"
|
||||
)
|
||||
|
||||
// NewPostgreSQL initializes disposable indexes, not canonical calendar data.
|
||||
// All writers sharing this DB must share Root and its working flock semantics.
|
||||
// Separate replicas with independent filesystems are not a supported HA mode.
|
||||
func NewPostgreSQL(ctx context.Context, root string, database *sql.DB) (*Repository, error) {
|
||||
if root == "" || database == nil {
|
||||
return nil, errors.New("calendar storage unavailable")
|
||||
}
|
||||
ctx, cancel := context.WithTimeout(ctx, 15*time.Second)
|
||||
defer cancel()
|
||||
err := db.ApplyPostgreSQLMigrations(ctx, database, "calendar-cache", []db.PostgreSQLMigration{{Version: 1, Name: "rebuildable monthly calendar indexes", Statements: []string{
|
||||
`CREATE TABLE calendar_index_state(domain TEXT COLLATE "C" NOT NULL,calendar TEXT COLLATE "C" NOT NULL,version TEXT NOT NULL,PRIMARY KEY(domain,calendar))`,
|
||||
`CREATE TABLE calendar_month_cache(domain TEXT COLLATE "C" NOT NULL,calendar TEXT COLLATE "C" NOT NULL,month TEXT COLLATE "C" NOT NULL,hash TEXT NOT NULL,PRIMARY KEY(domain,calendar,month))`,
|
||||
`CREATE TABLE calendar_event_cache(domain TEXT COLLATE "C" NOT NULL,calendar TEXT COLLATE "C" NOT NULL,uid TEXT COLLATE "C" NOT NULL,month TEXT COLLATE "C" NOT NULL,start BIGINT NOT NULL,"end" BIGINT NOT NULL,etag TEXT NOT NULL,data TEXT NOT NULL,PRIMARY KEY(domain,calendar,uid))`,
|
||||
`CREATE INDEX calendar_event_range ON calendar_event_cache(domain,calendar,start,"end")`,
|
||||
}, Assertions: []string{
|
||||
`SELECT domain,calendar,version FROM calendar_index_state WHERE 1=0`,
|
||||
`SELECT domain,calendar,month,hash FROM calendar_month_cache WHERE 1=0`,
|
||||
`SELECT domain,calendar,uid,month,start,"end",etag,data FROM calendar_event_cache WHERE 1=0`,
|
||||
}}})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &Repository{Root: root, DB: database, postgres: true}, nil
|
||||
}
|
||||
|
||||
// Compose source-owned SQL; never translate arbitrary SQL at runtime.
|
||||
func (r *Repository) p(n int) string {
|
||||
if r.postgres {
|
||||
return fmt.Sprintf("$%d", n)
|
||||
}
|
||||
return "?"
|
||||
}
|
||||
|
||||
func (r *Repository) failure(err error) error {
|
||||
if !r.postgres || err == nil {
|
||||
return err
|
||||
}
|
||||
for _, known := range []error{ErrForbidden, ErrConflict, ErrPreconditionRequired, ErrMissing, ErrLimit, ErrInvalid, ErrNameTaken, sql.ErrNoRows, context.Canceled, context.DeadlineExceeded} {
|
||||
if errors.Is(err, known) {
|
||||
return known
|
||||
}
|
||||
}
|
||||
var safe *db.PostgreSQLError
|
||||
if errors.As(err, &safe) {
|
||||
return safe
|
||||
}
|
||||
var pg *pgconn.PgError
|
||||
if errors.As(err, &pg) {
|
||||
return &db.PostgreSQLError{Operation: "calendar cache", SQLState: pg.Code}
|
||||
}
|
||||
// Encoding/Scan errors can contain event contents too.
|
||||
return errors.New("calendar operation failed")
|
||||
}
|
||||
@@ -5,6 +5,8 @@ import (
|
||||
"database/sql"
|
||||
"encoding/base64"
|
||||
"strings"
|
||||
"unicode"
|
||||
"unicode/utf8"
|
||||
)
|
||||
|
||||
func DAVFilename(c Calendar, uid string) string {
|
||||
@@ -36,7 +38,7 @@ func DAVUID(c Calendar, name string) (string, error) {
|
||||
}
|
||||
}
|
||||
b, err := base64.RawURLEncoding.DecodeString(strings.TrimSuffix(name, ".ics"))
|
||||
if err != nil || len(b) == 0 || len(b) > 512 {
|
||||
if err != nil || len(b) == 0 || len(b) > 512 || !utf8.Valid(b) || strings.IndexFunc(string(b), unicode.IsControl) >= 0 {
|
||||
return "", ErrMissing
|
||||
}
|
||||
return string(b), nil
|
||||
@@ -44,7 +46,8 @@ func DAVUID(c Calendar, name string) (string, error) {
|
||||
|
||||
// DAVSnapshot is complete or fails; a truncated listing can cause client deletes.
|
||||
// The metadata lock keeps href mappings and event generations in one snapshot.
|
||||
func (r *Repository) DAVSnapshot(ctx context.Context, domain, id, actor string, withData bool) (Calendar, []Event, error) {
|
||||
func (r *Repository) DAVSnapshot(ctx context.Context, domain, id, actor string, withData bool) (result Calendar, itemsResult []Event, resultErr error) {
|
||||
defer func() { resultErr = r.failure(resultErr) }()
|
||||
c, _, unlock, err := r.locked(ctx, domain, id, actor)
|
||||
if err != nil {
|
||||
return c, nil, err
|
||||
@@ -54,7 +57,7 @@ func (r *Repository) DAVSnapshot(ctx context.Context, domain, id, actor string,
|
||||
if withData {
|
||||
cols = "uid,etag,data"
|
||||
}
|
||||
rows, err := r.DB.QueryContext(ctx, `SELECT `+cols+` FROM calendar_event_cache WHERE domain=? AND calendar=? ORDER BY uid LIMIT 10001`, domain, id)
|
||||
rows, err := r.DB.QueryContext(ctx, `SELECT `+cols+` FROM calendar_event_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` ORDER BY uid LIMIT 10001`, domain, id)
|
||||
if err != nil {
|
||||
return c, nil, err
|
||||
}
|
||||
@@ -77,7 +80,8 @@ func (r *Repository) DAVSnapshot(ctx context.Context, domain, id, actor string,
|
||||
|
||||
// ChangeDAV reserves resource identities in the same manifest commit as the
|
||||
// monthly snapshots. Existing resources still require an exact strong ETag.
|
||||
func (r *Repository) ChangeDAV(ctx context.Context, domain, id, actor, name, match string, item *Event, authorize func() error) (Event, bool, error) {
|
||||
func (r *Repository) ChangeDAV(ctx context.Context, domain, id, actor, name, match string, item *Event, authorize func() error) (eventResult Event, created bool, resultErr error) {
|
||||
defer func() { resultErr = r.failure(resultErr) }()
|
||||
if !ValidDAVFilename(name) {
|
||||
return Event{}, false, ErrInvalid
|
||||
}
|
||||
@@ -94,7 +98,7 @@ func (r *Repository) ChangeDAV(ctx context.Context, domain, id, actor, name, mat
|
||||
uid, _ := DAVUID(c, name)
|
||||
var exists bool
|
||||
if uid != "" {
|
||||
if err = r.DB.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?)`, domain, id, uid).Scan(&exists); err != nil {
|
||||
if err = r.DB.QueryRowContext(ctx, `SELECT EXISTS(SELECT 1 FROM calendar_event_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` AND uid=`+r.p(3)+`)`, domain, id, uid).Scan(&exists); err != nil {
|
||||
return Event{}, false, err
|
||||
}
|
||||
}
|
||||
@@ -114,7 +118,7 @@ func (r *Repository) ChangeDAV(ctx context.Context, domain, id, actor, name, mat
|
||||
}
|
||||
uid = item.UID
|
||||
var tag string
|
||||
err = r.DB.QueryRowContext(ctx, `SELECT etag FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?`, domain, id, uid).Scan(&tag)
|
||||
err = r.DB.QueryRowContext(ctx, `SELECT etag FROM calendar_event_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` AND uid=`+r.p(3), domain, id, uid).Scan(&tag)
|
||||
if err == nil {
|
||||
return Event{}, false, ErrConflict
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package calendar
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/base64"
|
||||
"errors"
|
||||
"sync"
|
||||
"testing"
|
||||
@@ -9,6 +10,22 @@ import (
|
||||
"github.com/google/uuid"
|
||||
)
|
||||
|
||||
func TestDAVUIDRejectsBinaryFallback(t *testing.T) {
|
||||
for _, raw := range []string{"\xff\xfe", "uid\x00value", "uid\nvalue"} {
|
||||
name := base64.RawURLEncoding.EncodeToString([]byte(raw)) + ".ics"
|
||||
if _, err := DAVUID(Calendar{}, name); !errors.Is(err, ErrMissing) {
|
||||
t.Fatalf("binary UID accepted: %v", err)
|
||||
}
|
||||
}
|
||||
name := "client.ics"
|
||||
if _, err := DAVUID(Calendar{}, name); !errors.Is(err, ErrMissing) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if uid, err := DAVUID(Calendar{DAVNames: map[string]string{"日本語@example.invalid": name}}, name); err != nil || uid != "日本語@example.invalid" {
|
||||
t.Fatal(uid, err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCalendarDAVIdentityAtomicAndRebuild(t *testing.T) {
|
||||
r, domain, actor, c := fixture(t)
|
||||
ctx := context.Background()
|
||||
|
||||
@@ -51,6 +51,7 @@ type Repository struct {
|
||||
Root string
|
||||
DB *sql.DB
|
||||
PublicAllowed func(string) bool
|
||||
postgres bool
|
||||
}
|
||||
|
||||
func (r *Repository) canRead(domain string, c Calendar, actor string) bool {
|
||||
@@ -66,8 +67,8 @@ func New(root string, db *sql.DB) (*Repository, error) {
|
||||
}
|
||||
_, err := db.Exec(`CREATE TABLE IF NOT EXISTS calendar_index_state(domain TEXT NOT NULL,calendar TEXT NOT NULL,version TEXT NOT NULL,PRIMARY KEY(domain,calendar));
|
||||
CREATE TABLE IF NOT EXISTS calendar_month_cache(domain TEXT NOT NULL,calendar TEXT NOT NULL,month TEXT NOT NULL,hash TEXT NOT NULL,PRIMARY KEY(domain,calendar,month));
|
||||
CREATE TABLE IF NOT EXISTS calendar_event_cache(domain TEXT NOT NULL,calendar TEXT NOT NULL,uid TEXT NOT NULL,month TEXT NOT NULL,start INTEGER NOT NULL,end INTEGER NOT NULL,etag TEXT NOT NULL,data TEXT NOT NULL,PRIMARY KEY(domain,calendar,uid));
|
||||
CREATE INDEX IF NOT EXISTS calendar_event_range ON calendar_event_cache(domain,calendar,start,end);`)
|
||||
CREATE TABLE IF NOT EXISTS calendar_event_cache(domain TEXT NOT NULL,calendar TEXT NOT NULL,uid TEXT NOT NULL,month TEXT NOT NULL,start INTEGER NOT NULL,"end" INTEGER NOT NULL,etag TEXT NOT NULL,data TEXT NOT NULL,PRIMARY KEY(domain,calendar,uid));
|
||||
CREATE INDEX IF NOT EXISTS calendar_event_range ON calendar_event_cache(domain,calendar,start,"end");`)
|
||||
return &Repository{Root: root, DB: db}, err
|
||||
}
|
||||
func validID(s string) bool { u, err := uuid.Parse(s); return err == nil && u.String() == s }
|
||||
@@ -347,7 +348,10 @@ func (r *Repository) Settings(ctx context.Context, domain, id, actor, version, n
|
||||
// with event/source writes. Cache rows are disposable, but deleting them
|
||||
// before the atomic directory rename means a failed rename can safely rebuild
|
||||
// them from the still-visible canonical files on the next access.
|
||||
func (r *Repository) Delete(ctx context.Context, domain, id, actor, version string) error {
|
||||
func (r *Repository) Delete(ctx context.Context, domain, id, actor, version string) (resultErr error) {
|
||||
defer func() { resultErr = r.failure(resultErr) }()
|
||||
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
|
||||
defer cancel()
|
||||
dir, err := r.dir(domain, id)
|
||||
if err != nil {
|
||||
return err
|
||||
@@ -382,7 +386,7 @@ func (r *Repository) Delete(ctx context.Context, domain, id, actor, version stri
|
||||
}
|
||||
defer tx.Rollback()
|
||||
for _, table := range []string{"calendar_event_cache", "calendar_month_cache", "calendar_index_state"} {
|
||||
if _, err = tx.ExecContext(ctx, `DELETE FROM `+table+` WHERE domain=? AND calendar=?`, domain, id); err != nil {
|
||||
if _, err = tx.ExecContext(ctx, `DELETE FROM `+table+` WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2), domain, id); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -413,9 +417,12 @@ func syncDirectory(path string) error {
|
||||
|
||||
// refresh reconciles only changed monthly generations. A crash after manifest
|
||||
// commit but before index commit repairs itself on the next request.
|
||||
func (r *Repository) refresh(ctx context.Context, domain string, c Calendar, dir string) error {
|
||||
func (r *Repository) refresh(ctx context.Context, domain string, c Calendar, dir string) (resultErr error) {
|
||||
defer func() { resultErr = r.failure(resultErr) }()
|
||||
ctx, cancel := context.WithTimeout(ctx, 30*time.Second)
|
||||
defer cancel()
|
||||
var version string
|
||||
if err := r.DB.QueryRowContext(ctx, `SELECT version FROM calendar_index_state WHERE domain=? AND calendar=?`, domain, c.ID).Scan(&version); err == nil && version == c.Version {
|
||||
if err := r.DB.QueryRowContext(ctx, `SELECT version FROM calendar_index_state WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2), domain, c.ID).Scan(&version); err == nil && version == c.Version {
|
||||
return nil
|
||||
} else if err != nil && err != sql.ErrNoRows {
|
||||
return err
|
||||
@@ -425,7 +432,7 @@ func (r *Repository) refresh(ctx context.Context, domain string, c Calendar, dir
|
||||
return e
|
||||
}
|
||||
defer tx.Rollback()
|
||||
rows, e := tx.QueryContext(ctx, `SELECT month,hash FROM calendar_month_cache WHERE domain=? AND calendar=?`, domain, c.ID)
|
||||
rows, e := tx.QueryContext(ctx, `SELECT month,hash FROM calendar_month_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2), domain, c.ID)
|
||||
if e != nil {
|
||||
return e
|
||||
}
|
||||
@@ -445,10 +452,10 @@ func (r *Repository) refresh(ctx context.Context, domain string, c Calendar, dir
|
||||
}
|
||||
for m, h := range known {
|
||||
if c.Months[m] != h {
|
||||
if _, e = tx.ExecContext(ctx, `DELETE FROM calendar_event_cache WHERE domain=? AND calendar=? AND month=?`, domain, c.ID, m); e != nil {
|
||||
if _, e = tx.ExecContext(ctx, `DELETE FROM calendar_event_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` AND month=`+r.p(3), domain, c.ID, m); e != nil {
|
||||
return e
|
||||
}
|
||||
if _, e = tx.ExecContext(ctx, `DELETE FROM calendar_month_cache WHERE domain=? AND calendar=? AND month=?`, domain, c.ID, m); e != nil {
|
||||
if _, e = tx.ExecContext(ctx, `DELETE FROM calendar_month_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` AND month=`+r.p(3), domain, c.ID, m); e != nil {
|
||||
return e
|
||||
}
|
||||
}
|
||||
@@ -480,15 +487,15 @@ func (r *Repository) refresh(ctx context.Context, domain string, c Calendar, dir
|
||||
if e != nil {
|
||||
return e
|
||||
}
|
||||
if _, e = tx.ExecContext(ctx, `INSERT INTO calendar_event_cache(domain,calendar,uid,month,start,end,etag,data) VALUES(?,?,?,?,?,?,?,?)`, domain, c.ID, event.UID, m, event.Start.Unix(), event.End.Unix(), event.ETag, event.Data); e != nil {
|
||||
if _, e = tx.ExecContext(ctx, `INSERT INTO calendar_event_cache(domain,calendar,uid,month,start,"end",etag,data) VALUES(`+r.p(1)+`,`+r.p(2)+`,`+r.p(3)+`,`+r.p(4)+`,`+r.p(5)+`,`+r.p(6)+`,`+r.p(7)+`,`+r.p(8)+`)`, domain, c.ID, event.UID, m, event.Start.Unix(), event.End.Unix(), event.ETag, event.Data); e != nil {
|
||||
return e
|
||||
}
|
||||
}
|
||||
if _, e = tx.ExecContext(ctx, `INSERT INTO calendar_month_cache(domain,calendar,month,hash) VALUES(?,?,?,?)`, domain, c.ID, m, h); e != nil {
|
||||
if _, e = tx.ExecContext(ctx, `INSERT INTO calendar_month_cache(domain,calendar,month,hash) VALUES(`+r.p(1)+`,`+r.p(2)+`,`+r.p(3)+`,`+r.p(4)+`)`, domain, c.ID, m, h); e != nil {
|
||||
return e
|
||||
}
|
||||
}
|
||||
if _, e = tx.ExecContext(ctx, `INSERT INTO calendar_index_state(domain,calendar,version) VALUES(?,?,?) ON CONFLICT(domain,calendar) DO UPDATE SET version=excluded.version`, domain, c.ID, c.Version); e != nil {
|
||||
if _, e = tx.ExecContext(ctx, `INSERT INTO calendar_index_state(domain,calendar,version) VALUES(`+r.p(1)+`,`+r.p(2)+`,`+r.p(3)+`) ON CONFLICT(domain,calendar) DO UPDATE SET version=excluded.version`, domain, c.ID, c.Version); e != nil {
|
||||
return e
|
||||
}
|
||||
return tx.Commit()
|
||||
@@ -540,7 +547,8 @@ func (r *Repository) query(ctx context.Context, domain, id, actor string, start,
|
||||
func (r *Repository) Upcoming(ctx context.Context, domain, id, actor string, start, end time.Time) ([]Event, error) {
|
||||
return r.queryLimit(ctx, domain, id, actor, start, end, true, 20)
|
||||
}
|
||||
func (r *Repository) queryLimit(ctx context.Context, domain, id, actor string, start, end time.Time, withData bool, limit int) ([]Event, error) {
|
||||
func (r *Repository) queryLimit(ctx context.Context, domain, id, actor string, start, end time.Time, withData bool, limit int) (result []Event, resultErr error) {
|
||||
defer func() { resultErr = r.failure(resultErr) }()
|
||||
if !end.After(start) || end.Sub(start) > 370*24*time.Hour {
|
||||
return nil, ErrInvalid
|
||||
}
|
||||
@@ -553,7 +561,7 @@ func (r *Repository) queryLimit(ctx context.Context, domain, id, actor string, s
|
||||
if withData {
|
||||
columns = "data"
|
||||
}
|
||||
rows, e := r.DB.QueryContext(ctx, `SELECT `+columns+` FROM calendar_event_cache WHERE domain=? AND calendar=? AND start<? AND (end>? OR (start=end AND start>=?)) ORDER BY start,uid LIMIT ?`, domain, id, end.Unix(), start.Unix(), start.Unix(), limit)
|
||||
rows, e := r.DB.QueryContext(ctx, `SELECT `+columns+` FROM calendar_event_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` AND start<`+r.p(3)+` AND ("end">`+r.p(4)+` OR (start="end" AND start>=`+r.p(5)+`)) ORDER BY start,uid LIMIT `+r.p(6), domain, id, end.Unix(), start.Unix(), start.Unix(), limit)
|
||||
if e != nil {
|
||||
return nil, e
|
||||
}
|
||||
@@ -583,14 +591,15 @@ func (r *Repository) queryLimit(ctx context.Context, domain, id, actor string, s
|
||||
}
|
||||
return out, rows.Err()
|
||||
}
|
||||
func (r *Repository) Event(ctx context.Context, domain, id, actor, uid string) (Event, error) {
|
||||
func (r *Repository) Event(ctx context.Context, domain, id, actor, uid string) (result Event, resultErr error) {
|
||||
defer func() { resultErr = r.failure(resultErr) }()
|
||||
_, _, unlock, e := r.locked(ctx, domain, id, actor)
|
||||
if e != nil {
|
||||
return Event{}, e
|
||||
}
|
||||
defer unlock()
|
||||
var data string
|
||||
e = r.DB.QueryRowContext(ctx, `SELECT data FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?`, domain, id, uid).Scan(&data)
|
||||
e = r.DB.QueryRowContext(ctx, `SELECT data FROM calendar_event_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` AND uid=`+r.p(3), domain, id, uid).Scan(&data)
|
||||
if e == sql.ErrNoRows {
|
||||
e = ErrMissing
|
||||
}
|
||||
@@ -611,13 +620,14 @@ func (r *Repository) Change(ctx context.Context, domain, id, actor, uid, match s
|
||||
return r.changeLocked(ctx, domain, actor, uid, match, item, c, dir)
|
||||
}
|
||||
|
||||
func (r *Repository) changeLocked(ctx context.Context, domain, actor, uid, match string, item *Event, c Calendar, dir string) (Event, error) {
|
||||
func (r *Repository) changeLocked(ctx context.Context, domain, actor, uid, match string, item *Event, c Calendar, dir string) (result Event, resultErr error) {
|
||||
defer func() { resultErr = r.failure(resultErr) }()
|
||||
id := c.ID
|
||||
if !c.CanWrite(actor) {
|
||||
return Event{}, ErrForbidden
|
||||
}
|
||||
var oldData, oldMonth, oldTag string
|
||||
e := r.DB.QueryRowContext(ctx, `SELECT data,month,etag FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?`, domain, id, uid).Scan(&oldData, &oldMonth, &oldTag)
|
||||
e := r.DB.QueryRowContext(ctx, `SELECT data,month,etag FROM calendar_event_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` AND uid=`+r.p(3), domain, id, uid).Scan(&oldData, &oldMonth, &oldTag)
|
||||
exists := e == nil
|
||||
if e != nil && e != sql.ErrNoRows {
|
||||
return Event{}, e
|
||||
@@ -650,7 +660,7 @@ func (r *Repository) changeLocked(ctx context.Context, domain, actor, uid, match
|
||||
months[newMonth] = true
|
||||
}
|
||||
for month := range months {
|
||||
rows, e := r.DB.QueryContext(ctx, `SELECT data FROM calendar_event_cache WHERE domain=? AND calendar=? AND month=? AND uid<>? ORDER BY uid`, domain, id, month, uid)
|
||||
rows, e := r.DB.QueryContext(ctx, `SELECT data FROM calendar_event_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` AND month=`+r.p(3)+` AND uid<>`+r.p(4)+` ORDER BY uid`, domain, id, month, uid)
|
||||
if e != nil {
|
||||
return Event{}, e
|
||||
}
|
||||
@@ -717,7 +727,7 @@ func (r *Repository) changeLocked(ctx context.Context, domain, actor, uid, match
|
||||
_ = os.Remove(file)
|
||||
}
|
||||
}
|
||||
// The committed files, not SQLite, determine success. A subsequent read
|
||||
// The committed files, not the database cache, determine success. A subsequent read
|
||||
// reconciles the cache; retries with the old ETag correctly get 412.
|
||||
return next, nil
|
||||
}
|
||||
@@ -25,14 +25,15 @@ func (r *Repository) ReadPersonalLocalIndex(ctx context.Context, domain, id, act
|
||||
// TaskBlock gets a current event, or creates it if absent and a draft is supplied.
|
||||
// Retries NEVER overwrite an event moved/edited in the calendar. Metadata policy
|
||||
// is checked under the same lock as snapshot access and the eventual commit.
|
||||
func (r *Repository) TaskBlock(ctx context.Context, domain, id, actor, uid string, draft *Event) (Calendar, Event, error) {
|
||||
func (r *Repository) TaskBlock(ctx context.Context, domain, id, actor, uid string, draft *Event) (calendarResult Calendar, eventResult Event, resultErr error) {
|
||||
defer func() { resultErr = r.failure(resultErr) }()
|
||||
c, dir, unlock, err := r.lockedWithGuard(ctx, domain, id, actor, func(c Calendar) bool { return c.PersonalLocal(actor) })
|
||||
if err != nil {
|
||||
return Calendar{}, Event{}, err
|
||||
}
|
||||
defer unlock()
|
||||
var data string
|
||||
err = r.DB.QueryRowContext(ctx, `SELECT data FROM calendar_event_cache WHERE domain=? AND calendar=? AND uid=?`, domain, id, uid).Scan(&data)
|
||||
err = r.DB.QueryRowContext(ctx, `SELECT data FROM calendar_event_cache WHERE domain=`+r.p(1)+` AND calendar=`+r.p(2)+` AND uid=`+r.p(3), domain, id, uid).Scan(&data)
|
||||
if err == nil {
|
||||
event, e := Parse(data)
|
||||
return c, event, e
|
||||
|
||||
Reference in new issue
Block a user