OverviewFilesCommitsIssuesDocsReleasesPeers

opencog-atomspace-cog commits / 5120199

Revise unit tests to stop using old get_handle()
It an obsolete call. I want to just remove it and be done with it.
5120199812c0e52b168ce0764854f2785ef93874
by Linas Vepstas <linasvepstas@gmail.com> · 2025-12-08T00:10:07.000Z

Changed files (12) +220 -136

tests/persist/cog-simple/SimpleDeleteUTest.cxxtest +31 -19
……@@ -293,16 +293,20 @@ void DeleteUTest::fetch_space(int idx, StorageNodePtr space)
293293void DeleteUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
294294{
295295 dbgmsg += "-idx=" + std::to_string(idx);
296 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
296 std::string name1 = n1[idx]->get_name();
297 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
297298 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
298299
299 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
300 std::string name2 = n2[idx]->get_name();
301 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
300302 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
301303
302 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
304 std::string name3 = n3[idx]->get_name();
305 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
303306 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
304307
305 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
308 std::string name4 = n4[idx]->get_name();
309 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
306310 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
307311
308312 HandleSeq hvec;
……@@ -311,24 +315,28 @@ void DeleteUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
311315 hvec.push_back(hb3);
312316 hvec.push_back(hb4);
313317
314 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
318 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
315319 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
316320
317321 HandleSeq hv2({hlb, hb2});
318 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
322 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
319323 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
320324
321325 HandleSeq hv3({hb1, hlb2, hb3});
322 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
326 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
323327 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
324328}
325329
326330void DeleteUTest::check_remove(int idx, AtomSpacePtr space, std::string dbgmsg)
327331{
328 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
329 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
330 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
331 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
332 std::string name1 = n1[idx]->get_name();
333 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
334 std::string name2 = n2[idx]->get_name();
335 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
336 std::string name3 = n3[idx]->get_name();
337 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
338 std::string name4 = n4[idx]->get_name();
339 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
332340
333341 HandleSeq hvec;
334342 hvec.push_back(hb1);
……@@ -336,30 +344,34 @@ void DeleteUTest::check_remove(int idx, AtomSpacePtr space, std::string dbgmsg)
336344 hvec.push_back(hb3);
337345 hvec.push_back(hb4);
338346
339 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
347 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
340348 tvMiscompare(hl[idx], hlb, dbgmsg + "-hlinkb");
341349
342350 HandleSeq hv2({hlb, hb2});
343 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
351 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
344352 tvMiscompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
345353
346354 HandleSeq hv3({hb1, hlb2, hb3});
347 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
355 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
348356 tvMiscompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
349357}
350358
351359void DeleteUTest::check_empty(int idx, AtomSpacePtr space)
352360{
353 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
361 std::string name1 = n1[idx]->get_name();
362 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
354363 TSM_ASSERT("Should not find this atom", hb1 == Handle::UNDEFINED);
355364
356 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
365 std::string name2 = n2[idx]->get_name();
366 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
357367 TSM_ASSERT("Should not find this atom", hb2 == Handle::UNDEFINED);
358368
359 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
369 std::string name3 = n3[idx]->get_name();
370 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
360371 TSM_ASSERT("Should not find this atom", hb3 == Handle::UNDEFINED);
361372
362 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
373 std::string name4 = n4[idx]->get_name();
374 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
363375 TSM_ASSERT("Should not find this atom", hb4 == Handle::UNDEFINED);
364376
365377 HandleSeq hvec;
……@@ -368,7 +380,7 @@ void DeleteUTest::check_empty(int idx, AtomSpacePtr space)
368380 hvec.push_back(h3[idx]);
369381 hvec.push_back(h4[idx]);
370382
371 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
383 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
372384 TSM_ASSERT("Should not find this atom", hlb == Handle::UNDEFINED);
373385}
374386
tests/persist/cog-simple/SimpleLargeFlatUTest.cxxtest +20 -12
……@@ -284,16 +284,20 @@ void LargeFlatUTest::fetch_space(int idx, StorageNodePtr space)
284284
285285void LargeFlatUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
286286{
287 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
287 std::string name1 = n1[idx]->get_name();
288 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
288289 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
289290
290 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
291 std::string name2 = n2[idx]->get_name();
292 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
291293 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
292294
293 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
295 std::string name3 = n3[idx]->get_name();
296 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
294297 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
295298
296 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
299 std::string name4 = n4[idx]->get_name();
300 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
297301 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
298302
299303 HandleSeq hvec;
……@@ -302,30 +306,34 @@ void LargeFlatUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg
302306 hvec.push_back(hb3);
303307 hvec.push_back(hb4);
304308
305 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
309 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
306310 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
307311
308312 HandleSeq hv2({hlb, hb2});
309 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
313 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
310314 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
311315
312316 HandleSeq hv3({hb1, hlb2, hb3});
313 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
317 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
314318 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
315319}
316320
317321void LargeFlatUTest::check_empty(int idx, AtomSpacePtr space)
318322{
319 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
323 std::string name1 = n1[idx]->get_name();
324 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
320325 TSM_ASSERT("Should not find this atom", hb1 == Handle::UNDEFINED);
321326
322 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
327 std::string name2 = n2[idx]->get_name();
328 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
323329 TSM_ASSERT("Should not find this atom", hb2 == Handle::UNDEFINED);
324330
325 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
331 std::string name3 = n3[idx]->get_name();
332 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
326333 TSM_ASSERT("Should not find this atom", hb3 == Handle::UNDEFINED);
327334
328 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
335 std::string name4 = n4[idx]->get_name();
336 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
329337 TSM_ASSERT("Should not find this atom", hb4 == Handle::UNDEFINED);
330338
331339 HandleSeq hvec;
……@@ -334,7 +342,7 @@ void LargeFlatUTest::check_empty(int idx, AtomSpacePtr space)
334342 hvec.push_back(h3[idx]);
335343 hvec.push_back(h4[idx]);
336344
337 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
345 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
338346 TSM_ASSERT("Should not find this atom", hlb == Handle::UNDEFINED);
339347}
340348
tests/persist/cog-simple/SimpleLargeZipfUTest.cxxtest +8 -6
……@@ -206,14 +206,15 @@ void LargeZipfUTest::check_space(AtomSpacePtr space, std::string dbgmsg)
206206{
207207 for (int w=0; w<NWORDS; w++)
208208 {
209 Handle h = space->xget_handle(hword[w]->get_type(), hword[w]->get_name());
209 std::string nam = hword[w]->get_name();
210 Handle h = space->get_node(hword[w]->get_type(), std::move(nam));
210211 atomCompare(hword[w], h, dbgmsg + "-word-" + std::to_string(w));
211212 }
212213
213214 for (int p=0; p<npairs; p++)
214215 {
215 Handle h = space->xget_handle(hpair[p]->get_type(),
216 hpair[p]->getOutgoingSet());
216 HandleSeq hs = hpair[p]->getOutgoingSet();
217 Handle h = space->get_link(hpair[p]->get_type(), std::move(hs));
217218 atomCompare(hpair[p], h, dbgmsg + "pair-" + std::to_string(p));
218219 }
219220}
……@@ -222,14 +223,15 @@ void LargeZipfUTest::check_empty(AtomSpacePtr space)
222223{
223224 for (int w=0; w<NWORDS; w++)
224225 {
225 Handle h = space->xget_handle(hword[w]->get_type(), hword[w]->get_name());
226 std::string nam = hword[w]->get_name();
227 Handle h = space->get_node(hword[w]->get_type(), std::move(nam));
226228 TSM_ASSERT("Should not find this word", h == Handle::UNDEFINED);
227229 }
228230
229231 for (int p=0; p<npairs; p++)
230232 {
231 Handle h = space->xget_handle(hpair[p]->get_type(),
232 hpair[p]->getOutgoingSet());
233 HandleSeq hs = hpair[p]->getOutgoingSet();
234 Handle h = space->get_link(hpair[p]->get_type(), std::move(hs));
233235 TSM_ASSERT("Should not find this pair", h == Handle::UNDEFINED);
234236 }
235237}
tests/persist/cog-simple/SimpleMultiPersistUTest.cxxtest +20 -12
……@@ -325,16 +325,20 @@ void MultiPersistUTest::check_space(int idx, AtomSpacePtr space, std::string dbg
325325 // printf("Checking %d\n", idx);
326326 fflush(stdout);
327327
328 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
328 std::string name1 = n1[idx]->get_name();
329 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
329330 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
330331
331 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
332 std::string name2 = n2[idx]->get_name();
333 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
332334 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
333335
334 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
336 std::string name3 = n3[idx]->get_name();
337 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
335338 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
336339
337 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
340 std::string name4 = n4[idx]->get_name();
341 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
338342 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
339343
340344 HandleSeq hvec;
……@@ -343,30 +347,34 @@ void MultiPersistUTest::check_space(int idx, AtomSpacePtr space, std::string dbg
343347 hvec.push_back(hb3);
344348 hvec.push_back(hb4);
345349
346 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
350 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
347351 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
348352
349353 HandleSeq hv2({hlb, hb2});
350 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
354 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
351355 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
352356
353357 HandleSeq hv3({hb1, hlb2, hb3});
354 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
358 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
355359 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
356360}
357361
358362void MultiPersistUTest::check_empty(int idx, AtomSpacePtr space)
359363{
360 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
364 std::string name1 = n1[idx]->get_name();
365 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
361366 TSM_ASSERT("Should not find this atom", hb1 == Handle::UNDEFINED);
362367
363 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
368 std::string name2 = n2[idx]->get_name();
369 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
364370 TSM_ASSERT("Should not find this atom", hb2 == Handle::UNDEFINED);
365371
366 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
372 std::string name3 = n3[idx]->get_name();
373 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
367374 TSM_ASSERT("Should not find this atom", hb3 == Handle::UNDEFINED);
368375
369 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
376 std::string name4 = n4[idx]->get_name();
377 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
370378 TSM_ASSERT("Should not find this atom", hb4 == Handle::UNDEFINED);
371379
372380 HandleSeq hvec;
……@@ -375,7 +383,7 @@ void MultiPersistUTest::check_empty(int idx, AtomSpacePtr space)
375383 hvec.push_back(h3[idx]);
376384 hvec.push_back(h4[idx]);
377385
378 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
386 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
379387 TSM_ASSERT("Should not find this atom", hlb == Handle::UNDEFINED);
380388}
381389
tests/persist/cog-simple/SimpleMultiUserUTest.cxxtest +11 -7
……@@ -361,16 +361,20 @@ void MultiUserUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg
361361 // printf("Checking %d\n", idx);
362362 fflush(stdout);
363363
364 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
364 std::string name1 = n1[idx]->get_name();
365 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
365366 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
366367
367 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
368 std::string name2 = n2[idx]->get_name();
369 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
368370 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
369371
370 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
372 std::string name3 = n3[idx]->get_name();
373 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
371374 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
372375
373 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
376 std::string name4 = n4[idx]->get_name();
377 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
374378 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
375379
376380 HandleSeq hvec;
……@@ -379,15 +383,15 @@ void MultiUserUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg
379383 hvec.push_back(hb3);
380384 hvec.push_back(hb4);
381385
382 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
386 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
383387 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
384388
385389 HandleSeq hv2({hlb, hb2});
386 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
390 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
387391 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
388392
389393 HandleSeq hv3({hb1, hlb2, hb3});
390 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
394 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
391395 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
392396}
393397
tests/persist/cog-simple/SimplePersistUTest.cxxtest +20 -12
……@@ -257,16 +257,20 @@ void PersistUTest::fetch_space(int idx, StorageNodePtr space)
257257
258258void PersistUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
259259{
260 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
260 std::string name1 = n1[idx]->get_name();
261 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
261262 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
262263
263 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
264 std::string name2 = n2[idx]->get_name();
265 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
264266 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
265267
266 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
268 std::string name3 = n3[idx]->get_name();
269 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
267270 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
268271
269 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
272 std::string name4 = n4[idx]->get_name();
273 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
270274 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
271275
272276 HandleSeq hvec;
……@@ -275,30 +279,34 @@ void PersistUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
275279 hvec.push_back(hb3);
276280 hvec.push_back(hb4);
277281
278 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
282 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
279283 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
280284
281285 HandleSeq hv2({hlb, hb2});
282 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
286 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
283287 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
284288
285289 HandleSeq hv3({hb1, hlb2, hb3});
286 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
290 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
287291 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
288292}
289293
290294void PersistUTest::check_empty(int idx, AtomSpacePtr space)
291295{
292 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
296 std::string name1 = n1[idx]->get_name();
297 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
293298 TSM_ASSERT("Should not find this atom", hb1 == Handle::UNDEFINED);
294299
295 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
300 std::string name2 = n2[idx]->get_name();
301 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
296302 TSM_ASSERT("Should not find this atom", hb2 == Handle::UNDEFINED);
297303
298 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
304 std::string name3 = n3[idx]->get_name();
305 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
299306 TSM_ASSERT("Should not find this atom", hb3 == Handle::UNDEFINED);
300307
301 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
308 std::string name4 = n4[idx]->get_name();
309 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
302310 TSM_ASSERT("Should not find this atom", hb4 == Handle::UNDEFINED);
303311
304312 HandleSeq hvec;
……@@ -307,7 +315,7 @@ void PersistUTest::check_empty(int idx, AtomSpacePtr space)
307315 hvec.push_back(h3[idx]);
308316 hvec.push_back(h4[idx]);
309317
310 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
318 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
311319 TSM_ASSERT("Should not find this atom", hlb == Handle::UNDEFINED);
312320}
313321
tests/persist/cog-storage/DeleteUTest.cxxtest +31 -19
……@@ -293,16 +293,20 @@ void DeleteUTest::fetch_space(int idx, StorageNodePtr space)
293293void DeleteUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
294294{
295295 dbgmsg += "-idx=" + std::to_string(idx);
296 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
296 std::string name1 = n1[idx]->get_name();
297 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
297298 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
298299
299 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
300 std::string name2 = n2[idx]->get_name();
301 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
300302 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
301303
302 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
304 std::string name3 = n3[idx]->get_name();
305 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
303306 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
304307
305 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
308 std::string name4 = n4[idx]->get_name();
309 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
306310 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
307311
308312 HandleSeq hvec;
……@@ -311,24 +315,28 @@ void DeleteUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
311315 hvec.push_back(hb3);
312316 hvec.push_back(hb4);
313317
314 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
318 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
315319 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
316320
317321 HandleSeq hv2({hlb, hb2});
318 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
322 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
319323 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
320324
321325 HandleSeq hv3({hb1, hlb2, hb3});
322 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
326 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
323327 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
324328}
325329
326330void DeleteUTest::check_remove(int idx, AtomSpacePtr space, std::string dbgmsg)
327331{
328 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
329 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
330 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
331 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
332 std::string name1 = n1[idx]->get_name();
333 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
334 std::string name2 = n2[idx]->get_name();
335 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
336 std::string name3 = n3[idx]->get_name();
337 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
338 std::string name4 = n4[idx]->get_name();
339 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
332340
333341 HandleSeq hvec;
334342 hvec.push_back(hb1);
……@@ -336,30 +344,34 @@ void DeleteUTest::check_remove(int idx, AtomSpacePtr space, std::string dbgmsg)
336344 hvec.push_back(hb3);
337345 hvec.push_back(hb4);
338346
339 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
347 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
340348 tvMiscompare(hl[idx], hlb, dbgmsg + "-hlinkb");
341349
342350 HandleSeq hv2({hlb, hb2});
343 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
351 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
344352 tvMiscompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
345353
346354 HandleSeq hv3({hb1, hlb2, hb3});
347 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
355 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
348356 tvMiscompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
349357}
350358
351359void DeleteUTest::check_empty(int idx, AtomSpacePtr space)
352360{
353 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
361 std::string name1 = n1[idx]->get_name();
362 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
354363 TSM_ASSERT("Should not find this atom", hb1 == Handle::UNDEFINED);
355364
356 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
365 std::string name2 = n2[idx]->get_name();
366 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
357367 TSM_ASSERT("Should not find this atom", hb2 == Handle::UNDEFINED);
358368
359 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
369 std::string name3 = n3[idx]->get_name();
370 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
360371 TSM_ASSERT("Should not find this atom", hb3 == Handle::UNDEFINED);
361372
362 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
373 std::string name4 = n4[idx]->get_name();
374 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
363375 TSM_ASSERT("Should not find this atom", hb4 == Handle::UNDEFINED);
364376
365377 HandleSeq hvec;
……@@ -368,7 +380,7 @@ void DeleteUTest::check_empty(int idx, AtomSpacePtr space)
368380 hvec.push_back(h3[idx]);
369381 hvec.push_back(h4[idx]);
370382
371 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
383 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
372384 TSM_ASSERT("Should not find this atom", hlb == Handle::UNDEFINED);
373385}
374386
tests/persist/cog-storage/LargeFlatUTest.cxxtest +20 -12
……@@ -284,16 +284,20 @@ void LargeFlatUTest::fetch_space(int idx, StorageNodePtr space)
284284
285285void LargeFlatUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
286286{
287 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
287 std::string name1 = n1[idx]->get_name();
288 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
288289 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
289290
290 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
291 std::string name2 = n2[idx]->get_name();
292 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
291293 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
292294
293 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
295 std::string name3 = n3[idx]->get_name();
296 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
294297 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
295298
296 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
299 std::string name4 = n4[idx]->get_name();
300 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
297301 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
298302
299303 HandleSeq hvec;
……@@ -302,30 +306,34 @@ void LargeFlatUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg
302306 hvec.push_back(hb3);
303307 hvec.push_back(hb4);
304308
305 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
309 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
306310 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
307311
308312 HandleSeq hv2({hlb, hb2});
309 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
313 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
310314 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
311315
312316 HandleSeq hv3({hb1, hlb2, hb3});
313 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
317 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
314318 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
315319}
316320
317321void LargeFlatUTest::check_empty(int idx, AtomSpacePtr space)
318322{
319 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
323 std::string name1 = n1[idx]->get_name();
324 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
320325 TSM_ASSERT("Should not find this atom", hb1 == Handle::UNDEFINED);
321326
322 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
327 std::string name2 = n2[idx]->get_name();
328 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
323329 TSM_ASSERT("Should not find this atom", hb2 == Handle::UNDEFINED);
324330
325 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
331 std::string name3 = n3[idx]->get_name();
332 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
326333 TSM_ASSERT("Should not find this atom", hb3 == Handle::UNDEFINED);
327334
328 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
335 std::string name4 = n4[idx]->get_name();
336 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
329337 TSM_ASSERT("Should not find this atom", hb4 == Handle::UNDEFINED);
330338
331339 HandleSeq hvec;
……@@ -334,7 +342,7 @@ void LargeFlatUTest::check_empty(int idx, AtomSpacePtr space)
334342 hvec.push_back(h3[idx]);
335343 hvec.push_back(h4[idx]);
336344
337 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
345 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
338346 TSM_ASSERT("Should not find this atom", hlb == Handle::UNDEFINED);
339347}
340348
tests/persist/cog-storage/LargeZipfUTest.cxxtest +8 -6
……@@ -206,14 +206,15 @@ void LargeZipfUTest::check_space(AtomSpacePtr space, std::string dbgmsg)
206206{
207207 for (int w=0; w<NWORDS; w++)
208208 {
209 Handle h = space->xget_handle(hword[w]->get_type(), hword[w]->get_name());
209 std::string nam = hword[w]->get_name();
210 Handle h = space->get_node(hword[w]->get_type(), std::move(nam));
210211 atomCompare(hword[w], h, dbgmsg + "-word-" + std::to_string(w));
211212 }
212213
213214 for (int p=0; p<npairs; p++)
214215 {
215 Handle h = space->xget_handle(hpair[p]->get_type(),
216 hpair[p]->getOutgoingSet());
216 HandleSeq hs = hpair[p]->getOutgoingSet();
217 Handle h = space->get_link(hpair[p]->get_type(), std::move(hs));
217218 atomCompare(hpair[p], h, dbgmsg + "pair-" + std::to_string(p));
218219 }
219220}
……@@ -222,14 +223,15 @@ void LargeZipfUTest::check_empty(AtomSpacePtr space)
222223{
223224 for (int w=0; w<NWORDS; w++)
224225 {
225 Handle h = space->xget_handle(hword[w]->get_type(), hword[w]->get_name());
226 std::string nam = hword[w]->get_name();
227 Handle h = space->get_node(hword[w]->get_type(), std::move(nam));
226228 TSM_ASSERT("Should not find this word", h == Handle::UNDEFINED);
227229 }
228230
229231 for (int p=0; p<npairs; p++)
230232 {
231 Handle h = space->xget_handle(hpair[p]->get_type(),
232 hpair[p]->getOutgoingSet());
233 HandleSeq hs = hpair[p]->getOutgoingSet();
234 Handle h = space->get_link(hpair[p]->get_type(), std::move(hs));
233235 TSM_ASSERT("Should not find this pair", h == Handle::UNDEFINED);
234236 }
235237}
tests/persist/cog-storage/MultiPersistUTest.cxxtest +20 -12
……@@ -327,16 +327,20 @@ void MultiPersistUTest::check_space(int idx, AtomSpacePtr space, std::string dbg
327327 // printf("Checking %d\n", idx);
328328 fflush(stdout);
329329
330 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
330 std::string name1 = n1[idx]->get_name();
331 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
331332 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
332333
333 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
334 std::string name2 = n2[idx]->get_name();
335 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
334336 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
335337
336 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
338 std::string name3 = n3[idx]->get_name();
339 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
337340 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
338341
339 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
342 std::string name4 = n4[idx]->get_name();
343 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
340344 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
341345
342346 HandleSeq hvec;
……@@ -345,30 +349,34 @@ void MultiPersistUTest::check_space(int idx, AtomSpacePtr space, std::string dbg
345349 hvec.push_back(hb3);
346350 hvec.push_back(hb4);
347351
348 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
352 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
349353 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
350354
351355 HandleSeq hv2({hlb, hb2});
352 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
356 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
353357 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
354358
355359 HandleSeq hv3({hb1, hlb2, hb3});
356 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
360 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
357361 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
358362}
359363
360364void MultiPersistUTest::check_empty(int idx, AtomSpacePtr space)
361365{
362 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
366 std::string name1 = n1[idx]->get_name();
367 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
363368 TSM_ASSERT("Should not find this atom", hb1 == Handle::UNDEFINED);
364369
365 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
370 std::string name2 = n2[idx]->get_name();
371 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
366372 TSM_ASSERT("Should not find this atom", hb2 == Handle::UNDEFINED);
367373
368 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
374 std::string name3 = n3[idx]->get_name();
375 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
369376 TSM_ASSERT("Should not find this atom", hb3 == Handle::UNDEFINED);
370377
371 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
378 std::string name4 = n4[idx]->get_name();
379 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
372380 TSM_ASSERT("Should not find this atom", hb4 == Handle::UNDEFINED);
373381
374382 HandleSeq hvec;
……@@ -377,7 +385,7 @@ void MultiPersistUTest::check_empty(int idx, AtomSpacePtr space)
377385 hvec.push_back(h3[idx]);
378386 hvec.push_back(h4[idx]);
379387
380 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
388 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
381389 TSM_ASSERT("Should not find this atom", hlb == Handle::UNDEFINED);
382390}
383391
tests/persist/cog-storage/MultiUserUTest.cxxtest +11 -7
……@@ -366,16 +366,20 @@ void MultiUserUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg
366366 // printf("Checking %d\n", idx);
367367 fflush(stdout);
368368
369 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
369 std::string name1 = n1[idx]->get_name();
370 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
370371 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
371372
372 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
373 std::string name2 = n2[idx]->get_name();
374 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
373375 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
374376
375 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
377 std::string name3 = n3[idx]->get_name();
378 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
376379 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
377380
378 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
381 std::string name4 = n4[idx]->get_name();
382 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
379383 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
380384
381385 HandleSeq hvec;
……@@ -384,15 +388,15 @@ void MultiUserUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg
384388 hvec.push_back(hb3);
385389 hvec.push_back(hb4);
386390
387 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
391 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
388392 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
389393
390394 HandleSeq hv2({hlb, hb2});
391 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
395 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
392396 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
393397
394398 HandleSeq hv3({hb1, hlb2, hb3});
395 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
399 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
396400 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
397401}
398402
tests/persist/cog-storage/PersistUTest.cxxtest +20 -12
……@@ -258,16 +258,20 @@ void PersistUTest::fetch_space(int idx, StorageNodePtr space)
258258
259259void PersistUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
260260{
261 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
261 std::string name1 = n1[idx]->get_name();
262 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
262263 atomCompare(h1[idx], hb1, dbgmsg + "-hb1");
263264
264 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
265 std::string name2 = n2[idx]->get_name();
266 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
265267 atomCompare(h2[idx], hb2, dbgmsg + "-hb2");
266268
267 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
269 std::string name3 = n3[idx]->get_name();
270 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
268271 atomCompare(h3[idx], hb3, dbgmsg + "-hb3");
269272
270 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
273 std::string name4 = n4[idx]->get_name();
274 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
271275 atomCompare(h4[idx], hb4, dbgmsg + "-hb4");
272276
273277 HandleSeq hvec;
……@@ -276,30 +280,34 @@ void PersistUTest::check_space(int idx, AtomSpacePtr space, std::string dbgmsg)
276280 hvec.push_back(hb3);
277281 hvec.push_back(hb4);
278282
279 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
283 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
280284 atomCompare(hl[idx], hlb, dbgmsg + "-hlinkb");
281285
282286 HandleSeq hv2({hlb, hb2});
283 Handle hlb2 = space->xget_handle(hl2[idx]->get_type(), hv2);
287 Handle hlb2 = space->get_link(hl2[idx]->get_type(), std::move(hv2));
284288 atomCompare(hl2[idx], hlb2, dbgmsg + "-hlinkb2");
285289
286290 HandleSeq hv3({hb1, hlb2, hb3});
287 Handle hlb3 = space->xget_handle(hl3[idx]->get_type(), hv3);
291 Handle hlb3 = space->get_link(hl3[idx]->get_type(), std::move(hv3));
288292 atomCompare(hl3[idx], hlb3, dbgmsg + "-hlinkb3");
289293}
290294
291295void PersistUTest::check_empty(int idx, AtomSpacePtr space)
292296{
293 Handle hb1 = space->xget_handle(n1[idx]->get_type(), n1[idx]->get_name());
297 std::string name1 = n1[idx]->get_name();
298 Handle hb1 = space->get_node(n1[idx]->get_type(), std::move(name1));
294299 TSM_ASSERT("Should not find this atom", hb1 == Handle::UNDEFINED);
295300
296 Handle hb2 = space->xget_handle(n2[idx]->get_type(), n2[idx]->get_name());
301 std::string name2 = n2[idx]->get_name();
302 Handle hb2 = space->get_node(n2[idx]->get_type(), std::move(name2));
297303 TSM_ASSERT("Should not find this atom", hb2 == Handle::UNDEFINED);
298304
299 Handle hb3 = space->xget_handle(n3[idx]->get_type(), n3[idx]->get_name());
305 std::string name3 = n3[idx]->get_name();
306 Handle hb3 = space->get_node(n3[idx]->get_type(), std::move(name3));
300307 TSM_ASSERT("Should not find this atom", hb3 == Handle::UNDEFINED);
301308
302 Handle hb4 = space->xget_handle(n4[idx]->get_type(), n4[idx]->get_name());
309 std::string name4 = n4[idx]->get_name();
310 Handle hb4 = space->get_node(n4[idx]->get_type(), std::move(name4));
303311 TSM_ASSERT("Should not find this atom", hb4 == Handle::UNDEFINED);
304312
305313 HandleSeq hvec;
……@@ -308,7 +316,7 @@ void PersistUTest::check_empty(int idx, AtomSpacePtr space)
308316 hvec.push_back(h3[idx]);
309317 hvec.push_back(h4[idx]);
310318
311 Handle hlb = space->xget_handle(hl[idx]->get_type(), hvec);
319 Handle hlb = space->get_link(hl[idx]->get_type(), std::move(hvec));
312320 TSM_ASSERT("Should not find this atom", hlb == Handle::UNDEFINED);
313321}
314322