Loognqiang commented on code in PR #666:
URL: https://github.com/apache/geaflow/pull/666#discussion_r2525893923
##########
geaflow/geaflow-dsl/geaflow-dsl-connector/geaflow-dsl-connector-odps/src/main/java/org/apache/geaflow/dsl/connector/odps/OdpsConfigKeys.java:
##########
@@ -58,6 +59,11 @@ public class OdpsConfigKeys {
.defaultValue(1000)
.description("The buffer size of odps sink buffer.");
+ public static final ConfigKey GEAFLOW_DSL_ODPS_SINK_FLUSH_INTERVAL_MS =
ConfigKeys
+ .key("geaflow.dsl.odps.sink.flush.interval.ms")
+ .defaultValue(10000)
+ .description("The buffer size of odps sink buffer.");
Review Comment:
The description info is incorrect
##########
geaflow/geaflow-dsl/geaflow-dsl-connector/geaflow-dsl-connector-odps/src/main/java/org/apache/geaflow/dsl/connector/odps/DefaultPartitionExtractor.java:
##########
@@ -0,0 +1,147 @@
+/*
+ * 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.geaflow.dsl.connector.odps;
+
+import com.aliyun.odps.Column;
+import java.util.ArrayList;
+import java.util.List;
+import org.apache.geaflow.common.type.IType;
+import org.apache.geaflow.dsl.common.data.Row;
+import org.apache.geaflow.dsl.common.types.StructType;
+
+public class DefaultPartitionExtractor implements PartitionExtractor {
+
+ // partition spec separator
+ private final String separator;
+ // all partition keys
+ private final String[] keys;
+ // dynamic fields index
+ private final int[] columns;
+ // dynamic field types
+ private final IType<?>[] types;
+ // constant fields, values.length should be equal to keys.length
+ // if values[i] is null, it means the i-th key is a dynamic field
+ private final String[] values;
+
+ /**
+ * Create a partition extractor.
+ * @param partitionColumns partition columns
+ * @param schema the input schema
+ * @return the partition extractor
+ */
+ public static PartitionExtractor create(List<Column> partitionColumns,
StructType schema) {
+ if (partitionColumns == null || partitionColumns.isEmpty()) {
+ return row -> "";
+ }
+ int[] columns = new int[partitionColumns.size()];
+ IType<?>[] types = new IType<?>[partitionColumns.size()];
+ StringBuilder sb = new StringBuilder();
+ for (int i = 0; i < partitionColumns.size(); i++) {
+ String partitionColumn = partitionColumns.get(i).getName();
+ int index = schema.indexOf(partitionColumn);
+ if (index < 0) {
+ throw new IllegalArgumentException("Partition column " +
partitionColumn + " not found in schema");
+ }
+ columns[i] = index;
+ types[i] = schema.getType(index);
+
sb.append(partitionColumn).append("=$").append(partitionColumn).append(",");
+ }
+ return new DefaultPartitionExtractor(sb.substring(0, sb.length() - 1),
columns, types);
+ }
+
+ /**
+ * Create a partition extractor.
+ * @param spec partition spec, like "dt=$dt,hh=$hh"
+ * @param schema the input schema
+ * @return the partition extractor
+ */
+ public static PartitionExtractor create(String spec, StructType schema) {
+ if (spec == null || spec.isEmpty()) {
+ return row -> "";
+ }
+ String[] groups = spec.split("[,/]");
+ List<Integer> index = new ArrayList<>();
+ List<IType<?>> types = new ArrayList<>();
+ for (String group : groups) {
+ String[] kv = group.split("=");
+ if (kv.length != 2) {
+ throw new IllegalArgumentException("Invalid partition spec.");
+ }
+ String k = kv[0].trim();
+ String v = kv[1].trim().replaceAll("'", "").replaceAll("\"",
"").replaceAll("`", "");
+ if (k.isEmpty() || v.isEmpty()) {
+ throw new IllegalArgumentException("Invalid partition spec.");
+ }
+ if (v.startsWith("$")) {
+ int val = schema.indexOf(v.substring(1));
+ if (val != -1) {
+ index.add(val);
+ types.add(schema.getType(val));
+ }
+ }
+ }
+ return new DefaultPartitionExtractor(spec, index.stream().mapToInt(i
-> i).toArray(), types.toArray(new IType[0]));
+ }
+
+ public DefaultPartitionExtractor(String spec, int[] columns, IType<?>[]
types) {
+ this.columns = columns;
+ this.types = types;
+ if (spec == null) {
+ throw new IllegalArgumentException("Argument 'spec' cannot be
null");
+ }
+ String[] groups = spec.split("[,/]");
Review Comment:
It is strongly recommended to extract magic strings such as ",", "/", "=",
etc., into private static final String constants.
##########
geaflow/geaflow-dsl/geaflow-dsl-connector/geaflow-dsl-connector-odps/src/main/java/org/apache/geaflow/dsl/connector/odps/OdpsTableSink.java:
##########
@@ -149,67 +139,82 @@ public void write(Row row) throws IOException {
values[i] = null;
}
}
- buffer.add(values);
- if (buffer.size() >= bufferSize) {
- try {
- flush();
- } catch (Exception e) {
- throw new IOException(e);
- }
- }
+ PartitionWriter writer =
createOrGetWriter(partitionExtractor.extractPartition(row));
+ writer.write(new ArrayRecord(recordColumns, values));
}
@Override
public void finish() throws IOException {
- try {
- flush();
- } catch (Exception e) {
- throw new IOException(e);
- }
+ flush();
}
@Override
public void close() {
LOGGER.info("close.");
- if (writer != null) {
- try {
- writer.close();
Review Comment:
why not call close method？
--
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]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
