OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-atomspace-rocks commits / f52945b

Convert unit tests away from deprecated API
f52945b20f5dccc80322587b941905bf6db86522
by Linas Vepstas <linasvepstas@gmail.com> · 2026-01-18T05:14:06.000Z

Changed files (25) +322 -322

examples/space-frames.scm +1 -1
……@@ -168,7 +168,7 @@
168168(define (check-equal MSG A B)
169169 (format #t "For ~A, expecting: ~A-- Got: ~A\n" MSG A B))
170170
171(define (get-val ATM) (cog-vale ATM (Predicate "key")))
171(define (get-val ATM) (cog-value ATM (Predicate "key")))
172172
173173; Lets take a look at the TV on `foo` in the base space.
174174(cog-set-atomspace! base-space)
tests/persist/monospace/mono-value-store-test.scm +6 -6
……@@ -27,9 +27,9 @@
2727
2828 ; Store the content. Store only the top-most link.
2929 (define storage (MonoStorageNode "monospace:///tmp/cog-mono-value-store-test"))
30 (cog-open storage)
31 (store-atom (ListLink (Concept "foo") (List (Concept "bar"))))
32 (cog-close storage)
30 (cog-set-value! storage (*-open-*))
31 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (List (Concept "bar"))))
32 (cog-set-value! storage (*-close-*))
3333
3434 ; Clear out the space, start with a clean slate.
3535 (cog-atomspace-clear (cog-atomspace))
……@@ -46,11 +46,11 @@
4646
4747 ; Load everything.
4848 (define storage (MonoStorageNode "monospace:///tmp/cog-mono-value-store-test"))
49 (cog-open storage)
49 (cog-set-value! storage (*-open-*))
5050 ; (cog-mono-stats storage)
5151 ; (cog-mono-print storage "")
52 (load-atomspace)
53 (cog-close storage)
52 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
53 (cog-set-value! storage (*-close-*))
5454
5555 ; Verify the ListLink is as expected.
5656 (define lilly (ListLink (Concept "foo") (List (Concept "bar"))))
tests/persist/rocks/dtor-close-test.scm +5 -5
……@@ -17,13 +17,13 @@
1717(test-begin test-close-open)
1818
1919(define rsn (RocksStorageNode "rocks:///tmp/cog-rocks-dtor-close-test"))
20(cog-open rsn)
20(cog-set-value! rsn (*-open-*))
2121
2222; Create and store some data.
2323(List (Concept "A") (Concept "B"))
2424(Set (Concept "A") (Concept "B"))
2525(Set (Concept "A") (Concept "B") (Concept "C"))
26(store-atomspace)
26(cog-set-value! rsn (*-store-atomspace-*) (cog-atomspace))
2727
2828; The user should call (cog-close rsn) right now, but doesn't.
2929; And this is what we're testing, here: some quasi-reasonable
……@@ -89,12 +89,12 @@
8989(test-equal #f (cog-atom? rsn))
9090
9191(define rsn (RocksStorageNode "rocks:///tmp/cog-rocks-dtor-close-test"))
92(cog-open rsn)
93(load-atomspace)
92(cog-set-value! rsn (*-open-*))
93(cog-set-value! rsn (*-load-atomspace-*) (cog-atomspace))
9494
9595(test-equal #t (cog-atom? rsn))
9696
97(cog-close rsn)
97(cog-set-value! rsn (*-close-*))
9898(test-end test-close-open)
9999
100100; ===================================================================
tests/persist/rocks/fetch-frame-test.scm +20 -20
……@@ -40,17 +40,17 @@
4040 ; Store the content. Store the Concepts as well as the link,
4141 ; as otherwise, the TV's on the Concepts aren't stored.
4242 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-fetch-frame-test"))
43 (cog-open storage)
44 (store-frames surface-space)
45 (store-atom (ListLink (Concept "foo") (Concept "bar")))
46 (store-atom (Concept "bar"))
47 (store-atom (Concept "foo"))
43 (cog-set-value! storage (*-open-*))
44 (cog-set-value! storage (*-store-frames-*) surface-space)
45 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
46 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
47 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
4848 (cog-set-atomspace! mid1-space)
49 (store-atom (Concept "foo"))
49 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
5050 (cog-set-atomspace! base-space)
51 (store-atom (Concept "foo"))
51 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
5252
53 (cog-close storage)
53 (cog-set-value! storage (*-close-*))
5454
5555 ; Clear out the spaces, start with a clean slate.
5656 (cog-atomspace-clear surface-space)
……@@ -75,11 +75,11 @@
7575
7676 ; Load everything.
7777 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-fetch-frame-test"))
78 (cog-open storage)
79 (define top-space (car (load-frames)))
78 (cog-set-value! storage (*-open-*))
79 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
8080 (cog-set-atomspace! top-space)
81 (fetch-atom (Concept "foo"))
82 (cog-close storage)
81 (cog-set-value! storage (*-fetch-atom-*) (LinkValue top-space (Concept "foo")))
82 (cog-set-value! storage (*-close-*))
8383
8484 ; Grab references into the inheritance hierarchy
8585 (define surface-space top-space)
……@@ -126,11 +126,11 @@
126126
127127 ; Load everything.
128128 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-fetch-frame-test"))
129 (cog-open storage)
130 (define top-space (car (load-frames)))
129 (cog-set-value! storage (*-open-*))
130 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
131131 (cog-set-atomspace! top-space)
132 (load-atoms-of-type 'Concept)
133 (cog-close storage)
132 (cog-set-value! storage (*-load-atoms-of-type-*) (Type 'Concept))
133 (cog-set-value! storage (*-close-*))
134134
135135 ; Grab references into the inheritance hierarchy
136136 (define surface-space top-space)
……@@ -181,12 +181,12 @@
181181
182182 ; Load incoming set of just one atom.
183183 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-fetch-frame-test"))
184 (cog-open storage)
185 (define top-space (car (load-frames)))
184 (cog-set-value! storage (*-open-*))
185 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
186186 (cog-set-atomspace! top-space)
187 (fetch-incoming-set (Concept "foo"))
187 (cog-set-value! storage (*-fetch-incoming-set-*) (LinkValue top-space (Concept "foo")))
188188
189 (cog-close storage)
189 (cog-set-value! storage (*-close-*))
190190
191191 ; Grab references into the inheritance hierarchy
192192 (define surface-space top-space)
tests/persist/rocks/frame-delete-test.scm +35 -35
……@@ -40,7 +40,7 @@
4040 (cog-set-atomspace! surface-space)
4141 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-delete-test"))
4242 (cog-open storage)
43 (store-frames surface-space)
43 (cog-set-value! storage (*-store-frames-*) surface-space)
4444
4545 ; Repeatedly add and remove the same atom
4646 (cog-set-atomspace! base-space)
……@@ -61,16 +61,16 @@
6161 ; Store the content. Store the Concepts as well as the link,
6262 ; as otherwise, the TV's on the Concepts aren't stored.
6363 (cog-set-atomspace! base-space)
64 (store-atomspace)
64 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6565 (cog-set-atomspace! mid1-space)
66 (store-atomspace)
66 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6767 (cog-set-atomspace! mid2-space)
68 (store-atomspace)
68 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6969 (cog-set-atomspace! mid3-space)
70 (store-atomspace)
70 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
7171 (cog-set-atomspace! surface-space)
72 (store-atomspace)
73 (cog-close storage)
72 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
73 (cog-set-value! storage (*-close-*))
7474
7575 ; Return the surface space
7676 surface-space
……@@ -93,20 +93,20 @@
9393
9494 ; Load everything.
9595 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-delete-test"))
96 (cog-open storage)
96 (cog-set-value! storage (*-open-*))
9797
9898 ; Load all of the AtomSpace Frames.
9999 ; There are two frames at the top, and we want the newer one.
100100 ; The second one is the root space; it doesn't have the stack.
101101 ; This is awkward. I don't entirely like it. For now, it works.
102 (define the-frames (load-frames))
102 (define the-frames (cog-value->list (cog-value storage (*-load-frames-*))))
103103 ; (format #t "The frames are ~A\n" the-frames)
104104 (define top-space (car the-frames))
105105
106106 ; Load all atoms in all frames
107107 (cog-set-atomspace! top-space)
108 (load-atomspace)
109 (cog-close storage)
108 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
109 (cog-set-value! storage (*-close-*))
110110
111111 ; Grab references into the inheritance hierarchy
112112 (define surface-space top-space)
……@@ -165,7 +165,7 @@
165165
166166 (cog-set-atomspace! surface-space)
167167 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-delete-test"))
168 (cog-open storage)
168 (cog-set-value! storage (*-open-*))
169169
170170 ; Repeatedly add and remove the same atom
171171 (cog-set-atomspace! base-space)
……@@ -180,18 +180,18 @@
180180 ; Store the changed content. Toggle through all the atomspaces,
181181 ; as otherwise, the TV's on the Concepts aren't stored.
182182 ; Do NOT store frames a second time! This will mess it up.
183 ; (store-frames surface-space)
183 ; (cog-set-value! storage (*-store-frames-*) surface-space)
184184 (cog-set-atomspace! base-space)
185 (store-atomspace)
185 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
186186 (cog-set-atomspace! mid1-space)
187 (store-atomspace)
187 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
188188 (cog-set-atomspace! mid2-space)
189 (store-atomspace)
189 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
190190 (cog-set-atomspace! mid3-space)
191 (store-atomspace)
191 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
192192 (cog-set-atomspace! surface-space)
193 (store-atomspace)
194 (cog-close storage)
193 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
194 (cog-set-value! storage (*-close-*))
195195)
196196
197197(define (test-deep-change DELETE)
……@@ -204,15 +204,15 @@
204204
205205 ; Load everything.
206206 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-delete-test"))
207 (cog-open storage)
207 (cog-set-value! storage (*-open-*))
208208
209209 ; Load all of the AtomSpace Frames.
210 (define top-space (car (load-frames)))
210 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
211211
212212 ; Load all atoms in all frames
213213 (cog-set-atomspace! top-space)
214 (load-atomspace)
215 (cog-close storage)
214 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
215 (cog-set-value! storage (*-close-*))
216216
217217 ; Grab references into the inheritance hierarchy
218218 (define surface-space top-space)
……@@ -272,7 +272,7 @@
272272 (cog-set-atomspace! surface-space)
273273 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-delete-test"))
274274 (cog-open storage)
275 (store-frames surface-space)
275 (cog-set-value! storage (*-store-frames-*) surface-space)
276276
277277 ; Repeatedly add and remove the same atom
278278 (cog-set-atomspace! base-space)
……@@ -294,18 +294,18 @@
294294 ; Store the changed content. Toggle through all the atomspaces,
295295 ; as otherwise, the TV's on the Atoms aren't stored.
296296 ; Do NOT store frames a second time! This will mess it up.
297 ; (store-frames surface-space)
297 ; (cog-set-value! storage (*-store-frames-*) surface-space)
298298 (cog-set-atomspace! base-space)
299 (store-atomspace)
299 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
300300 (cog-set-atomspace! mid1-space)
301 (store-atomspace)
301 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
302302 (cog-set-atomspace! mid2-space)
303 (store-atomspace)
303 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
304304 (cog-set-atomspace! mid3-space)
305 (store-atomspace)
305 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
306306 (cog-set-atomspace! surface-space)
307 (store-atomspace)
308 (cog-close storage)
307 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
308 (cog-set-value! storage (*-close-*))
309309)
310310
311311(define (test-deep-link DELETE-REC)
……@@ -317,15 +317,15 @@
317317
318318 ; Load everything.
319319 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-delete-test"))
320 (cog-open storage)
320 (cog-set-value! storage (*-open-*))
321321
322322 ; Load all of the AtomSpace Frames.
323 (define top-space (car (load-frames)))
323 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
324324
325325 ; Load all atoms in all frames
326326 (cog-set-atomspace! top-space)
327 (load-atomspace)
328 (cog-close storage)
327 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
328 (cog-set-value! storage (*-close-*))
329329
330330 ; Grab references into the inheritance hierarchy
331331 (define surface-space top-space)
tests/persist/rocks/frame-links-test.scm +14 -14
……@@ -57,23 +57,23 @@
5757
5858 ; Store all content.
5959 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-links-test"))
60 (cog-open storage)
61 (store-frames surface-space)
60 (cog-set-value! storage (*-open-*))
61 (cog-set-value! storage (*-store-frames-*) surface-space)
6262 (cog-set-atomspace! base-space)
63 (store-atomspace)
63 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6464 (cog-set-atomspace! mid1-space)
65 (store-atomspace)
65 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6666 (cog-set-atomspace! mid2-space)
67 (store-atomspace)
67 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6868 (cog-set-atomspace! mid3-space)
69 (store-atomspace)
69 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
7070 (cog-set-atomspace! mid4-space)
71 (store-atomspace)
71 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
7272 (cog-set-atomspace! mid5-space)
73 (store-atomspace)
73 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
7474 (cog-set-atomspace! surface-space)
75 (store-atomspace)
76 (cog-close storage)
75 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
76 (cog-set-value! storage (*-close-*))
7777)
7878
7979; -------------------------------------------------------------------
……@@ -92,11 +92,11 @@
9292
9393 ; Load everything.
9494 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-links-test"))
95 (cog-open storage)
96 (define top-space (car (load-frames)))
95 (cog-set-value! storage (*-open-*))
96 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
9797 (cog-set-atomspace! top-space)
98 (load-atomspace)
99 (cog-close storage)
98 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
99 (cog-set-value! storage (*-close-*))
100100
101101 ; Grab references into the inheritance hierarchy
102102 (define surface-space top-space)
tests/persist/rocks/frame-print-test.scm +3 -3
……@@ -38,11 +38,11 @@
3838
3939 (cog-set-atomspace! c)
4040 (define rsn (RocksStorageNode "rocks:///tmp/cog-rocks-frame-print-test"))
41 (cog-open rsn)
42 (store-atomspace)
41 (cog-set-value! rsn (*-open-*))
42 (cog-set-value! rsn (*-store-atomspace-*) (cog-atomspace))
4343 (cog-prt-atomspace)
4444
45 (cog-close rsn)
45 (cog-set-value! rsn (*-close-*))
4646)
4747
4848(define test-name "test print")
tests/persist/rocks/frame-progressive-test.scm +15 -15
……@@ -26,33 +26,33 @@
2626;; These atoms are in COW spaces, and thus, in order for the store
2727;; to work correctly, we must store the COW atom, returned by the
2828;; value setter. This is unintuitive to the casual user!
29(define (store-stuff N)
29(define (store-stuff storage N)
3030 (define x (Concept "foo"))
3131 (define x1 (cog-set-value! x (Predicate "gee") (FloatValue 1 0 N)))
32 (store-atom x1)
32 (cog-set-value! storage (*-store-atom-*) x1)
3333
3434 (define y (Concept "bar"))
3535 (define y1 (cog-set-value! y (Predicate "gosh") (FloatValue 1 0 (+ 1 N))))
36 (store-atom y1)
36 (cog-set-value! storage (*-store-atom-*) y1)
3737
3838 (define z (List x y))
3939 (define z1 (cog-set-value! z (Predicate "bang") (FloatValue 1 0 (+ 2 N))))
40 (store-atom z1)
40 (cog-set-value! storage (*-store-atom-*) z1)
4141
4242 (define w (List z x))
4343 (define w1 (cog-set-value! w (Predicate "bash") (FloatValue 1 0 (+ 3 N))))
44 (store-atom w1)
44 (cog-set-value! storage (*-store-atom-*) w1)
4545)
4646
4747; Recursive calls to above
48(define (recompute N NLOOP)
48(define (recompute storage N NLOOP)
4949 (when (< 0 NLOOP)
50 (store-stuff N)
50 (store-stuff storage N)
5151 (cog-set-atomspace! (AtomSpace (cog-atomspace)))
5252 (cog-delete-recursive! (Concept "bar"))
5353 (cog-extract-recursive! (Concept "bar"))
5454 (cog-set-atomspace! (AtomSpace (cog-atomspace)))
55 (recompute (+ N 3) (- NLOOP 1)))
55 (recompute storage (+ N 3) (- NLOOP 1)))
5656)
5757
5858(define (progressive-store N)
……@@ -67,12 +67,12 @@
6767 ; We plan to store multiple atomspaces.
6868 ; Let this be stated in advance.
6969 (cog-atomspace-cow! #t)
70 (store-frames base-space)
70 (cog-set-value! storage (*-store-frames-*) base-space)
7171
7272 ; Repeatedly add and remove the same atom
73 (recompute 1 N)
73 (recompute storage 1 N)
7474
75 (cog-close storage)
75 (cog-set-value! storage (*-close-*))
7676)
7777
7878; Verify expected contents
……@@ -143,15 +143,15 @@
143143
144144 ; Load everything.
145145 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-progressive-test"))
146 (cog-open storage)
146 (cog-set-value! storage (*-open-*))
147147
148148 ; Load all of the AtomSpace Frames.
149 (define top-space (car (load-frames)))
149 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
150150
151151 ; Load all atoms in all frames
152152 (cog-set-atomspace! top-space)
153 (load-atomspace)
154 (cog-close storage)
153 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
154 (cog-set-value! storage (*-close-*))
155155
156156 ; Check the rest of them, recursing downwards.
157157 (progressive-check (- STACK-DEPTH 1))
tests/persist/rocks/frame-values-test.scm +14 -14
……@@ -54,23 +54,23 @@
5454
5555 ; Store all content.
5656 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-values-test"))
57 (cog-open storage)
58 (store-frames surface-space)
57 (cog-set-value! storage (*-open-*))
58 (cog-set-value! storage (*-store-frames-*) surface-space)
5959 (cog-set-atomspace! base-space)
60 (store-atomspace)
60 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6161 (cog-set-atomspace! mid1-space)
62 (store-atomspace)
62 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6363 (cog-set-atomspace! mid2-space)
64 (store-atomspace)
64 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6565 (cog-set-atomspace! mid3-space)
66 (store-atomspace)
66 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6767 (cog-set-atomspace! mid4-space)
68 (store-atomspace)
68 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
6969 (cog-set-atomspace! mid5-space)
70 (store-atomspace)
70 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
7171 (cog-set-atomspace! surface-space)
72 (store-atomspace)
73 (cog-close storage)
72 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
73 (cog-set-value! storage (*-close-*))
7474)
7575
7676(define (get-cnt ATOM) (inexact->exact (cog-count ATOM)))
……@@ -94,11 +94,11 @@
9494
9595 ; Load everything.
9696 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-frame-values-test"))
97 (cog-open storage)
98 (define top-space (car (load-frames)))
97 (cog-set-value! storage (*-open-*))
98 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
9999 (cog-set-atomspace! top-space)
100 (load-atomspace)
101 (cog-close storage)
100 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
101 (cog-set-value! storage (*-close-*))
102102
103103 ; Grab references into the inheritance hierarchy
104104 (define surface-space top-space)
tests/persist/rocks/many-spaces-test.scm +21 -21
……@@ -54,12 +54,12 @@
5454 (cog-set-atomspace! as-main)
5555
5656 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-many-spaces-test"))
57 (cog-open storage)
58 (store-atomspace as-one)
59 (store-atomspace as-two)
60 (store-atomspace as-three)
61 (store-atomspace as-main)
62 (cog-close storage)
57 (cog-set-value! storage (*-open-*))
58 (cog-set-value! storage (*-store-atomspace-*) as-one)
59 (cog-set-value! storage (*-store-atomspace-*) as-two)
60 (cog-set-value! storage (*-store-atomspace-*) as-three)
61 (cog-set-value! storage (*-store-atomspace-*) as-main)
62 (cog-set-value! storage (*-close-*))
6363
6464 ; Return the spaces for verification before clear
6565 (list as-main as-one as-two as-three)
……@@ -80,12 +80,12 @@
8080 (cog-set-atomspace! as-main)
8181
8282 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-many-spaces-test"))
83 (cog-open storage)
83 (cog-set-value! storage (*-open-*))
8484
8585 ; Load and verify space two first (out of order)
8686 (define as-two (AtomSpace "bar"))
8787 (cog-set-atomspace! as-two)
88 (load-atomspace as-two)
88 (cog-set-value! storage (*-load-atomspace-*) as-two)
8989
9090 (test-assert "two-has-resident"
9191 (cog-node 'Concept "Resident of Two, here!"))
……@@ -101,7 +101,7 @@
101101 ; Load and verify space one
102102 (define as-one (AtomSpace "foo"))
103103 (cog-set-atomspace! as-one)
104 (load-atomspace as-one)
104 (cog-set-value! storage (*-load-atomspace-*) as-one)
105105
106106 (test-assert "one-has-content"
107107 (cog-node 'Concept "I am in Space One!"))
……@@ -115,7 +115,7 @@
115115 ; Load and verify space three
116116 (define as-three (AtomSpace "bing"))
117117 (cog-set-atomspace! as-three)
118 (load-atomspace as-three)
118 (cog-set-value! storage (*-load-atomspace-*) as-three)
119119
120120 (test-assert "three-has-edge"
121121 (cog-link 'EdgeLink
……@@ -124,7 +124,7 @@
124124 (test-assert "three-has-company"
125125 (cog-node 'Concept "Three's company"))
126126
127 (cog-close storage)
127 (cog-set-value! storage (*-close-*))
128128)
129129
130130(define basic-multispace "test basic-multispace")
……@@ -148,10 +148,10 @@
148148 (cog-set-atomspace! as-main)
149149
150150 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-many-spaces-test"))
151 (cog-open storage)
151 (cog-set-value! storage (*-open-*))
152152
153153 ; Load main space which contains the index
154 (load-atomspace as-main)
154 (cog-set-value! storage (*-load-atomspace-*) as-main)
155155
156156 ; Verify the bundle index exists
157157 (test-assert "bundle-predicate-exists"
……@@ -179,7 +179,7 @@
179179 (Predicate "bundle")
180180 (List (Item "Bundle Beta") as-three)))
181181
182 (cog-close storage)
182 (cog-set-value! storage (*-close-*))
183183)
184184
185185(define space-index "test space-index")
……@@ -203,7 +203,7 @@
203203 (cog-set-atomspace! as-main)
204204
205205 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-many-spaces-test"))
206 (cog-open storage)
206 (cog-set-value! storage (*-open-*))
207207
208208 ; Create all spaces but only load one
209209 (define as-one (AtomSpace "foo"))
……@@ -211,7 +211,7 @@
211211 (define as-three (AtomSpace "bing"))
212212
213213 ; Load only space one
214 (load-atomspace as-one)
214 (cog-set-value! storage (*-load-atomspace-*) as-one)
215215
216216 ; Verify space two doesn't have space one's content
217217 (cog-set-atomspace! as-two)
……@@ -224,7 +224,7 @@
224224 (not (cog-node 'Concept "I am in Space One!")))
225225
226226 ; Now load space two and verify it has correct content
227 (load-atomspace as-two)
227 (cog-set-value! storage (*-load-atomspace-*) as-two)
228228 (cog-set-atomspace! as-two)
229229 (test-assert "two-loaded-has-content"
230230 (cog-node 'Concept "Resident of Two, here!"))
……@@ -236,7 +236,7 @@
236236 (test-assert "three-no-two-list"
237237 (not (cog-link 'List (Concept "two-a") (Concept "two-b"))))
238238
239 (cog-close storage)
239 (cog-set-value! storage (*-close-*))
240240)
241241
242242(define no-leakage "test no-leakage")
……@@ -260,7 +260,7 @@
260260 (cog-set-atomspace! as-main)
261261
262262 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-many-spaces-test"))
263 (cog-open storage)
263 (cog-set-value! storage (*-open-*))
264264
265265 ; Create space three and set it as current
266266 (define as-three (AtomSpace "bing"))
……@@ -270,7 +270,7 @@
270270 (test-equal "three-initially-empty" '() (cog-get-all-roots))
271271
272272 ; Load without argument - should load current space (as-three)
273 (load-atomspace)
273 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
274274
275275 ; Verify content was loaded
276276 (test-assert "three-loaded-via-no-arg"
……@@ -280,7 +280,7 @@
280280 (Predicate "three-ness")
281281 (Item "Just an old lump of coal")))
282282
283 (cog-close storage)
283 (cog-set-value! storage (*-close-*))
284284)
285285
286286(define load-current "test load-current")
tests/persist/rocks/promote-test.scm +23 -23
……@@ -29,22 +29,22 @@
2929
3030 ; Store the content. Store only the top-most link.
3131 (define mstorage (MonoStorageNode "monospace:///tmp/cog-rocks-promote-test"))
32 (cog-open mstorage)
33 (store-atom (Concept "foo"))
34 (store-atom (Concept "bar"))
35 (store-atom (ListLink (Concept "foo") (List (Concept "bar"))))
36 (cog-close mstorage)
32 (cog-set-value! mstorage (*-open-*))
33 (cog-set-value! mstorage (*-store-atom-*) (Concept "foo"))
34 (cog-set-value! mstorage (*-store-atom-*) (Concept "bar"))
35 (cog-set-value! mstorage (*-store-atom-*) (ListLink (Concept "foo") (List (Concept "bar"))))
36 (cog-set-value! mstorage (*-close-*))
3737
3838 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-promote-test"))
39 (cog-open storage)
40 (store-frames (cog-atomspace))
39 (cog-set-value! storage (*-open-*))
40 (cog-set-value! storage (*-store-frames-*) (cog-atomspace))
4141 (cog-set-atomspace! (AtomSpace (cog-atomspace)))
4242 (set-cnt! (Concept "foo") (FloatValue 1 0 7))
43 (store-atom (Concept "foo"))
44 (store-atom (Concept "bar"))
43 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
44 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
4545 (set-cnt! (ListLink (Concept "foo") (List (Concept "bar"))) (FloatValue 1 0 8))
46 (store-atom (ListLink (Concept "foo") (List (Concept "bar"))))
47 (cog-close storage)
46 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (List (Concept "bar"))))
47 (cog-set-value! storage (*-close-*))
4848
4949 ; Clear out the space, start with a clean slate.
5050 (cog-atomspace-clear (cog-atomspace))
……@@ -61,13 +61,13 @@
6161
6262 ; Load everything.
6363 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-promote-test"))
64 (cog-open storage)
64 (cog-set-value! storage (*-open-*))
6565 ; (cog-rocks-stats storage)
6666 ; (cog-rocks-print storage "")
67 (define top-space (car (load-frames)))
67 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
6868 (cog-set-atomspace! top-space)
69 (load-atomspace)
70 (cog-close storage)
69 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
70 (cog-set-value! storage (*-close-*))
7171
7272 ; Verify the ListLink is as expected.
7373 (define lilly (ListLink (Concept "foo") (List (Concept "bar"))))
……@@ -95,12 +95,12 @@
9595
9696 ; Load enough to get started.
9797 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-promote-test"))
98 (cog-open storage)
98 (cog-set-value! storage (*-open-*))
9999 ; (cog-rocks-stats storage)
100100 ; (cog-rocks-print storage "")
101 (define top-space (car (load-frames)))
102 (delete-frame! top-space)
103 (cog-close storage)
101 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
102 (cog-set-value! storage (*-delete-frame-*) top-space)
103 (cog-set-value! storage (*-close-*))
104104)
105105
106106; Verify what's left a the bottom
……@@ -111,13 +111,13 @@
111111
112112 ; Load everything.
113113 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-promote-test"))
114 (cog-open storage)
114 (cog-set-value! storage (*-open-*))
115115 ; (cog-rocks-stats storage)
116116 ; (cog-rocks-print storage "")
117 (define top-space (car (load-frames)))
117 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
118118 (cog-set-atomspace! top-space)
119 (load-atomspace)
120 (cog-close storage)
119 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
120 (cog-set-value! storage (*-close-*))
121121
122122 ; Verify the ListLink is as expected.
123123 (define lilly (ListLink (Concept "foo") (List (Concept "bar"))))
tests/persist/rocks/query-storage-test.scm +26 -26
……@@ -31,9 +31,9 @@
3131
3232 ; Store to disk
3333 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-query-storage-test"))
34 (cog-open storage)
35 (store-atomspace)
36 (cog-close storage)
34 (cog-set-value! storage (*-open-*))
35 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
36 (cog-set-value! storage (*-close-*))
3737
3838 ; Clear and reopen
3939 (cog-atomspace-clear)
……@@ -49,14 +49,14 @@
4949 (setup-and-store)
5050
5151 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-query-storage-test"))
52 (cog-open storage)
52 (cog-set-value! storage (*-open-*))
5353
5454 ; Define query to find tail of (List A ?)
5555 (define get-tail (Meet (List (Concept "A") (Variable "tail"))))
5656 (define results-key (Predicate "results"))
5757
5858 ; Run query
59 (fetch-query get-tail results-key)
59 (cog-set-value! storage (*-fetch-query-*) get-tail results-key)
6060 (define result (cog-value get-tail results-key))
6161
6262 ; Verify result contains (Concept "B")
……@@ -73,7 +73,7 @@
7373 (test-assert "ListLink-not-in-atomspace"
7474 (not (member (List (Concept "A") (Concept "B")) roots)))
7575
76 (cog-close storage)
76 (cog-set-value! storage (*-close-*))
7777)
7878
7979(define basic-meet "test basic-meet")
……@@ -91,13 +91,13 @@
9191 (setup-and-store)
9292
9393 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-query-storage-test"))
94 (cog-open storage)
94 (cog-set-value! storage (*-open-*))
9595
9696 (define get-tail (Meet (List (Concept "A") (Variable "tail"))))
9797 (define results-key (Predicate "results"))
9898
9999 ; Initial query - should return B
100 (fetch-query get-tail results-key)
100 (cog-set-value! storage (*-fetch-query-*) get-tail results-key)
101101 (define result1 (cog-value get-tail results-key))
102102 (test-equal "initial-result-B"
103103 (list (Concept "B"))
……@@ -105,11 +105,11 @@
105105
106106 ; Add new data and store
107107 (List (Concept "A") (Concept "F"))
108 (store-atomspace)
108 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
109109 (cog-extract-recursive! (Concept "F"))
110110
111111 ; Re-run query - should get cached (stale) result
112 (fetch-query get-tail results-key)
112 (cog-set-value! storage (*-fetch-query-*) get-tail results-key)
113113 (define cached-result (cog-value get-tail results-key))
114114 (test-equal "cached-result-still-B"
115115 (list (Concept "B"))
……@@ -117,8 +117,8 @@
117117
118118 ; Clear cache and re-run
119119 (cog-set-value! get-tail results-key #f)
120 (store-value get-tail results-key)
121 (fetch-query get-tail results-key)
120 (cog-set-value! storage (*-store-value-*) get-tail results-key)
121 (cog-set-value! storage (*-fetch-query-*) get-tail results-key)
122122 (define fresh-result (cog-value get-tail results-key))
123123 (define fresh-list (cog-value->list fresh-result))
124124
……@@ -126,7 +126,7 @@
126126 (test-assert "fresh-contains-B" (member (Concept "B") fresh-list))
127127 (test-assert "fresh-contains-F" (member (Concept "F") fresh-list))
128128
129 (cog-close storage)
129 (cog-set-value! storage (*-close-*))
130130)
131131
132132(define query-caching "test query-caching")
……@@ -145,21 +145,21 @@
145145 (setup-and-store)
146146
147147 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-query-storage-test"))
148 (cog-open storage)
148 (cog-set-value! storage (*-open-*))
149149
150150 (define get-tail (Meet (List (Concept "A") (Variable "tail"))))
151151 (define results-key (Predicate "results"))
152152
153153 ; Initial query
154 (fetch-query get-tail results-key)
154 (cog-set-value! storage (*-fetch-query-*) get-tail results-key)
155155
156156 ; Add new data
157157 (List (Concept "A") (Concept "G"))
158 (store-atomspace)
158 (cog-set-value! storage (*-store-atomspace-*) (cog-atomspace))
159159 (cog-extract-recursive! (Concept "G"))
160160
161161 ; Stale cache - should NOT have G yet
162 (fetch-query get-tail results-key)
162 (cog-set-value! storage (*-fetch-query-*) get-tail results-key)
163163 (define stale-result (cog-value get-tail results-key))
164164 (define stale-list (cog-value->list stale-result))
165165 (test-assert "stale-missing-G"
……@@ -167,14 +167,14 @@
167167
168168 ; Request fresh with metadata
169169 (define metadata (Predicate "my metadata"))
170 (fetch-query get-tail results-key metadata #t)
170 (cog-set-value! storage (*-fetch-query-*) (LinkValue (cog-atomspace) get-tail results-key metadata (BoolValue #t)))
171171
172172 (define fresh-result (cog-value get-tail results-key))
173173 (define fresh-list (cog-value->list fresh-result))
174174 (test-assert "fresh-contains-G" (member (Concept "G") fresh-list))
175175
176176 ; Check metadata exists and is a timestamp
177 (fetch-value get-tail metadata)
177 (cog-set-value! storage (*-fetch-value-*) get-tail metadata)
178178 (define meta-value (cog-value get-tail metadata))
179179 (test-assert "metadata-exists" meta-value)
180180 (test-assert "metadata-is-float"
……@@ -184,7 +184,7 @@
184184 (define timestamp (car (cog-value->list meta-value)))
185185 (test-assert "timestamp-reasonable" (> timestamp 1577836800))
186186
187 (cog-close storage)
187 (cog-set-value! storage (*-close-*))
188188)
189189
190190(define query-metadata "test query-metadata")
……@@ -202,13 +202,13 @@
202202 (setup-and-store)
203203
204204 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-query-storage-test"))
205 (cog-open storage)
205 (cog-set-value! storage (*-open-*))
206206
207207 (define results-key (Predicate "results"))
208208
209209 ; Find all structures containing (Concept "B")
210210 (define b-holders (MaximalJoin (Concept "B")))
211 (fetch-query b-holders results-key)
211 (cog-set-value! storage (*-fetch-query-*) b-holders results-key)
212212 (define result (cog-value b-holders results-key))
213213
214214 (test-assert "join-result-exists" result)
……@@ -229,7 +229,7 @@
229229 (test-assert "SetAB-in-atomspace"
230230 (member (Set (Concept "A") (Concept "B")) roots))
231231
232 (cog-close storage)
232 (cog-set-value! storage (*-close-*))
233233)
234234
235235(define join-link "test join-link")
……@@ -247,7 +247,7 @@
247247 (setup-and-store)
248248
249249 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-query-storage-test"))
250 (cog-open storage)
250 (cog-set-value! storage (*-open-*))
251251
252252 (define results-key (Predicate "results"))
253253
……@@ -258,7 +258,7 @@
258258 (OrderedLink (Variable "tail") (Concept "by") (Variable "tail"))
259259 ))
260260
261 (fetch-query tail-by-tail results-key)
261 (cog-set-value! storage (*-fetch-query-*) tail-by-tail results-key)
262262 (define result (cog-value tail-by-tail results-key))
263263
264264 (test-assert "querylink-result-exists" result)
……@@ -269,7 +269,7 @@
269269 (member (OrderedLink (Concept "B") (Concept "by") (Concept "B"))
270270 rewrite-list))
271271
272 (cog-close storage)
272 (cog-set-value! storage (*-close-*))
273273)
274274
275275(define query-link "test query-link")
tests/persist/rocks/space-delete-test.scm +22 -22
……@@ -38,12 +38,12 @@
3838 ; Store the content. Store the Concepts as well as the link,
3939 ; as otherwise, the TV's on the Concepts aren't stored.
4040 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-delete-test"))
41 (cog-open storage)
42 (store-frames surface-space)
43 (store-atom (ListLink (Concept "foo") (Concept "bar")))
44 (store-atom (Concept "foo"))
45 (store-atom (Concept "bar"))
46 (cog-close storage)
41 (cog-set-value! storage (*-open-*))
42 (cog-set-value! storage (*-store-frames-*) surface-space)
43 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
44 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
45 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
46 (cog-set-value! storage (*-close-*))
4747
4848 ; Clear out the spaces, start with a clean slate.
4949 (cog-atomspace-clear surface-space)
……@@ -62,12 +62,12 @@
6262
6363 ; Load everything.
6464 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-delete-test"))
65 (cog-open storage)
65 (cog-set-value! storage (*-open-*))
6666 ; (cog-rocks-print storage "")
6767
68 (define top-space (car (load-frames)))
69 (delete-frame! top-space)
70 (cog-close storage)
68 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
69 (cog-set-value! storage (*-delete-frame-*) top-space)
70 (cog-set-value! storage (*-close-*))
7171)
7272
7373; -------------------------------------------------------------------
……@@ -101,11 +101,11 @@
101101
102102 ; Load everything.
103103 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-delete-test"))
104 (cog-open storage)
105 (define top-space (car (load-frames)))
104 (cog-set-value! storage (*-open-*))
105 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
106106 (cog-set-atomspace! top-space)
107 (load-atomspace)
108 (cog-close storage)
107 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
108 (cog-set-value! storage (*-close-*))
109109
110110 (test-equal "top-depth" 4 (count-depth top-space 1))
111111
……@@ -113,11 +113,11 @@
113113
114114 ; Load everything. Again.
115115 (cog-set-atomspace! (AtomSpace))
116 (cog-open storage)
117 (set! top-space (car (load-frames)))
116 (cog-set-value! storage (*-open-*))
117 (set! top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
118118 (cog-set-atomspace! top-space)
119 (load-atomspace)
120 (cog-close storage)
119 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
120 (cog-set-value! storage (*-close-*))
121121
122122 (test-equal "top-depth" 3 (count-depth top-space 1))
123123
……@@ -125,11 +125,11 @@
125125
126126 ; Load everything. Again.
127127 (cog-set-atomspace! (AtomSpace))
128 (cog-open storage)
129 (set! top-space (car (load-frames)))
128 (cog-set-value! storage (*-open-*))
129 (set! top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
130130 (cog-set-atomspace! top-space)
131 (load-atomspace)
132 (cog-close storage)
131 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
132 (cog-set-value! storage (*-close-*))
133133
134134 (test-equal "top-depth" 2 (count-depth top-space 1))
135135
tests/persist/rocks/space-diamond-test.scm +11 -11
……@@ -40,18 +40,18 @@
4040 ; Store the content. Store the Concepts as well as the link,
4141 ; as otherwise, the TV's on the Concepts aren't stored.
4242 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-diamond-test"))
43 (cog-open storage)
44 (store-frames top-space)
45 (store-atom (ListLink (Concept "foo") (Concept "bar")))
46 (store-atom (Concept "foo"))
43 (cog-set-value! storage (*-open-*))
44 (cog-set-value! storage (*-store-frames-*) top-space)
45 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
46 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
4747
4848 ; Store the two variants, with the explicit spaces in which
4949 ; they come from.
5050 (cog-set-atomspace! left-space)
51 (store-atom (Concept "bar"))
51 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
5252 (cog-set-atomspace! right-space)
53 (store-atom (Concept "bar"))
54 (cog-close storage)
53 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
54 (cog-set-value! storage (*-close-*))
5555)
5656
5757; -------------------------------------------------------------------
……@@ -65,15 +65,15 @@
6565
6666 ; Load everything.
6767 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-diamond-test"))
68 (cog-open storage)
68 (cog-set-value! storage (*-open-*))
6969
7070 ; Load all of the AtomSpaces.
71 (define top-space (car (load-frames)))
71 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
7272 (cog-set-atomspace! top-space)
7373
7474 ; Now load the AtomSpace itself
75 (load-atomspace)
76 (cog-close storage)
75 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
76 (cog-set-value! storage (*-close-*))
7777
7878 ; Verify that a diamond pattern was created.
7979 (define left-space (cog-outgoing-atom top-space 0))
tests/persist/rocks/space-episodic-test.scm +10 -10
……@@ -69,11 +69,11 @@
6969
7070; Dump all three AtomSpaces to the same file.
7171(define rsn (RocksStorageNode "rocks:///tmp/cog-rocks-space-episodic-test"))
72(cog-open rsn)
73(store-atomspace)
74(store-atomspace (AtomSpace "happy thoughts"))
75(store-atomspace (AtomSpace "crushing defeat"))
76(cog-close rsn)
72(cog-set-value! rsn (*-open-*))
73(cog-set-value! rsn (*-store-atomspace-*) (cog-atomspace))
74(cog-set-value! rsn (*-store-atomspace-*) (AtomSpace "happy thoughts"))
75(cog-set-value! rsn (*-store-atomspace-*) (AtomSpace "crushing defeat"))
76(cog-set-value! rsn (*-close-*))
7777
7878; Verify that the contents are as expected
7979(cog-prt-atomspace)
……@@ -92,8 +92,8 @@
9292
9393(define gsn (RocksStorageNode "rocks:///tmp/cog-rocks-space-episodic-test"))
9494
95(cog-open gsn)
96(load-atomspace)
95(cog-set-value! gsn (*-open-*))
96(cog-set-value! gsn (*-load-atomspace-*) (cog-atomspace))
9797(format #t "Loaded Atom counts ~A ~A ~A\n"
9898 (count-all)
9999 (count-all (cog-value (ConceptNode "foo") (Predicate "real life")))
……@@ -112,9 +112,9 @@
112112 (count-all (cog-value (ConceptNode "foo") (Predicate "repressed mem")))))
113113
114114; Now, restore the two batches of episodic memories.
115(load-atomspace (AtomSpace "happy thoughts"))
116(load-atomspace (AtomSpace "crushing defeat"))
117(cog-close gsn)
115(cog-set-value! gsn (*-load-atomspace-*) (AtomSpace "happy thoughts"))
116(cog-set-value! gsn (*-load-atomspace-*) (AtomSpace "crushing defeat"))
117(cog-set-value! gsn (*-close-*))
118118
119119; +1 for (Predicate "*-IsKeyFlag-*")
120120(test-assert "base-count" (equal? 19 (count-all)))
tests/persist/rocks/space-frame-test.scm +10 -10
……@@ -38,12 +38,12 @@
3838 ; Store the content. Store the Concepts as well as the link,
3939 ; as otherwise, the TV's on the Concepts aren't stored.
4040 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-frame-test"))
41 (cog-open storage)
42 (store-frames surface-space)
43 (store-atom (ListLink (Concept "foo") (Concept "bar")))
44 (store-atom (Concept "foo"))
45 (store-atom (Concept "bar"))
46 (cog-close storage)
41 (cog-set-value! storage (*-open-*))
42 (cog-set-value! storage (*-store-frames-*) surface-space)
43 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
44 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
45 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
46 (cog-set-value! storage (*-close-*))
4747
4848 ; Clear out the spaces, start with a clean slate.
4949 (cog-atomspace-clear surface-space)
……@@ -68,11 +68,11 @@
6868
6969 ; Load everything.
7070 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-frame-test"))
71 (cog-open storage)
72 (define top-space (car (load-frames)))
71 (cog-set-value! storage (*-open-*))
72 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
7373 (cog-set-atomspace! top-space)
74 (load-atomspace)
75 (cog-close storage)
74 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
75 (cog-set-value! storage (*-close-*))
7676
7777 ; Grab references into the inheritance hierarchy
7878 (define surface-space top-space)
tests/persist/rocks/space-link-test.scm +6 -6
……@@ -24,18 +24,18 @@
2424
2525 ; Store it
2626 (define rsn (RocksStorageNode "rocks:///tmp/cog-rocks-space-link-test"))
27 (cog-open rsn)
28 (store-atomspace)
29 (cog-close rsn)
27 (cog-set-value! rsn (*-open-*))
28 (cog-set-value! rsn (*-store-atomspace-*) (cog-atomspace))
29 (cog-set-value! rsn (*-close-*))
3030
3131 ; Start fresh
3232 (cog-atomspace-clear)
3333
3434 ; Load
3535 (set! rsn (RocksStorageNode "rocks:///tmp/cog-rocks-space-link-test"))
36 (cog-open rsn)
37 (load-atomspace)
38 (cog-close rsn)
36 (cog-set-value! rsn (*-open-*))
37 (cog-set-value! rsn (*-load-atomspace-*) (cog-atomspace))
38 (cog-set-value! rsn (*-close-*))
3939 (cog-prt-atomspace)
4040
4141 ; Was the Item loaded?
tests/persist/rocks/space-wye-test.scm +10 -10
……@@ -36,12 +36,12 @@
3636 ; Store the content. Store the Concepts as well as the link,
3737 ; as otherwise, the TV's on the Concepts aren't stored.
3838 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-wye-test"))
39 (cog-open storage)
40 (store-frames top-space)
41 (store-atom (ListLink (Concept "foo") (Concept "bar")))
42 (store-atom (Concept "foo"))
43 (store-atom (Concept "bar"))
44 (cog-close storage)
39 (cog-set-value! storage (*-open-*))
40 (cog-set-value! storage (*-store-frames-*) top-space)
41 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
42 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
43 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
44 (cog-set-value! storage (*-close-*))
4545)
4646
4747; -------------------------------------------------------------------
……@@ -60,15 +60,15 @@
6060
6161 ; Load everything.
6262 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-wye-test"))
63 (cog-open storage)
63 (cog-set-value! storage (*-open-*))
6464
6565 ; Load all of the AtomSpaces.
66 (define top-space (car (load-frames)))
66 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
6767 (cog-set-atomspace! top-space)
6868
6969 ; Now load the AtomSpace itself
70 (load-atomspace)
71 (cog-close storage)
70 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
71 (cog-set-value! storage (*-close-*))
7272
7373 ; Verify that a wye pattern was created.
7474 (define left-space (cog-outgoing-atom top-space 0))
tests/persist/rocks/space-x-test.scm +14 -14
……@@ -44,18 +44,18 @@
4444 ; Store the content. Store the Concepts as well as the link,
4545 ; as otherwise, the TV's on the Concepts aren't stored.
4646 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-x-test"))
47 (cog-open storage)
48 (store-frames top1-space)
49 (store-frames top2-space)
47 (cog-set-value! storage (*-open-*))
48 (cog-set-value! storage (*-store-frames-*) top1-space)
49 (cog-set-value! storage (*-store-frames-*) top2-space)
5050 (cog-set-atomspace! top1-space)
51 (store-atom (Concept "bar"))
51 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
5252 (cog-set-atomspace! top2-space)
53 (store-atom (Concept "bar"))
54 (store-atom (Concept "foo"))
53 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
54 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
5555 (cog-set-atomspace! mid-space)
56 (store-atom (ListLink (Concept "foo") (Concept "bar")))
57 (store-atom (Concept "bar"))
58 (cog-close storage)
56 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
57 (cog-set-value! storage (*-store-atom-*) (Concept "bar"))
58 (cog-set-value! storage (*-close-*))
5959)
6060
6161; -------------------------------------------------------------------
……@@ -74,21 +74,21 @@
7474
7575 ; Load everything.
7676 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-space-x-test"))
77 (cog-open storage)
77 (cog-set-value! storage (*-open-*))
7878
7979 ; Load all of the Frames.
80 (define top-spaces (load-frames))
80 (define top-spaces (cog-value->list (cog-value storage (*-load-frames-*))))
8181 ; (format #t "The top spaces are ~A\n" top-spaces)
8282 (define top1-space (first top-spaces))
8383 (define top2-space (second top-spaces))
8484
8585 ; Load all of the AtomSpaces.
8686 (cog-set-atomspace! top1-space)
87 (load-atomspace)
87 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
8888 (cog-set-atomspace! top2-space)
89 (load-atomspace)
89 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
9090
91 (cog-close storage)
91 (cog-set-value! storage (*-close-*))
9292
9393 (test-assert "exe-top-unequal" (not (equal? top1-space top2-space)))
9494
tests/persist/rocks/value-frame-test.scm +8 -8
……@@ -42,10 +42,10 @@
4242
4343 ; Store only the top link, nothing else.
4444 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-frame-test"))
45 (cog-open storage)
46 (store-frames surface-space)
47 (store-atom (ListLink (Concept "foo") (List (Concept "bar"))))
48 (cog-close storage)
45 (cog-set-value! storage (*-open-*))
46 (cog-set-value! storage (*-store-frames-*) surface-space)
47 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (List (Concept "bar"))))
48 (cog-set-value! storage (*-close-*))
4949
5050 ; Clear out the spaces, start with a clean slate.
5151 (cog-atomspace-clear surface-space)
……@@ -66,13 +66,13 @@
6666
6767 ; Load everything.
6868 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-frame-test"))
69 (cog-open storage)
70 (define top-space (car (load-frames)))
69 (cog-set-value! storage (*-open-*))
70 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
7171 (cog-set-atomspace! top-space)
72 (load-atomspace)
72 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
7373 ; (cog-rocks-stats storage)
7474 ; (cog-rocks-print storage "")
75 (cog-close storage)
75 (cog-set-value! storage (*-close-*))
7676
7777 ; Grab references into the inheritance hierarchy
7878 (define surface-space top-space)
tests/persist/rocks/value-readd-test.scm +10 -10
……@@ -22,7 +22,7 @@
2222
2323 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-readd-test"))
2424 (cog-open storage)
25 (store-frames (cog-atomspace))
25 (cog-set-value! storage (*-store-frames-*) (cog-atomspace))
2626
2727 ; Splatter some atoms into the various spaces.
2828 (set-cnt! (Concept "foo") (FloatValue 1 0 3))
……@@ -33,7 +33,7 @@
3333
3434 (cog-set-atomspace! mid1-space)
3535 (set-cnt! (List (Concept "foo") (Concept "bar")) (FloatValue 1 0 5))
36 (store-atom (ListLink (Concept "foo") (Concept "bar")))
36 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
3737
3838 (define mid2-space (AtomSpace mid1-space))
3939 (cog-set-atomspace! mid2-space)
……@@ -43,18 +43,18 @@
4343 (cog-delete-recursive! (Concept "foo"))
4444 (cog-extract-recursive! (Concept "foo"))
4545 (set-cnt! (Concept "foo") (FloatValue 1 0 6))
46 (store-atom (ListLink (Concept "foo") (Concept "faa")))
46 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "faa")))
4747
4848 (define mid3-space (AtomSpace mid2-space))
4949 (cog-set-atomspace! mid3-space)
5050 (set-cnt! (List (Concept "foo") (Concept "bar")) (FloatValue 1 0 7))
51 (store-atom (ListLink (Concept "foo") (Concept "bar")))
51 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
5252
5353 (define surface-space (AtomSpace mid3-space))
5454 (cog-set-atomspace! surface-space)
55 (store-frames surface-space)
55 (cog-set-value! storage (*-store-frames-*) surface-space)
5656
57 (cog-close storage)
57 (cog-set-value! storage (*-close-*))
5858
5959 ; Clear out the spaces, start with a clean slate.
6060 (cog-atomspace-clear surface-space)
……@@ -75,13 +75,13 @@
7575
7676 ; Load everything.
7777 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-readd-test"))
78 (cog-open storage)
79 (define top-space (car (load-frames)))
78 (cog-set-value! storage (*-open-*))
79 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
8080 (cog-set-atomspace! top-space)
81 (load-atomspace)
81 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
8282 ; (cog-rocks-stats storage)
8383 ; (cog-rocks-print storage "")
84 (cog-close storage)
84 (cog-set-value! storage (*-close-*))
8585
8686 ; Grab references into the inheritance hierarchy
8787 (define surface-space top-space)
tests/persist/rocks/value-resave-test.scm +10 -10
……@@ -22,7 +22,7 @@
2222
2323 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-resave-test"))
2424 (cog-open storage)
25 (store-frames (cog-atomspace))
25 (cog-set-value! storage (*-store-frames-*) (cog-atomspace))
2626
2727 ; Splatter some atoms into the various spaces.
2828 (set-cnt! (Concept "foo") (FloatValue 1 0 3))
……@@ -33,7 +33,7 @@
3333
3434 (cog-set-atomspace! mid1-space)
3535 (set-cnt! (List (Concept "foo") (Concept "bar")) (FloatValue 1 0 5))
36 (store-atom (ListLink (Concept "foo") (Concept "bar")))
36 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
3737
3838 (define mid2-space (AtomSpace mid1-space))
3939 (cog-set-atomspace! mid2-space)
……@@ -43,18 +43,18 @@
4343 (cog-delete-recursive! (Concept "foo"))
4444 (cog-extract-recursive! (Concept "foo"))
4545 (set-cnt! (Concept "foo") (FloatValue 1 0 6))
46 (store-atom (Concept "foo"))
46 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
4747
4848 (define mid3-space (AtomSpace mid2-space))
4949 (cog-set-atomspace! mid3-space)
5050 (set-cnt! (List (Concept "foo") (Concept "bar")) (FloatValue 1 0 7))
51 (store-atom (ListLink (Concept "foo") (Concept "bar")))
51 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
5252
5353 (define surface-space (AtomSpace mid3-space))
5454 (cog-set-atomspace! surface-space)
55 (store-frames surface-space)
55 (cog-set-value! storage (*-store-frames-*) surface-space)
5656
57 (cog-close storage)
57 (cog-set-value! storage (*-close-*))
5858
5959 ; Clear out the spaces, start with a clean slate.
6060 (cog-atomspace-clear surface-space)
……@@ -75,13 +75,13 @@
7575
7676 ; Load everything.
7777 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-resave-test"))
78 (cog-open storage)
79 (define top-space (car (load-frames)))
78 (cog-set-value! storage (*-open-*))
79 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
8080 (cog-set-atomspace! top-space)
81 (load-atomspace)
81 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
8282 ; (cog-rocks-stats storage)
8383 ; (cog-rocks-print storage "")
84 (cog-close storage)
84 (cog-set-value! storage (*-close-*))
8585
8686 ; Grab references into the inheritance hierarchy
8787 (define surface-space top-space)
tests/persist/rocks/value-reval-test.scm +11 -11
……@@ -22,7 +22,7 @@
2222
2323 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-reval-test"))
2424 (cog-open storage)
25 (store-frames (cog-atomspace))
25 (cog-set-value! storage (*-store-frames-*) (cog-atomspace))
2626
2727 ; Splatter some atoms into the various spaces.
2828 (set-cnt! (Concept "foo") (FloatValue 1 0 3))
……@@ -33,7 +33,7 @@
3333
3434 (cog-set-atomspace! mid1-space)
3535 (set-cnt! (List (Concept "foo") (Concept "bar")) (FloatValue 1 0 5))
36 (store-atom (ListLink (Concept "foo") (Concept "bar")))
36 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
3737
3838 (define mid2-space (AtomSpace mid1-space))
3939 (cog-set-atomspace! mid2-space)
……@@ -43,20 +43,20 @@
4343 ; But it has no values. Next, write an explicit value.
4444 (cog-delete-recursive! (Concept "foo"))
4545 (cog-extract-recursive! (Concept "foo"))
46 (store-atom (Concept "foo"))
46 (cog-set-value! storage (*-store-atom-*) (Concept "foo"))
4747 (set-cnt! (Concept "foo") (FloatValue 1 0 6))
48 (store-value (Concept "foo") (Predicate "kayfabe"))
48 (cog-set-value! storage (*-store-value-*) (Concept "foo") (Predicate "kayfabe"))
4949
5050 (define mid3-space (AtomSpace mid2-space))
5151 (cog-set-atomspace! mid3-space)
5252 (set-cnt! (List (Concept "foo") (Concept "bar")) (FloatValue 1 0 7))
53 (store-atom (ListLink (Concept "foo") (Concept "bar")))
53 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (Concept "bar")))
5454
5555 (define surface-space (AtomSpace mid3-space))
5656 (cog-set-atomspace! surface-space)
57 (store-frames surface-space)
57 (cog-set-value! storage (*-store-frames-*) surface-space)
5858
59 (cog-close storage)
59 (cog-set-value! storage (*-close-*))
6060
6161 ; Clear out the spaces, start with a clean slate.
6262 (cog-atomspace-clear surface-space)
……@@ -77,13 +77,13 @@
7777
7878 ; Load everything.
7979 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-reval-test"))
80 (cog-open storage)
81 (define top-space (car (load-frames)))
80 (cog-set-value! storage (*-open-*))
81 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
8282 (cog-set-atomspace! top-space)
83 (load-atomspace)
83 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
8484 ; (cog-rocks-stats storage)
8585 ; (cog-rocks-print storage "")
86 (cog-close storage)
86 (cog-set-value! storage (*-close-*))
8787
8888 ; Grab references into the inheritance hierarchy
8989 (define surface-space top-space)
tests/persist/rocks/value-store-test.scm +6 -6
……@@ -27,9 +27,9 @@
2727
2828 ; Store the content. Store only the top-most link.
2929 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-store-test"))
30 (cog-open storage)
31 (store-atom (ListLink (Concept "foo") (List (Concept "bar"))))
32 (cog-close storage)
30 (cog-set-value! storage (*-open-*))
31 (cog-set-value! storage (*-store-atom-*) (ListLink (Concept "foo") (List (Concept "bar"))))
32 (cog-set-value! storage (*-close-*))
3333
3434 ; Clear out the space, start with a clean slate.
3535 (cog-atomspace-clear (cog-atomspace))
……@@ -46,11 +46,11 @@
4646
4747 ; Load everything.
4848 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-value-store-test"))
49 (cog-open storage)
49 (cog-set-value! storage (*-open-*))
5050 ; (cog-rocks-stats storage)
5151 ; (cog-rocks-print storage "")
52 (load-atomspace)
53 (cog-close storage)
52 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
53 (cog-set-value! storage (*-close-*))
5454
5555 ; Verify the ListLink is as expected.
5656 (define lilly (ListLink (Concept "foo") (List (Concept "bar"))))
tests/persist/rocks/valueless-test.scm +11 -11
……@@ -27,15 +27,15 @@
2727 (define surface-space (AtomSpace mid5-space))
2828
2929 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-valueless-test"))
30 (cog-open storage)
31 (store-frames surface-space)
30 (cog-set-value! storage (*-open-*))
31 (cog-set-value! storage (*-store-frames-*) surface-space)
3232
3333 ; Splatter some atoms into the various spaces.
3434 (cog-set-atomspace! base-space)
35 (store-atom (Concept "even"))
35 (cog-set-value! storage (*-store-atom-*) (Concept "even"))
3636
3737 (cog-set-atomspace! mid1-space)
38 (store-atom (Concept "odd"))
38 (cog-set-value! storage (*-store-atom-*) (Concept "odd"))
3939
4040 (cog-set-atomspace! mid2-space)
4141 (cog-delete! (Concept "even"))
……@@ -46,12 +46,12 @@
4646 (cog-extract! (Concept "odd"))
4747
4848 (cog-set-atomspace! mid4-space)
49 (store-atom (Concept "even"))
49 (cog-set-value! storage (*-store-atom-*) (Concept "even"))
5050
5151 (cog-set-atomspace! mid5-space)
52 (store-atom (Concept "odd"))
52 (cog-set-value! storage (*-store-atom-*) (Concept "odd"))
5353
54 (cog-close storage)
54 (cog-set-value! storage (*-close-*))
5555
5656 ; Clear out the spaces, start with a clean slate.
5757 (cog-atomspace-clear surface-space)
……@@ -79,11 +79,11 @@
7979
8080 ; Load everything.
8181 (define storage (RocksStorageNode "rocks:///tmp/cog-rocks-valueless-test"))
82 (cog-open storage)
83 (define top-space (car (load-frames)))
82 (cog-set-value! storage (*-open-*))
83 (define top-space (car (cog-value->list (cog-value storage (*-load-frames-*)))))
8484 (cog-set-atomspace! top-space)
85 (load-atomspace)
86 (cog-close storage)
85 (cog-set-value! storage (*-load-atomspace-*) (cog-atomspace))
86 (cog-set-value! storage (*-close-*))
8787
8888 ; Grab references into the inheritance hierarchy
8989 (define surface-space top-space)