Commit e55b7254a06f7032f68c83505a5a2ec39733b1f7
2024-01-07T09:25:01
fix facts_clean
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109
diff --git a/libc3/facts.c b/libc3/facts.c
index 864c132..65d0585 100644
--- a/libc3/facts.c
+++ b/libc3/facts.c
@@ -28,6 +28,7 @@
#include "log.h"
#include "set__fact.h"
#include "set__tag.h"
+#include "set_cursor__fact.h"
#include "skiplist__fact.h"
#include "tag.h"
@@ -63,7 +64,6 @@ s_fact * facts_add_fact (s_facts *facts, const s_fact *fact)
skiplist_insert__fact(facts->index_spo, f);
skiplist_insert__fact(facts->index_pos, f);
skiplist_insert__fact(facts->index_osp, f);
- facts->fact_list = fact_list_new(f, facts->fact_list);
facts_lock_unlock_w(facts);
return f;
}
@@ -79,14 +79,9 @@ s_fact * facts_add_tags (s_facts *facts, const s_tag *subject,
void facts_clean (s_facts *facts)
{
- s_fact_list *fl;
if (facts->log)
facts_close(facts);
- fl = facts->fact_list;
- while (fl) {
- facts_remove_fact(facts, fl->fact);
- fl = fact_list_delete(fl);
- }
+ facts_remove_all(facts);
skiplist_delete__fact(facts->index_osp);
skiplist_delete__fact(facts->index_pos);
skiplist_delete__fact(facts->index_spo);
@@ -531,6 +526,48 @@ s_tag * facts_ref_tag (s_facts *facts, const s_tag *tag)
return &item->data;
}
+int facts_compare_fact_id_reverse (const void *a, const void *b)
+{
+ const s_fact *fa;
+ const s_fact *fb;
+ fa = a;
+ fb = b;
+ if (fa == fb)
+ return 0;
+ if (fa->id == fb->id)
+ return 0;
+ if (fa->id < fb->id)
+ return 1;
+ return -1;
+}
+
+
+void facts_remove_all (s_facts *facts)
+{
+ uw count;
+ s_set_cursor__fact cursor;
+ s_fact **f;
+ uw i;
+ s_set_item__fact *item;
+ assert(facts);
+ count = facts->facts.count;
+ f = calloc(count, sizeof(s_fact *));
+ i = 0;
+ set_cursor_init__fact(&facts->facts, &cursor);
+ while (i < count &&
+ (item = set_cursor_next__fact(&cursor))) {
+ f[i] = &item->data;
+ i++;
+ }
+ qsort(f, count, sizeof(f[0]), facts_compare_fact_id_reverse);
+ i = 0;
+ while (i < count) {
+ facts_remove_fact(facts, f[i]);
+ i++;
+ }
+ free(f);
+}
+
bool facts_remove_fact (s_facts *facts, const s_fact *fact)
{
s_fact f;
diff --git a/libc3/facts.h b/libc3/facts.h
index aa2c40c..bf36889 100644
--- a/libc3/facts.h
+++ b/libc3/facts.h
@@ -46,6 +46,7 @@ void facts_lock_w (s_facts *facts);
sw facts_open_file (s_facts *facts, const s_str *path);
s_tag * facts_ref_tag (s_facts *facts, const s_tag *tag);
bool facts_remove_fact (s_facts *facts, const s_fact *fact);
+void facts_remove_all (s_facts *facts);
s_fact * facts_replace_fact (s_facts *facts, const s_fact *fact);
s_fact * facts_replace_tags (s_facts *facts, const s_tag *subject,
const s_tag *predicate,
diff --git a/libc3/types.h b/libc3/types.h
index 0597cd8..2d7372b 100644
--- a/libc3/types.h
+++ b/libc3/types.h
@@ -538,7 +538,6 @@ struct facts {
sw rwlock_count;
pthread_t rwlock_thread;
uw next_id;
- s_fact_list *fact_list;
};
struct facts_cursor {