database: use Vec instead of BTreeSet as inner value for TagIndexValues

Fix query issue due to wrong tag value order

Closes https://gitworkshop.dev/r/naddr1qq98yatnwskkummnw3eqz9thwden5te0wp6hyurvv4ex2mrp0yhxxmmdqgsx3kq3vkgczq9hmfplc28h687py42yvms3zkyxh8nmkvn0vhkyyusrqsqqqaue3uzvg2/issues/note1jn747m4uwr99au8wtv53tjml9kvme4jat7c3x37vea90ez8cwcess6zddk

Signed-off-by: Yuki Kishimoto <[email protected]>

Author: yukibtc

CHANGELOG.md

@@ -39,6 +39,7 @@
 * pool: bump `async-wsocket` to `v0.6` ([Yuki Kishimoto])
 * database: not match event if `Filter::search` field is set ([Yuki Kishimoto])
 * database: avoid to copy `EventId` in `Event::decode` ([Yuki Kishimoto])
+* database: use `Vec` instead of `BTreeSet` as inner value for `TagIndexValues` ([Yuki Kishimoto])
 * sdk: rename `Proxy` and `ProxyTarget` to `Connection` and `ConnectionTarget` ([Yuki Kishimoto])
 * sqlite: use `ValueRef` instead of owned one ([Yuki Kishimoto])
 * cli: improve `sync` command ([Yuki Kishimoto])
@@ -65,6 +66,7 @@
 
 * pool: fix `Event` notification variant sent also for events sent by the SDK ([Yuki Kishimoto])
 * database: fix indexes `QueryPattern` ([Yuki Kishimoto])
+* database: fix query issue due to wrong tag value order ([Yuki Kishimoto])
 
 ### Removed
 

crates/nostr-database/src/tag_indexes.rs

@@ -4,7 +4,7 @@
 
 //! Tag Indexes
 
-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeMap;
 use std::ops::{Deref, DerefMut};
 
 #[cfg(feature = "flatbuf")]
@@ -48,10 +48,7 @@ impl TagIndexes {
                 if t.len() > 1 {
                     if let Some(single_letter_tag) = single_char_tagname(t.get(0)) {
                         let inner = hash(t.get(1));
-                        tag_index
-                            .entry(single_letter_tag)
-                            .or_default()
-                            .insert(inner);
+                        tag_index.entry(single_letter_tag).or_default().push(inner);
                     }
                 }
             }
@@ -60,9 +57,10 @@ impl TagIndexes {
     }
 
     /// Get hashed `d` tag
+    #[inline]
     pub fn identifier(&self) -> Option<[u8; TAG_INDEX_VALUE_SIZE]> {
         let values = self.inner.get(&SingleLetterTag::lowercase(Alphabet::D))?;
-        values.iter().next().copied()
+        values.first().copied()
     }
 }
 
@@ -76,10 +74,7 @@ where
             iter.filter_map(|t| Some((t.single_letter_tag()?, t.content()?)))
         {
             let inner = hash(content);
-            tag_index
-                .entry(single_letter_tag)
-                .or_default()
-                .insert(inner);
+            tag_index.entry(single_letter_tag).or_default().push(inner);
         }
         tag_index
     }
@@ -108,11 +103,11 @@ where
 /// Tag Index Values
 #[derive(Debug, Clone, Default, PartialEq, Eq, Hash)]
 pub struct TagIndexValues {
-    inner: BTreeSet<[u8; TAG_INDEX_VALUE_SIZE]>,
+    inner: Vec<[u8; TAG_INDEX_VALUE_SIZE]>,
 }
 
 impl Deref for TagIndexValues {
-    type Target = BTreeSet<[u8; TAG_INDEX_VALUE_SIZE]>;
+    type Target = Vec<[u8; TAG_INDEX_VALUE_SIZE]>;
 
     fn deref(&self) -> &Self::Target {
         &self.inner