Skip to content

Commit 973109a

Browse files
committed
fix compile
1 parent 4b71087 commit 973109a

5 files changed

Lines changed: 12 additions & 29 deletions

File tree

be/src/core/column/predicate_column.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,7 @@ class PredicateColumnType final : public COWHelper<IColumn, PredicateColumnType<
325325
for (size_t i = 0; i < n; i++) {
326326
memcpy(dst, str.data(), str.size());
327327
insert_string_value(dst, str.size());
328-
dst += i * str.size();
328+
dst += str.size();
329329
}
330330
} else if constexpr (Type == TYPE_LARGEINT) {
331331
const auto& v = x.get<TYPE_LARGEINT>();

be/src/exprs/aggregate/aggregate_function_ai_agg.h

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,7 @@ class AggregateFunctionAIAggData {
4343

4444
void add(StringRef ref) {
4545
auto delta_size = ref.size + (inited ? SEPARATOR_SIZE : 0);
46-
if (handle_overflow(delta_size)) {
47-
throw Exception(ErrorCode::OUT_OF_BOUND,
48-
"Failed to add data: combined context size exceeded "
49-
"maximum limit even after processing");
50-
}
46+
handle_overflow(delta_size);
5147
append_data(ref.data, ref.size);
5248
}
5349

@@ -60,11 +56,7 @@ class AggregateFunctionAIAggData {
6056
_task = rhs._task;
6157

6258
size_t delta_size = (inited ? SEPARATOR_SIZE : 0) + rhs.data.size();
63-
if (handle_overflow(delta_size)) {
64-
throw Exception(ErrorCode::OUT_OF_BOUND,
65-
"Failed to merge data: combined context size exceeded "
66-
"maximum limit even after processing");
67-
}
59+
handle_overflow(delta_size);
6860

6961
if (!inited) {
7062
inited = true;
@@ -159,7 +151,7 @@ class AggregateFunctionAIAggData {
159151
const std::string& get_task() const { return _task; }
160152

161153
#ifdef BE_TEST
162-
static void normalize_endpoint_for_test(TAIResource& config) { normalize_endpoint(config); }
154+
static void normalize_endpoint_for_test(AIResource& config) { normalize_endpoint(config); }
163155
#endif
164156

165157
private:
@@ -195,17 +187,14 @@ class AggregateFunctionAIAggData {
195187
return client->execute_post_request(request_body, &response);
196188
}
197189

198-
// handle overflow situations when adding content.
199-
bool handle_overflow(size_t additional_size) {
190+
// Treat the context window as a soft batching trigger instead of a hard reject.
191+
void handle_overflow(size_t additional_size) {
200192
const size_t max_context_size = get_ai_context_window_size();
201-
if (additional_size + data.size() <= max_context_size) {
202-
return false;
193+
if (additional_size + data.size() <= max_context_size || !inited) {
194+
return;
203195
}
204196

205197
process_current_context();
206-
207-
// check if there is still an overflow after replacement.
208-
return (additional_size + data.size() > max_context_size);
209198
}
210199

211200
static size_t get_ai_context_window_size() {
@@ -214,7 +203,7 @@ class AggregateFunctionAIAggData {
214203
return static_cast<size_t>(_ctx->query_options().ai_context_window_size);
215204
}
216205

217-
static void normalize_endpoint(TAIResource& config) {
206+
static void normalize_endpoint(AIResource& config) {
218207
if (iequal(config.provider_type, "GEMINI")) {
219208
if (!config.endpoint.ends_with("v1") && !config.endpoint.ends_with("v1beta")) {
220209
return;

be/src/exprs/function/ai/ai_adapter.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,6 @@ class VoyageAIAdapter : public AIAdapter {
273273
}
274274

275275
Status build_embedding_request(const std::vector<std::string>& inputs,
276-
const std::vector<std::string>& /*media_content_types*/,
277276
std::string& request_body) const override {
278277
rapidjson::Document doc;
279278
doc.SetObject();
@@ -503,7 +502,6 @@ class LocalAdapter : public AIAdapter {
503502
}
504503

505504
Status build_embedding_request(const std::vector<std::string>& inputs,
506-
const std::vector<std::string>& /*media_content_types*/,
507505
std::string& request_body) const override {
508506
rapidjson::Document doc;
509507
doc.SetObject();
@@ -909,7 +907,6 @@ class OpenAIAdapter : public VoyageAIAdapter {
909907
class DeepSeekAdapter : public OpenAIAdapter {
910908
public:
911909
Status build_embedding_request(const std::vector<std::string>& inputs,
912-
const std::vector<std::string>& /*media_content_types*/,
913910
std::string& request_body) const override {
914911
return embed_not_supported_status();
915912
}
@@ -923,7 +920,6 @@ class DeepSeekAdapter : public OpenAIAdapter {
923920
class MoonShotAdapter : public OpenAIAdapter {
924921
public:
925922
Status build_embedding_request(const std::vector<std::string>& inputs,
926-
const std::vector<std::string>& /*media_content_types*/,
927923
std::string& request_body) const override {
928924
return embed_not_supported_status();
929925
}
@@ -937,7 +933,6 @@ class MoonShotAdapter : public OpenAIAdapter {
937933
class MinimaxAdapter : public OpenAIAdapter {
938934
public:
939935
Status build_embedding_request(const std::vector<std::string>& inputs,
940-
const std::vector<std::string>& /*media_content_types*/,
941936
std::string& request_body) const override {
942937
rapidjson::Document doc;
943938
doc.SetObject();
@@ -1269,7 +1264,6 @@ class GeminiAdapter : public AIAdapter {
12691264
}
12701265

12711266
Status build_embedding_request(const std::vector<std::string>& inputs,
1272-
const std::vector<std::string>& /*media_content_types*/,
12731267
std::string& request_body) const override {
12741268
rapidjson::Document doc;
12751269
doc.SetObject();

be/test/ai/aggregate_function_ai_agg_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ TEST_F(AggregateFunctionAIAggTest, ai_context_window_size_session_variable_test)
425425
}
426426

427427
TEST_F(AggregateFunctionAIAggTest, gemini_endpoint_normalize_to_generate_content_test) {
428-
TAIResource resource;
428+
AIResource resource;
429429
resource.provider_type = "GEMINI";
430430
resource.model_name = "gemini-pro";
431431
resource.endpoint = "https://generativelanguage.googleapis.com/v1beta";
@@ -435,7 +435,7 @@ TEST_F(AggregateFunctionAIAggTest, gemini_endpoint_normalize_to_generate_content
435435
}
436436

437437
TEST_F(AggregateFunctionAIAggTest, openai_completions_endpoint_normalize_test) {
438-
TAIResource resource;
438+
AIResource resource;
439439
resource.provider_type = "OPENAI";
440440
resource.endpoint = "https://api.openai.com/v1/completions";
441441
AggregateFunctionAIAggData::normalize_endpoint_for_test(resource);

fe/fe-core/src/test/java/org/apache/doris/qe/SessionVariablesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import org.apache.doris.analysis.IntLiteral;
2121
import org.apache.doris.analysis.SetType;
2222
import org.apache.doris.analysis.SetVar;
23-
import org.apache.doris.common.DdlException;
2423
import org.apache.doris.common.Config;
24+
import org.apache.doris.common.DdlException;
2525
import org.apache.doris.common.FeConstants;
2626
import org.apache.doris.nereids.parser.NereidsParser;
2727
import org.apache.doris.utframe.TestWithFeService;

0 commit comments

Comments
 (0)