From 48113b41ddba739d5db0a1b9a0d24bb0157fe131 Mon Sep 17 00:00:00 2001 From: lexluo09 <39718951+lexluo09@users.noreply.github.com> Date: Wed, 19 Jun 2024 18:07:26 +0800 Subject: [PATCH] (improvement)(common) Optimized the structure of the common package. (#1164) --- .../chat/server/plugin/PluginManager.java | 12 +++++------ .../embedding/EmbeddingRecallRecognizer.java | 4 ++-- .../execute/MetricRatioProcessor.java | 2 +- .../execute/MetricRecommendProcessor.java | 6 +++--- .../chat/server/util/SimilarQueryManager.java | 12 +++++------ .../{util => }/calcite/S2MysqlSqlDialect.java | 2 +- .../{util => }/calcite/SqlParseUtils.java | 2 +- .../{util => }/calcite/SqlParserInfo.java | 2 +- .../{util => }/jsqlparser/AggregateEnum.java | 2 +- .../jsqlparser/DateFunctionHelper.java | 2 +- .../{util => }/jsqlparser/DateVisitor.java | 2 +- .../jsqlparser/ExpressionReplaceVisitor.java | 2 +- .../jsqlparser/FieldAcquireVisitor.java | 2 +- .../FieldAndValueAcquireVisitor.java | 2 +- .../jsqlparser/FieldExpression.java | 2 +- .../jsqlparser/FieldReplaceVisitor.java | 2 +- .../jsqlparser/FieldlValueReplaceVisitor.java | 2 +- .../jsqlparser/FiledExpression.java | 2 +- .../jsqlparser/FiledFilterReplaceVisitor.java | 2 +- .../jsqlparser/FiledNameReplaceVisitor.java | 2 +- .../jsqlparser/FilterRemoveVisitor.java | 2 +- .../FunctionAliasReplaceVisitor.java | 2 +- .../FunctionNameReplaceVisitor.java | 2 +- .../jsqlparser/FunctionReplaceVisitor.java | 2 +- .../jsqlparser/FunctionVisitor.java | 2 +- .../GroupByFunctionReplaceVisitor.java | 2 +- .../jsqlparser/GroupByReplaceVisitor.java | 2 +- .../{util => }/jsqlparser/GroupByVisitor.java | 2 +- .../{util => }/jsqlparser/JsqlConstants.java | 2 +- .../jsqlparser/OrderByAcquireVisitor.java | 2 +- .../jsqlparser/OrderByExpression.java | 2 +- .../jsqlparser/OrderByReplaceVisitor.java | 2 +- .../jsqlparser/ParseVisitorHelper.java | 2 +- .../QueryExpressionReplaceVisitor.java | 2 +- .../{util => }/jsqlparser/SqlAddHelper.java | 2 +- .../jsqlparser/SqlDateSelectHelper.java | 6 +++--- .../{util => }/jsqlparser/SqlEditEnum.java | 2 +- .../{util => }/jsqlparser/SqlEqualHelper.java | 2 +- .../jsqlparser/SqlRemoveHelper.java | 2 +- .../jsqlparser/SqlReplaceHelper.java | 2 +- .../jsqlparser/SqlSelectFunctionHelper.java | 2 +- .../jsqlparser/SqlSelectHelper.java | 2 +- .../jsqlparser/TableNameReplaceVisitor.java | 2 +- .../GsonInMemoryEmbeddingStoreJsonCodec.java | 21 ------------------- .../store/embedding}/ComponentFactory.java | 6 +++--- .../store}/embedding/EmbeddingCollection.java | 2 +- .../store}/embedding/EmbeddingQuery.java | 2 +- .../GsonInMemoryEmbeddingStoreJsonCodec.java | 21 +++++++++++++++++++ .../InMemoryEmbeddingStoreJsonCodec.java | 4 ++-- .../embedding/InMemoryS2EmbeddingStore.java | 8 ++----- .../PythonServiceS2EmbeddingStore.java | 11 +++++----- .../store}/embedding/Retrieval.java | 5 +++-- .../store}/embedding/RetrieveQuery.java | 2 +- .../store}/embedding/RetrieveQueryResult.java | 2 +- .../store}/embedding/S2EmbeddingStore.java | 2 +- .../common/{util => }/DateUtilsTest.java | 4 +++- .../{util => }/calcite/SqlParseUtilsTest.java | 3 ++- .../jsqlparser/SqlAddHelperTest.java | 3 ++- .../jsqlparser/SqlDateSelectHelperTest.java | 4 ++-- .../jsqlparser/SqlEqualHelperTest.java | 2 +- .../jsqlparser/SqlRemoveHelperTest.java | 3 ++- .../jsqlparser/SqlReplaceHelperTest.java | 2 +- .../SqlSelectFunctionHelperTest.java | 2 +- .../jsqlparser/SqlSelectHelperTest.java | 2 +- .../api/pojo/request/QueryStructReq.java | 2 +- .../headless/chat/corrector/AggCorrector.java | 2 +- .../chat/corrector/BaseSemanticCorrector.java | 4 ++-- .../chat/corrector/GrammarCorrector.java | 2 +- .../chat/corrector/GroupByCorrector.java | 4 ++-- .../chat/corrector/HavingCorrector.java | 6 +++--- .../chat/corrector/SchemaCorrector.java | 10 ++++----- .../chat/corrector/SelectCorrector.java | 4 ++-- .../chat/corrector/TimeCorrector.java | 12 +++++------ .../chat/corrector/WhereCorrector.java | 4 ++-- .../chat/knowledge/MetaEmbeddingService.java | 10 ++++----- .../headless/chat/mapper/EmbeddingMapper.java | 2 +- .../chat/mapper/EmbeddingMatchStrategy.java | 6 +++--- .../headless/chat/parser/QueryTypeParser.java | 2 +- .../chat/parser/llm/ExemplarManager.java | 12 +++++------ .../chat/parser/llm/LLMResponseService.java | 2 +- .../core/adaptor/db/ClickHouseAdaptor.java | 2 +- .../core/adaptor/db/PostgresqlAdaptor.java | 2 +- .../accelerator/AbstractAccelerator.java | 2 +- .../core/parser/DefaultQueryParser.java | 2 +- .../converter/DefaultDimValueConverter.java | 4 ++-- .../headless/core/utils/SqlGenerateUtils.java | 4 ++-- .../server/aspect/DimValueAspect.java | 6 +++--- .../server/aspect/MetricDrillDownChecker.java | 2 +- .../server/aspect/S2DataPermissionAspect.java | 2 +- .../listener/MetaEmbeddingListener.java | 6 +++--- .../server/processor/ParseInfoProcessor.java | 4 ++-- .../server/schedule/EmbeddingTask.java | 8 +++---- .../service/impl/ChatQueryServiceImpl.java | 10 ++++----- .../service/impl/DataSetServiceImpl.java | 2 +- .../service/impl/DatabaseServiceImpl.java | 2 +- .../service/impl/MetricServiceImpl.java | 2 +- .../server/utils/MetricCheckUtils.java | 2 +- .../server/utils/QueryReqConverter.java | 6 +++--- .../server/utils/QueryStructUtils.java | 4 ++-- .../headless/server/utils/StatUtils.java | 2 +- .../main/resources/META-INF/spring.factories | 4 ++-- .../main/resources/META-INF/spring.factories | 4 ++-- .../main/resources/META-INF/spring.factories | 4 ++-- .../test/resources/META-INF/spring.factories | 4 ++-- 104 files changed, 202 insertions(+), 199 deletions(-) rename common/src/main/java/com/tencent/supersonic/common/{util => }/calcite/S2MysqlSqlDialect.java (90%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/calcite/SqlParseUtils.java (99%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/calcite/SqlParserInfo.java (86%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/AggregateEnum.java (94%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/DateFunctionHelper.java (97%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/DateVisitor.java (98%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/ExpressionReplaceVisitor.java (98%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FieldAcquireVisitor.java (89%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FieldAndValueAcquireVisitor.java (99%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FieldExpression.java (76%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FieldReplaceVisitor.java (92%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FieldlValueReplaceVisitor.java (99%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FiledExpression.java (68%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FiledFilterReplaceVisitor.java (98%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FiledNameReplaceVisitor.java (97%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FilterRemoveVisitor.java (98%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FunctionAliasReplaceVisitor.java (95%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FunctionNameReplaceVisitor.java (96%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FunctionReplaceVisitor.java (98%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/FunctionVisitor.java (90%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/GroupByFunctionReplaceVisitor.java (97%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/GroupByReplaceVisitor.java (98%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/GroupByVisitor.java (88%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/JsqlConstants.java (97%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/OrderByAcquireVisitor.java (96%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/OrderByExpression.java (77%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/OrderByReplaceVisitor.java (96%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/ParseVisitorHelper.java (97%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/QueryExpressionReplaceVisitor.java (98%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlAddHelper.java (99%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlDateSelectHelper.java (82%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlEditEnum.java (52%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlEqualHelper.java (97%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlRemoveHelper.java (99%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlReplaceHelper.java (99%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlSelectFunctionHelper.java (98%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlSelectHelper.java (99%) rename common/src/main/java/com/tencent/supersonic/common/{util => }/jsqlparser/TableNameReplaceVisitor.java (87%) delete mode 100644 common/src/main/java/com/tencent/supersonic/common/util/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store/embedding}/ComponentFactory.java (84%) rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store}/embedding/EmbeddingCollection.java (77%) rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store}/embedding/EmbeddingQuery.java (95%) create mode 100644 common/src/main/java/dev/langchain4j/store/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store}/embedding/InMemoryEmbeddingStoreJsonCodec.java (53%) rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store}/embedding/InMemoryS2EmbeddingStore.java (97%) rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store}/embedding/PythonServiceS2EmbeddingStore.java (98%) rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store}/embedding/Retrieval.java (95%) rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store}/embedding/RetrieveQuery.java (83%) rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store}/embedding/RetrieveQueryResult.java (74%) rename common/src/main/java/{com/tencent/supersonic/common/util => dev/langchain4j/store}/embedding/S2EmbeddingStore.java (90%) rename common/src/test/java/com/tencent/supersonic/common/{util => }/DateUtilsTest.java (94%) rename common/src/test/java/com/tencent/supersonic/common/{util => }/calcite/SqlParseUtilsTest.java (99%) rename common/src/test/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlAddHelperTest.java (99%) rename common/src/test/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlDateSelectHelperTest.java (94%) rename common/src/test/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlEqualHelperTest.java (97%) rename common/src/test/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlRemoveHelperTest.java (99%) rename common/src/test/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlReplaceHelperTest.java (99%) rename common/src/test/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlSelectFunctionHelperTest.java (98%) rename common/src/test/java/com/tencent/supersonic/common/{util => }/jsqlparser/SqlSelectHelperTest.java (99%) diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/PluginManager.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/PluginManager.java index f74455afa..0d757dc01 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/PluginManager.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/PluginManager.java @@ -14,13 +14,13 @@ import com.tencent.supersonic.chat.server.plugin.event.PluginUpdateEvent; import com.tencent.supersonic.chat.server.pojo.ChatParseContext; import com.tencent.supersonic.chat.server.service.PluginService; import com.tencent.supersonic.common.config.EmbeddingConfig; -import com.tencent.supersonic.common.util.ComponentFactory; +import dev.langchain4j.store.embedding.ComponentFactory; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.util.embedding.EmbeddingQuery; -import com.tencent.supersonic.common.util.embedding.Retrieval; -import com.tencent.supersonic.common.util.embedding.RetrieveQuery; -import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult; -import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore; +import dev.langchain4j.store.embedding.EmbeddingQuery; +import dev.langchain4j.store.embedding.Retrieval; +import dev.langchain4j.store.embedding.RetrieveQuery; +import dev.langchain4j.store.embedding.RetrieveQueryResult; +import dev.langchain4j.store.embedding.S2EmbeddingStore; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch; import com.tencent.supersonic.headless.api.pojo.SchemaElementType; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/recognize/embedding/EmbeddingRecallRecognizer.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/recognize/embedding/EmbeddingRecallRecognizer.java index 473cadeee..2599b83f2 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/recognize/embedding/EmbeddingRecallRecognizer.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/recognize/embedding/EmbeddingRecallRecognizer.java @@ -9,8 +9,8 @@ import com.tencent.supersonic.chat.server.plugin.recognize.PluginRecognizer; import com.tencent.supersonic.chat.server.pojo.ChatParseContext; import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.util.embedding.Retrieval; -import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult; +import dev.langchain4j.store.embedding.Retrieval; +import dev.langchain4j.store.embedding.RetrieveQueryResult; import com.tencent.supersonic.headless.chat.utils.ComponentFactory; import com.tencent.supersonic.headless.chat.parser.llm.PythonLLMProxy; import lombok.extern.slf4j.Slf4j; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java index c5261eda4..676b3330e 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRatioProcessor.java @@ -20,7 +20,7 @@ import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.RatioOverType; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateUtils; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.AggregateInfo; import com.tencent.supersonic.headless.api.pojo.MetricInfo; import com.tencent.supersonic.headless.api.pojo.SchemaElement; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRecommendProcessor.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRecommendProcessor.java index 29517c7e9..4ccd246fb 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRecommendProcessor.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/processor/execute/MetricRecommendProcessor.java @@ -5,9 +5,9 @@ import com.tencent.supersonic.chat.server.pojo.ChatExecuteContext; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.util.embedding.Retrieval; -import com.tencent.supersonic.common.util.embedding.RetrieveQuery; -import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult; +import dev.langchain4j.store.embedding.Retrieval; +import dev.langchain4j.store.embedding.RetrieveQuery; +import dev.langchain4j.store.embedding.RetrieveQueryResult; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SchemaElementType; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/SimilarQueryManager.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/SimilarQueryManager.java index adaa78904..0fcf3691f 100644 --- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/SimilarQueryManager.java +++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/util/SimilarQueryManager.java @@ -4,12 +4,12 @@ import com.google.common.collect.Lists; import com.tencent.supersonic.chat.api.pojo.request.SimilarQueryReq; import com.tencent.supersonic.chat.api.pojo.response.SimilarQueryRecallResp; import com.tencent.supersonic.common.config.EmbeddingConfig; -import com.tencent.supersonic.common.util.ComponentFactory; -import com.tencent.supersonic.common.util.embedding.EmbeddingQuery; -import com.tencent.supersonic.common.util.embedding.Retrieval; -import com.tencent.supersonic.common.util.embedding.RetrieveQuery; -import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult; -import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore; +import dev.langchain4j.store.embedding.ComponentFactory; +import dev.langchain4j.store.embedding.EmbeddingQuery; +import dev.langchain4j.store.embedding.Retrieval; +import dev.langchain4j.store.embedding.RetrieveQuery; +import dev.langchain4j.store.embedding.RetrieveQueryResult; +import dev.langchain4j.store.embedding.S2EmbeddingStore; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/calcite/S2MysqlSqlDialect.java b/common/src/main/java/com/tencent/supersonic/common/calcite/S2MysqlSqlDialect.java similarity index 90% rename from common/src/main/java/com/tencent/supersonic/common/util/calcite/S2MysqlSqlDialect.java rename to common/src/main/java/com/tencent/supersonic/common/calcite/S2MysqlSqlDialect.java index 4dab36e70..e379d1433 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/calcite/S2MysqlSqlDialect.java +++ b/common/src/main/java/com/tencent/supersonic/common/calcite/S2MysqlSqlDialect.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.calcite; +package com.tencent.supersonic.common.calcite; import org.apache.calcite.sql.dialect.MysqlSqlDialect; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/calcite/SqlParseUtils.java b/common/src/main/java/com/tencent/supersonic/common/calcite/SqlParseUtils.java similarity index 99% rename from common/src/main/java/com/tencent/supersonic/common/util/calcite/SqlParseUtils.java rename to common/src/main/java/com/tencent/supersonic/common/calcite/SqlParseUtils.java index 59841caec..517c7758a 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/calcite/SqlParseUtils.java +++ b/common/src/main/java/com/tencent/supersonic/common/calcite/SqlParseUtils.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.calcite; +package com.tencent.supersonic.common.calcite; import java.util.HashMap; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/calcite/SqlParserInfo.java b/common/src/main/java/com/tencent/supersonic/common/calcite/SqlParserInfo.java similarity index 86% rename from common/src/main/java/com/tencent/supersonic/common/util/calcite/SqlParserInfo.java rename to common/src/main/java/com/tencent/supersonic/common/calcite/SqlParserInfo.java index c75b01f8f..318809577 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/calcite/SqlParserInfo.java +++ b/common/src/main/java/com/tencent/supersonic/common/calcite/SqlParserInfo.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.calcite; +package com.tencent.supersonic.common.calcite; import java.io.Serializable; import java.util.ArrayList; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/AggregateEnum.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/AggregateEnum.java similarity index 94% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/AggregateEnum.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/AggregateEnum.java index 04fc82566..319fbf63f 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/AggregateEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/AggregateEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.Arrays; import java.util.Map; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateFunctionHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateFunctionHelper.java similarity index 97% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateFunctionHelper.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateFunctionHelper.java index 9eaf796b8..eb6e439e2 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateFunctionHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateFunctionHelper.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.util.DatePeriodEnum; import com.tencent.supersonic.common.util.DateUtils; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateVisitor.java similarity index 98% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateVisitor.java index 5eeed1b7b..933b961e5 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/DateVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/DateVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.List; import lombok.Data; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/ExpressionReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/ExpressionReplaceVisitor.java similarity index 98% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/ExpressionReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/ExpressionReplaceVisitor.java index 971d244e5..ad216fe9d 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/ExpressionReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/ExpressionReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.Map; import java.util.Objects; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAcquireVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAcquireVisitor.java similarity index 89% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAcquireVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAcquireVisitor.java index c3eddc03e..bcca801e8 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAcquireVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAcquireVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.Set; import net.sf.jsqlparser.expression.ExpressionVisitorAdapter; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAndValueAcquireVisitor.java similarity index 99% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAndValueAcquireVisitor.java index 0e662cf84..4894d29d7 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldAndValueAcquireVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldAndValueAcquireVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.util.DatePeriodEnum; import java.util.ArrayList; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldExpression.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldExpression.java similarity index 76% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldExpression.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldExpression.java index 6e9c746eb..e37a0f5e9 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldExpression.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldExpression.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import lombok.Data; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldReplaceVisitor.java similarity index 92% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldReplaceVisitor.java index f75e61324..5ef1fefab 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.Map; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldlValueReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldlValueReplaceVisitor.java similarity index 99% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldlValueReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldlValueReplaceVisitor.java index 4771673a8..f149c327e 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FieldlValueReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FieldlValueReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.util.JsonUtil; import java.util.ArrayList; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledExpression.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledExpression.java similarity index 68% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledExpression.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledExpression.java index e19ae3d80..56394ce65 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledExpression.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledExpression.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import lombok.Data; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledFilterReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledFilterReplaceVisitor.java similarity index 98% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledFilterReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledFilterReplaceVisitor.java index 31299714a..5d3980aa6 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledFilterReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledFilterReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.ArrayList; import java.util.List; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledNameReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledNameReplaceVisitor.java similarity index 97% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledNameReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledNameReplaceVisitor.java index 73c7d6d5a..91c25cb30 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FiledNameReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FiledNameReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.Map; import java.util.Objects; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FilterRemoveVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FilterRemoveVisitor.java similarity index 98% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FilterRemoveVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FilterRemoveVisitor.java index 7f704945d..246c00d1d 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FilterRemoveVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FilterRemoveVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.List; import net.sf.jsqlparser.expression.Expression; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionAliasReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionAliasReplaceVisitor.java similarity index 95% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionAliasReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionAliasReplaceVisitor.java index d2b0ad955..d35b84e0c 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionAliasReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionAliasReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.HashMap; import java.util.Map; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionNameReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionNameReplaceVisitor.java similarity index 96% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionNameReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionNameReplaceVisitor.java index d0cd3476e..2dea55b79 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionNameReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionNameReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.Map; import java.util.Objects; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionReplaceVisitor.java similarity index 98% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionReplaceVisitor.java index f072f4d52..d9e55585a 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.util.StringUtil; import java.util.ArrayList; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionVisitor.java similarity index 90% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionVisitor.java index 16ee86882..7369e0648 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/FunctionVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/FunctionVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.HashSet; import java.util.Set; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByFunctionReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByFunctionReplaceVisitor.java similarity index 97% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByFunctionReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByFunctionReplaceVisitor.java index 423bf1c46..a13eef0a0 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByFunctionReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByFunctionReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByReplaceVisitor.java similarity index 98% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByReplaceVisitor.java index 8f4f12118..2bf988949 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByVisitor.java similarity index 88% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByVisitor.java index 9bce2c0d6..6c5f638fb 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/GroupByVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/GroupByVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.statement.select.GroupByElement; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/JsqlConstants.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/JsqlConstants.java similarity index 97% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/JsqlConstants.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/JsqlConstants.java index 0934dbbe9..8ad918e6f 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/JsqlConstants.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/JsqlConstants.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/OrderByAcquireVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByAcquireVisitor.java similarity index 96% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/OrderByAcquireVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByAcquireVisitor.java index 34f2a6dbc..4a6a1209b 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/OrderByAcquireVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByAcquireVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.pojo.Constants; import java.util.Set; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/OrderByExpression.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByExpression.java similarity index 77% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/OrderByExpression.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByExpression.java index 970c37df6..6ab6db4a9 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/OrderByExpression.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByExpression.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import lombok.Data; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/OrderByReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByReplaceVisitor.java similarity index 96% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/OrderByReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByReplaceVisitor.java index 7fe649700..af07d61c8 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/OrderByReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/OrderByReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.Map; import net.sf.jsqlparser.expression.Expression; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/ParseVisitorHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/ParseVisitorHelper.java similarity index 97% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/ParseVisitorHelper.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/ParseVisitorHelper.java index 22c91911f..b07496de8 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/ParseVisitorHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/ParseVisitorHelper.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.Map; import java.util.Map.Entry; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/QueryExpressionReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/QueryExpressionReplaceVisitor.java similarity index 98% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/QueryExpressionReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/QueryExpressionReplaceVisitor.java index 4113cc49e..5aad3fefc 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/QueryExpressionReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/QueryExpressionReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.Map; import java.util.Objects; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlAddHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlAddHelper.java similarity index 99% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlAddHelper.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlAddHelper.java index 39cf96a7b..f2c7181d9 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlAddHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlAddHelper.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.List; import java.util.Map; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlDateSelectHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlDateSelectHelper.java similarity index 82% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlDateSelectHelper.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlDateSelectHelper.java index ee1819647..838572832 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlDateSelectHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlDateSelectHelper.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.common.util.jsqlparser.DateVisitor.DateBoundInfo; + import java.util.List; import java.util.Objects; import lombok.extern.slf4j.Slf4j; @@ -14,7 +14,7 @@ import net.sf.jsqlparser.statement.select.PlainSelect; @Slf4j public class SqlDateSelectHelper { - public static DateBoundInfo getDateBoundInfo(String sql) { + public static DateVisitor.DateBoundInfo getDateBoundInfo(String sql) { List plainSelectList = SqlSelectHelper.getPlainSelect(sql); if (plainSelectList.size() != 1) { return null; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlEditEnum.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEditEnum.java similarity index 52% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlEditEnum.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEditEnum.java index 1fab1113e..cb75229e7 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlEditEnum.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEditEnum.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; public enum SqlEditEnum { NUMBER_FILTER, diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlEqualHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEqualHelper.java similarity index 97% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlEqualHelper.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEqualHelper.java index c8f31242b..fc76a3239 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlEqualHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlEqualHelper.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.List; import lombok.extern.slf4j.Slf4j; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlRemoveHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlRemoveHelper.java similarity index 99% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlRemoveHelper.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlRemoveHelper.java index e82387be2..e5fc9de13 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlRemoveHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlRemoveHelper.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.HashSet; import java.util.List; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlReplaceHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java similarity index 99% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlReplaceHelper.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java index 9a2736807..96550f864 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlReplaceHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelper.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.util.StringUtil; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectFunctionHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectFunctionHelper.java similarity index 98% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectFunctionHelper.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectFunctionHelper.java index 8836e94c2..fa7ca2743 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectFunctionHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectFunctionHelper.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import java.util.ArrayList; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelper.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelper.java similarity index 99% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelper.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelper.java index 85ef109e4..4f9818bae 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelper.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelper.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.util.StringUtil; import java.util.ArrayList; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/TableNameReplaceVisitor.java b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/TableNameReplaceVisitor.java similarity index 87% rename from common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/TableNameReplaceVisitor.java rename to common/src/main/java/com/tencent/supersonic/common/jsqlparser/TableNameReplaceVisitor.java index 361e8eb64..c8f0d2389 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/jsqlparser/TableNameReplaceVisitor.java +++ b/common/src/main/java/com/tencent/supersonic/common/jsqlparser/TableNameReplaceVisitor.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import net.sf.jsqlparser.schema.Table; import net.sf.jsqlparser.statement.select.FromItemVisitorAdapter; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java b/common/src/main/java/com/tencent/supersonic/common/util/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java deleted file mode 100644 index 82eea82e1..000000000 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.tencent.supersonic.common.util.embedding; - -import com.google.gson.Gson; -import com.google.gson.reflect.TypeToken; -import com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore.InMemoryEmbeddingStore; -import java.lang.reflect.Type; - -public class GsonInMemoryEmbeddingStoreJsonCodec implements InMemoryEmbeddingStoreJsonCodec { - - @Override - public InMemoryEmbeddingStore fromJson(String json) { - Type type = new TypeToken>() { - }.getType(); - return new Gson().fromJson(json, type); - } - - @Override - public String toJson(InMemoryEmbeddingStore store) { - return new Gson().toJson(store); - } -} diff --git a/common/src/main/java/com/tencent/supersonic/common/util/ComponentFactory.java b/common/src/main/java/dev/langchain4j/store/embedding/ComponentFactory.java similarity index 84% rename from common/src/main/java/com/tencent/supersonic/common/util/ComponentFactory.java rename to common/src/main/java/dev/langchain4j/store/embedding/ComponentFactory.java index 768856ce1..dde8bc501 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/ComponentFactory.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/ComponentFactory.java @@ -1,9 +1,9 @@ -package com.tencent.supersonic.common.util; +package dev.langchain4j.store.embedding; -import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore; -import java.util.Objects; import org.springframework.core.io.support.SpringFactoriesLoader; +import java.util.Objects; + public class ComponentFactory { private static S2EmbeddingStore s2EmbeddingStore; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/EmbeddingCollection.java b/common/src/main/java/dev/langchain4j/store/embedding/EmbeddingCollection.java similarity index 77% rename from common/src/main/java/com/tencent/supersonic/common/util/embedding/EmbeddingCollection.java rename to common/src/main/java/dev/langchain4j/store/embedding/EmbeddingCollection.java index 9277e7ae5..03f11fa4a 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/EmbeddingCollection.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/EmbeddingCollection.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.embedding; +package dev.langchain4j.store.embedding; import lombok.Data; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/EmbeddingQuery.java b/common/src/main/java/dev/langchain4j/store/embedding/EmbeddingQuery.java similarity index 95% rename from common/src/main/java/com/tencent/supersonic/common/util/embedding/EmbeddingQuery.java rename to common/src/main/java/dev/langchain4j/store/embedding/EmbeddingQuery.java index 0fa077061..ef4606f67 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/EmbeddingQuery.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/EmbeddingQuery.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.embedding; +package dev.langchain4j.store.embedding; import com.alibaba.fastjson.JSONObject; diff --git a/common/src/main/java/dev/langchain4j/store/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java b/common/src/main/java/dev/langchain4j/store/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java new file mode 100644 index 000000000..10dd9928f --- /dev/null +++ b/common/src/main/java/dev/langchain4j/store/embedding/GsonInMemoryEmbeddingStoreJsonCodec.java @@ -0,0 +1,21 @@ +package dev.langchain4j.store.embedding; + +import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; + +public class GsonInMemoryEmbeddingStoreJsonCodec implements InMemoryEmbeddingStoreJsonCodec { + + @Override + public InMemoryS2EmbeddingStore.InMemoryEmbeddingStore fromJson(String json) { + Type type = new TypeToken>() { + }.getType(); + return new Gson().fromJson(json, type); + } + + @Override + public String toJson(InMemoryS2EmbeddingStore.InMemoryEmbeddingStore store) { + return new Gson().toJson(store); + } +} diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/InMemoryEmbeddingStoreJsonCodec.java b/common/src/main/java/dev/langchain4j/store/embedding/InMemoryEmbeddingStoreJsonCodec.java similarity index 53% rename from common/src/main/java/com/tencent/supersonic/common/util/embedding/InMemoryEmbeddingStoreJsonCodec.java rename to common/src/main/java/dev/langchain4j/store/embedding/InMemoryEmbeddingStoreJsonCodec.java index 5432ac26b..b89c118e4 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/InMemoryEmbeddingStoreJsonCodec.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/InMemoryEmbeddingStoreJsonCodec.java @@ -1,6 +1,6 @@ -package com.tencent.supersonic.common.util.embedding; +package dev.langchain4j.store.embedding; -import com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore.InMemoryEmbeddingStore; +import dev.langchain4j.store.embedding.InMemoryS2EmbeddingStore.InMemoryEmbeddingStore; public interface InMemoryEmbeddingStoreJsonCodec { diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/InMemoryS2EmbeddingStore.java b/common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java similarity index 97% rename from common/src/main/java/com/tencent/supersonic/common/util/embedding/InMemoryS2EmbeddingStore.java rename to common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java index e9f3b7f8b..fc3e13dd9 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/InMemoryS2EmbeddingStore.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/InMemoryS2EmbeddingStore.java @@ -1,15 +1,11 @@ -package com.tencent.supersonic.common.util.embedding; +package dev.langchain4j.store.embedding; import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.util.ContextUtils; import dev.langchain4j.data.embedding.Embedding; import dev.langchain4j.model.embedding.EmbeddingModel; -import dev.langchain4j.store.embedding.CosineSimilarity; -import dev.langchain4j.store.embedding.EmbeddingMatch; -import dev.langchain4j.store.embedding.EmbeddingStore; -import dev.langchain4j.store.embedding.RelevanceScore; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.MapUtils; +import org.apache.commons.collections.MapUtils; import org.apache.commons.lang3.StringUtils; import java.io.IOException; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/PythonServiceS2EmbeddingStore.java b/common/src/main/java/dev/langchain4j/store/embedding/PythonServiceS2EmbeddingStore.java similarity index 98% rename from common/src/main/java/com/tencent/supersonic/common/util/embedding/PythonServiceS2EmbeddingStore.java rename to common/src/main/java/dev/langchain4j/store/embedding/PythonServiceS2EmbeddingStore.java index a530b61fe..4038dae43 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/PythonServiceS2EmbeddingStore.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/PythonServiceS2EmbeddingStore.java @@ -1,14 +1,10 @@ -package com.tencent.supersonic.common.util.embedding; +package dev.langchain4j.store.embedding; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.serializer.SerializerFeature; import com.google.common.collect.Lists; import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.util.ContextUtils; -import java.net.URI; -import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpEntity; @@ -20,6 +16,11 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.client.RestTemplate; import org.springframework.web.util.UriComponentsBuilder; +import java.net.URI; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + /*** * Implementation of calling the Python service S2EmbeddingStore. */ diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/Retrieval.java b/common/src/main/java/dev/langchain4j/store/embedding/Retrieval.java similarity index 95% rename from common/src/main/java/com/tencent/supersonic/common/util/embedding/Retrieval.java rename to common/src/main/java/dev/langchain4j/store/embedding/Retrieval.java index f45dcf869..e126a4ad0 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/Retrieval.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/Retrieval.java @@ -1,11 +1,12 @@ -package com.tencent.supersonic.common.util.embedding; +package dev.langchain4j.store.embedding; import com.google.common.base.Objects; import com.tencent.supersonic.common.pojo.Constants; -import java.util.Map; import lombok.Data; import org.apache.commons.lang3.StringUtils; +import java.util.Map; + @Data public class Retrieval { diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/RetrieveQuery.java b/common/src/main/java/dev/langchain4j/store/embedding/RetrieveQuery.java similarity index 83% rename from common/src/main/java/com/tencent/supersonic/common/util/embedding/RetrieveQuery.java rename to common/src/main/java/dev/langchain4j/store/embedding/RetrieveQuery.java index 737792fa5..a46bb6fd6 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/RetrieveQuery.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/RetrieveQuery.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.embedding; +package dev.langchain4j.store.embedding; import lombok.Builder; import lombok.Data; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/RetrieveQueryResult.java b/common/src/main/java/dev/langchain4j/store/embedding/RetrieveQueryResult.java similarity index 74% rename from common/src/main/java/com/tencent/supersonic/common/util/embedding/RetrieveQueryResult.java rename to common/src/main/java/dev/langchain4j/store/embedding/RetrieveQueryResult.java index 8991f1497..194888714 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/RetrieveQueryResult.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/RetrieveQueryResult.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.embedding; +package dev.langchain4j.store.embedding; import lombok.Data; diff --git a/common/src/main/java/com/tencent/supersonic/common/util/embedding/S2EmbeddingStore.java b/common/src/main/java/dev/langchain4j/store/embedding/S2EmbeddingStore.java similarity index 90% rename from common/src/main/java/com/tencent/supersonic/common/util/embedding/S2EmbeddingStore.java rename to common/src/main/java/dev/langchain4j/store/embedding/S2EmbeddingStore.java index c188ee13b..14ef7f5dd 100644 --- a/common/src/main/java/com/tencent/supersonic/common/util/embedding/S2EmbeddingStore.java +++ b/common/src/main/java/dev/langchain4j/store/embedding/S2EmbeddingStore.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.embedding; +package dev.langchain4j.store.embedding; import java.util.List; diff --git a/common/src/test/java/com/tencent/supersonic/common/util/DateUtilsTest.java b/common/src/test/java/com/tencent/supersonic/common/DateUtilsTest.java similarity index 94% rename from common/src/test/java/com/tencent/supersonic/common/util/DateUtilsTest.java rename to common/src/test/java/com/tencent/supersonic/common/DateUtilsTest.java index bbef9221b..f1075bf79 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/DateUtilsTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/DateUtilsTest.java @@ -1,6 +1,8 @@ -package com.tencent.supersonic.common.util; +package com.tencent.supersonic.common; import com.tencent.supersonic.common.pojo.Constants; +import com.tencent.supersonic.common.util.DatePeriodEnum; +import com.tencent.supersonic.common.util.DateUtils; import org.assertj.core.util.Lists; import org.junit.Assert; import org.junit.jupiter.api.Assertions; diff --git a/common/src/test/java/com/tencent/supersonic/common/util/calcite/SqlParseUtilsTest.java b/common/src/test/java/com/tencent/supersonic/common/calcite/SqlParseUtilsTest.java similarity index 99% rename from common/src/test/java/com/tencent/supersonic/common/util/calcite/SqlParseUtilsTest.java rename to common/src/test/java/com/tencent/supersonic/common/calcite/SqlParseUtilsTest.java index 604609072..f52b39b25 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/calcite/SqlParseUtilsTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/calcite/SqlParseUtilsTest.java @@ -1,8 +1,9 @@ -package com.tencent.supersonic.common.util.calcite; +package com.tencent.supersonic.common.calcite; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; + import lombok.extern.slf4j.Slf4j; import org.apache.calcite.sql.parser.SqlParseException; import org.junit.Assert; diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlAddHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlAddHelperTest.java similarity index 99% rename from common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlAddHelperTest.java rename to common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlAddHelperTest.java index 842bbbeb2..cd5ad541b 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlAddHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlAddHelperTest.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.ArrayList; import java.util.HashMap; @@ -6,6 +6,7 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; + import net.sf.jsqlparser.JSQLParserException; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.parser.CCJSqlParserUtil; diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlDateSelectHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlDateSelectHelperTest.java similarity index 94% rename from common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlDateSelectHelperTest.java rename to common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlDateSelectHelperTest.java index bb4fbab5a..d1ed5960f 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlDateSelectHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlDateSelectHelperTest.java @@ -1,7 +1,7 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; -import com.tencent.supersonic.common.util.jsqlparser.DateVisitor.DateBoundInfo; +import com.tencent.supersonic.common.jsqlparser.DateVisitor.DateBoundInfo; import org.junit.Assert; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlEqualHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlEqualHelperTest.java similarity index 97% rename from common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlEqualHelperTest.java rename to common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlEqualHelperTest.java index a5de633f3..ab115e9f3 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlEqualHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlEqualHelperTest.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import org.junit.Assert; diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlRemoveHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlRemoveHelperTest.java similarity index 99% rename from common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlRemoveHelperTest.java rename to common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlRemoveHelperTest.java index 8db7d50ba..64362adfd 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlRemoveHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlRemoveHelperTest.java @@ -1,8 +1,9 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import java.util.HashSet; import java.util.List; import java.util.Set; + import org.junit.Assert; import org.junit.jupiter.api.Test; diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlReplaceHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelperTest.java similarity index 99% rename from common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlReplaceHelperTest.java rename to common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelperTest.java index 34ef32590..bb99f8e4e 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlReplaceHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlReplaceHelperTest.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import java.util.Collections; diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectFunctionHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlSelectFunctionHelperTest.java similarity index 98% rename from common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectFunctionHelperTest.java rename to common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlSelectFunctionHelperTest.java index 52b550f4e..ef5f23e96 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectFunctionHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlSelectFunctionHelperTest.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import net.sf.jsqlparser.JSQLParserException; import org.junit.Assert; diff --git a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelperTest.java b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelperTest.java similarity index 99% rename from common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelperTest.java rename to common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelperTest.java index a7728f253..35a8870f3 100644 --- a/common/src/test/java/com/tencent/supersonic/common/util/jsqlparser/SqlSelectHelperTest.java +++ b/common/src/test/java/com/tencent/supersonic/common/jsqlparser/SqlSelectHelperTest.java @@ -1,4 +1,4 @@ -package com.tencent.supersonic.common.util.jsqlparser; +package com.tencent.supersonic.common.jsqlparser; import net.sf.jsqlparser.expression.Expression; import net.sf.jsqlparser.statement.select.Select; diff --git a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java index 1aaad6f25..12bd3187d 100644 --- a/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java +++ b/headless/api/src/main/java/com/tencent/supersonic/headless/api/pojo/request/QueryStructReq.java @@ -12,7 +12,7 @@ import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateModeUtils; import com.tencent.supersonic.common.util.SqlFilterUtils; -import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper; +import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/AggCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/AggCorrector.java index 9583444c4..cb4eb5e66 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/AggCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/AggCorrector.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.chat.corrector; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.chat.QueryContext; import lombok.extern.slf4j.Slf4j; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/BaseSemanticCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/BaseSemanticCorrector.java index 0802ad978..8067cbed8 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/BaseSemanticCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/BaseSemanticCorrector.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.chat.corrector; import com.tencent.supersonic.common.pojo.enums.AggregateTypeEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.SemanticSchema; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GrammarCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GrammarCorrector.java index 1ccaee9bb..3240eb09c 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GrammarCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GrammarCorrector.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.chat.corrector; -import com.tencent.supersonic.common.util.jsqlparser.SqlRemoveHelper; +import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.chat.QueryContext; import lombok.extern.slf4j.Slf4j; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GroupByCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GroupByCorrector.java index 87c779596..bd6f0f3e0 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GroupByCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/GroupByCorrector.java @@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.chat.corrector; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.SemanticSchema; import com.tencent.supersonic.headless.api.pojo.SqlInfo; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/HavingCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/HavingCorrector.java index 19e22c780..0c61d49e5 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/HavingCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/HavingCorrector.java @@ -1,9 +1,9 @@ package com.tencent.supersonic.headless.chat.corrector; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectFunctionHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.SemanticSchema; import com.tencent.supersonic.headless.chat.QueryContext; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SchemaCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SchemaCorrector.java index 6ac2f799a..d1d7ca464 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SchemaCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SchemaCorrector.java @@ -5,11 +5,11 @@ import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.DateUtils; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.common.util.jsqlparser.AggregateEnum; -import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; -import com.tencent.supersonic.common.util.jsqlparser.SqlRemoveHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.AggregateEnum; +import com.tencent.supersonic.common.jsqlparser.FieldExpression; +import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.SemanticSchema; import com.tencent.supersonic.headless.api.pojo.SqlInfo; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SelectCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SelectCorrector.java index d763ad18a..93131d765 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SelectCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/SelectCorrector.java @@ -1,8 +1,8 @@ package com.tencent.supersonic.headless.chat.corrector; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.chat.QueryContext; import lombok.extern.slf4j.Slf4j; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/TimeCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/TimeCorrector.java index 5275edcac..17d1c4626 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/TimeCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/TimeCorrector.java @@ -3,12 +3,12 @@ package com.tencent.supersonic.headless.chat.corrector; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlDateSelectHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlRemoveHelper; -import com.tencent.supersonic.common.util.jsqlparser.DateVisitor.DateBoundInfo; +import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; +import com.tencent.supersonic.common.jsqlparser.SqlDateSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper; +import com.tencent.supersonic.common.jsqlparser.DateVisitor.DateBoundInfo; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.chat.QueryContext; import com.tencent.supersonic.headless.chat.utils.S2SqlDateHelper; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/WhereCorrector.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/WhereCorrector.java index f8a7c949e..c26e80616 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/WhereCorrector.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/corrector/WhereCorrector.java @@ -3,8 +3,8 @@ package com.tencent.supersonic.headless.chat.corrector; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.util.StringUtil; -import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SchemaValueMap; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/MetaEmbeddingService.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/MetaEmbeddingService.java index 6e4870430..73cf1f535 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/MetaEmbeddingService.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/knowledge/MetaEmbeddingService.java @@ -2,11 +2,11 @@ package com.tencent.supersonic.headless.chat.knowledge; import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.common.util.ComponentFactory; -import com.tencent.supersonic.common.util.embedding.Retrieval; -import com.tencent.supersonic.common.util.embedding.RetrieveQuery; -import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult; -import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore; +import dev.langchain4j.store.embedding.ComponentFactory; +import dev.langchain4j.store.embedding.Retrieval; +import dev.langchain4j.store.embedding.RetrieveQuery; +import dev.langchain4j.store.embedding.RetrieveQueryResult; +import dev.langchain4j.store.embedding.S2EmbeddingStore; import com.tencent.supersonic.headless.chat.knowledge.helper.NatureHelper; import java.util.ArrayList; import java.util.HashMap; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMapper.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMapper.java index a972a1df5..ed1ca7e58 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMapper.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMapper.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.chat.mapper; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.util.embedding.Retrieval; +import dev.langchain4j.store.embedding.Retrieval; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SchemaElementMatch; import com.tencent.supersonic.headless.api.pojo.SchemaElementType; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMatchStrategy.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMatchStrategy.java index a4cebba9c..64555b203 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMatchStrategy.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/mapper/EmbeddingMatchStrategy.java @@ -2,9 +2,9 @@ package com.tencent.supersonic.headless.chat.mapper; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.common.util.embedding.Retrieval; -import com.tencent.supersonic.common.util.embedding.RetrieveQuery; -import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult; +import dev.langchain4j.store.embedding.Retrieval; +import dev.langchain4j.store.embedding.RetrieveQuery; +import dev.langchain4j.store.embedding.RetrieveQueryResult; import com.tencent.supersonic.headless.chat.QueryContext; import com.tencent.supersonic.headless.chat.knowledge.EmbeddingResult; import com.tencent.supersonic.headless.chat.knowledge.MetaEmbeddingService; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java index 862942159..17dcf9298 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/QueryTypeParser.java @@ -3,7 +3,7 @@ package com.tencent.supersonic.headless.chat.parser; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.SemanticSchema; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/ExemplarManager.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/ExemplarManager.java index a776ebd2e..d54428485 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/ExemplarManager.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/ExemplarManager.java @@ -3,13 +3,13 @@ package com.tencent.supersonic.headless.chat.parser.llm; import com.fasterxml.jackson.core.type.TypeReference; import com.tencent.supersonic.common.config.EmbeddingConfig; -import com.tencent.supersonic.common.util.ComponentFactory; +import dev.langchain4j.store.embedding.ComponentFactory; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.common.util.embedding.EmbeddingQuery; -import com.tencent.supersonic.common.util.embedding.Retrieval; -import com.tencent.supersonic.common.util.embedding.RetrieveQuery; -import com.tencent.supersonic.common.util.embedding.RetrieveQueryResult; -import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore; +import dev.langchain4j.store.embedding.EmbeddingQuery; +import dev.langchain4j.store.embedding.Retrieval; +import dev.langchain4j.store.embedding.RetrieveQuery; +import dev.langchain4j.store.embedding.RetrieveQueryResult; +import dev.langchain4j.store.embedding.S2EmbeddingStore; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMResponseService.java b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMResponseService.java index 0ab9fa3fa..aa1d4f17f 100644 --- a/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMResponseService.java +++ b/headless/chat/src/main/java/com/tencent/supersonic/headless/chat/parser/llm/LLMResponseService.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.chat.parser.llm; import com.tencent.supersonic.common.pojo.Constants; -import com.tencent.supersonic.common.util.jsqlparser.SqlEqualHelper; +import com.tencent.supersonic.common.jsqlparser.SqlEqualHelper; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.chat.query.QueryManager; import com.tencent.supersonic.headless.chat.query.llm.LLMSemanticQuery; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/ClickHouseAdaptor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/ClickHouseAdaptor.java index 9812c9ada..89f2591a2 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/ClickHouseAdaptor.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/ClickHouseAdaptor.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.adaptor.db; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.pojo.Constants; import java.util.HashMap; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PostgresqlAdaptor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PostgresqlAdaptor.java index e432e54f3..4a108050a 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PostgresqlAdaptor.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PostgresqlAdaptor.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.adaptor.db; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; import java.util.HashMap; import java.util.Map; import java.util.Objects; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/accelerator/AbstractAccelerator.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/accelerator/AbstractAccelerator.java index 0dc25dd83..f19f5e6e6 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/accelerator/AbstractAccelerator.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/executor/accelerator/AbstractAccelerator.java @@ -1,6 +1,6 @@ package com.tencent.supersonic.headless.core.executor.accelerator; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.core.parser.calcite.Configuration; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.TimeRange; import com.tencent.supersonic.headless.core.parser.calcite.schema.DataSourceTable; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java index a172b1816..d90a6c66e 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/DefaultQueryParser.java @@ -2,7 +2,7 @@ package com.tencent.supersonic.headless.core.parser; import com.google.common.base.Strings; import com.tencent.supersonic.common.util.StringUtil; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.MetricTable; import com.tencent.supersonic.headless.api.pojo.QueryParam; import com.tencent.supersonic.headless.api.pojo.enums.AggOption; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/DefaultDimValueConverter.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/DefaultDimValueConverter.java index 00743b632..a300a164e 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/DefaultDimValueConverter.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/parser/converter/DefaultDimValueConverter.java @@ -2,8 +2,8 @@ package com.tencent.supersonic.headless.core.parser.converter; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.MetricTable; import com.tencent.supersonic.headless.core.parser.calcite.s2sql.Dimension; import com.tencent.supersonic.headless.core.pojo.QueryStatement; diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java index effe1ec14..ae4d27d1c 100644 --- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java +++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/utils/SqlGenerateUtils.java @@ -15,8 +15,8 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.DateModeUtils; import com.tencent.supersonic.common.util.SqlFilterUtils; import com.tencent.supersonic.common.util.StringUtil; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.Measure; import com.tencent.supersonic.headless.api.pojo.QueryParam; import com.tencent.supersonic.headless.api.pojo.enums.AggOption; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java index 210c3a0d9..25170a091 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/DimValueAspect.java @@ -6,9 +6,9 @@ import com.tencent.supersonic.common.pojo.QueryColumn; import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.FieldExpression; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.DimValueMap; import com.tencent.supersonic.headless.api.pojo.SchemaItem; import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownChecker.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownChecker.java index dbe4c1e81..a551718bf 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownChecker.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/MetricDrillDownChecker.java @@ -3,7 +3,7 @@ package com.tencent.supersonic.headless.server.aspect; import com.google.common.collect.Lists; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.response.DimSchemaResp; import com.tencent.supersonic.headless.api.pojo.response.DimensionResp; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java index af8f0e164..c870d28e5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/aspect/S2DataPermissionAspect.java @@ -21,7 +21,7 @@ import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.SensitiveLevelEnum; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.pojo.exception.InvalidPermissionException; -import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper; +import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; import com.tencent.supersonic.headless.api.pojo.request.QueryStructReq; import com.tencent.supersonic.headless.api.pojo.request.SchemaFilterReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/MetaEmbeddingListener.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/MetaEmbeddingListener.java index e1a2b0256..6c40b29fa 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/MetaEmbeddingListener.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/listener/MetaEmbeddingListener.java @@ -4,9 +4,9 @@ import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.pojo.DataEvent; import com.tencent.supersonic.common.pojo.DataItem; import com.tencent.supersonic.common.pojo.enums.EventType; -import com.tencent.supersonic.common.util.ComponentFactory; -import com.tencent.supersonic.common.util.embedding.EmbeddingQuery; -import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore; +import dev.langchain4j.store.embedding.ComponentFactory; +import dev.langchain4j.store.embedding.EmbeddingQuery; +import dev.langchain4j.store.embedding.S2EmbeddingStore; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java index 6c34b0079..c92e37b61 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/processor/ParseInfoProcessor.java @@ -6,8 +6,8 @@ import com.tencent.supersonic.common.pojo.enums.FilterOperatorEnum; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; -import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.FieldExpression; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.SchemaElement; import com.tencent.supersonic.headless.api.pojo.SemanticParseInfo; import com.tencent.supersonic.headless.api.pojo.SemanticSchema; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/schedule/EmbeddingTask.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/schedule/EmbeddingTask.java index c57546ce1..f1d6c28d9 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/schedule/EmbeddingTask.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/schedule/EmbeddingTask.java @@ -2,10 +2,10 @@ package com.tencent.supersonic.headless.server.schedule; import com.tencent.supersonic.common.config.EmbeddingConfig; import com.tencent.supersonic.common.pojo.DataItem; -import com.tencent.supersonic.common.util.ComponentFactory; -import com.tencent.supersonic.common.util.embedding.EmbeddingQuery; -import com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore; -import com.tencent.supersonic.common.util.embedding.S2EmbeddingStore; +import dev.langchain4j.store.embedding.ComponentFactory; +import dev.langchain4j.store.embedding.EmbeddingQuery; +import dev.langchain4j.store.embedding.InMemoryS2EmbeddingStore; +import dev.langchain4j.store.embedding.S2EmbeddingStore; import com.tencent.supersonic.headless.server.service.DimensionService; import com.tencent.supersonic.headless.server.service.MetricService; import lombok.extern.slf4j.Slf4j; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatQueryServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatQueryServiceImpl.java index 5b64c1bc1..3f20ceb53 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatQueryServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/ChatQueryServiceImpl.java @@ -9,11 +9,11 @@ import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; import com.tencent.supersonic.common.util.ContextUtils; import com.tencent.supersonic.common.util.DateUtils; import com.tencent.supersonic.common.util.JsonUtil; -import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; -import com.tencent.supersonic.common.util.jsqlparser.SqlAddHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlRemoveHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.FieldExpression; +import com.tencent.supersonic.common.jsqlparser.SqlAddHelper; +import com.tencent.supersonic.common.jsqlparser.SqlRemoveHelper; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.DataSetSchema; import com.tencent.supersonic.headless.api.pojo.EntityInfo; import com.tencent.supersonic.headless.api.pojo.SchemaElement; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java index 4573b06d2..6127067c2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DataSetServiceImpl.java @@ -11,7 +11,7 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; import com.tencent.supersonic.common.util.BeanMapper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.DataSetDetail; import com.tencent.supersonic.headless.api.pojo.QueryConfig; import com.tencent.supersonic.headless.api.pojo.enums.TagDefineType; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java index 44df0066e..d3ce5bbe5 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/DatabaseServiceImpl.java @@ -6,7 +6,7 @@ import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.Pair; import com.tencent.supersonic.common.pojo.QueryColumn; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.request.DatabaseReq; import com.tencent.supersonic.headless.api.pojo.request.SqlExecuteReq; import com.tencent.supersonic.headless.api.pojo.response.DatabaseResp; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java index 6721a43b8..94689bb60 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/service/impl/MetricServiceImpl.java @@ -18,7 +18,7 @@ import com.tencent.supersonic.common.pojo.enums.StatusEnum; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.BeanMapper; import com.tencent.supersonic.headless.server.utils.AliasGenerateHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectFunctionHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper; import com.tencent.supersonic.headless.api.pojo.DrillDownDimension; import com.tencent.supersonic.headless.api.pojo.Measure; import com.tencent.supersonic.headless.api.pojo.MeasureParam; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java index 4f15f77b1..5c5e532e6 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/MetricCheckUtils.java @@ -1,7 +1,7 @@ package com.tencent.supersonic.headless.server.utils; import com.tencent.supersonic.common.pojo.exception.InvalidArgumentException; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectFunctionHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper; import com.tencent.supersonic.headless.api.pojo.enums.MetricDefineType; import com.tencent.supersonic.headless.api.pojo.MetricDefineByFieldParams; import com.tencent.supersonic.headless.api.pojo.MetricDefineByMeasureParams; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java index ed0ad6628..2b2d712c2 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryReqConverter.java @@ -6,9 +6,9 @@ import com.tencent.supersonic.common.pojo.Constants; import com.tencent.supersonic.common.pojo.enums.AggOperatorEnum; import com.tencent.supersonic.common.pojo.enums.QueryType; import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum; -import com.tencent.supersonic.common.util.jsqlparser.SqlReplaceHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectFunctionHelper; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlReplaceHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectFunctionHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.Measure; import com.tencent.supersonic.headless.api.pojo.MetricTable; import com.tencent.supersonic.headless.api.pojo.QueryParam; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java index 162f0c0d0..e698e7364 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/QueryStructUtils.java @@ -7,8 +7,8 @@ import com.tencent.supersonic.common.pojo.ItemDateResp; import com.tencent.supersonic.common.pojo.enums.TypeEnums; import com.tencent.supersonic.common.util.DateModeUtils; import com.tencent.supersonic.common.util.SqlFilterUtils; -import com.tencent.supersonic.common.util.jsqlparser.FieldExpression; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.FieldExpression; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.ItemDateFilter; import com.tencent.supersonic.headless.api.pojo.SchemaItem; import com.tencent.supersonic.headless.api.pojo.request.QuerySqlReq; diff --git a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java index df06b21b2..6e091cddd 100644 --- a/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java +++ b/headless/server/src/main/java/com/tencent/supersonic/headless/server/utils/StatUtils.java @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.tencent.supersonic.auth.api.authentication.pojo.User; import com.tencent.supersonic.common.pojo.enums.TaskStatusEnum; import com.tencent.supersonic.common.util.SqlFilterUtils; -import com.tencent.supersonic.common.util.jsqlparser.SqlSelectHelper; +import com.tencent.supersonic.common.jsqlparser.SqlSelectHelper; import com.tencent.supersonic.headless.api.pojo.QueryStat; import com.tencent.supersonic.headless.api.pojo.SchemaItem; import com.tencent.supersonic.headless.api.pojo.enums.QueryOptMode; diff --git a/launchers/chat/src/main/resources/META-INF/spring.factories b/launchers/chat/src/main/resources/META-INF/spring.factories index 19f005479..67b28a2bc 100644 --- a/launchers/chat/src/main/resources/META-INF/spring.factories +++ b/launchers/chat/src/main/resources/META-INF/spring.factories @@ -43,5 +43,5 @@ com.tencent.supersonic.chat.server.processor.execute.ExecuteResultProcessor=\ com.tencent.supersonic.chat.server.processor.execute.MetricRatioProcessor -com.tencent.supersonic.common.util.embedding.S2EmbeddingStore=\ - com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore \ No newline at end of file +dev.langchain4j.store.embedding.S2EmbeddingStore=\ + dev.langchain4j.store.embedding.InMemoryS2EmbeddingStore \ No newline at end of file diff --git a/launchers/headless/src/main/resources/META-INF/spring.factories b/launchers/headless/src/main/resources/META-INF/spring.factories index 076b21d9e..52df14016 100644 --- a/launchers/headless/src/main/resources/META-INF/spring.factories +++ b/launchers/headless/src/main/resources/META-INF/spring.factories @@ -4,8 +4,8 @@ com.tencent.supersonic.auth.authentication.interceptor.AuthenticationInterceptor com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor=\ com.tencent.supersonic.auth.authentication.adaptor.DefaultUserAdaptor -com.tencent.supersonic.common.util.embedding.S2EmbeddingStore=\ - com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore +dev.langchain4j.store.embedding.S2EmbeddingStore=\ + dev.langchain4j.store.embedding.InMemoryS2EmbeddingStore com.tencent.supersonic.headless.core.parser.converter.HeadlessConverter=\ diff --git a/launchers/standalone/src/main/resources/META-INF/spring.factories b/launchers/standalone/src/main/resources/META-INF/spring.factories index 2bf4aa1dc..70e918881 100644 --- a/launchers/standalone/src/main/resources/META-INF/spring.factories +++ b/launchers/standalone/src/main/resources/META-INF/spring.factories @@ -86,5 +86,5 @@ com.tencent.supersonic.auth.api.authentication.adaptor.UserAdaptor=\ ### common SPIs -com.tencent.supersonic.common.util.embedding.S2EmbeddingStore=\ - com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore +dev.langchain4j.store.embedding.S2EmbeddingStore=\ + dev.langchain4j.store.embedding.InMemoryS2EmbeddingStore diff --git a/launchers/standalone/src/test/resources/META-INF/spring.factories b/launchers/standalone/src/test/resources/META-INF/spring.factories index eb2fc868f..4d61b8c89 100644 --- a/launchers/standalone/src/test/resources/META-INF/spring.factories +++ b/launchers/standalone/src/test/resources/META-INF/spring.factories @@ -66,5 +66,5 @@ com.tencent.supersonic.chat.server.processor.execute.ExecuteResultProcessor=\ com.tencent.supersonic.chat.server.processor.execute.DimensionRecommendProcessor,\ com.tencent.supersonic.chat.server.processor.execute.MetricRatioProcessor -com.tencent.supersonic.common.util.embedding.S2EmbeddingStore=\ - com.tencent.supersonic.common.util.embedding.InMemoryS2EmbeddingStore +dev.langchain4j.store.embedding.S2EmbeddingStore=\ + dev.langchain4j.store.embedding.InMemoryS2EmbeddingStore