nick/amethyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fixes duplicated results

Browse Source
This commit is contained in:
Vitor Pamplona
2025-12-30 11:42:57 -05:00
parent 258c4e0111
commit 2a8e7cbe94
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/QueryAssemblerTest.kt
+9 -7
View File
@@ -84,12 +84,14 @@ class QueryAssemblerTest {
""" """
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN ( INNER JOIN (
SELECT event_tags.event_header_row_id as row_id FROM event_tags INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE (event_headers.created_at >= "1750889190") AND (event_tags.tag_hash = "2657743813502222172") AND (event_headers.kind = "5") AND (event_headers.pubkey = "7c5eb72a4584fdaaeaa145b25c92ea9917704224951219dbd43acef9e91fb88d") SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE (event_headers.created_at >= "1750889190") AND (event_tags.tag_hash = "2657743813502222172") AND (event_headers.kind = "5") AND (event_headers.pubkey = "7c5eb72a4584fdaaeaa145b25c92ea9917704224951219dbd43acef9e91fb88d")
) AS filtered ) AS filtered
ON event_headers.row_id = filtered.row_id ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id ORDER BY created_at DESC, id
├── SEARCH event_tags USING COVERING INDEX query_by_tags_hash (tag_hash=?) ├── CO-ROUTINE filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) │ ├── SEARCH event_tags USING COVERING INDEX query_by_tags_hash (tag_hash=?)
│ └── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
├── SCAN filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
└── USE TEMP B-TREE FOR ORDER BY └── USE TEMP B-TREE FOR ORDER BY
""".trimIndent(), """.trimIndent(),
@@ -278,7 +280,7 @@ class QueryAssemblerTest {
""" """
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN ( INNER JOIN (
SELECT event_tags.event_header_row_id as row_id FROM event_tags INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE event_tags.tag_hash = "-4551135004136952885" ORDER BY event_headers.created_at DESC, event_headers.id ASC LIMIT 30 SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE event_tags.tag_hash = "-4551135004136952885" ORDER BY event_headers.created_at DESC, event_headers.id ASC LIMIT 30
) AS filtered ) AS filtered
ON event_headers.row_id = filtered.row_id ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id ORDER BY created_at DESC, id
@@ -313,7 +315,7 @@ class QueryAssemblerTest {
""" """
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN ( INNER JOIN (
SELECT event_tags.event_header_row_id as row_id FROM event_tags INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_headers.kind = "3") ORDER BY event_headers.created_at DESC, event_headers.id ASC LIMIT 30 SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_headers.kind = "3") ORDER BY event_headers.created_at DESC, event_headers.id ASC LIMIT 30
) AS filtered ) AS filtered
ON event_headers.row_id = filtered.row_id ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id ORDER BY created_at DESC, id
@@ -345,7 +347,7 @@ class QueryAssemblerTest {
""" """
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN ( INNER JOIN (
SELECT event_tags.event_header_row_id as row_id FROM event_tags INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_headers.pubkey = "7c5eb72a4584fdaaeaa145b25c92ea9917704224951219dbd43acef9e91fb88d") ORDER BY event_headers.created_at DESC, event_headers.id ASC LIMIT 30 SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_headers.pubkey = "7c5eb72a4584fdaaeaa145b25c92ea9917704224951219dbd43acef9e91fb88d") ORDER BY event_headers.created_at DESC, event_headers.id ASC LIMIT 30
) AS filtered ) AS filtered
ON event_headers.row_id = filtered.row_id ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id ORDER BY created_at DESC, id
@@ -381,7 +383,7 @@ class QueryAssemblerTest {
""" """
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN ( INNER JOIN (
SELECT event_tags.event_header_row_id as row_id FROM event_tags INNER JOIN event_tags as event_tagst ON event_tagst.event_header_row_id = event_tags.event_header_row_id INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_tagst.tag_hash = "-6379614208644810021") AND (event_headers.kind = "1") ORDER BY event_headers.created_at DESC, event_headers.id ASC LIMIT 30 SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags INNER JOIN event_tags as event_tagst ON event_tagst.event_header_row_id = event_tags.event_header_row_id INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_tagst.tag_hash = "-6379614208644810021") AND (event_headers.kind = "1") ORDER BY event_headers.created_at DESC, event_headers.id ASC LIMIT 30
) AS filtered ) AS filtered
ON event_headers.row_id = filtered.row_id ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id ORDER BY created_at DESC, id
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventIndexesModule.kt
+1 -1
View File
@@ -466,7 +466,7 @@ class EventIndexesModule(
buildString { buildString {
// always do tags if there are any // always do tags if there are any
if (nonDTags.isNotEmpty()) { if (nonDTags.isNotEmpty()) {
append("SELECT event_tags.event_header_row_id as row_id FROM event_tags ") append("SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags ")
// it's quite rare to have 2 tags in the filter, but possible // it's quite rare to have 2 tags in the filter, but possible
nonDTags.keys.forEachIndexed { index, tagName -> nonDTags.keys.forEachIndexed { index, tagName ->