[fix][headless]Fix issue in determining mysql version to support with statement.

This commit is contained in:
jerryjzhang
2024-12-21 22:50:55 +08:00
parent 8c6ae62522
commit 5de5b0a5e2
2 changed files with 2 additions and 2 deletions

View File

@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration @Configuration
public class ExecutorConfig { public class ExecutorConfig {
@Value("${s2.metricParser.agg.mysql.lowVersion:5.7}") @Value("${s2.metricParser.agg.mysql.lowVersion:8.0}")
private String mysqlLowVersion; private String mysqlLowVersion;
@Value("${s2.metricParser.agg.ck.lowVersion:20.4}") @Value("${s2.metricParser.agg.ck.lowVersion:20.4}")

View File

@@ -260,7 +260,7 @@ public class SqlGenerateUtils {
public boolean isSupportWith(EngineType engineTypeEnum, String version) { public boolean isSupportWith(EngineType engineTypeEnum, String version) {
if (engineTypeEnum.equals(EngineType.MYSQL) && Objects.nonNull(version) if (engineTypeEnum.equals(EngineType.MYSQL) && Objects.nonNull(version)
&& version.startsWith(executorConfig.getMysqlLowVersion())) { && StringUtil.compareVersion(version, executorConfig.getMysqlLowVersion()) < 0) {
return false; return false;
} }
if (engineTypeEnum.equals(EngineType.CLICKHOUSE) && Objects.nonNull(version) if (engineTypeEnum.equals(EngineType.CLICKHOUSE) && Objects.nonNull(version)