SteNicholas commented on code in PR #100:
URL:
https://github.com/apache/incubator-paimon-webui/pull/100#discussion_r1408689872
##########
paimon-web-api/src/main/java/org/apache/paimon/web/api/catalog/PaimonServiceFactory.java:
##########
@@ -26,15 +26,30 @@
import org.apache.commons.lang3.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
+
/** Paimon service factory. */
public class PaimonServiceFactory {
- public static PaimonService createFileSystemCatalogService(String name,
String warehouse) {
+ public static PaimonService createFileSystemCatalogService(
+ String name, String warehouse, Map<String, String> catalogOptions)
{
+ if (catalogOptions == null) {
+ catalogOptions = new HashMap<>();
+ }
Options options = new Options();
options.set(CatalogProperties.WAREHOUSE, warehouse + "/" + name);
-
+ String fileSystemType = catalogOptions.get("fileSystemType");
+ if ("s3".equals(fileSystemType)) {
Review Comment:
What's the behavior of other filesystem type?
##########
paimon-web-server/src/test/resources/application.yml:
##########
@@ -0,0 +1,67 @@
+# 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.
+
+# Paimon Web Service Port
+server:
+ port: 10088
+
+spring:
+ # Paimon Web Service Name
+ application:
+ name: Paimon-Web-UI
+ profiles:
+ active: dev-h2
+ messages:
+ basename: i18n/messages
+ encoding: UTF-8
+
+ # mvc config
+ mvc:
+ pathmatch:
+ # Path matching strategy, default ant_path_matcher, support
ant_path_matcher and path_pattern_parser
+ matching-strategy: ant_path_matcher
+ format:
+ date: yyyy-MM-dd HH:mm:ss # date format
+ time: HH:mm:ss # time format
+ date-time: yyyy-MM-dd HH:mm:ss # date-time format
+
+ # json format global configuration
+ jackson:
+ time-zone: GMT+8 # Time zone, default is GMT+8
+ date-format: yyyy-MM-dd HH:mm:ss # Date format, the default is yyyy-MM-dd
HH:mm:ss
+
+mybatis-plus:
+ mapperLocations: classpath*:mapper/*Mapper.xml
+ global-config:
+ banner: false
+ db-config:
+ logic-delete-field: is_delete
+ configuration:
+ log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
+ # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+
+sa-token:
+ token-name: ${spring.application.name}
+ timeout: 2592000
Review Comment:
Why does this set timeout to 2592000?
##########
paimon-web-api/src/main/java/org/apache/paimon/web/api/catalog/PaimonServiceFactory.java:
##########
@@ -26,15 +26,30 @@
import org.apache.commons.lang3.StringUtils;
+import java.util.HashMap;
+import java.util.Map;
+
/** Paimon service factory. */
public class PaimonServiceFactory {
- public static PaimonService createFileSystemCatalogService(String name,
String warehouse) {
+ public static PaimonService createFileSystemCatalogService(
+ String name, String warehouse, Map<String, String> catalogOptions)
{
+ if (catalogOptions == null) {
+ catalogOptions = new HashMap<>();
Review Comment:
When `catalogOptions` is null, does the logic need to consider the
filesystem type?
##########
paimon-web-server/src/main/java/org/apache/paimon/web/server/data/dto/CatalogDTO.java:
##########
@@ -33,9 +35,21 @@ public class CatalogDTO {
private String warehouse;
- private String hiveUri;
-
- private String hiveConfDir;
+ private HashMap<String, String> options;
Review Comment:
```suggestion
private Map<String, String> options;
```
##########
paimon-web-server/src/main/resources/db/ddl-h2.sql:
##########
@@ -105,17 +105,21 @@ CREATE TABLE if not exists `role_menu`
CREATE TABLE if not exists `catalog`
(
- `id` int(11) not null primary key comment 'id',
- `catalog_type` varchar(50) not null comment 'catalog type',
- `catalog_name` varchar(100) not null comment 'catalog name',
- `warehouse` varchar(200) not null comment 'warehouse',
- `hive_uri` varchar(200) comment 'hive uri',
- `hive_conf_dir` varchar(100) comment 'catalog name',
- `is_delete` tinyint(1) NOT NULL DEFAULT 0 COMMENT 'is delete',
- `create_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'create
time',
- `update_time` datetime(0) NULL DEFAULT CURRENT_TIMESTAMP COMMENT 'update
time'
+ id int not null comment 'id'
+ primary key,
+ catalog_type varchar(50) not null comment
'catalog type',
+ catalog_name varchar(100) not null comment
'catalog name',
+ warehouse varchar(200) not null comment
'warehouse',
+ hive_uri varchar(200) null comment 'hive uri',
+ hive_conf_dir varchar(100) null comment 'catalog
name',
+ is_delete tinyint(1) default 0 not null comment 'is
delete',
+ create_time datetime default CURRENT_TIMESTAMP null comment 'create
time',
+ update_time datetime default CURRENT_TIMESTAMP null comment 'update
time',
+ options varchar(512) null
) engine = innodb;
Review Comment:
Any changes?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
