tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nostrdb: rename: ndb_u64_tsid to ndb_u64_ts

Browse Source 
technically more accurate. we are about to introduce a new type called:

	ndb_ts_u64_id

which would be confusing if we didn't do this

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-12-13 16:49:08 -08:00
committed by Daniel D’Aquino
parent 0916b14b32
commit 9e0dc47e98
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nostrdb/src/nostrdb.c
View File

@@ -236,7 +236,7 @@ struct ndb_tsid {
}; };
// A u64 + timestamp id. Just using this for kinds at the moment. // A u64 + timestamp id. Just using this for kinds at the moment.
struct ndb_u64_tsid { struct ndb_u64_ts {
uint64_t u64; // kind, etc uint64_t u64; // kind, etc
uint64_t timestamp; uint64_t timestamp;
}; };
@@ -1492,9 +1492,9 @@ int ndb_db_version(struct ndb *ndb)
// custom kind+timestamp comparison function. This is used by lmdb to perform // custom kind+timestamp comparison function. This is used by lmdb to perform
// b+ tree searches over the kind+timestamp index // b+ tree searches over the kind+timestamp index
static int ndb_u64_tsid_compare(const MDB_val *a, const MDB_val *b) static int ndb_u64_ts_compare(const MDB_val *a, const MDB_val *b)
{ {
struct ndb_u64_tsid *tsa, *tsb; struct ndb_u64_ts *tsa, *tsb;
tsa = a->mv_data; tsa = a->mv_data;
tsb = b->mv_data; tsb = b->mv_data;
@@ -1545,7 +1545,7 @@ static inline void ndb_tsid_init(struct ndb_tsid *key, unsigned char *id,
key->timestamp = timestamp; key->timestamp = timestamp;
} }
static inline void ndb_u64_tsid_init(struct ndb_u64_tsid *key, uint64_t integer, static inline void ndb_u64_ts_init(struct ndb_u64_ts *key, uint64_t integer,
uint64_t timestamp) uint64_t timestamp)
{ {
key->u64 = integer; key->u64 = integer;
@@ -3067,7 +3067,7 @@ static int ndb_query_plan_execute_kinds(struct ndb_txn *txn,
MDB_dbi db; MDB_dbi db;
MDB_val k, v; MDB_val k, v;
struct ndb_note *note; struct ndb_note *note;
struct ndb_u64_tsid tsid, *ptsid; struct ndb_u64_ts tsid, *ptsid;
struct ndb_filter_elements *kinds; struct ndb_filter_elements *kinds;
struct ndb_query_result res; struct ndb_query_result res;
uint64_t kind, note_id, until, *pint; uint64_t kind, note_id, until, *pint;
@@ -3093,7 +3093,7 @@ static int ndb_query_plan_execute_kinds(struct ndb_txn *txn,
kind = kinds->elements[i]; kind = kinds->elements[i];
ndb_debug("kind %" PRIu64 "\n", kind); ndb_debug("kind %" PRIu64 "\n", kind);
ndb_u64_tsid_init(&tsid, kind, until); ndb_u64_ts_init(&tsid, kind, until);
k.mv_data = &tsid; k.mv_data = &tsid;
k.mv_size = sizeof(tsid); k.mv_size = sizeof(tsid);
@@ -3103,7 +3103,7 @@ static int ndb_query_plan_execute_kinds(struct ndb_txn *txn,
// for each id in our ids filter, find in the db // for each id in our ids filter, find in the db
while (!query_is_full(results, limit)) { while (!query_is_full(results, limit)) {
ptsid = (struct ndb_u64_tsid *)k.mv_data; ptsid = (struct ndb_u64_ts *)k.mv_data;
if (ptsid->u64 != kind) if (ptsid->u64 != kind)
break; break;
@@ -3300,12 +3300,12 @@ static int ndb_write_note_tag_index(struct ndb_txn *txn, struct ndb_note *note,
static int ndb_write_note_kind_index(struct ndb_txn *txn, struct ndb_note *note, static int ndb_write_note_kind_index(struct ndb_txn *txn, struct ndb_note *note,
uint64_t note_key) uint64_t note_key)
{ {
struct ndb_u64_tsid tsid; struct ndb_u64_ts tsid;
int rc; int rc;
MDB_val key, val; MDB_val key, val;
MDB_dbi kind_db; MDB_dbi kind_db;
ndb_u64_tsid_init(&tsid, note->kind, note->created_at); ndb_u64_ts_init(&tsid, note->kind, note->created_at);
key.mv_data = &tsid; key.mv_data = &tsid;
key.mv_size = sizeof(tsid); key.mv_size = sizeof(tsid);
@@ -4372,7 +4372,7 @@ static int ndb_init_lmdb(const char *filename, struct ndb_lmdb *lmdb, size_t map
fprintf(stderr, "mdb_dbi_open note_kind failed: %s\n", mdb_strerror(rc)); fprintf(stderr, "mdb_dbi_open note_kind failed: %s\n", mdb_strerror(rc));
return 0; return 0;
} }
mdb_set_compare(txn, lmdb->dbs[NDB_DB_NOTE_KIND], ndb_u64_tsid_compare); mdb_set_compare(txn, lmdb->dbs[NDB_DB_NOTE_KIND], ndb_u64_ts_compare);
if ((rc = mdb_dbi_open(txn, "note_text", MDB_CREATE | MDB_DUPSORT, if ((rc = mdb_dbi_open(txn, "note_text", MDB_CREATE | MDB_DUPSORT,
&lmdb->dbs[NDB_DB_NOTE_TEXT]))) { &lmdb->dbs[NDB_DB_NOTE_TEXT]))) {
@@ -6231,7 +6231,7 @@ int ndb_print_kind_keys(struct ndb_txn *txn)
MDB_cursor *cur; MDB_cursor *cur;
MDB_val k, v; MDB_val k, v;
int i; int i;
struct ndb_u64_tsid *tsid; struct ndb_u64_ts *tsid;
if (mdb_cursor_open(txn->mdb_txn, txn->lmdb->dbs[NDB_DB_NOTE_KIND], &cur)) if (mdb_cursor_open(txn->mdb_txn, txn->lmdb->dbs[NDB_DB_NOTE_KIND], &cur))
return 0; return 0;