-
Notifications
You must be signed in to change notification settings - Fork 168
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Feature][MetaData] Add metadata fetch execute page
- Loading branch information
Showing
16 changed files
with
391 additions
and
106 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
...es-server/src/main/java/io/datavines/server/api/controller/CatalogMetaDataController.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| /* | ||
| * 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.controller; | ||
|
|
||
| import io.datavines.core.aop.RefreshToken; | ||
| import io.datavines.core.constant.DataVinesConstants; | ||
| import io.datavines.server.repository.service.CatalogMetaDataFetchTaskService; | ||
| import io.swagger.annotations.Api; | ||
| import io.swagger.annotations.ApiOperation; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.http.MediaType; | ||
| import org.springframework.validation.annotation.Validated; | ||
| import org.springframework.web.bind.annotation.*; | ||
|
|
||
| @Api(value = "catalog", tags = "catalog", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @RestController | ||
| @RequestMapping(value = DataVinesConstants.BASE_API_PATH + "/catalog/metadata/task", produces = MediaType.APPLICATION_JSON_VALUE) | ||
| @RefreshToken | ||
| @Validated | ||
| public class CatalogMetaDataController { | ||
|
|
||
| @Autowired | ||
| private CatalogMetaDataFetchTaskService catalogMetaDataFetchTaskService; | ||
|
|
||
| @ApiOperation(value = "get job page") | ||
| @GetMapping(value = "/page") | ||
| public Object page(@RequestParam("datasourceId") Long datasourceId, | ||
| @RequestParam("pageNumber") Integer pageNumber, | ||
| @RequestParam("pageSize") Integer pageSize) { | ||
| return catalogMetaDataFetchTaskService.getFetchTaskPage(datasourceId, pageNumber, pageSize); | ||
| } | ||
| } |
58 changes: 58 additions & 0 deletions
58
...rver/src/main/java/io/datavines/server/api/dto/vo/catalog/CatalogMetaDataFetchTaskVO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
| * 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.catalog; | ||
|
|
||
| import com.fasterxml.jackson.annotation.JsonFormat; | ||
| import io.datavines.common.enums.ExecutionStatus; | ||
| import lombok.Data; | ||
|
|
||
| import java.io.Serializable; | ||
| import java.time.LocalDateTime; | ||
|
|
||
| @Data | ||
| public class CatalogMetaDataFetchTaskVO implements Serializable { | ||
|
|
||
| private static final long serialVersionUID = -1L; | ||
|
|
||
| private Long id; | ||
|
|
||
| private String type; | ||
|
|
||
| private String databaseName; | ||
|
|
||
| private String tableName; | ||
|
|
||
| private String executeHost; | ||
|
|
||
| private ExecutionStatus status; | ||
|
|
||
| @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") | ||
| private LocalDateTime submitTime; | ||
|
|
||
| @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") | ||
| private LocalDateTime scheduleTime; | ||
|
|
||
| @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") | ||
| private LocalDateTime startTime; | ||
|
|
||
| @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") | ||
| private LocalDateTime endTime; | ||
|
|
||
| public String getStatus() { | ||
| return status.getDescription(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
datavines-server/src/main/resources/mapper/CatalogMetaDataFetchTaskMapper.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <!-- | ||
| 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. | ||
| --> | ||
| <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > | ||
| <mapper namespace="io.datavines.server.repository.mapper.CatalogMetaDataFetchTaskMapper"> | ||
|
|
||
| <sql id="basic_sql"> | ||
| select * from dv_catalog_metadata_fetch_task | ||
| <where> | ||
| <if test="datasourceId != null"> | ||
| datasource_id = #{datasourceId} | ||
| </if> | ||
| </where> | ||
| </sql> | ||
|
|
||
| <select id="getJobExecutionPage" resultType="io.datavines.server.api.dto.vo.catalog.CatalogMetaDataFetchTaskVO"> | ||
| select p.id, p.type, p.execute_host, p.database_name, p.table_name, p.status, p.submit_time, p.start_time, p.end_time, p.schedule_time | ||
| from (<include refid="basic_sql"/>) p | ||
| order by p.update_time desc | ||
| </select> | ||
| </mapper> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.