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

duplicates kinds and pubkey on the tags table to take complex queries under 100 microseconds

Browse Source
This commit is contained in:
Vitor Pamplona
2026-01-01 14:57:48 -05:00
parent 238d4e0004
commit 291db1f30b
5 changed files with 207 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionTest.kt
+4 -4
View File
@@ -227,9 +227,9 @@ class DeletionTest {
ON event_headers.row_id = event_tags.event_header_row_id ON event_headers.row_id = event_tags.event_header_row_id
WHERE WHERE
event_tags.tag_hash IN (3221122, 223322) AND event_tags.tag_hash IN (3221122, 223322) AND
event_tags.created_at >= 1766686500 AND event_tags.kind = 5 AND
event_headers.kind = 5 AND event_tags.pubkey_hash = 22332323 AND
event_headers.pubkey_owner_hash = 22332323 event_tags.created_at >= 1766686500
""".trimIndent() """.trimIndent()
val explainer = val explainer =
@@ -238,7 +238,7 @@ class DeletionTest {
TestCase.assertEquals( TestCase.assertEquals(
""" """
${sql.replace("\n","\n ")} ${sql.replace("\n","\n ")}
├── SEARCH event_tags USING INDEX query_by_tags_hash (tag_hash=? AND created_at>?) ├── SEARCH event_tags USING INDEX query_by_tags_hash_kind_pubkey (tag_hash=? AND kind=? AND pubkey_hash=? AND created_at>?)
└── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) └── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
""".trimIndent(), """.trimIndent(),
explainer, explainer,
quartz/src/androidInstrumentedTest/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/QueryAssemblerTest.kt
+163 -19
View File
@@ -22,8 +22,13 @@ package com.vitorpamplona.quartz.nip01Core.store.sqlite
import android.content.Context import android.content.Context
import androidx.test.core.app.ApplicationProvider import androidx.test.core.app.ApplicationProvider
import com.vitorpamplona.quartz.experimental.relationshipStatus.ContactCardEvent
import com.vitorpamplona.quartz.nip01Core.metadata.MetadataEvent
import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent import com.vitorpamplona.quartz.nip02FollowList.ContactListEvent
import com.vitorpamplona.quartz.nip37Drafts.DraftWrapEvent
import com.vitorpamplona.quartz.nip50Search.SearchRelayListEvent
import com.vitorpamplona.quartz.nip65RelayList.AdvertisedRelayListEvent
import junit.framework.TestCase import junit.framework.TestCase
import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertEquals
import org.junit.After import org.junit.After
@@ -82,13 +87,12 @@ 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 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 = "2657743813502222172") AND (event_tags.created_at >= "1750889190") AND (event_headers.kind = "5") AND (event_headers.pubkey = "7c5eb72a4584fdaaeaa145b25c92ea9917704224951219dbd43acef9e91fb88d") SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags WHERE (event_tags.tag_hash = "2657743813502222172") AND (event_tags.kind = "5") AND (event_tags.pubkey_hash = "1730514094536529999") AND (event_tags.created_at >= "1750889190")
) 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
├── CO-ROUTINE filtered ├── CO-ROUTINE filtered
│ ├── SEARCH event_tags USING INDEX query_by_tags_hash (tag_hash=? AND created_at>?) │ ├── SEARCH event_tags USING INDEX query_by_tags_hash_kind_pubkey (tag_hash=? AND kind=? AND pubkey_hash=? AND created_at>?)
│ ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
│ └── USE TEMP B-TREE FOR DISTINCT │ └── USE TEMP B-TREE FOR DISTINCT
├── SCAN filtered ├── SCAN filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
@@ -280,13 +284,12 @@ 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 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_tags.created_at DESC LIMIT 30 SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_tags.kind = "3") ORDER BY event_tags.created_at DESC 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
├── CO-ROUTINE filtered ├── CO-ROUTINE filtered
│ ├── SEARCH event_tags USING INDEX query_by_tags_hash (tag_hash=?) │ ├── SEARCH event_tags USING INDEX query_by_tags_hash_kind (tag_hash=? AND kind=?)
│ ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
│ └── USE TEMP B-TREE FOR DISTINCT │ └── USE TEMP B-TREE FOR DISTINCT
├── SCAN filtered ├── SCAN filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
@@ -342,13 +345,12 @@ 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 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_tags.created_at DESC LIMIT 30 SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_tags.kind = "3") ORDER BY event_tags.created_at DESC 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
├── CO-ROUTINE filtered ├── CO-ROUTINE filtered
│ ├── SEARCH event_tags USING INDEX query_by_tags_hash (tag_hash=?) │ ├── SEARCH event_tags USING INDEX query_by_tags_hash_kind (tag_hash=? AND kind=?)
│ ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
│ └── USE TEMP B-TREE FOR DISTINCT │ └── USE TEMP B-TREE FOR DISTINCT
├── SCAN filtered ├── SCAN filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
@@ -374,13 +376,12 @@ 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 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_tags.created_at DESC LIMIT 30 SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_tags.pubkey_hash = "1730514094536529999") ORDER BY event_tags.created_at DESC 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
├── CO-ROUTINE filtered ├── CO-ROUTINE filtered
│ ├── SEARCH event_tags USING INDEX query_by_tags_hash (tag_hash=?) │ ├── SEARCH event_tags USING INDEX query_by_tags_hash (tag_hash=?)
│ ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
│ └── USE TEMP B-TREE FOR DISTINCT │ └── USE TEMP B-TREE FOR DISTINCT
├── SCAN filtered ├── SCAN filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
@@ -410,14 +411,13 @@ 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 DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags INNER JOIN event_tags as event_tagsIn1 ON event_tagsIn1.event_header_row_id = event_tags.event_header_row_id AND event_tagsIn1.created_at = event_tags.created_at INNER JOIN event_headers ON event_headers.row_id = event_tags.event_header_row_id WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_tagsIn1.tag_hash = "-6379614208644810021") AND (event_headers.kind = "1") ORDER BY event_tags.created_at DESC LIMIT 30 SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags INNER JOIN event_tags as event_tagsIn1 ON event_tagsIn1.event_header_row_id = event_tags.event_header_row_id AND event_tagsIn1.created_at = event_tags.created_at WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_tagsIn1.tag_hash = "-6379614208644810021") AND (event_tags.kind = "1") ORDER BY event_tags.created_at DESC 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
├── CO-ROUTINE filtered ├── CO-ROUTINE filtered
│ ├── SEARCH event_tags USING INDEX query_by_tags_hash (tag_hash=?) │ ├── SEARCH event_tags USING INDEX query_by_tags_hash_kind (tag_hash=? AND kind=?)
│ ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) │ ├── SEARCH event_tagsIn1 USING INDEX query_by_tags_hash (tag_hash=? AND created_at=?)
│ ├── SEARCH event_tagsIn1 USING INDEX query_by_tags_hash (tag_hash=? AND event_header_row_id=?)
│ └── USE TEMP B-TREE FOR DISTINCT │ └── USE TEMP B-TREE FOR DISTINCT
├── SCAN filtered ├── SCAN filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
@@ -519,7 +519,7 @@ class QueryAssemblerTest {
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
├── CO-ROUTINE filtered ├── CO-ROUTINE filtered
│ ├── SEARCH event_tags USING INDEX query_by_tags_hash (tag_hash=?) │ ├── SEARCH event_tags USING INDEX query_by_tags_hash_kind (tag_hash=?)
│ ├── SEARCH event_tagsAll0_1 USING INDEX query_by_tags_hash (tag_hash=? AND created_at=?) │ ├── SEARCH event_tagsAll0_1 USING INDEX query_by_tags_hash (tag_hash=? AND created_at=?)
│ └── USE TEMP B-TREE FOR DISTINCT │ └── USE TEMP B-TREE FOR DISTINCT
├── SCAN filtered ├── SCAN filtered
@@ -548,13 +548,12 @@ 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 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") AND (event_headers.pubkey = "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c") ORDER BY event_tags.created_at DESC LIMIT 500 SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_tags.kind = "3") AND (event_tags.pubkey_hash = "5446767199141196776") ORDER BY event_tags.created_at DESC LIMIT 500
) 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
├── CO-ROUTINE filtered ├── CO-ROUTINE filtered
│ ├── SEARCH event_tags USING INDEX query_by_tags_hash (tag_hash=?) │ ├── SEARCH event_tags USING INDEX query_by_tags_hash_kind_pubkey (tag_hash=? AND kind=? AND pubkey_hash=?)
│ ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
│ └── USE TEMP B-TREE FOR DISTINCT │ └── USE TEMP B-TREE FOR DISTINCT
├── SCAN filtered ├── SCAN filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?) ├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
@@ -563,4 +562,149 @@ class QueryAssemblerTest {
sql, sql,
) )
} }
@Test
fun testFollowersSinceNov2025() {
val sql =
explain(
Filter(
kinds = listOf(ContactListEvent.KIND),
tags =
mapOf(
"p" to listOf("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c"),
),
since = 1764553447, // Nov 2025
),
)
println(sql)
assertEquals(
"""
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN (
SELECT DISTINCT(event_tags.event_header_row_id) as row_id FROM event_tags WHERE (event_tags.tag_hash = "-4551135004136952885") AND (event_tags.kind = "3") AND (event_tags.created_at >= "1764553447")
) AS filtered
ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id
├── CO-ROUTINE filtered
│ ├── SEARCH event_tags USING INDEX query_by_tags_hash_kind (tag_hash=? AND kind=? AND created_at>?)
│ └── USE TEMP B-TREE FOR DISTINCT
├── SCAN filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
└── USE TEMP B-TREE FOR ORDER BY
""".trimIndent(),
sql,
)
}
@Test
fun testAllAddressablesOfAKindDownload() {
val sql =
explain(
Filter(
kinds = listOf(DraftWrapEvent.KIND),
authors = listOf("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c"),
since = 1764553447, // Nov 2025
),
)
println(sql)
assertEquals(
"""
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN (
SELECT event_headers.row_id as row_id FROM event_headers WHERE (event_headers.kind = "31234") AND (event_headers.pubkey = "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c") AND (event_headers.created_at >= "1764553447") AND ((event_headers.kind >= 30000 AND event_headers.kind < 40000))
) AS filtered
ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id
├── SEARCH event_headers USING COVERING INDEX query_by_kind_pubkey_created (kind=? AND pubkey=? AND created_at>?)
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
└── USE TEMP B-TREE FOR ORDER BY
""".trimIndent(),
sql,
)
}
@Test
fun testReplaceablesOfMultipleKindsDownloadByDateLimit() {
val sql =
explain(
Filter(
kinds = listOf(MetadataEvent.KIND, SearchRelayListEvent.KIND, AdvertisedRelayListEvent.KIND),
authors = listOf("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c"),
limit = 20,
since = 1764553447, // Nov 2025
),
)
assertEquals(
"""
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN (
SELECT event_headers.row_id as row_id FROM event_headers WHERE (event_headers.kind IN ("0", "10007", "10002")) AND (event_headers.pubkey = "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c") AND (event_headers.created_at >= "1764553447") ORDER BY event_headers.created_at DESC, event_headers.id ASC LIMIT 20
) AS filtered
ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id
├── CO-ROUTINE filtered
│ ├── SEARCH event_headers USING INDEX query_by_kind_pubkey_created (kind=? AND pubkey=? AND created_at>?)
│ └── USE TEMP B-TREE FOR ORDER BY
├── SCAN filtered
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
└── USE TEMP B-TREE FOR ORDER BY
""".trimIndent(),
sql,
)
}
@Test
fun testReplaceablesOfMultipleKindsDownload() {
val sql =
explain(
Filter(
kinds = listOf(MetadataEvent.KIND, SearchRelayListEvent.KIND, AdvertisedRelayListEvent.KIND),
authors = listOf("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c"),
),
)
assertEquals(
"""
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN (
SELECT event_headers.row_id as row_id FROM event_headers WHERE (event_headers.kind IN ("0", "10007", "10002")) AND (event_headers.pubkey = "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c")
) AS filtered
ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id
├── SEARCH event_headers USING COVERING INDEX query_by_kind_pubkey_created (kind=? AND pubkey=?)
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
└── USE TEMP B-TREE FOR ORDER BY
""".trimIndent(),
sql,
)
}
@Test
fun testContactCardDownloadFromTrustedKeys() {
val sql =
explain(
Filter(
kinds = listOf(ContactCardEvent.KIND),
authors = listOf("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c"),
tags =
mapOf(
"d" to listOf("460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c"),
),
since = 1764553447, // Nov 2025
),
)
assertEquals(
"""
SELECT id, pubkey, created_at, kind, tags, content, sig FROM event_headers
INNER JOIN (
SELECT event_headers.row_id as row_id FROM event_headers WHERE (event_headers.kind = "30382") AND (event_headers.pubkey = "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c") AND (event_headers.d_tag = "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c") AND (event_headers.created_at >= "1764553447") AND ((event_headers.kind >= 30000 AND event_headers.kind < 40000))
) AS filtered
ON event_headers.row_id = filtered.row_id
ORDER BY created_at DESC, id
├── SEARCH event_headers USING INDEX addressable_idx (kind=? AND pubkey=? AND d_tag=?)
├── SEARCH event_headers USING INTEGER PRIMARY KEY (rowid=?)
└── USE TEMP B-TREE FOR ORDER BY
""".trimIndent(),
sql,
)
}
} }
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/DeletionRequestModule.kt
+3 -5
View File
@@ -51,13 +51,11 @@ class DeletionRequestModule(
SELECT RAISE(ABORT, 'blocked: a deletion event exists') SELECT RAISE(ABORT, 'blocked: a deletion event exists')
WHERE EXISTS ( WHERE EXISTS (
SELECT 1 FROM event_tags SELECT 1 FROM event_tags
INNER JOIN event_headers
ON event_headers.row_id = event_tags.event_header_row_id
WHERE WHERE
event_tags.tag_hash IN (NEW.etag_hash, NEW.atag_hash) AND event_tags.tag_hash IN (NEW.etag_hash, NEW.atag_hash) AND
event_tags.created_at >= NEW.created_at AND event_tags.kind = 5 AND
event_headers.kind = 5 AND event_tags.pubkey_hash = NEW.pubkey_owner_hash AND
event_headers.pubkey_owner_hash = NEW.pubkey_owner_hash event_tags.created_at >= NEW.created_at
); );
END; END;
""".trimIndent(), """.trimIndent(),
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/EventIndexesModule.kt
+9 -3
View File
@@ -57,6 +57,8 @@ class EventIndexesModule(
event_header_row_id INTEGER NOT NULL, event_header_row_id INTEGER NOT NULL,
tag_hash INTEGER NOT NULL, tag_hash INTEGER NOT NULL,
created_at INTEGER NOT NULL, created_at INTEGER NOT NULL,
kind INTEGER NOT NULL,
pubkey_hash INTEGER NOT NULL,
FOREIGN KEY (event_header_row_id) REFERENCES event_headers(row_id) ON DELETE CASCADE FOREIGN KEY (event_header_row_id) REFERENCES event_headers(row_id) ON DELETE CASCADE
) )
""".trimIndent(), """.trimIndent(),
@@ -74,8 +76,10 @@ class EventIndexesModule(
// makes deletions on the event_header fast // makes deletions on the event_header fast
db.execSQL("CREATE INDEX fk_event_tags_header_id ON event_tags (event_header_row_id)") db.execSQL("CREATE INDEX fk_event_tags_header_id ON event_tags (event_header_row_id)")
// This is a very slow index to build (half the insert time goes here) but it is extremely effective. // This is a very slow index to build (80% of the insert time goes here) but it is extremely effective.
db.execSQL("CREATE INDEX query_by_tags_hash ON event_tags (tag_hash, created_at DESC)") db.execSQL("CREATE INDEX query_by_tags_hash ON event_tags (tag_hash, created_at DESC)")
db.execSQL("CREATE INDEX query_by_tags_hash_kind ON event_tags (tag_hash, kind, created_at DESC)")
db.execSQL("CREATE INDEX query_by_tags_hash_kind_pubkey ON event_tags (tag_hash, kind, pubkey_hash, created_at DESC)")
// Prevent updates to maintain immutability // Prevent updates to maintain immutability
db.execSQL( db.execSQL(
@@ -117,9 +121,9 @@ class EventIndexesModule(
val sqlInsertTags = val sqlInsertTags =
""" """
INSERT OR ROLLBACK INTO event_tags INSERT OR ROLLBACK INTO event_tags
(event_header_row_id, tag_hash, created_at) (event_header_row_id, tag_hash, created_at, kind, pubkey_hash)
VALUES VALUES
(?,?,?) (?,?,?,?,?)
""".trimIndent() """.trimIndent()
fun insert( fun insert(
@@ -178,6 +182,8 @@ class EventIndexesModule(
stmtTags.bindLong(1, headerId) stmtTags.bindLong(1, headerId)
stmtTags.bindLong(2, it) stmtTags.bindLong(2, it)
stmtTags.bindLong(3, event.createdAt) stmtTags.bindLong(3, event.createdAt)
stmtTags.bindLong(4, kindLong)
stmtTags.bindLong(5, pubkeyHash)
stmtTags.executeInsert() stmtTags.executeInsert()
} }
quartz/src/androidMain/kotlin/com/vitorpamplona/quartz/nip01Core/store/sqlite/QueryBuilder.kt
+23 -8
View File
@@ -24,6 +24,7 @@ import android.database.Cursor
import android.database.sqlite.SQLiteDatabase import android.database.sqlite.SQLiteDatabase
import com.vitorpamplona.quartz.nip01Core.core.Event import com.vitorpamplona.quartz.nip01Core.core.Event
import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper import com.vitorpamplona.quartz.nip01Core.core.OptimizedJsonMapper
import com.vitorpamplona.quartz.nip01Core.core.isAddressable
import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter import com.vitorpamplona.quartz.nip01Core.relay.filters.Filter
import com.vitorpamplona.quartz.nip01Core.store.sqlite.sql.where import com.vitorpamplona.quartz.nip01Core.store.sqlite.sql.where
import com.vitorpamplona.quartz.utils.EventFactory import com.vitorpamplona.quartz.utils.EventFactory
@@ -338,10 +339,7 @@ class QueryBuilder(
val needHeaders = val needHeaders =
with(filter) { with(filter) {
(ids != null) || (ids != null) || (tags != null && tags.containsKey("d"))
(authors != null && authors.isNotEmpty()) ||
(kinds != null && kinds.isNotEmpty()) ||
(tags != null && tags.containsKey("d"))
} }
val hasHeaders = val hasHeaders =
@@ -440,13 +438,19 @@ class QueryBuilder(
// range search is bad but most of the time these are up the top with few elements. // range search is bad but most of the time these are up the top with few elements.
if (reverseLookup) { if (reverseLookup) {
filter.kinds?.let { equalsOrIn("event_tags.kind", it) }
filter.authors?.let { equalsOrIn("event_tags.pubkey_hash", it.map { hasher.hash(it) }) }
filter.since?.let { greaterThanOrEquals("event_tags.created_at", it) } filter.since?.let { greaterThanOrEquals("event_tags.created_at", it) }
filter.until?.let { lessThanOrEquals("event_tags.created_at", it) } filter.until?.let { lessThanOrEquals("event_tags.created_at", it) }
} else {
filter.since?.let { greaterThanOrEquals("event_headers.created_at", it) }
filter.until?.let { lessThanOrEquals("event_headers.created_at", it) }
}
// there are indexes for these, starting with tags.
filter.tags?.forEach { (tagName, tagValues) ->
if (tagName == "d") {
equalsOrIn("event_headers.d_tag", tagValues)
}
}
} else {
filter.kinds?.let { equalsOrIn("event_headers.kind", it) } filter.kinds?.let { equalsOrIn("event_headers.kind", it) }
filter.authors?.let { equalsOrIn("event_headers.pubkey", it) } filter.authors?.let { equalsOrIn("event_headers.pubkey", it) }
@@ -457,6 +461,17 @@ class QueryBuilder(
} }
} }
filter.since?.let { greaterThanOrEquals("event_headers.created_at", it) }
filter.until?.let { lessThanOrEquals("event_headers.created_at", it) }
// no need to add the replaceable because query_by_kind_pubkey_created already covers it
val isAllAddressable = filter.kinds?.all { it.isAddressable() } ?: false
if (isAllAddressable) {
// matches unique index kind >= 30000 AND kind < 40000
raw("(event_headers.kind >= 30000 AND event_headers.kind < 40000)")
}
}
// if search is included, SQLLite will always start here. // if search is included, SQLLite will always start here.
filter.search?.let { filter.search?.let {
if (it.isNotBlank()) { if (it.isNotBlank()) {