diff --git a/datavines-engine/datavines-engine-plugins/datavines-engine-local/datavines-engine-local-config/src/main/java/io/datavines/engine/local/config/LocalMultiTableAccuracyMetricBuilder.java b/datavines-engine/datavines-engine-plugins/datavines-engine-local/datavines-engine-local-config/src/main/java/io/datavines/engine/local/config/LocalMultiTableAccuracyMetricBuilder.java index b87ce99a9..8621e4fea 100644 --- a/datavines-engine/datavines-engine-plugins/datavines-engine-local/datavines-engine-local-config/src/main/java/io/datavines/engine/local/config/LocalMultiTableAccuracyMetricBuilder.java +++ b/datavines-engine/datavines-engine-plugins/datavines-engine-local/datavines-engine-local-config/src/main/java/io/datavines/engine/local/config/LocalMultiTableAccuracyMetricBuilder.java @@ -112,7 +112,7 @@ public void buildSinkConfigs() throws DataVinesException { ConnectorParameter connectorParameter = jobExecutionParameter.getConnectorParameter(); ConnectorFactory connectorFactory = PluginLoader .getPluginLoader(ConnectorFactory.class) - .getNewPlugin(connectorParameter.getType()); + .getNewPlugin(jobExecutionInfo.getErrorDataStorageType()); if (connectorFactory == null) { return; diff --git a/datavines-metric/datavines-metric-plugins/datavines-metric-multi-table-accuracy/src/main/java/io/datavines/metric/plugin/MultiTableAccuracy.java b/datavines-metric/datavines-metric-plugins/datavines-metric-multi-table-accuracy/src/main/java/io/datavines/metric/plugin/MultiTableAccuracy.java index eb083808b..55451a4b6 100644 --- a/datavines-metric/datavines-metric-plugins/datavines-metric-multi-table-accuracy/src/main/java/io/datavines/metric/plugin/MultiTableAccuracy.java +++ b/datavines-metric/datavines-metric-plugins/datavines-metric-multi-table-accuracy/src/main/java/io/datavines/metric/plugin/MultiTableAccuracy.java @@ -79,11 +79,11 @@ public CheckResult validateConfig(Map config) { @Override public void prepare(Map config) { if (config.containsKey("filter")) { - sourceTableSql.append("WHERE (${filter})"); + sourceTableSql.append(" WHERE (${filter}) "); } if (config.containsKey("filter2")) { - targetTableSql.append("WHERE (${filter2})"); + targetTableSql.append(" WHERE (${filter2}) "); } invalidateItemsSql diff --git a/datavines-server/src/main/java/io/datavines/server/api/dto/vo/JobExecutionStat.java b/datavines-server/src/main/java/io/datavines/server/api/dto/vo/JobExecutionStat.java index 9ba0dde13..6da96a946 100644 --- a/datavines-server/src/main/java/io/datavines/server/api/dto/vo/JobExecutionStat.java +++ b/datavines-server/src/main/java/io/datavines/server/api/dto/vo/JobExecutionStat.java @@ -1,3 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package io.datavines.server.api.dto.vo; diff --git a/datavines-server/src/main/resources/mapper/JobMapper.xml b/datavines-server/src/main/resources/mapper/JobMapper.xml index 935a3929b..75713879a 100644 --- a/datavines-server/src/main/resources/mapper/JobMapper.xml +++ b/datavines-server/src/main/resources/mapper/JobMapper.xml @@ -42,22 +42,22 @@ left join `dv_job_schedule` s on p.id = s.job_id and s.status = 1 - LOWER(p.`name`) LIKE CONCAT(CONCAT('%', LOWER(#{searchVal})), '%') + AND LOWER(p.`name`) LIKE CONCAT(CONCAT('%', LOWER(#{searchVal})), '%') - LOWER(p.schema_name) LIKE CONCAT(CONCAT('%', LOWER(#{schemaSearch})), '%') + AND LOWER(p.schema_name) LIKE CONCAT(CONCAT('%', LOWER(#{schemaSearch})), '%') - LOWER(p.table_name) LIKE CONCAT(CONCAT('%', LOWER(#{tableSearch})), '%') + AND LOWER(p.table_name) LIKE CONCAT(CONCAT('%', LOWER(#{tableSearch})), '%') - LOWER(p.column_name) LIKE CONCAT(CONCAT('%', LOWER(#{columnSearch})), '%') + AND LOWER(p.column_name) LIKE CONCAT(CONCAT('%', LOWER(#{columnSearch})), '%') - and p.update_time >= #{startTime} + AND p.update_time >= #{startTime} - and p.update_time <= #{endTime} + AND p.update_time <= #{endTime} order by p.update_time desc diff --git a/datavines-ui/src/view/Main/HomeDetail/Jobs/JobsList.tsx b/datavines-ui/src/view/Main/HomeDetail/Jobs/JobsList.tsx index 32e651cd6..a3c4732bc 100644 --- a/datavines-ui/src/view/Main/HomeDetail/Jobs/JobsList.tsx +++ b/datavines-ui/src/view/Main/HomeDetail/Jobs/JobsList.tsx @@ -296,23 +296,24 @@ const Jobs = ({ datasourceId }: TJobs) => { return (
- {/* {intl.formatMessage({ id: 'jobs_list' })} */}
{/**/}
- - - + - + + + + @@ -322,7 +323,7 @@ const Jobs = ({ datasourceId }: TJobs) => { /> - @@ -331,7 +332,8 @@ const Jobs = ({ datasourceId }: TJobs) => { autoComplete="off" /> - @@ -340,28 +342,26 @@ const Jobs = ({ datasourceId }: TJobs) => { autoComplete="off" /> - - - {Date} - {/**/} + {intl.formatMessage({ id: 'jobs_schedule_time_to' })} + {Date} -