add Utils and Cache folder under Vector Index

myscale · Apr 16, 2024 · 4588638 · 4588638
1 parent a00408f
commit 4588638
Show file tree

Hide file tree

Showing 43 changed files with 130 additions and 130 deletions.
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
@@ -2,11 +2,11 @@
 
 #include <utility>
 #include <Core/ColumnsWithTypeAndName.h>
-#include <Core/NamesAndTypes.h>
 #include <Core/Names.h>
+#include <Core/NamesAndTypes.h>
 #include <Interpreters/Context_fwd.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 #include <Common/logger_useful.h>
-#include <VectorIndex/Common/VectorScanUtils.h>
 
 #include "config.h"
 

diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
@@ -9,7 +9,7 @@
 #include <Core/ColumnNumbers.h>
 #include <Core/ColumnWithTypeAndName.h>
 
-#include <VectorIndex/Common/VectorScanUtils.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 
 
 namespace DB

diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -82,9 +82,9 @@
 #include <Common/logger_useful.h>
 
 #include <VectorIndex/Common/VectorIndexCommon.h>
-#include <VectorIndex/Common/VectorIndexUtils.h>
-#include <VectorIndex/Interpreters/GetVectorScanVisitor.h>
-#include <VectorIndex/Interpreters/parseVectorScanParameters.h>
+#include <VectorIndex/Interpreters/GetVSVisitor.h>
+#include <VectorIndex/Interpreters/parseVSParameters.h>
+#include <VectorIndex/Utils/VectorIndexUtils.h>
 
 namespace DB
 {

diff --git a/src/Interpreters/RequiredSourceColumnsVisitor.cpp b/src/Interpreters/RequiredSourceColumnsVisitor.cpp
@@ -9,7 +9,7 @@
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTInterpolateElement.h>
 
-#include <VectorIndex/Common/VectorScanUtils.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 
 #include <Common/logger_useful.h>
 

diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
@@ -19,7 +19,7 @@
 #include <Parsers/ASTSetQuery.h>
 #include <Core/QualifiedTableName.h>
 
-#include <VectorIndex/Common/VectorScanUtils.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 
 using namespace std::literals;
 

diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
@@ -46,8 +46,8 @@
 
 #include <Interpreters/StorageID.h>
 
+#include <VectorIndex/Utils/VectorScanUtils.h>
 #include <Common/logger_useful.h>
-#include <VectorIndex/Common/VectorScanUtils.h>
 
 namespace DB
 {

diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -1,12 +1,12 @@
 #pragma once
 #include <Processors/QueryPlan/SourceStepWithFilter.h>
-#include <Storages/MergeTree/RangesInDataPart.h>
-#include <Storages/MergeTree/RequestResponse.h>
-#include <Storages/SelectQueryInfo.h>
 #include <Storages/MergeTree/AlterConversions.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeReadPool.h>
-#include <VectorIndex/Storages/MergeTreeVectorScanUtils.h>
+#include <Storages/MergeTree/RangesInDataPart.h>
+#include <Storages/MergeTree/RequestResponse.h>
+#include <Storages/SelectQueryInfo.h>
+#include <VectorIndex/Utils/MergeTreeVectorScanUtils.h>
 
 
 namespace DB

diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
@@ -32,7 +32,7 @@
 #include <Interpreters/FunctionNameNormalizer.h>
 
 #include <DataTypes/DataTypesNumber.h>
-#include <VectorIndex/Common/VectorScanUtils.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 
 #include <Common/logger_useful.h>
 

diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -35,10 +35,10 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/escapeForFileName.h>
 
+#include <VectorIndex/Cache/PrimaryKeyCacheManager.h>
 #include <VectorIndex/Common/Metadata.h>
 #include <VectorIndex/Common/SegmentId.h>
 #include <VectorIndex/Interpreters/VectorIndexEventLog.h>
-#include <VectorIndex/Storages/PrimaryKeyCacheManager.h>
 
 
 namespace CurrentMetrics

diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
@@ -32,9 +32,9 @@
 #include <Storages/MergeTree/MergeTreeInOrderSelectProcessor.h>
 #include <Storages/MergeTree/MergeTreeSequentialSource.h>
 #include <Storages/MergeTree/MergeTreeSource.h>
+#include <VectorIndex/Cache/CacheManager.h>
 #include <VectorIndex/Storages/MergeTreeDataPartVectorIndex.h>
-#include <VectorIndex/Common/CacheManager.h>
-#include <VectorIndex/Common/VectorIndexUtils.h>
+#include <VectorIndex/Utils/VectorIndexUtils.h>
 #include <Common/ActionBlocker.h>
 #include <Common/logger_useful.h>
 

diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp
@@ -1,25 +1,25 @@
 #include <memory>
 #include <optional>
-#include <Storages/MergeTree/MergeTreeBaseSelectProcessor.h>
-#include <Storages/MergeTree/MergeTreeRangeReader.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/FilterDescription.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <Processors/Transforms/AggregatingTransform.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
+#include <Storages/MergeTree/MergeTreeBaseSelectProcessor.h>
 #include <Storages/MergeTree/MergeTreeBlockReadUtils.h>
+#include <Storages/MergeTree/MergeTreeRangeReader.h>
 #include <Storages/MergeTree/RequestResponse.h>
-#include <Columns/FilterDescription.h>
+#include <VectorIndex/Storages/MergeTreeVectorScanManager.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 #include <Common/ElapsedTimeProfileEventIncrement.h>
-#include <Columns/ColumnArray.h>
 #include <Common/FieldVisitorConvertToNumber.h>
-#include <Common/typeid_cast.h>
-#include <DataTypes/DataTypeNothing.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeUUID.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <Processors/Transforms/AggregatingTransform.h>
 #include <Common/logger_useful.h>
-#include <VectorIndex/Common/VectorScanUtils.h>
-#include <VectorIndex/Storages/MergeTreeVectorScanManager.h>
+#include <Common/typeid_cast.h>
 
 #include <city.h>
 

diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.h
@@ -6,7 +6,7 @@
 #include <Storages/MergeTree/RequestResponse.h>
 #include <Processors/Chunk.h>
 
-#include <VectorIndex/Storages/PrimaryKeyCacheManager.h>
+#include <VectorIndex/Cache/PrimaryKeyCacheManager.h>
 
 
 namespace DB

diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.h b/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
@@ -8,8 +8,8 @@
 #include <Storages/MergeTree/MergeTreeRangeReader.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
 
-#include <VectorIndex/Common/VectorScanUtils.h>
 #include <VectorIndex/Storages/VectorScanResult.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 
 namespace DB
 {

diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -91,11 +91,11 @@
 #include <fmt/format.h>
 #include <Poco/Logger.h>
 
-#include <VectorIndex/Common/CacheManager.h>
+#include <VectorIndex/Cache/CacheManager.h>
+#include <VectorIndex/Cache/PrimaryKeyCacheManager.h>
 #include <VectorIndex/Common/SegmentId.h>
-#include <VectorIndex/Common/VectorIndexUtils.h>
 #include <VectorIndex/Interpreters/VectorIndexEventLog.h>
-#include <VectorIndex/Storages/PrimaryKeyCacheManager.h>
+#include <VectorIndex/Utils/VectorIndexUtils.h>
 
 template <>
 struct fmt::formatter<DB::DataPartPtr> : fmt::formatter<std::string>

diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -1,21 +1,21 @@
-#include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/MergeTree/KeyCondition.h>
+#include <DataTypes/NestedUtils.h>
+#include <Interpreters/ActionsDAG.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/TreeRewriter.h>
-#include <Parsers/ASTSelectQuery.h>
+#include <Interpreters/misc.h>
+#include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTSelectQuery.h>
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/formatAST.h>
-#include <Interpreters/misc.h>
-#include <Common/typeid_cast.h>
-#include <DataTypes/NestedUtils.h>
-#include <Interpreters/ActionsDAG.h>
+#include <Storages/MergeTree/KeyCondition.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 #include <base/map.h>
-#include <VectorIndex/Common/VectorScanUtils.h>
+#include <Common/typeid_cast.h>
 
 namespace DB
 {

diff --git a/src/Storages/SelectQueryInfo.h b/src/Storages/SelectQueryInfo.h
@@ -9,10 +9,10 @@
 #include <Interpreters/PreparedSets.h>
 #include <Planner/PlannerContext.h>
 #include <QueryPipeline/StreamLocalLimits.h>
-#include <Storages/ProjectionsDescription.h>
 #include <Storages/MergeTree/ParallelReplicasReadingCoordinator.h>
+#include <Storages/ProjectionsDescription.h>
 #include <VectorIndex/Storages/VectorScanDescription.h>
-#include <VectorIndex/Common/VectorScanUtils.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 
 #include <memory>
 

diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
@@ -13,7 +13,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
 
-#include <VectorIndex/Common/VectorScanUtils.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
 
 
 namespace DB

diff --git a/src/Storages/StorageInMemoryMetadata.h b/src/Storages/StorageInMemoryMetadata.h
@@ -5,13 +5,13 @@
 #include <Storages/ColumnsDescription.h>
 #include <Storages/ConstraintsDescription.h>
 #include <Storages/IndicesDescription.h>
-#include <Storages/ProjectionsDescription.h>
 #include <Storages/KeyDescription.h>
+#include <Storages/ProjectionsDescription.h>
 #include <Storages/SelectQueryDescription.h>
 #include <Storages/TTLDescription.h>
-#include <Common/MultiVersion.h>
 #include <VectorIndex/Storages/VectorIndicesDescription.h>
-#include <VectorIndex/Common/VectorScanUtils.h>
+#include <VectorIndex/Utils/VectorScanUtils.h>
+#include <Common/MultiVersion.h>
 
 namespace DB
 {

diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
@@ -4,46 +4,46 @@
 
 #include <optional>
 
-#include <base/sort.h>
 #include <Backups/BackupEntriesCollector.h>
 #include <Databases/IDatabase.h>
-#include <Common/escapeForFileName.h>
-#include <Common/ProfileEventsScope.h>
-#include <Common/typeid_cast.h>
-#include <Common/ThreadPool.h>
+#include <IO/copyData.h>
+#include <Interpreters/ClusterProxy/SelectStreamFactory.h>
+#include <Interpreters/ClusterProxy/executeQuery.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/InterpreterAlterQuery.h>
-#include <Interpreters/PartLog.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/MutationsInterpreter.h>
-#include <Interpreters/Context.h>
+#include <Interpreters/PartLog.h>
 #include <Interpreters/TransactionLog.h>
-#include <Interpreters/ClusterProxy/executeQuery.h>
-#include <Interpreters/ClusterProxy/SelectStreamFactory.h>
-#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
-#include <IO/copyData.h>
 #include <Parsers/ASTCheckQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTPartition.h>
 #include <Parsers/ASTSetQuery.h>
-#include <Parsers/queryToString.h>
 #include <Parsers/formatAST.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/MergeTree/ActiveDataPartSet.h>
+#include <Parsers/queryToString.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <QueryPipeline/Pipe.h>
 #include <Storages/AlterCommands.h>
-#include <Storages/PartitionCommands.h>
-#include <Storages/MergeTree/MergeTreeSink.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
+#include <Storages/MergeTree/ActiveDataPartSet.h>
+#include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/MergePlainMergeTreeTask.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
+#include <Storages/MergeTree/MergeTreeSink.h>
 #include <Storages/MergeTree/PartitionPruner.h>
-#include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/checkDataPart.h>
-#include <QueryPipeline/Pipe.h>
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
-#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-#include <VectorIndex/Storages/VectorIndexTask.h>
+#include <Storages/PartitionCommands.h>
 #include <VectorIndex/Common/VectorIndexCommon.h>
-#include <VectorIndex/Common/VectorIndexUtils.h>
+#include <VectorIndex/Storages/VectorIndexTask.h>
+#include <VectorIndex/Utils/VectorIndexUtils.h>
+#include <base/sort.h>
+#include <Common/ProfileEventsScope.h>
+#include <Common/ThreadPool.h>
+#include <Common/escapeForFileName.h>
+#include <Common/typeid_cast.h>
 
 namespace DB
 {

diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -101,7 +101,7 @@
 
 #include <Poco/DirectoryIterator.h>
 
-#include <VectorIndex/Common/CacheManager.h>
+#include <VectorIndex/Cache/CacheManager.h>
 #include <VectorIndex/Storages/ReplicatedVectorIndexTask.h>
 
 #include <base/scope_guard.h>

diff --git a/src/VectorIndex/Common/CacheManager.cpp → src/VectorIndex/Cache/CacheManager.cpp b/src/VectorIndex/Common/CacheManager.cpp → src/VectorIndex/Cache/CacheManager.cpp
@@ -15,11 +15,11 @@
 
 #include <memory>
 
-#include <Common/CurrentMetrics.h>
 #include <Interpreters/Context.h>
-#include <VectorIndex/Interpreters/VectorIndexEventLog.h>
-#include <VectorIndex/Common/CacheManager.h>
+#include <VectorIndex/Cache/CacheManager.h>
 #include <VectorIndex/Common/IndexException.h>
+#include <VectorIndex/Interpreters/VectorIndexEventLog.h>
+#include <Common/CurrentMetrics.h>
 
 namespace DB::ErrorCodes
 {

diff --git a/src/VectorIndex/Common/CacheManager.h → src/VectorIndex/Cache/CacheManager.h b/src/VectorIndex/Common/CacheManager.h → src/VectorIndex/Cache/CacheManager.h
@@ -20,8 +20,8 @@
 #include <memory>
 #include <string>
 
-#include <Common/LRUResourceCache.h>
-#include <VectorIndex/Common/VectorIndexCacheObject.h>
+#include "../../Common/LRUResourceCache.h"
+#include "VectorIndexCacheObject.h"
 
 namespace std
 {

diff --git a/...Index/Storages/PrimaryKeyCacheManager.cpp → ...torIndex/Cache/PrimaryKeyCacheManager.cpp b/...Index/Storages/PrimaryKeyCacheManager.cpp → ...torIndex/Cache/PrimaryKeyCacheManager.cpp
@@ -17,7 +17,7 @@
 #include <optional>
 #include <Interpreters/Context.h>
 
-#include <VectorIndex/Storages/PrimaryKeyCacheManager.h>
+#include <VectorIndex/Cache/PrimaryKeyCacheManager.h>
 
 namespace DB
 {

diff --git a/...orIndex/Storages/PrimaryKeyCacheManager.h → ...ectorIndex/Cache/PrimaryKeyCacheManager.h b/...orIndex/Storages/PrimaryKeyCacheManager.h → ...ectorIndex/Cache/PrimaryKeyCacheManager.h
@@ -20,9 +20,9 @@
 #include <functional>
 #include <optional>
 
-#include <Common/CacheBase.h>
-#include <Columns/IColumn.h>
-#include <Storages/KeyDescription.h>
+#include "../../Columns/IColumn.h"
+#include "../../Common/CacheBase.h"
+#include "../../Storages/KeyDescription.h"
 
 namespace DB
 {

diff --git a/...ctorIndex/Common/VectorIndexCacheObject.h → ...ectorIndex/Cache/VectorIndexCacheObject.h b/...ctorIndex/Common/VectorIndexCacheObject.h → ...ectorIndex/Cache/VectorIndexCacheObject.h
@@ -18,9 +18,9 @@
 #include <memory>
 #include <filesystem>
 
-#include <base/types.h>
+#include "../../../base/base/types.h"
 
-#include <VectorIndex/Common/VectorIndexCommon.h>
+#include "../Common/VectorIndexCommon.h"
 
 namespace fs = std::filesystem;