Skip to content

Commit

Permalink
refactor: sqlx - rename key_id to kid
Browse files Browse the repository at this point in the history
  • Loading branch information
@nalgeon
nalgeon committed May 3, 2024
1 parent 4f3ce93 commit 5acaeaa
Show file tree
Hide file tree
Showing 9 changed files with 101 additions and 101 deletions.
20 changes: 10 additions & 10 deletions internal/rhash/tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ import (
const (
sqlCount = `
select count(field)
from rhash join rkey on key_id = rkey.id and type = 4
from rhash join rkey on kid = rkey.id and type = 4
where key = ? and (etime is null or etime > ?) and field in (:fields)`

sqlDelete1 = `
delete from rhash
where key_id = (
where kid = (
select id from rkey
where key = ? and type = 4 and (etime is null or etime > ?)
) and field in (:fields)`
Expand All @@ -30,22 +30,22 @@ const (

sqlFields = `
select field
from rhash join rkey on key_id = rkey.id and type = 4
from rhash join rkey on kid = rkey.id and type = 4
where key = ? and (etime is null or etime > ?)`

sqlGet = `
select value
from rhash join rkey on key_id = rkey.id and type = 4
from rhash join rkey on kid = rkey.id and type = 4
where key = ? and (etime is null or etime > ?) and field = ?`

sqlGetMany = `
select field, value
from rhash join rkey on key_id = rkey.id and type = 4
from rhash join rkey on kid = rkey.id and type = 4
where key = ? and (etime is null or etime > ?) and field in (:fields)`

sqlItems = `
select field, value
from rhash join rkey on key_id = rkey.id and type = 4
from rhash join rkey on kid = rkey.id and type = 4
where key = ? and (etime is null or etime > ?)`

sqlLen = `
Expand All @@ -54,7 +54,7 @@ const (

sqlScan = `
select rhash.rowid, field, value
from rhash join rkey on key_id = rkey.id and type = 4
from rhash join rkey on kid = rkey.id and type = 4
where
key = ? and (etime is null or etime > ?)
and rhash.rowid > ? and field glob ?
Expand All @@ -71,14 +71,14 @@ const (
returning id`

sqlSet2 = `
insert into rhash (key_id, field, value)
insert into rhash (kid, field, value)
values (?, ?, ?)
on conflict (key_id, field) do update
on conflict (kid, field) do update
set value = excluded.value;`

sqlValues = `
select value
from rhash join rkey on key_id = rkey.id and type = 4
from rhash join rkey on kid = rkey.id and type = 4
where key = ? and (etime is null or etime > ?)`
)

Expand Down
64 changes: 32 additions & 32 deletions internal/rlist/tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ import (
const (
sqlDelete = `
delete from rlist
where key_id = (
where kid = (
select id from rkey
where key = ? and type = 2 and (etime is null or etime > ?)
) and elem = ?`

sqlDeleteBack = `
with ids as (
select rlist.rowid
from rlist join rkey on key_id = rkey.id and type = 2
from rlist join rkey on kid = rkey.id and type = 2
where key = ? and (etime is null or etime > ?) and elem = ?
order by pos desc
limit ?
Expand All @@ -31,7 +31,7 @@ const (
sqlDeleteFront = `
with ids as (
select rlist.rowid
from rlist join rkey on key_id = rkey.id and type = 2
from rlist join rkey on kid = rkey.id and type = 2
where key = ? and (etime is null or etime > ?) and elem = ?
order by pos
limit ?
Expand All @@ -42,7 +42,7 @@ const (
sqlGet = `
with elems as (
select elem, row_number() over (order by pos asc) as rownum
from rlist join rkey on key_id = rkey.id and type = 2
from rlist join rkey on kid = rkey.id and type = 2
where key = ? and (etime is null or etime > ?)
)
select elem
Expand All @@ -60,11 +60,11 @@ const (
sqlInsertAfter = `
with elprev as (
select min(pos) as pos from rlist
where key_id = ? and elem = ?
where kid = ? and elem = ?
),
elnext as (
select min(pos) as pos from rlist
where key_id = ? and pos > (select pos from elprev)
where kid = ? and pos > (select pos from elprev)
),
newpos as (
select
Expand All @@ -74,20 +74,20 @@ const (
end as pos
from elprev, elnext
)
insert into rlist (key_id, pos, elem)
insert into rlist (kid, pos, elem)
select ?, (select pos from newpos), ?
from rlist
where key_id = ?
where kid = ?
limit 1`

sqlInsertBefore = `
with elnext as (
select min(pos) as pos from rlist
where key_id = ? and elem = ?
where kid = ? and elem = ?
),
elprev as (
select max(pos) as pos from rlist
where key_id = ? and pos < (select pos from elnext)
where kid = ? and pos < (select pos from elnext)
),
newpos as (
select
Expand All @@ -97,41 +97,41 @@ const (
end as pos
from elprev, elnext
)
insert into rlist (key_id, pos, elem)
insert into rlist (kid, pos, elem)
select ?, (select pos from newpos), ?
from rlist
where key_id = ?
where kid = ?
limit 1`

sqlLen = `
select len from rkey
where key = ? and type = 2 and (etime is null or etime > ?)`

sqlPopBack = `
with keyid as (
with curkey as (
select id from rkey
where key = ? and type = 2 and (etime is null or etime > ?)
)
delete from rlist
where
key_id = (select id from keyid)
kid = (select id from curkey)
and pos = (
select max(pos) from rlist
where key_id = (select id from keyid)
where kid = (select id from curkey)
)
returning elem`

sqlPopFront = `
with keyid as (
with curkey as (
select id from rkey
where key = ? and type = 2 and (etime is null or etime > ?)
)
delete from rlist
where
key_id = (select id from keyid)
kid = (select id from curkey)
and pos = (
select min(pos) from rlist
where key_id = (select id from keyid)
where kid = (select id from curkey)
)
returning elem`

Expand All @@ -147,25 +147,25 @@ const (
returning id, len`

sqlPushBack = `
insert into rlist (key_id, pos, elem)
insert into rlist (kid, pos, elem)
select ?, coalesce(max(pos)+1, 0), ?
from rlist
where key_id = ?`
where kid = ?`

sqlPushFront = `
insert into rlist (key_id, pos, elem)
insert into rlist (kid, pos, elem)
select ?, coalesce(min(pos)-1, 0), ?
from rlist
where key_id = ?`
where kid = ?`

sqlRange = `
with keyid as (
with curkey as (
select id from rkey
where key = ? and type = 2 and (etime is null or etime > ?)
),
counts as (
select len from rkey
where id = (select id from keyid)
where id = (select id from curkey)
),
bounds as (
select
Expand All @@ -180,34 +180,34 @@ const (
)
select elem
from rlist
where key_id = (select id from keyid)
where kid = (select id from curkey)
order by pos
limit
(select start from bounds),
((select stop from bounds) - (select start from bounds) + 1)`

sqlSet = `
with keyid as (
with curkey as (
select id from rkey
where key = ? and type = 2 and (etime is null or etime > ?)
),
elems as (
select pos, row_number() over (order by pos asc) as rownum
from rlist
where key_id = (select id from keyid)
where kid = (select id from curkey)
)
update rlist set elem = ?
where key_id = (select id from keyid)
where kid = (select id from curkey)
and pos = (select pos from elems where rownum = ? + 1)`

sqlTrim = `
with keyid as (
with curkey as (
select id from rkey
where key = ? and type = 2 and (etime is null or etime > ?)
),
counts as (
select len from rkey
where id = (select id from keyid)
where id = (select id from curkey)
),
bounds as (
select
Expand All @@ -222,15 +222,15 @@ const (
),
remain as (
select rowid from rlist
where key_id = (select id from keyid)
where kid = (select id from curkey)
order by pos
limit
(select start from bounds),
((select stop from bounds) - (select start from bounds) + 1)
)
delete from rlist
where
key_id = (select id from keyid)
kid = (select id from curkey)
and rowid not in (select rowid from remain)`
)

Expand Down
12 changes: 6 additions & 6 deletions internal/rstring/tx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ import (
const (
sqlGet = `
select value
from rstring join rkey on key_id = rkey.id and type = 1
from rstring join rkey on kid = rkey.id and type = 1
where key = ? and (etime is null or etime > ?)`

sqlGetMany = `
select key, value
from rstring
join rkey on key_id = rkey.id and type = 1
join rkey on kid = rkey.id and type = 1
where key in (:keys) and (etime is null or etime > ?)`

sqlSet1 = `
Expand All @@ -31,9 +31,9 @@ const (
returning id`

sqlSet2 = `
insert into rstring (key_id, value)
insert into rstring (kid, value)
values (?, ?)
on conflict (key_id) do update
on conflict (kid) do update
set value = excluded.value`

sqlUpdate1 = `
Expand All @@ -46,9 +46,9 @@ const (
returning id`

sqlUpdate2 = `
insert into rstring (key_id, value)
insert into rstring (kid, value)
values (?, ?)
on conflict (key_id) do update
on conflict (kid) do update
set value = excluded.value`
)

Expand Down
4 changes: 2 additions & 2 deletions internal/rzset/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const (
with ranked as (
select rowid, elem, score
from rzset
where key_id = (
where kid = (
select id from rkey
where key = ? and type = 5 and (etime is null or etime > ?)
)
Expand All @@ -23,7 +23,7 @@ const (

sqlDeleteScore = `
delete from rzset
where key_id = (
where kid = (
select id from rkey
where key = ? and type = 5 and (etime is null or etime > ?)
) and score between ? and ?`
Expand Down
10 changes: 5 additions & 5 deletions internal/rzset/inter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ import (
const (
sqlInter = `
select elem, sum(score) as score
from rzset join rkey on key_id = rkey.id and type = 5
from rzset join rkey on kid = rkey.id and type = 5
where key in (:keys) and (etime is null or etime > ?)
group by elem
having count(distinct key_id) = ?
having count(distinct kid) = ?
order by sum(score), elem`

sqlInterStore1 = sqlDeleteAll

sqlInterStore2 = sqlAdd1

sqlInterStore3 = `
insert into rzset (key_id, elem, score)
insert into rzset (kid, elem, score)
select ?, elem, sum(score) as score
from rzset join rkey on key_id = rkey.id and type = 5
from rzset join rkey on kid = rkey.id and type = 5
where key in (:keys) and (etime is null or etime > ?)
group by elem
having count(distinct key_id) = ?
having count(distinct kid) = ?
order by sum(score), elem;`
)

Expand Down
6 changes: 3 additions & 3 deletions internal/rzset/range.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ const (
sqlRangeRank = `
with ranked as (
select elem, score, (row_number() over w - 1) as rank
from rzset join rkey on key_id = rkey.id and type = 5
from rzset join rkey on kid = rkey.id and type = 5
where key = ? and (etime is null or etime > ?)
window w as (partition by key_id order by score asc, elem asc)
window w as (partition by kid order by score asc, elem asc)
)
select elem, score
from ranked
Expand All @@ -22,7 +22,7 @@ const (

sqlRangeScore = `
select elem, score
from rzset join rkey on key_id = rkey.id and type = 5
from rzset join rkey on kid = rkey.id and type = 5
where key = ? and (etime is null or etime > ?)
and score between ? and ?
order by score asc, elem asc`
Expand Down

0 comments on commit 5acaeaa

Please sign in to comment.