Skip to content

Commit 04322a3

Browse files
authored
Fixed task partition cleanup (#61)
1 parent 2c43a32 commit 04322a3

2 files changed

Lines changed: 15 additions & 0 deletions

File tree

pgqueue/manager/partition.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,16 @@ func (manager *Manager) DropDrainedPartition(ctx context.Context) (result string
102102
if oldest.Count > 0 {
103103
return "", nil
104104
}
105+
106+
// Don't drop a partition if the sequence hasn't advanced past its end — new
107+
// inserts could still land in this range.
108+
seq, err := manager.GetPartitionSeq(ctx)
109+
if err != nil {
110+
return "", err
111+
}
112+
if seq < oldest.End {
113+
return "", nil
114+
}
105115
if err := manager.DeletePartition(ctx, oldest.Partition); err != nil {
106116
return "", err
107117
} else {

queries.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ func NewQueries(r io.Reader) (*Queries, error) {
8383
self.keys = append(self.keys, key)
8484
}
8585

86+
// Remove any ; at the end of each SQL statement
87+
for k, v := range self.queries {
88+
self.queries[k] = strings.TrimSuffix(v, ";")
89+
}
90+
8691
// Check for scanner errors
8792
if err := scanner.Err(); err != nil {
8893
return nil, err

0 commit comments

Comments
 (0)