17568: Removes entity cache indirection to improve performance, plus …

…accompanying code cleanup (#10)
howsoai · Sep 21, 2023 · 8653121 · 8653121
1 parent ed06c66
commit 8653121
Show file tree

Hide file tree

Showing 41 changed files with 1,976 additions and 2,057 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -117,7 +117,6 @@ set(COMMON_SOURCE
     src/Amalgam/entity/EntityQueryBuilder.h
     src/Amalgam/entity/EntityQueryCaches.cpp
     src/Amalgam/entity/EntityQueryCaches.h
-    src/Amalgam/entity/EntityQueryManager.h
     src/Amalgam/entity/EntityWriteListener.cpp
     src/Amalgam/entity/EntityWriteListener.h
     src/Amalgam/evaluablenode/EvaluableNode.cpp

diff --git a/src/Amalgam/Amalgam.vcxproj b/src/Amalgam/Amalgam.vcxproj
@@ -623,7 +623,6 @@
     <ClInclude Include="entity\EntityQueriesStatistics.h" />
     <ClInclude Include="entity\EntityQueryBuilder.h" />
     <ClInclude Include="entity\EntityQueryCaches.h" />
-    <ClInclude Include="entity\EntityQueryManager.h" />
     <ClInclude Include="entity\EntityWriteListener.h" />
     <ClInclude Include="evaluablenode\EvaluableNode.h" />
     <ClInclude Include="evaluablenode\EvaluableNodeManagement.h" />

diff --git a/src/Amalgam/Amalgam.vcxproj.filters b/src/Amalgam/Amalgam.vcxproj.filters
@@ -272,9 +272,6 @@
     <ClInclude Include="entity\EntityQueryCaches.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="entity\EntityQueryManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="entity\EntityWriteListener.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/src/Amalgam/AmalgamMain.cpp b/src/Amalgam/AmalgamMain.cpp
@@ -6,10 +6,10 @@
 #include "Entity.h"
 #include "EntityExternalInterface.h"
 #include "EntityQueries.h"
-#include "EntityQueryManager.h"
 #include "EntityWriteListener.h"
 #include "EvaluableNode.h"
 #include "EvaluableNodeTreeFunctions.h"
+#include "Interpreter.h"
 #include "Parser.h"
 #include "PerformanceProfiler.h"
 #include "PlatformSpecific.h"

diff --git a/src/Amalgam/SBFDSColumnData.h b/src/Amalgam/SBFDSColumnData.h
@@ -3,7 +3,6 @@
 //project headers:
 #include "DistanceReferencePair.h"
 #include "EvaluableNode.h"
-#include "EvaluableNodeTreeFunctions.h"
 #include "HashMaps.h"
 #include "IntegerSet.h"