xushiyan commented on code in PR #5064: URL: https://github.com/apache/hudi/pull/5064#discussion_r1070817124
########## hudi-platform-service/hudi-metaserver/hudi-metaserver-client/src/main/java/org/apache/hudi/common/table/HoodieTableMetaserverClient.java: ########## @@ -0,0 +1,162 @@ +/* + * 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 org.apache.hudi.common.table; + +import org.apache.hudi.common.config.HoodieMetaserverConfig; +import org.apache.hudi.common.fs.ConsistencyGuardConfig; +import org.apache.hudi.common.fs.FileSystemRetryConfig; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.timeline.HoodieActiveTimeline; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieMetaserverBasedTimeline; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.exception.HoodieException; +import org.apache.hudi.metaserver.client.HoodieMetaserverClient; +import org.apache.hudi.metaserver.client.HoodieMetaserverClientProxy; +import org.apache.hudi.metaserver.thrift.NoSuchObjectException; +import org.apache.hudi.metaserver.thrift.Table; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.security.UserGroupInformation; +import org.apache.log4j.LogManager; +import org.apache.log4j.Logger; + +import java.io.IOException; +import java.util.List; +import java.util.Set; + +import static org.apache.hudi.common.util.StringUtils.nonEmpty; +import static org.apache.hudi.common.util.ValidationUtils.checkArgument; + +/** + * HoodieTableMetaClient implementation for hoodie table whose metadata is stored in the hoodie metaserver. + */ +public class HoodieTableMetaserverClient extends HoodieTableMetaClient { + private static final Logger LOG = LogManager.getLogger(HoodieTableMetaserverClient.class); + + private final String databaseName; + private final String tableName; + private final Table table; + private final HoodieMetaserverClient metaserverClient; + + public HoodieTableMetaserverClient(Configuration conf, ConsistencyGuardConfig consistencyGuardConfig, + String mergerStrategy, FileSystemRetryConfig fileSystemRetryConfig, + String databaseName, String tableName, HoodieMetaserverConfig config) { + super(conf, config.getString(HoodieWriteConfig.BASE_PATH), false, consistencyGuardConfig, Option.of(TimelineLayoutVersion.CURR_LAYOUT_VERSION), + config.getString(HoodieTableConfig.PAYLOAD_CLASS_NAME), mergerStrategy, fileSystemRetryConfig); + checkArgument(nonEmpty(databaseName), "database name is required."); + checkArgument(nonEmpty(tableName), "table name is required."); + this.databaseName = databaseName; + this.tableName = tableName; + this.metaserverConfig = config; + this.metaserverClient = HoodieMetaserverClientProxy.getProxy(config); + this.table = initOrGetTable(databaseName, tableName, config); + // TODO: transfer table parameters to table config + this.tableConfig = new HoodieTableConfig(); + tableConfig.setTableVersion(HoodieTableVersion.current()); + tableConfig.setAll(config.getProps()); + } + + private Table initOrGetTable(String db, String tb, HoodieMetaserverConfig config) { + Table table; + try { + table = metaserverClient.getTable(databaseName, tableName); + } catch (HoodieException e) { + if (e.getCause() instanceof NoSuchObjectException) { + String user = ""; + try { + user = UserGroupInformation.getCurrentUser().getShortUserName(); + } catch (IOException ioException) { + LOG.info("Failed to get the user", ioException); + } + LOG.info(String.format("Table %s.%s doesn't exist, will create it.", db, tb)); + table = new Table(); + table.setDbName(db); Review Comment: setDatabaseName() ########## hudi-platform-service/hudi-metaserver/hudi-metaserver-server/src/main/java/org/apache/hudi/metaserver/store/bean/TableBean.java: ########## @@ -0,0 +1,124 @@ +/* + * 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 org.apache.hudi.metaserver.store.bean; + +import org.apache.hudi.metaserver.thrift.Table; + +import java.sql.Timestamp; + +/** + * Table entity for store. + */ +public class TableBean { + private String dbName; Review Comment: use `databaseName`; pls review all occurrences ########## hudi-platform-service/hudi-metaserver/hudi-metaserver-server/src/main/java/org/apache/hudi/metaserver/store/jdbc/BatchDaoOperation.java: ########## @@ -0,0 +1,74 @@ +/* + * 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 org.apache.hudi.metaserver.store.jdbc; + +public class BatchDaoOperation { + + public static final String OPERATION_TYPE_INSERT = "INSERT"; + public static final String OPERATION_TYPE_UPDATE = "UPDATE"; + public static final String OPERATION_TYPE_DELETE = "DELETE"; + + private String namespace; + private String sqlID; + private Object parameter; + private String operationType; + + public BatchDaoOperation(String namespace, String sqlID, Object parameter, String operationType) { + this.namespace = namespace; + this.sqlID = sqlID; + this.parameter = parameter; + this.operationType = operationType; + } + + public BatchDaoOperation(String sqlID, Object parameter, String operationType) { + this(null, sqlID, parameter, operationType); Review Comment: namespace is nullable? let's avoid passing null around by making Option<String> namespace ########## hudi-platform-service/hudi-metaserver/hudi-metaserver-server/src/main/java/org/apache/hudi/metaserver/store/RelationalDBBasedStorage.java: ########## @@ -0,0 +1,240 @@ +/* + * 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 org.apache.hudi.metaserver.store; + +import org.apache.hudi.metaserver.store.bean.InstantBean; +import org.apache.hudi.metaserver.store.bean.TableBean; +import org.apache.hudi.metaserver.store.jdbc.WrapperDao; +import org.apache.hudi.metaserver.thrift.MetaserverStorageException; +import org.apache.hudi.metaserver.thrift.THoodieInstant; +import org.apache.hudi.metaserver.thrift.TState; +import org.apache.hudi.metaserver.thrift.Table; + +import java.io.Serializable; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static org.apache.hudi.common.util.CollectionUtils.isNullOrEmpty; +import static org.apache.hudi.common.util.ValidationUtils.checkState; + +/** + * Metadata store based on relation database. + */ +public class RelationalDBBasedStorage implements MetaserverStorage, Serializable { + + private final WrapperDao tableDao = new WrapperDao.TableDao(); + private final WrapperDao timelineDao = new WrapperDao.TimelineDao(); + + @Override + public void initStorage() throws MetaserverStorageException { + WrapperDao dao = new WrapperDao("DDLMapper"); + dao.updateBySql("createDBs", null); + dao.updateBySql("createTables", null); + dao.updateBySql("createTableParams", null); + dao.updateBySql("createPartitions", null); + dao.updateBySql("createTableTimestamp", null); + dao.updateBySql("createInstant", null); + dao.updateBySql("createInstantMetadata", null); + dao.updateBySql("createFiles", null); + } + + @Override + public boolean createDatabase(String db) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("databaseName", db); + return tableDao.insertBySql("insertDB", params) == 1; + } + + @Override + public Long getDatabaseId(String db) throws MetaserverStorageException { + List<Long> ids = tableDao.queryForListBySql("selectDBId", db); + validate(ids, "db " + db); + return ids.isEmpty() ? null : ids.get(0); + } + + @Override + public boolean createTable(Long dbId, Table table) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("dbId", dbId); + TableBean tableBean = new TableBean(table); + params.put("tableBean", tableBean); + return tableDao.insertBySql("insertTable", params) == 1; + } + + @Override + public Table getTable(String db, String tb) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("databaseName", db); + params.put("tableName", tb); + List<TableBean> table = tableDao.queryForListBySql("selectTable", params); + validate(table, "table " + db + "." + tb); + return table.isEmpty() ? null : table.get(0).toTable(); + } + + @Override + public Long getTableId(String db, String tb) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("databaseName", db); + params.put("tableName", tb); + List<Long> ids = tableDao.queryForListBySql("selectTableId", params); + validate(ids, "table " + db + "." + tb); + return ids.isEmpty() ? null : ids.get(0); + } + + @Override + public String createNewTimestamp(long tableId) throws MetaserverStorageException { + // todo: support SSS + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); Review Comment: should actually reuse the format from the existing constant. And make millisecond first supported. ########## hudi-platform-service/hudi-metaserver/hudi-metaserver-server/src/main/java/org/apache/hudi/metaserver/service/HoodieMetaserverService.java: ########## @@ -0,0 +1,87 @@ +/* + * 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 org.apache.hudi.metaserver.service; + +import org.apache.hudi.metaserver.thrift.HoodieInstantChangeResult; +import org.apache.hudi.metaserver.thrift.THoodieInstant; +import org.apache.hudi.metaserver.thrift.Table; +import org.apache.hudi.metaserver.thrift.ThriftHoodieMetaserver; +import org.apache.thrift.TException; + +import java.io.Serializable; +import java.nio.ByteBuffer; +import java.util.List; + +/** + * A proxy for meta server, accepts all thrift calls and routes them to the corresponding service. + */ +public class HoodieMetaserverService implements ThriftHoodieMetaserver.Iface, Serializable { Review Comment: MetaserverGateway sounds better ########## hudi-platform-service/hudi-metaserver/hudi-metaserver-server/src/main/java/org/apache/hudi/metaserver/store/RelationalDBBasedStorage.java: ########## @@ -0,0 +1,240 @@ +/* + * 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 org.apache.hudi.metaserver.store; + +import org.apache.hudi.metaserver.store.bean.InstantBean; +import org.apache.hudi.metaserver.store.bean.TableBean; +import org.apache.hudi.metaserver.store.jdbc.WrapperDao; +import org.apache.hudi.metaserver.thrift.MetaserverStorageException; +import org.apache.hudi.metaserver.thrift.THoodieInstant; +import org.apache.hudi.metaserver.thrift.TState; +import org.apache.hudi.metaserver.thrift.Table; + +import java.io.Serializable; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import static org.apache.hudi.common.util.CollectionUtils.isNullOrEmpty; +import static org.apache.hudi.common.util.ValidationUtils.checkState; + +/** + * Metadata store based on relation database. + */ +public class RelationalDBBasedStorage implements MetaserverStorage, Serializable { + + private final WrapperDao tableDao = new WrapperDao.TableDao(); + private final WrapperDao timelineDao = new WrapperDao.TimelineDao(); + + @Override + public void initStorage() throws MetaserverStorageException { + WrapperDao dao = new WrapperDao("DDLMapper"); + dao.updateBySql("createDBs", null); + dao.updateBySql("createTables", null); + dao.updateBySql("createTableParams", null); + dao.updateBySql("createPartitions", null); + dao.updateBySql("createTableTimestamp", null); + dao.updateBySql("createInstant", null); + dao.updateBySql("createInstantMetadata", null); + dao.updateBySql("createFiles", null); + } + + @Override + public boolean createDatabase(String db) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("databaseName", db); + return tableDao.insertBySql("insertDB", params) == 1; + } + + @Override + public Long getDatabaseId(String db) throws MetaserverStorageException { + List<Long> ids = tableDao.queryForListBySql("selectDBId", db); + validate(ids, "db " + db); + return ids.isEmpty() ? null : ids.get(0); + } + + @Override + public boolean createTable(Long dbId, Table table) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("dbId", dbId); + TableBean tableBean = new TableBean(table); + params.put("tableBean", tableBean); + return tableDao.insertBySql("insertTable", params) == 1; + } + + @Override + public Table getTable(String db, String tb) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("databaseName", db); + params.put("tableName", tb); + List<TableBean> table = tableDao.queryForListBySql("selectTable", params); + validate(table, "table " + db + "." + tb); + return table.isEmpty() ? null : table.get(0).toTable(); + } + + @Override + public Long getTableId(String db, String tb) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("databaseName", db); + params.put("tableName", tb); + List<Long> ids = tableDao.queryForListBySql("selectTableId", params); + validate(ids, "table " + db + "." + tb); + return ids.isEmpty() ? null : ids.get(0); + } + + @Override + public String createNewTimestamp(long tableId) throws MetaserverStorageException { + // todo: support SSS + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + String oldTimestamp; + String newTimestamp; + boolean success; + try { + do { + oldTimestamp = getLatestTimestamp(tableId); + newTimestamp = oldTimestamp == null + ? sdf.format(new Date()) + : sdf.format(Math.max(new Date().getTime(), sdf.parse(oldTimestamp).getTime() + 1000)); + Map<String, Object> params = new HashMap<>(); + params.put("tableId", tableId); + params.put("oldTimestamp", oldTimestamp); + params.put("newTimestamp", newTimestamp); + if (oldTimestamp == null) { + success = timelineDao.insertBySql("insertTimestamp", params) == 1; + } else { + success = timelineDao.updateBySql("updateTimestamp", params) == 1; + } + } while (!success); + } catch (ParseException e) { + throw new MetaserverStorageException("Fail to parse the timestamp, " + e.getMessage()); + } + return newTimestamp; + } + + private String getLatestTimestamp(long tableId) throws MetaserverStorageException { + List<String> timestamps = timelineDao.queryForListBySql("selectTimestampByTableId", tableId); + validate(timestamps, "timestamp"); + return timestamps.isEmpty() ? null : timestamps.get(0); + } + + @Override + public boolean createInstant(long tableId, THoodieInstant instant) throws MetaserverStorageException { + InstantBean instantBean = new InstantBean(tableId, instant); + Map<String, Object> params = new HashMap<>(); + params.put("instant", instantBean); + // todo: support heartbeat + params.put("duration", 120); + params.put("startTs", (int) (System.currentTimeMillis() / 1000L)); + return timelineDao.insertBySql("insertInstant", params) == 1; + } + + @Override + public boolean updateInstant(long tableId, THoodieInstant fromInstant, THoodieInstant toInstant) throws MetaserverStorageException { + InstantBean oldInstant = new InstantBean(tableId, fromInstant); + InstantBean newInstant = new InstantBean(tableId, toInstant); + Map<String, Object> params = new HashMap<>(); + params.put("oldInstant", oldInstant); + params.put("newInstant", newInstant); + return timelineDao.updateBySql("updateInstant", params) == 1; + } + + @Override + public boolean deleteInstant(long tableId, THoodieInstant instant) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("tableId", tableId); + params.put("ts", instant.getTimestamp()); + return timelineDao.deleteBySql("deleteInstant", params) == 1; + } + + @Override + public List<THoodieInstant> scanInstants(long tableId, List<TState> states, int limit) throws MetaserverStorageException { + if (isNullOrEmpty(states)) { + throw new MetaserverStorageException("State has to be specified when scan instants"); + } + Map<String, Object> params = new HashMap<>(); + params.put("tableId", tableId); + params.put("states", states.stream().mapToInt(TState::getValue).boxed().collect(Collectors.toList())); + params.put("limit", limit); + List<InstantBean> instantBeans = timelineDao.queryForListBySql("selectInstantsByStates", params); + return instantBeans.stream().map(InstantBean::toTHoodieInstant).collect(Collectors.toList()); + } + + @Override + public List<THoodieInstant> scanInstants(long tableId, TState state, int limit) throws MetaserverStorageException { + return scanInstants(tableId, Collections.singletonList(state), limit); + } + + @Override + public boolean instantExists(long tableId, THoodieInstant instant) throws MetaserverStorageException { + InstantBean instantBean = new InstantBean(tableId, instant); + List<Long> ids = timelineDao.queryForListBySql("selectInstantId", instantBean); + validate(ids, instantBean.toString()); + return !ids.isEmpty(); + } + + // todo: check correctness + @Override + public void saveInstantMetadata(long tableId, THoodieInstant instant, byte[] metadata) throws MetaserverStorageException { + InstantBean instantBean = new InstantBean(tableId, instant); + Map<String, Object> params = new HashMap<>(); + params.put("instant", instantBean); + params.put("metadata", metadata); + // todo: array bytes to longblob + timelineDao.insertBySql("insertInstantMetadata", params); + } + + @Override + public boolean deleteInstantMetadata(long tableId, THoodieInstant instant) throws MetaserverStorageException { + InstantBean instantBean = new InstantBean(tableId, instant); + return timelineDao.deleteBySql("deleteInstantMetadata", instantBean) == 1; + } + + @Override + public boolean deleteInstantAllMeta(long tableId, String timestamp) throws MetaserverStorageException { + Map<String, Object> params = new HashMap<>(); + params.put("tableId", tableId); + params.put("ts", timestamp); + return timelineDao.deleteBySql("deleteInstantAllMetadata", params) >= 1; + } + + @Override + public byte[] getInstantMetadata(long tableId, THoodieInstant instant) throws MetaserverStorageException { Review Comment: the other interface is using Option<byte[]>. we should align them for consistency ########## hudi-platform-service/hudi-metaserver/src/main/thrift/hudi-metaserver.thrift: ########## @@ -0,0 +1,100 @@ +/* + * 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. + */ + + namespace java org.apache.hudi.metaserver.thrift + + // table related + struct Table { + 1: string tableName, + 2: string dbName, Review Comment: `databaseName` -- 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]
