Skip to content
Snippets Groups Projects
Commit 229ce364 authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

ltm memory changes and first folder structure for filter->encode->store->forget pipeline

parent 07611ad8
No related branches found
No related tags found
No related merge requests found
Showing
with 47 additions and 21 deletions
......@@ -83,14 +83,27 @@ set(LIB_FILES
server/MemoryRemoteGui.cpp
server/RemoteGuiAronDataVisitor.cpp
server/ltm/detail/MemoryItem.cpp
server/ltm/detail/MemoryBase.cpp
server/ltm/detail/BufferedMemoryBase.cpp
server/ltm/detail/LUTMemoryBase.cpp
server/ltm/detail/CoreSegmentBase.cpp
server/ltm/detail/ProviderSegmentBase.cpp
server/ltm/detail/EntityBase.cpp
server/ltm/detail/EntitySnapshotBase.cpp
server/ltm/base/detail/MemoryItem.cpp
server/ltm/base/detail/MemoryBase.cpp
server/ltm/base/detail/BufferedMemoryBase.cpp
server/ltm/base/detail/LUTMemoryBase.cpp
server/ltm/base/detail/CoreSegmentBase.cpp
server/ltm/base/detail/ProviderSegmentBase.cpp
server/ltm/base/detail/EntityBase.cpp
server/ltm/base/detail/EntitySnapshotBase.cpp
server/ltm/base/filter/Filter.cpp
server/ltm/base/filter/noFilter/NoFilter.cpp
server/ltm/base/encoder/Encoder.cpp
server/ltm/base/encoder/noEncoder/NoEncoder.cpp
server/ltm/base/converter/Converter.cpp
server/ltm/base/converter/json/JsonConverter.cpp
server/ltm/base/converter/bson/BsonConverter.cpp
server/ltm/base/forgetter/Forgetter.cpp
server/ltm/base/forgetter/noForgetter/NoForgetter.cpp
server/ltm/disk/detail/Data.cpp
server/ltm/disk/detail/DiskStorage.cpp
......@@ -121,7 +134,7 @@ set(LIB_FILES
server/query_proc/ltm/detail/ProviderSegmentQueryProcessorBase.cpp
server/query_proc/ltm/detail/CoreSegmentQueryProcessorBase.cpp
server/query_proc/ltm/detail/MemoryQueryProcessorBase.cpp
server/query_proc/ltm/ltm.cpp
server/query_proc/ltm/disk/ltm.cpp
server/query_proc/wm/detail/EntityQueryProcessorBase.cpp
server/query_proc/wm/detail/ProviderSegmentQueryProcessorBase.cpp
......@@ -216,14 +229,27 @@ set(LIB_HEADERS
server/MemoryRemoteGui.h
server/RemoteGuiAronDataVisitor.h
server/ltm/detail/MemoryItem.h
server/ltm/detail/MemoryBase.h
server/ltm/detail/BufferedMemoryBase.h
server/ltm/detail/LUTMemoryBase.h
server/ltm/detail/CoreSegmentBase.h
server/ltm/detail/ProviderSegmentBase.h
server/ltm/detail/EntityBase.h
server/ltm/detail/EntitySnapshotBase.h
server/ltm/base/detail/MemoryItem.h
server/ltm/base/detail/MemoryBase.h
server/ltm/base/detail/BufferedMemoryBase.h
server/ltm/base/detail/LUTMemoryBase.h
server/ltm/base/detail/CoreSegmentBase.h
server/ltm/base/detail/ProviderSegmentBase.h
server/ltm/base/detail/EntityBase.h
server/ltm/base/detail/EntitySnapshotBase.h
server/ltm/base/filter/Filter.h
server/ltm/base/filter/noFilter/NoFilter.h
server/ltm/base/encoder/Encoder.h
server/ltm/base/encoder/noEncoder/NoEncoder.h
server/ltm/base/converter/Converter.h
server/ltm/base/converter/json/JsonConverter.h
server/ltm/base/converter/bson/BsonConverter.h
server/ltm/base/forgetter/Forgetter.h
server/ltm/base/forgetter/noForgetter/NoForgetter.h
server/ltm/disk/detail/Data.h
server/ltm/disk/detail/DiskStorage.h
......@@ -258,7 +284,7 @@ set(LIB_HEADERS
server/query_proc/ltm/detail/ProviderSegmentQueryProcessorBase.h
server/query_proc/ltm/detail/CoreSegmentQueryProcessorBase.h
server/query_proc/ltm/detail/MemoryQueryProcessorBase.h
server/query_proc/ltm/ltm.h
server/query_proc/ltm/disk/ltm.h
server/query_proc/wm/detail/EntityQueryProcessorBase.h
server/query_proc/wm/detail/ProviderSegmentQueryProcessorBase.h
......
#include "MemoryToIceAdapter.h"
#include "query_proc/wm/wm.h"
#include "query_proc/ltm/ltm.h"
#include "query_proc/ltm/disk/ltm.h"
#include <RobotAPI/libraries/armem/server/wm/ice_conversions.h>
......@@ -243,7 +243,7 @@ namespace armarx::armem::server
input.withData ? armem::DataMode::WithData : armem::DataMode::NoData);
armem::wm::Memory wmResult = wmServerProcessor.process(input.memoryQueries, *workingMemory);
query_proc::ltm_server::MemoryQueryProcessor ltmProcessor;
query_proc::ltm_server::disk::MemoryQueryProcessor ltmProcessor;
armem::wm::Memory ltmResult = ltmProcessor.process(input, *longtermMemory);
armem::query::data::Result result;
......@@ -251,7 +251,7 @@ namespace armarx::armem::server
{
ARMARX_INFO << "The LTM returned data after query";
longtermMemory->convert(ltmResult); // convert memory ==> meaning resolving lut references to e.g. mongodb
longtermMemory->convert(ltmResult); // convert memory ==> meaning resolving references
wmResult.append(ltmResult);
if (wmResult.empty())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment