davidzollo commented on code in PR #9872: URL: https://github.com/apache/seatunnel/pull/9872#discussion_r2383988517
########## seatunnel-connectors-v2/connector-iotdb-v2/src/main/java/org/apache/seatunnel/connectors/seatunnel/iotdbv2/source/IoTDBv2SourceSplitEnumerator.java: ########## @@ -0,0 +1,261 @@ +/* + * 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.seatunnel.connectors.seatunnel.iotdbv2.source; + +import org.apache.seatunnel.shade.com.google.common.base.Strings; + +import org.apache.seatunnel.api.configuration.ReadonlyConfig; +import org.apache.seatunnel.api.source.SourceSplitEnumerator; +import org.apache.seatunnel.common.exception.CommonErrorCodeDeprecated; +import org.apache.seatunnel.connectors.seatunnel.iotdbv2.exception.IotdbConnectorException; +import org.apache.seatunnel.connectors.seatunnel.iotdbv2.state.IoTDBv2SourceState; + +import lombok.extern.slf4j.Slf4j; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.config.IoTDBv2SourceOptions.LOWER_BOUND; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.config.IoTDBv2SourceOptions.NUM_PARTITIONS; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.config.IoTDBv2SourceOptions.SQL; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.config.IoTDBv2SourceOptions.UPPER_BOUND; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.constant.SourceConstants.DEFAULT_PARTITIONS; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.constant.SourceConstants.SQL_ALIGN; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.constant.SourceConstants.SQL_WHERE; +import static shaded.org.apache.tsfile.common.constant.QueryConstant.RESERVED_TIME; + +@Slf4j +public class IoTDBv2SourceSplitEnumerator + implements SourceSplitEnumerator<IoTDBv2SourceSplit, IoTDBv2SourceState> { + + /** + * A SQL statement can contain at most one where We split the SQL using the where keyword + * Therefore, it can be split into two SQL at most + */ + private static final int SQL_WHERE_SPLIT_LENGTH = 2; + + private final Object stateLock = new Object(); + private final Context<IoTDBv2SourceSplit> context; + private final ReadonlyConfig conf; + private final Map<Integer, List<IoTDBv2SourceSplit>> pendingSplit; + private volatile boolean shouldEnumerate; + + public IoTDBv2SourceSplitEnumerator( + SourceSplitEnumerator.Context<IoTDBv2SourceSplit> context, ReadonlyConfig conf) { + this(context, conf, null); + } + + public IoTDBv2SourceSplitEnumerator( + SourceSplitEnumerator.Context<IoTDBv2SourceSplit> context, + ReadonlyConfig conf, + IoTDBv2SourceState sourceState) { + this.context = context; + this.conf = conf; + this.pendingSplit = new HashMap<>(); + this.shouldEnumerate = sourceState == null; + if (sourceState != null) { + this.shouldEnumerate = sourceState.isShouldEnumerate(); + this.pendingSplit.putAll(sourceState.getPendingSplit()); + } + } + + @Override + public void open() {} + + @Override + public void run() { + Set<Integer> readers = context.registeredReaders(); + if (shouldEnumerate) { + Set<IoTDBv2SourceSplit> newSplits = getIotDBSplit(); + + synchronized (stateLock) { + addPendingSplit(newSplits); + shouldEnumerate = false; + } + + assignSplit(readers); + } + + log.debug( + "No more splits to assign." + " Sending NoMoreSplitsEvent to reader {}.", readers); + readers.forEach(context::signalNoMoreSplits); + } + + /** + * split the time range into numPartitions parts if numPartitions is 1, use the whole time range + * if numPartitions < (end - start), use (start-end) partitions + * + * <p>eg: start = 1, end = 10, numPartitions = 2 sql = "select * from test where age > 0 and age + * < 10" + * + * <p>split result + * + * <p>split 1: select * from test where (time >= 1 and time < 6) and ( age > 0 and age < 10 ) + * + * <p>split 2: select * from test where (time >= 6 and time < 11) and ( age > 0 and age < 10 ) + */ + private Set<IoTDBv2SourceSplit> getIotDBSplit() { + String sql = conf.get(SQL); + Set<IoTDBv2SourceSplit> iotDBSourceSplits = new HashSet<>(); + // no need numPartitions, use one partition + if (!conf.getOptional(NUM_PARTITIONS).isPresent()) { + iotDBSourceSplits.add(new IoTDBv2SourceSplit(DEFAULT_PARTITIONS, sql)); + return iotDBSourceSplits; + } + long start = conf.get(LOWER_BOUND); + long end = conf.get(UPPER_BOUND); + int numPartitions = conf.get(NUM_PARTITIONS); + String sqlBase = sql; + String sqlAlign = null; + String sqlCondition = null; + String[] sqls = sqlBase.split("(?i)" + SQL_ALIGN); + if (sqls.length > 1) { + sqlBase = sqls[0]; + sqlAlign = sqls[1]; + } + sqls = sqlBase.split("(?i)" + SQL_WHERE); + if (sqls.length > SQL_WHERE_SPLIT_LENGTH) { + throw new IotdbConnectorException( + CommonErrorCodeDeprecated.ILLEGAL_ARGUMENT, + "sql should not contain more than one where"); + } + if (sqls.length > 1) { + sqlBase = sqls[0]; + sqlCondition = sqls[1]; + } + long size = (end - start) / numPartitions + 1; + long remainder = (end + 1 - start) % numPartitions; + if (end - start < numPartitions) { + numPartitions = (int) (end - start); + } + long currentStart = start; + int i = 0; + while (i < numPartitions) { + String query = + " where (" + + RESERVED_TIME + + " >= " + + currentStart + + " and " + + RESERVED_TIME + + " < " + + (currentStart + size) + + ") "; + i++; + currentStart += size; + if (i + 1 <= numPartitions) { + currentStart = currentStart - remainder; + } + query = sqlBase + query; + if (!Strings.isNullOrEmpty(sqlCondition)) { + query = query + " and ( " + sqlCondition + " ) "; + } + if (!Strings.isNullOrEmpty(sqlAlign)) { + query = query + " align by " + sqlAlign; + } + iotDBSourceSplits.add(new IoTDBv2SourceSplit(String.valueOf(query.hashCode()), query)); + } + return iotDBSourceSplits; + } + + @Override + public void addSplitsBack(List<IoTDBv2SourceSplit> splits, int subtaskId) { + log.debug("Add back splits {} to IoTDBSourceSplitEnumerator.", splits); + if (!splits.isEmpty()) { + addPendingSplit(splits); + assignSplit(Collections.singletonList(subtaskId)); + } + } + + @Override + public int currentUnassignedSplitSize() { + return pendingSplit.size(); + } + + @Override + public void registerReader(int subtaskId) { + log.debug("Register reader {} to IoTDBSourceSplitEnumerator.", subtaskId); + if (!pendingSplit.isEmpty()) { + assignSplit(Collections.singletonList(subtaskId)); + } + } + + private void addPendingSplit(Collection<IoTDBv2SourceSplit> splits) { + int readerCount = context.currentParallelism(); + for (IoTDBv2SourceSplit split : splits) { + int ownerReader = getSplitOwner(split.splitId(), readerCount); + log.info("Assigning {} to {} reader.", split, ownerReader); + pendingSplit.computeIfAbsent(ownerReader, r -> new ArrayList<>()).add(split); + } + } + + private void assignSplit(Collection<Integer> readers) { + log.debug("Assign pendingSplits to readers {}", readers); + + for (int reader : readers) { + List<IoTDBv2SourceSplit> assignmentForReader = pendingSplit.remove(reader); + if (assignmentForReader != null && !assignmentForReader.isEmpty()) { + log.info("Assign splits {} to reader {}", assignmentForReader, reader); + try { + context.assignSplit(reader, assignmentForReader); + } catch (Exception e) { + log.error( + "Failed to assign splits {} to reader {}", + assignmentForReader, + reader, + e); + pendingSplit.put(reader, assignmentForReader); + } + } + } Review Comment: synchronized (stateLock) { ... } ########## seatunnel-connectors-v2/connector-iotdb-v2/src/main/java/org/apache/seatunnel/connectors/seatunnel/iotdbv2/source/IoTDBv2SourceSplitEnumerator.java: ########## @@ -0,0 +1,261 @@ +/* + * 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.seatunnel.connectors.seatunnel.iotdbv2.source; + +import org.apache.seatunnel.shade.com.google.common.base.Strings; + +import org.apache.seatunnel.api.configuration.ReadonlyConfig; +import org.apache.seatunnel.api.source.SourceSplitEnumerator; +import org.apache.seatunnel.common.exception.CommonErrorCodeDeprecated; +import org.apache.seatunnel.connectors.seatunnel.iotdbv2.exception.IotdbConnectorException; +import org.apache.seatunnel.connectors.seatunnel.iotdbv2.state.IoTDBv2SourceState; + +import lombok.extern.slf4j.Slf4j; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.config.IoTDBv2SourceOptions.LOWER_BOUND; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.config.IoTDBv2SourceOptions.NUM_PARTITIONS; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.config.IoTDBv2SourceOptions.SQL; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.config.IoTDBv2SourceOptions.UPPER_BOUND; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.constant.SourceConstants.DEFAULT_PARTITIONS; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.constant.SourceConstants.SQL_ALIGN; +import static org.apache.seatunnel.connectors.seatunnel.iotdbv2.constant.SourceConstants.SQL_WHERE; +import static shaded.org.apache.tsfile.common.constant.QueryConstant.RESERVED_TIME; + +@Slf4j +public class IoTDBv2SourceSplitEnumerator + implements SourceSplitEnumerator<IoTDBv2SourceSplit, IoTDBv2SourceState> { + + /** + * A SQL statement can contain at most one where We split the SQL using the where keyword + * Therefore, it can be split into two SQL at most + */ + private static final int SQL_WHERE_SPLIT_LENGTH = 2; + + private final Object stateLock = new Object(); + private final Context<IoTDBv2SourceSplit> context; + private final ReadonlyConfig conf; + private final Map<Integer, List<IoTDBv2SourceSplit>> pendingSplit; + private volatile boolean shouldEnumerate; + + public IoTDBv2SourceSplitEnumerator( + SourceSplitEnumerator.Context<IoTDBv2SourceSplit> context, ReadonlyConfig conf) { + this(context, conf, null); + } + + public IoTDBv2SourceSplitEnumerator( + SourceSplitEnumerator.Context<IoTDBv2SourceSplit> context, + ReadonlyConfig conf, + IoTDBv2SourceState sourceState) { + this.context = context; + this.conf = conf; + this.pendingSplit = new HashMap<>(); + this.shouldEnumerate = sourceState == null; + if (sourceState != null) { + this.shouldEnumerate = sourceState.isShouldEnumerate(); + this.pendingSplit.putAll(sourceState.getPendingSplit()); + } + } + + @Override + public void open() {} + + @Override + public void run() { + Set<Integer> readers = context.registeredReaders(); + if (shouldEnumerate) { + Set<IoTDBv2SourceSplit> newSplits = getIotDBSplit(); + + synchronized (stateLock) { + addPendingSplit(newSplits); + shouldEnumerate = false; + } + + assignSplit(readers); + } + + log.debug( + "No more splits to assign." + " Sending NoMoreSplitsEvent to reader {}.", readers); + readers.forEach(context::signalNoMoreSplits); + } + + /** + * split the time range into numPartitions parts if numPartitions is 1, use the whole time range + * if numPartitions < (end - start), use (start-end) partitions + * + * <p>eg: start = 1, end = 10, numPartitions = 2 sql = "select * from test where age > 0 and age + * < 10" + * + * <p>split result + * + * <p>split 1: select * from test where (time >= 1 and time < 6) and ( age > 0 and age < 10 ) + * + * <p>split 2: select * from test where (time >= 6 and time < 11) and ( age > 0 and age < 10 ) + */ + private Set<IoTDBv2SourceSplit> getIotDBSplit() { + String sql = conf.get(SQL); + Set<IoTDBv2SourceSplit> iotDBSourceSplits = new HashSet<>(); + // no need numPartitions, use one partition + if (!conf.getOptional(NUM_PARTITIONS).isPresent()) { + iotDBSourceSplits.add(new IoTDBv2SourceSplit(DEFAULT_PARTITIONS, sql)); + return iotDBSourceSplits; + } + long start = conf.get(LOWER_BOUND); + long end = conf.get(UPPER_BOUND); + int numPartitions = conf.get(NUM_PARTITIONS); + String sqlBase = sql; + String sqlAlign = null; + String sqlCondition = null; + String[] sqls = sqlBase.split("(?i)" + SQL_ALIGN); + if (sqls.length > 1) { + sqlBase = sqls[0]; + sqlAlign = sqls[1]; + } + sqls = sqlBase.split("(?i)" + SQL_WHERE); + if (sqls.length > SQL_WHERE_SPLIT_LENGTH) { + throw new IotdbConnectorException( + CommonErrorCodeDeprecated.ILLEGAL_ARGUMENT, + "sql should not contain more than one where"); + } + if (sqls.length > 1) { + sqlBase = sqls[0]; + sqlCondition = sqls[1]; + } + long size = (end - start) / numPartitions + 1; + long remainder = (end + 1 - start) % numPartitions; + if (end - start < numPartitions) { + numPartitions = (int) (end - start); + } + long currentStart = start; + int i = 0; + while (i < numPartitions) { + String query = + " where (" + + RESERVED_TIME + + " >= " + + currentStart + + " and " + + RESERVED_TIME + + " < " + + (currentStart + size) + + ") "; + i++; + currentStart += size; + if (i + 1 <= numPartitions) { + currentStart = currentStart - remainder; + } + query = sqlBase + query; + if (!Strings.isNullOrEmpty(sqlCondition)) { + query = query + " and ( " + sqlCondition + " ) "; + } + if (!Strings.isNullOrEmpty(sqlAlign)) { + query = query + " align by " + sqlAlign; + } + iotDBSourceSplits.add(new IoTDBv2SourceSplit(String.valueOf(query.hashCode()), query)); + } + return iotDBSourceSplits; + } + + @Override + public void addSplitsBack(List<IoTDBv2SourceSplit> splits, int subtaskId) { + log.debug("Add back splits {} to IoTDBSourceSplitEnumerator.", splits); + if (!splits.isEmpty()) { + addPendingSplit(splits); + assignSplit(Collections.singletonList(subtaskId)); + } + } + + @Override + public int currentUnassignedSplitSize() { + return pendingSplit.size(); + } + + @Override + public void registerReader(int subtaskId) { + log.debug("Register reader {} to IoTDBSourceSplitEnumerator.", subtaskId); + if (!pendingSplit.isEmpty()) { + assignSplit(Collections.singletonList(subtaskId)); + } + } + + private void addPendingSplit(Collection<IoTDBv2SourceSplit> splits) { + int readerCount = context.currentParallelism(); + for (IoTDBv2SourceSplit split : splits) { + int ownerReader = getSplitOwner(split.splitId(), readerCount); + log.info("Assigning {} to {} reader.", split, ownerReader); + pendingSplit.computeIfAbsent(ownerReader, r -> new ArrayList<>()).add(split); + } Review Comment: `pendingSplit` is a competitive resource and should be locked， synchronized (stateLock) { ... } -- 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]
