| … | … | @@ -56,13 +56,13 @@ StorageNode::~StorageNode() |
| 56 | 56 | AtomSpace* StorageNode::get_target_as(const ValuePtr& value) const |
| 57 | 57 | { |
| 58 | 58 | if (nullptr == value) |
| 59 | | return _target_as.get(); |
| 59 | return _target_as; |
| 60 | 60 | |
| 61 | 61 | if (value->is_type(ATOM_SPACE)) |
| 62 | 62 | return AtomSpaceCast(value).get(); |
| 63 | 63 | |
| 64 | 64 | if (0 == value->size()) |
| 65 | | return _target_as.get(); |
| 65 | return _target_as; |
| 66 | 66 | |
| 67 | 67 | ValuePtr vp(value); |
| 68 | 68 | if (vp->is_type(ATOM)) |
| … | … | @@ -73,13 +73,13 @@ AtomSpace* StorageNode::get_target_as(const ValuePtr& value) const |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | if (nullptr == vp) |
| 76 | | return _target_as.get(); |
| 76 | return _target_as; |
| 77 | 77 | |
| 78 | 78 | if (vp->is_type(ATOM_SPACE)) |
| 79 | 79 | return AtomSpaceCast(vp).get(); |
| 80 | 80 | |
| 81 | 81 | if (0 == vp->size()) |
| 82 | | return _target_as.get(); |
| 82 | return _target_as; |
| 83 | 83 | |
| 84 | 84 | throw RuntimeException(TRACE_INFO, |
| 85 | 85 | "Expected AtomSpace; got %s", value->to_string().c_str()); |
| … | … | @@ -164,7 +164,7 @@ void StorageNode::setValue(const Handle& key, const ValuePtr& value) |
| 164 | 164 | COLL("*-open-*"); |
| 165 | 165 | AtomSpace* as = get_target_as(value); |
| 166 | 166 | if (nullptr == as) as = getAtomSpace(); |
| 167 | | _target_as = AtomSpaceCast(as->shared_from_this()); |
| 167 | _target_as = as; |
| 168 | 168 | open(); |
| 169 | 169 | return; |
| 170 | 170 | } |
| … | … | @@ -227,7 +227,7 @@ void StorageNode::setValue(const Handle& key, const ValuePtr& value) |
| 227 | 227 | } |
| 228 | 228 | if (not value->is_type(LINK_VALUE)) return; |
| 229 | 229 | const ValueSeq& vsq(LinkValueCast(value)->value()); |
| 230 | | AtomSpace* as = _target_as.get(); |
| 230 | AtomSpace* as = _target_as; |
| 231 | 231 | for (const ValuePtr& vp : vsq) |
| 232 | 232 | { |
| 233 | 233 | if (vp->is_type (ATOM_SPACE)) |
| … | … | @@ -266,7 +266,7 @@ void StorageNode::setValue(const Handle& key, const ValuePtr& value) |
| 266 | 266 | } |
| 267 | 267 | if (not value->is_type(LINK_VALUE)) return; |
| 268 | 268 | const ValueSeq& vsq(LinkValueCast(value)->value()); |
| 269 | | AtomSpace* as = _target_as.get(); |
| 269 | AtomSpace* as = _target_as; |
| 270 | 270 | for (const ValuePtr& vp : vsq) |
| 271 | 271 | { |
| 272 | 272 | if (vp->is_type (ATOM_SPACE)) |
| … | … | @@ -376,7 +376,7 @@ ValuePtr StorageNode::getValue(const Handle& key) const |
| 376 | 376 | |
| 377 | 377 | void StorageNode::barrier(AtomSpace* as) |
| 378 | 378 | { |
| 379 | | if (nullptr == as) as = _target_as.get(); |
| 379 | if (nullptr == as) as = _target_as; |
| 380 | 380 | as->barrier(); |
| 381 | 381 | } |
| 382 | 382 | |
| … | … | @@ -413,7 +413,7 @@ void StorageNode::remove_atom(AtomSpace* as, Handle h, bool recursive) |
| 413 | 413 | Handle StorageNode::fetch_atom(const Handle& h, AtomSpace* as) |
| 414 | 414 | { |
| 415 | 415 | if (nullptr == h) return Handle::UNDEFINED; |
| 416 | | if (nullptr == as) as = _target_as.get(); |
| 416 | if (nullptr == as) as = _target_as; |
| 417 | 417 | |
| 418 | 418 | // Now, get the latest values from the backing store. |
| 419 | 419 | // The operation here is to CLOBBER the values, NOT to merge them! |
| … | … | @@ -430,7 +430,7 @@ Handle StorageNode::fetch_atom(const Handle& h, AtomSpace* as) |
| 430 | 430 | Handle StorageNode::fetch_value(const Handle& h, const Handle& key, |
| 431 | 431 | AtomSpace* as) |
| 432 | 432 | { |
| 433 | | if (nullptr == as) as = _target_as.get(); |
| 433 | if (nullptr == as) as = _target_as; |
| 434 | 434 | Handle lkey = as->add_atom(key); |
| 435 | 435 | Handle lh = as->add_atom(h); |
| 436 | 436 | loadValue(lh, lkey); |
| … | … | @@ -440,7 +440,7 @@ Handle StorageNode::fetch_value(const Handle& h, const Handle& key, |
| 440 | 440 | Handle StorageNode::fetch_incoming_set(const Handle& h, bool recursive, |
| 441 | 441 | AtomSpace* as) |
| 442 | 442 | { |
| 443 | | if (nullptr == as) as = _target_as.get(); |
| 443 | if (nullptr == as) as = _target_as; |
| 444 | 444 | Handle lh = as->get_atom(h); |
| 445 | 445 | if (nullptr == lh) return lh; |
| 446 | 446 | |
| … | … | @@ -459,7 +459,7 @@ Handle StorageNode::fetch_incoming_set(const Handle& h, bool recursive, |
| 459 | 459 | Handle StorageNode::fetch_incoming_by_type(const Handle& h, Type t, |
| 460 | 460 | AtomSpace* as) |
| 461 | 461 | { |
| 462 | | if (nullptr == as) as = _target_as.get(); |
| 462 | if (nullptr == as) as = _target_as; |
| 463 | 463 | Handle lh = as->get_atom(h); |
| 464 | 464 | if (nullptr == lh) return lh; |
| 465 | 465 | |
| … | … | @@ -477,7 +477,7 @@ Handle StorageNode::fetch_query(const Handle& query, const Handle& key, |
| 477 | 477 | if (not query->is_executable() and not query->is_evaluatable()) |
| 478 | 478 | throw RuntimeException(TRACE_INFO, "Not executable!"); |
| 479 | 479 | |
| 480 | | if (nullptr == as) as = _target_as.get(); |
| 480 | if (nullptr == as) as = _target_as; |
| 481 | 481 | Handle lkey = as->add_atom(key); |
| 482 | 482 | Handle lq = as->add_atom(query); |
| 483 | 483 | Handle lmeta = metadata; |
| … | … | @@ -489,7 +489,7 @@ Handle StorageNode::fetch_query(const Handle& query, const Handle& key, |
| 489 | 489 | |
| 490 | 490 | void StorageNode::load_atomspace(AtomSpace* as) |
| 491 | 491 | { |
| 492 | | if (nullptr == as) as = _target_as.get(); |
| 492 | if (nullptr == as) as = _target_as; |
| 493 | 493 | loadAtomSpace(as); |
| 494 | 494 | } |
| 495 | 495 | |
| … | … | @@ -498,13 +498,13 @@ void StorageNode::load_atomspace(AtomSpace* as) |
| 498 | 498 | */ |
| 499 | 499 | void StorageNode::store_atomspace(AtomSpace* as) |
| 500 | 500 | { |
| 501 | | if (nullptr == as) as = _target_as.get(); |
| 501 | if (nullptr == as) as = _target_as; |
| 502 | 502 | storeAtomSpace(as); |
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | void StorageNode::fetch_all_atoms_of_type(Type t, AtomSpace* as) |
| 506 | 506 | { |
| 507 | | if (nullptr == as) as = _target_as.get(); |
| 507 | if (nullptr == as) as = _target_as; |
| 508 | 508 | loadType(as, t); |
| 509 | 509 | } |
| 510 | 510 | |