Merge pull request #635 from heljoyLiu/pulgin-gdb-update-to-set-property

gdbwrtier:  support set-property
This commit is contained in:
Trafalgar 2020-04-23 11:48:37 +08:00 committed by GitHub
commit 3b3fa878db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 1264 additions and 922 deletions

View File

@ -41,6 +41,14 @@ GDBWriter通过DataX框架获取Reader生成的协议数据使用`g.addV/E(GD
{ {
"random": "60,64", "random": "60,64",
"type": "string" "type": "string"
},
{
"random": "100,1000",
"type": "long"
},
{
"random": "32,48",
"type": "string"
} }
], ],
"sliceRecordCount": 1000 "sliceRecordCount": 1000
@ -70,6 +78,18 @@ GDBWriter通过DataX框架获取Reader生成的协议数据使用`g.addV/E(GD
"name": "vertex_propKey", "name": "vertex_propKey",
"value": "${2}", "value": "${2}",
"type": "string", "type": "string",
"columnType": "vertexSetProperty"
},
{
"name": "vertex_propKey",
"value": "${3}",
"type": "long",
"columnType": "vertexSetProperty"
},
{
"name": "vertex_propKey2",
"value": "${4}",
"type": "string",
"columnType": "vertexProperty" "columnType": "vertexProperty"
} }
] ]
@ -290,6 +310,7 @@ GDBWriter通过DataX框架获取Reader生成的协议数据使用`g.addV/E(GD
* primaryKey表示该字段是主键id * primaryKey表示该字段是主键id
* 点枚举值: * 点枚举值:
* vertexPropertylabelType为点时表示该字段是点的普通属性 * vertexPropertylabelType为点时表示该字段是点的普通属性
* vertexSetPropertylabelType为点时表示该字段是点的SET属性value是SET属性中的一个属性值
* vertexJsonPropertylabelType为点时表示是点json属性value结构请见备注**json properties示例**点配置最多只允许出现一个json属性 * vertexJsonPropertylabelType为点时表示是点json属性value结构请见备注**json properties示例**点配置最多只允许出现一个json属性
* 边枚举值: * 边枚举值:
* srcPrimaryKeylabelType为边时表示该字段是起点主键id * srcPrimaryKeylabelType为边时表示该字段是起点主键id
@ -305,6 +326,14 @@ GDBWriter通过DataX框架获取Reader生成的协议数据使用`g.addV/E(GD
> {"k":"age","t":"int","v":"20"}, > {"k":"age","t":"int","v":"20"},
> {"k":"sex","t":"string","v":"male"} > {"k":"sex","t":"string","v":"male"}
> ]} > ]}
>
> # json格式同样支持给点添加SET属性格式如下
> {"properties":[
> {"k":"name","t":"string","v":"tom","c":"set"},
> {"k":"name","t":"string","v":"jack","c":"set"},
> {"k":"age","t":"int","v":"20"},
> {"k":"sex","t":"string","v":"male"}
> ]}
> ``` > ```
## 4 性能报告 ## 4 性能报告
@ -367,4 +396,5 @@ DataX压测机器
- GDBWriter插件与用户查询DSL使用相同的GDB实例端口导入时可能会影响查询性能 - GDBWriter插件与用户查询DSL使用相同的GDB实例端口导入时可能会影响查询性能
## FAQ ## FAQ
1. 使用SET属性需要升级GDB实例到`1.0.20`版本及以上。
2. 边只支持普通单值属性不能给边写SET属性数据。

View File

@ -1,10 +1,5 @@
package com.alibaba.datax.plugin.writer.gdbwriter; package com.alibaba.datax.plugin.writer.gdbwriter;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.*;
import java.util.function.Function;
import com.alibaba.datax.common.element.Record; import com.alibaba.datax.common.element.Record;
import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.exception.DataXException;
import com.alibaba.datax.common.plugin.RecordReceiver; import com.alibaba.datax.common.plugin.RecordReceiver;
@ -18,13 +13,21 @@ import com.alibaba.datax.plugin.writer.gdbwriter.mapping.MappingRule;
import com.alibaba.datax.plugin.writer.gdbwriter.mapping.MappingRuleFactory; import com.alibaba.datax.plugin.writer.gdbwriter.mapping.MappingRuleFactory;
import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbElement; import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbElement;
import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbGraph; import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbGraph;
import groovy.lang.Tuple2; import groovy.lang.Tuple2;
import io.netty.util.concurrent.DefaultThreadFactory; import io.netty.util.concurrent.DefaultThreadFactory;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.function.Function;
public class GdbWriter extends Writer { public class GdbWriter extends Writer {
private static final Logger log = LoggerFactory.getLogger(GdbWriter.class); private static final Logger log = LoggerFactory.getLogger(GdbWriter.class);
@ -36,6 +39,7 @@ public class GdbWriter extends Writer {
* Job 中的方法仅执行一次Task 中方法会由框架启动多个 Task 线程并行执行 * Job 中的方法仅执行一次Task 中方法会由框架启动多个 Task 线程并行执行
* <p/> * <p/>
* 整个 Writer 执行流程是 * 整个 Writer 执行流程是
*
* <pre> * <pre>
* Job类init-->prepare-->split * Job类init-->prepare-->split
* *
@ -46,8 +50,7 @@ public class GdbWriter extends Writer {
* </pre> * </pre>
*/ */
public static class Job extends Writer.Job { public static class Job extends Writer.Job {
private static final Logger LOG = LoggerFactory private static final Logger LOG = LoggerFactory.getLogger(Job.class);
.getLogger(Job.class);
private Configuration jobConfig = null; private Configuration jobConfig = null;
@ -73,30 +76,30 @@ public class GdbWriter extends Writer {
*/ */
super.prepare(); super.prepare();
MappingRule rule = MappingRuleFactory.getInstance().createV2(jobConfig); final MappingRule rule = MappingRuleFactory.getInstance().createV2(this.jobConfig);
mapper = new DefaultGdbMapper().getMapper(rule); mapper = new DefaultGdbMapper(this.jobConfig).getMapper(rule);
session = jobConfig.getBool(Key.SESSION_STATE, false); session = this.jobConfig.getBool(Key.SESSION_STATE, false);
/** /**
* client connect check before task * client connect check before task
*/ */
try { try {
globalGraph = GdbGraphManager.instance().getGraph(jobConfig, false); globalGraph = GdbGraphManager.instance().getGraph(this.jobConfig, false);
} catch (RuntimeException e) { } catch (final RuntimeException e) {
throw DataXException.asDataXException(GdbWriterErrorCode.FAIL_CLIENT_CONNECT, e.getMessage()); throw DataXException.asDataXException(GdbWriterErrorCode.FAIL_CLIENT_CONNECT, e.getMessage());
} }
} }
@Override @Override
public List<Configuration> split(int mandatoryNumber) { public List<Configuration> split(final int mandatoryNumber) {
/** /**
* 注意此方法仅执行一次 * 注意此方法仅执行一次
* 最佳实践通常采用工具静态类完成把 Job 配置切分成多个 Task 配置的工作 * 最佳实践通常采用工具静态类完成把 Job 配置切分成多个 Task 配置的工作
* 这里的 mandatoryNumber 是强制必须切分的份数 * 这里的 mandatoryNumber 是强制必须切分的份数
*/ */
LOG.info("split begin..."); LOG.info("split begin...");
List<Configuration> configurationList = new ArrayList<Configuration>(); final List<Configuration> configurationList = new ArrayList<Configuration>();
for (int i = 0; i < mandatoryNumber; i++) { for (int i = 0; i < mandatoryNumber; i++) {
configurationList.add(this.jobConfig.clone()); configurationList.add(this.jobConfig.clone());
} }
@ -140,22 +143,22 @@ public class GdbWriter extends Writer {
* 最佳实践此处通过对 taskConfig 配置的读取进而初始化一些资源为 startWrite()做准备 * 最佳实践此处通过对 taskConfig 配置的读取进而初始化一些资源为 startWrite()做准备
*/ */
this.taskConfig = super.getPluginJobConf(); this.taskConfig = super.getPluginJobConf();
batchRecords = taskConfig.getInt(Key.MAX_RECORDS_IN_BATCH, GdbWriterConfig.DEFAULT_RECORD_NUM_IN_BATCH); this.batchRecords = this.taskConfig.getInt(Key.MAX_RECORDS_IN_BATCH, GdbWriterConfig.DEFAULT_RECORD_NUM_IN_BATCH);
submitService = new ThreadPoolExecutor(1, 1, 0L, this.submitService = new ThreadPoolExecutor(1, 1, 0L, TimeUnit.MILLISECONDS, new LinkedBlockingDeque<>(),
TimeUnit.MILLISECONDS, new LinkedBlockingDeque<>(), new DefaultThreadFactory("submit-dsl")); new DefaultThreadFactory("submit-dsl"));
if (!session) { if (!session) {
graph = globalGraph; this.graph = globalGraph;
} else { } else {
/** /**
* 分批创建session client由于服务端groovy编译性能的限制 * 分批创建session client由于服务端groovy编译性能的限制
*/ */
try { try {
Thread.sleep((getTaskId() / 10) * 10000); Thread.sleep((getTaskId() / 10) * 10000);
} catch (Exception e) { } catch (final Exception e) {
// ... // ...
} }
graph = GdbGraphManager.instance().getGraph(taskConfig, session); this.graph = GdbGraphManager.instance().getGraph(this.taskConfig, session);
} }
} }
@ -169,56 +172,61 @@ public class GdbWriter extends Writer {
} }
@Override @Override
public void startWrite(RecordReceiver recordReceiver) { public void startWrite(final RecordReceiver recordReceiver) {
/** /**
* 注意此方法每个 Task 都会执行一次 * 注意此方法每个 Task 都会执行一次
* 最佳实践此处适当封装确保简洁清晰完成数据写入工作 * 最佳实践此处适当封装确保简洁清晰完成数据写入工作
*/ */
Record r; Record r;
Future<Boolean> future = null; Future<Boolean> future = null;
List<Tuple2<Record, GdbElement>> records = new ArrayList<>(batchRecords); List<Tuple2<Record, GdbElement>> records = new ArrayList<>(this.batchRecords);
while ((r = recordReceiver.getFromReader()) != null) { while ((r = recordReceiver.getFromReader()) != null) {
try {
records.add(new Tuple2<>(r, mapper.apply(r))); records.add(new Tuple2<>(r, mapper.apply(r)));
} catch (final Exception ex) {
getTaskPluginCollector().collectDirtyRecord(r, ex);
continue;
}
if (records.size() >= batchRecords) { if (records.size() >= this.batchRecords) {
wait4Submit(future); wait4Submit(future);
final List<Tuple2<Record, GdbElement>> batch = records; final List<Tuple2<Record, GdbElement>> batch = records;
future = submitService.submit(() -> batchCommitRecords(batch)); future = this.submitService.submit(() -> batchCommitRecords(batch));
records = new ArrayList<>(batchRecords); records = new ArrayList<>(this.batchRecords);
} }
} }
wait4Submit(future); wait4Submit(future);
if (!records.isEmpty()) { if (!records.isEmpty()) {
final List<Tuple2<Record, GdbElement>> batch = records; final List<Tuple2<Record, GdbElement>> batch = records;
future = submitService.submit(() -> batchCommitRecords(batch)); future = this.submitService.submit(() -> batchCommitRecords(batch));
wait4Submit(future); wait4Submit(future);
} }
} }
private void wait4Submit(Future<Boolean> future) { private void wait4Submit(final Future<Boolean> future) {
if (future == null) { if (future == null) {
return; return;
} }
try { try {
future.get(); future.get();
} catch (Exception e) { } catch (final Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
private boolean batchCommitRecords(final List<Tuple2<Record, GdbElement>> records) { private boolean batchCommitRecords(final List<Tuple2<Record, GdbElement>> records) {
TaskPluginCollector collector = getTaskPluginCollector(); final TaskPluginCollector collector = getTaskPluginCollector();
try { try {
List<Tuple2<Record, Exception>> errors = graph.add(records); final List<Tuple2<Record, Exception>> errors = this.graph.add(records);
errors.forEach(t -> collector.collectDirtyRecord(t.getFirst(), t.getSecond())); errors.forEach(t -> collector.collectDirtyRecord(t.getFirst(), t.getSecond()));
failed += errors.size(); this.failed += errors.size();
} catch (Exception e) { } catch (final Exception e) {
records.forEach(t -> collector.collectDirtyRecord(t.getFirst(), e)); records.forEach(t -> collector.collectDirtyRecord(t.getFirst(), e));
failed += records.size(); this.failed += records.size();
} }
records.clear(); records.clear();
@ -231,7 +239,7 @@ public class GdbWriter extends Writer {
* 注意此方法每个 Task 都会执行一次 * 注意此方法每个 Task 都会执行一次
* 最佳实践如果 Task 中有需要进行数据同步之后的后续处理可以在此处完成 * 最佳实践如果 Task 中有需要进行数据同步之后的后续处理可以在此处完成
*/ */
log.info("Task done, dirty record count - {}", failed); log.info("Task done, dirty record count - {}", this.failed);
} }
@Override @Override
@ -241,9 +249,9 @@ public class GdbWriter extends Writer {
* 最佳实践通常配合Task 中的 post() 方法一起完成 Task 的资源释放 * 最佳实践通常配合Task 中的 post() 方法一起完成 Task 的资源释放
*/ */
if (session) { if (session) {
graph.close(); this.graph.close();
} }
submitService.shutdown(); this.submitService.shutdown();
} }
} }

View File

@ -27,7 +27,6 @@ public enum GdbWriterErrorCode implements ErrorCode {
@Override @Override
public String toString() { public String toString() {
return String.format("Code:[%s], Description:[%s]. ", this.code, return String.format("Code:[%s], Description:[%s]. ", this.code, this.description);
this.description);
} }
} }

View File

@ -63,6 +63,17 @@ public final class Key {
public static final String MAX_RECORDS_IN_BATCH = "maxRecordsInBatch"; public static final String MAX_RECORDS_IN_BATCH = "maxRecordsInBatch";
public static final String SESSION_STATE = "session"; public static final String SESSION_STATE = "session";
/**
* request length limit, include gdb element string length GDB字段长度限制配置可分别配置各字段的限制超过限制的记录会当脏数据处理
*/
public static final String MAX_GDB_STRING_LENGTH = "maxStringLengthLimit";
public static final String MAX_GDB_ID_LENGTH = "maxIdStringLengthLimit";
public static final String MAX_GDB_LABEL_LENGTH = "maxLabelStringLengthLimit";
public static final String MAX_GDB_PROP_KEY_LENGTH = "maxPropKeyStringLengthLimit";
public static final String MAX_GDB_PROP_VALUE_LENGTH = "maxPropValueStringLengthLimit";
public static final String MAX_GDB_REQUEST_LENGTH = "maxRequestLengthLimit";
public static enum ImportType { public static enum ImportType {
/** /**
* Import vertices * Import vertices
@ -100,6 +111,11 @@ public final class Key {
*/ */
vertexProperty, vertexProperty,
/**
* vertex setProperty
*/
vertexSetProperty,
/** /**
* start vertex id of edge * start vertex id of edge
*/ */
@ -138,4 +154,16 @@ public final class Key {
none none
} }
public static enum PropertyType {
/**
* single Vertex Property
*/
single,
/**
* set Vertex Property
*/
set
}
} }

View File

@ -3,37 +3,37 @@
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.client; package com.alibaba.datax.plugin.writer.gdbwriter.client;
import java.util.ArrayList;
import java.util.List;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbGraph; import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbGraph;
import com.alibaba.datax.plugin.writer.gdbwriter.model.ScriptGdbGraph; import com.alibaba.datax.plugin.writer.gdbwriter.model.ScriptGdbGraph;
import java.util.ArrayList;
import java.util.List;
/** /**
* @author jerrywang * @author jerrywang
* *
*/ */
public class GdbGraphManager implements AutoCloseable { public class GdbGraphManager implements AutoCloseable {
private static final GdbGraphManager instance = new GdbGraphManager(); private static final GdbGraphManager INSTANCE = new GdbGraphManager();
private List<GdbGraph> graphs = new ArrayList<>(); private List<GdbGraph> graphs = new ArrayList<>();
public static GdbGraphManager instance() { public static GdbGraphManager instance() {
return instance; return INSTANCE;
} }
public GdbGraph getGraph(Configuration config, boolean session) { public GdbGraph getGraph(final Configuration config, final boolean session) {
GdbGraph graph = new ScriptGdbGraph(config, session); final GdbGraph graph = new ScriptGdbGraph(config, session);
graphs.add(graph); this.graphs.add(graph);
return graph; return graph;
} }
@Override @Override
public void close() { public void close() {
for(GdbGraph graph : graphs) { for (final GdbGraph graph : this.graphs) {
graph.close(); graph.close();
} }
graphs.clear(); this.graphs.clear();
} }
} }

View File

@ -3,11 +3,12 @@
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.client; package com.alibaba.datax.plugin.writer.gdbwriter.client;
import static com.alibaba.datax.plugin.writer.gdbwriter.util.ConfigHelper.assertConfig;
import static com.alibaba.datax.plugin.writer.gdbwriter.util.ConfigHelper.assertHasContent;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.writer.gdbwriter.Key; import com.alibaba.datax.plugin.writer.gdbwriter.Key;
import static com.alibaba.datax.plugin.writer.gdbwriter.util.ConfigHelper.*;
/** /**
* @author jerrywang * @author jerrywang
* *
@ -19,23 +20,26 @@ public class GdbWriterConfig {
public static final int DEFAULT_BATCH_PROPERTY_NUM = 30; public static final int DEFAULT_BATCH_PROPERTY_NUM = 30;
public static final int DEFAULT_RECORD_NUM_IN_BATCH = 16; public static final int DEFAULT_RECORD_NUM_IN_BATCH = 16;
public static final int MAX_STRING_LENGTH = 10240;
public static final int MAX_REQUEST_LENGTH = 65535 - 1000;
private Configuration config; private Configuration config;
private GdbWriterConfig(Configuration config) { private GdbWriterConfig(final Configuration config) {
this.config = config; this.config = config;
validate(); validate();
} }
private void validate() { public static GdbWriterConfig of(final Configuration config) {
assertHasContent(config, Key.HOST);
assertConfig(Key.PORT, () -> config.getInt(Key.PORT) > 0);
assertHasContent(config, Key.USERNAME);
assertHasContent(config, Key.PASSWORD);
}
public static GdbWriterConfig of(Configuration config) {
return new GdbWriterConfig(config); return new GdbWriterConfig(config);
} }
private void validate() {
assertHasContent(this.config, Key.HOST);
assertConfig(Key.PORT, () -> this.config.getInt(Key.PORT) > 0);
assertHasContent(this.config, Key.USERNAME);
assertHasContent(this.config, Key.PASSWORD);
}
} }

View File

@ -3,6 +3,8 @@
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.mapping; package com.alibaba.datax.plugin.writer.gdbwriter.mapping;
import static com.alibaba.datax.plugin.writer.gdbwriter.Key.ImportType.VERTEX;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.UUID; import java.util.UUID;
@ -12,89 +14,83 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import com.alibaba.datax.common.element.Record; import com.alibaba.datax.common.element.Record;
import com.alibaba.fastjson.JSONArray; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.datax.plugin.writer.gdbwriter.Key; import com.alibaba.datax.plugin.writer.gdbwriter.Key;
import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbEdge; import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbEdge;
import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbElement; import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbElement;
import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbVertex; import com.alibaba.datax.plugin.writer.gdbwriter.model.GdbVertex;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import static com.alibaba.datax.plugin.writer.gdbwriter.Key.ImportType.VERTEX;
/** /**
* @author jerrywang * @author jerrywang
* *
*/ */
@Slf4j @Slf4j
public class DefaultGdbMapper implements GdbMapper { public class DefaultGdbMapper implements GdbMapper {
private static final Pattern STR_PATTERN = Pattern.compile("\\$\\{(\\d+)}"); private static final Pattern STR_DOLLAR_PATTERN = Pattern.compile("\\$\\{(\\d+)}");
private static final Pattern NORMAL_PATTERN = Pattern.compile("^\\$\\{(\\d+)}$"); private static final Pattern NORMAL_DOLLAR_PATTERN = Pattern.compile("^\\$\\{(\\d+)}$");
@Override private static final Pattern STR_NUM_PATTERN = Pattern.compile("#\\{(\\d+)}");
public Function<Record, GdbElement> getMapper(MappingRule rule) { private static final Pattern NORMAL_NUM_PATTERN = Pattern.compile("^#\\{(\\d+)}$");
return r -> {
GdbElement e = (rule.getImportType() == VERTEX) ? new GdbVertex() : new GdbEdge(); public DefaultGdbMapper() {}
forElement(rule).accept(r, e);
return e; public DefaultGdbMapper(final Configuration config) {
}; MapperConfig.getInstance().updateConfig(config);
} }
private static BiConsumer<Record, GdbElement> forElement(MappingRule rule) { private static BiConsumer<Record, GdbElement> forElement(final MappingRule rule) {
List<BiConsumer<Record, GdbElement>> properties = new ArrayList<>(); final boolean numPattern = rule.isNumPattern();
for (MappingRule.PropertyMappingRule propRule : rule.getProperties()) { final List<BiConsumer<Record, GdbElement>> properties = new ArrayList<>();
Function<Record, String> keyFunc = forStrColumn(propRule.getKey()); for (final MappingRule.PropertyMappingRule propRule : rule.getProperties()) {
final Function<Record, String> keyFunc = forStrColumn(numPattern, propRule.getKey());
if (propRule.getValueType() == ValueType.STRING) { if (propRule.getValueType() == ValueType.STRING) {
final Function<Record, String> valueFunc = forStrColumn(propRule.getValue()); final Function<Record, String> valueFunc = forStrColumn(numPattern, propRule.getValue());
properties.add((r, e) -> { properties.add((r, e) -> {
String k = keyFunc.apply(r); e.addProperty(keyFunc.apply(r), valueFunc.apply(r), propRule.getPType());
String v = valueFunc.apply(r);
if (k != null && v != null) {
e.getProperties().put(k, v);
}
}); });
} else { } else {
final Function<Record, Object> valueFunc = forObjColumn(propRule.getValue(), propRule.getValueType()); final Function<Record, Object> valueFunc =
forObjColumn(numPattern, propRule.getValue(), propRule.getValueType());
properties.add((r, e) -> { properties.add((r, e) -> {
String k = keyFunc.apply(r); e.addProperty(keyFunc.apply(r), valueFunc.apply(r), propRule.getPType());
Object v = valueFunc.apply(r);
if (k != null && v != null) {
e.getProperties().put(k, v);
}
}); });
} }
} }
if (rule.getPropertiesJsonStr() != null) { if (rule.getPropertiesJsonStr() != null) {
Function<Record, String> jsonFunc = forStrColumn(rule.getPropertiesJsonStr()); final Function<Record, String> jsonFunc = forStrColumn(numPattern, rule.getPropertiesJsonStr());
properties.add((r, e) -> { properties.add((r, e) -> {
String propertiesStr = jsonFunc.apply(r); final String propertiesStr = jsonFunc.apply(r);
JSONObject root = (JSONObject)JSONObject.parse(propertiesStr); final JSONObject root = (JSONObject)JSONObject.parse(propertiesStr);
JSONArray propertiesList = root.getJSONArray("properties"); final JSONArray propertiesList = root.getJSONArray("properties");
for (Object object : propertiesList) { for (final Object object : propertiesList) {
JSONObject jsonObject = (JSONObject)object; final JSONObject jsonObject = (JSONObject)object;
String key = jsonObject.getString("k"); final String key = jsonObject.getString("k");
String name = jsonObject.getString("v"); final String name = jsonObject.getString("v");
String type = jsonObject.getString("t"); final String type = jsonObject.getString("t");
final String card = jsonObject.getString("c");
if (key == null || name == null) { if (key == null || name == null) {
continue; continue;
} }
addToProperties(e, key, name, type); addToProperties(e, key, name, type, card);
} }
}); });
} }
BiConsumer<Record, GdbElement> ret = (r, e) -> { final BiConsumer<Record, GdbElement> ret = (r, e) -> {
String label = forStrColumn(rule.getLabel()).apply(r); final String label = forStrColumn(numPattern, rule.getLabel()).apply(r);
String id = forStrColumn(rule.getId()).apply(r); String id = forStrColumn(numPattern, rule.getId()).apply(r);
if (rule.getImportType() == Key.ImportType.EDGE) { if (rule.getImportType() == Key.ImportType.EDGE) {
String to = forStrColumn(rule.getTo()).apply(r); final String to = forStrColumn(numPattern, rule.getTo()).apply(r);
String from = forStrColumn(rule.getFrom()).apply(r); final String from = forStrColumn(numPattern, rule.getFrom()).apply(r);
if (to == null || from == null) { if (to == null || from == null) {
log.error("invalid record to: {} , from: {}", to, from); log.error("invalid record to: {} , from: {}", to, from);
throw new IllegalArgumentException("to or from missed in edge"); throw new IllegalArgumentException("to or from missed in edge");
@ -121,24 +117,26 @@ public class DefaultGdbMapper implements GdbMapper {
return ret; return ret;
} }
static Function<Record, Object> forObjColumn(String rule, ValueType type) { private static Function<Record, Object> forObjColumn(final boolean numPattern, final String rule, final ValueType type) {
Matcher m = NORMAL_PATTERN.matcher(rule); final Pattern pattern = numPattern ? NORMAL_NUM_PATTERN : NORMAL_DOLLAR_PATTERN;
final Matcher m = pattern.matcher(rule);
if (m.matches()) { if (m.matches()) {
int index = Integer.valueOf(m.group(1)); final int index = Integer.valueOf(m.group(1));
return r -> type.applyColumn(r.getColumn(index)); return r -> type.applyColumn(r.getColumn(index));
} else { } else {
return r -> type.fromStrFunc(rule); return r -> type.fromStrFunc(rule);
} }
} }
static Function<Record, String> forStrColumn(String rule) { private static Function<Record, String> forStrColumn(final boolean numPattern, final String rule) {
List<BiConsumer<StringBuilder, Record>> list = new ArrayList<>(); final List<BiConsumer<StringBuilder, Record>> list = new ArrayList<>();
Matcher m = STR_PATTERN.matcher(rule); final Pattern pattern = numPattern ? STR_NUM_PATTERN : STR_DOLLAR_PATTERN;
final Matcher m = pattern.matcher(rule);
int last = 0; int last = 0;
while (m.find()) { while (m.find()) {
String index = m.group(1); final String index = m.group(1);
// as simple integer index. // as simple integer index.
int i = Integer.parseInt(index); final int i = Integer.parseInt(index);
final int tmp = last; final int tmp = last;
final int start = m.start(); final int start = m.start();
@ -158,33 +156,49 @@ public class DefaultGdbMapper implements GdbMapper {
}); });
return r -> { return r -> {
StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
list.forEach(c -> c.accept(sb, r)); list.forEach(c -> c.accept(sb, r));
String res = sb.toString(); final String res = sb.toString();
return res.isEmpty() ? null : res; return res.isEmpty() ? null : res;
}; };
} }
static boolean addToProperties(GdbElement e, String key, String value, String type) { private static boolean addToProperties(final GdbElement e, final String key, final String value, final String type, final String card) {
ValueType valueType = ValueType.fromShortName(type); final Object pValue;
final ValueType valueType = ValueType.fromShortName(type);
if (valueType == ValueType.STRING) { if (valueType == ValueType.STRING) {
e.getProperties().put(key, value); pValue = value;
} else if (valueType == ValueType.INT) { } else if (valueType == ValueType.INT || valueType == ValueType.INTEGER) {
e.getProperties().put(key, Integer.valueOf(value)); pValue = Integer.valueOf(value);
} else if (valueType == ValueType.LONG) { } else if (valueType == ValueType.LONG) {
e.getProperties().put(key, Long.valueOf(value)); pValue = Long.valueOf(value);
} else if (valueType == ValueType.DOUBLE) { } else if (valueType == ValueType.DOUBLE) {
e.getProperties().put(key, Double.valueOf(value)); pValue = Double.valueOf(value);
} else if (valueType == ValueType.FLOAT) { } else if (valueType == ValueType.FLOAT) {
e.getProperties().put(key, Float.valueOf(value)); pValue = Float.valueOf(value);
} else if (valueType == ValueType.BOOLEAN) { } else if (valueType == ValueType.BOOLEAN) {
e.getProperties().put(key, Boolean.valueOf(value)); pValue = Boolean.valueOf(value);
} else { } else {
log.error("invalid property key {}, value {}, type {}", key, value, type); log.error("invalid property key {}, value {}, type {}", key, value, type);
return false; return false;
} }
// apply vertexSetProperty
if (Key.PropertyType.set.name().equals(card) && (e instanceof GdbVertex)) {
e.addProperty(key, pValue, Key.PropertyType.set);
} else {
e.addProperty(key, pValue);
}
return true; return true;
} }
@Override
public Function<Record, GdbElement> getMapper(final MappingRule rule) {
return r -> {
final GdbElement e = (rule.getImportType() == VERTEX) ? new GdbVertex() : new GdbEdge();
forElement(rule).accept(r, e);
return e;
};
}
} }

View File

@ -0,0 +1,68 @@
/*
* (C) 2019-present Alibaba Group Holding Limited.
*
* This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
* License version 2 as published by the Free Software Foundation.
*/
package com.alibaba.datax.plugin.writer.gdbwriter.mapping;
import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.writer.gdbwriter.Key;
import com.alibaba.datax.plugin.writer.gdbwriter.client.GdbWriterConfig;
/**
* @author : Liu Jianping
* @date : 2019/10/15
*/
public class MapperConfig {
private static MapperConfig instance = new MapperConfig();
private int maxIdLength;
private int maxLabelLength;
private int maxPropKeyLength;
private int maxPropValueLength;
private MapperConfig() {
this.maxIdLength = GdbWriterConfig.MAX_STRING_LENGTH;
this.maxLabelLength = GdbWriterConfig.MAX_STRING_LENGTH;
this.maxPropKeyLength = GdbWriterConfig.MAX_STRING_LENGTH;
this.maxPropValueLength = GdbWriterConfig.MAX_STRING_LENGTH;
}
public static MapperConfig getInstance() {
return instance;
}
public void updateConfig(final Configuration config) {
final int length = config.getInt(Key.MAX_GDB_STRING_LENGTH, GdbWriterConfig.MAX_STRING_LENGTH);
Integer sLength = config.getInt(Key.MAX_GDB_ID_LENGTH);
this.maxIdLength = sLength == null ? length : sLength;
sLength = config.getInt(Key.MAX_GDB_LABEL_LENGTH);
this.maxLabelLength = sLength == null ? length : sLength;
sLength = config.getInt(Key.MAX_GDB_PROP_KEY_LENGTH);
this.maxPropKeyLength = sLength == null ? length : sLength;
sLength = config.getInt(Key.MAX_GDB_PROP_VALUE_LENGTH);
this.maxPropValueLength = sLength == null ? length : sLength;
}
public int getMaxIdLength() {
return this.maxIdLength;
}
public int getMaxLabelLength() {
return this.maxLabelLength;
}
public int getMaxPropKeyLength() {
return this.maxPropKeyLength;
}
public int getMaxPropValueLength() {
return this.maxPropValueLength;
}
}

View File

@ -7,6 +7,7 @@ import java.util.ArrayList;
import java.util.List; import java.util.List;
import com.alibaba.datax.plugin.writer.gdbwriter.Key.ImportType; import com.alibaba.datax.plugin.writer.gdbwriter.Key.ImportType;
import com.alibaba.datax.plugin.writer.gdbwriter.Key.PropertyType;
import lombok.Data; import lombok.Data;
@ -30,6 +31,8 @@ public class MappingRule {
private String propertiesJsonStr = null; private String propertiesJsonStr = null;
private boolean numPattern = false;
@Data @Data
public static class PropertyMappingRule { public static class PropertyMappingRule {
private String key = null; private String key = null;
@ -37,5 +40,7 @@ public class MappingRule {
private String value = null; private String value = null;
private ValueType valueType = null; private ValueType valueType = null;
private PropertyType pType = PropertyType.single;
} }
} }

View File

@ -3,18 +3,21 @@
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.mapping; package com.alibaba.datax.plugin.writer.gdbwriter.mapping;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.exception.DataXException;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.writer.gdbwriter.GdbWriterErrorCode; import com.alibaba.datax.plugin.writer.gdbwriter.GdbWriterErrorCode;
import com.alibaba.datax.plugin.writer.gdbwriter.Key; import com.alibaba.datax.plugin.writer.gdbwriter.Key;
import com.alibaba.datax.plugin.writer.gdbwriter.Key.ImportType;
import com.alibaba.datax.plugin.writer.gdbwriter.Key.IdTransRule;
import com.alibaba.datax.plugin.writer.gdbwriter.Key.ColumnType; import com.alibaba.datax.plugin.writer.gdbwriter.Key.ColumnType;
import com.alibaba.datax.plugin.writer.gdbwriter.Key.IdTransRule;
import com.alibaba.datax.plugin.writer.gdbwriter.Key.ImportType;
import com.alibaba.datax.plugin.writer.gdbwriter.mapping.MappingRule.PropertyMappingRule; import com.alibaba.datax.plugin.writer.gdbwriter.mapping.MappingRule.PropertyMappingRule;
import com.alibaba.datax.plugin.writer.gdbwriter.util.ConfigHelper; import com.alibaba.datax.plugin.writer.gdbwriter.util.ConfigHelper;
import lombok.extern.slf4j.Slf4j;
import java.util.List; import lombok.extern.slf4j.Slf4j;
/** /**
* @author jerrywang * @author jerrywang
@ -23,14 +26,40 @@ import java.util.List;
@Slf4j @Slf4j
public class MappingRuleFactory { public class MappingRuleFactory {
private static final MappingRuleFactory instance = new MappingRuleFactory(); private static final MappingRuleFactory instance = new MappingRuleFactory();
private static final Pattern STR_PATTERN = Pattern.compile("\\$\\{(\\d+)}");
private static final Pattern STR_NUM_PATTERN = Pattern.compile("#\\{(\\d+)}");
public static final MappingRuleFactory getInstance() { public static MappingRuleFactory getInstance() {
return instance; return instance;
} }
private static boolean isPattern(final String value, final MappingRule rule, final boolean checked) {
if (checked) {
return true;
}
if (value == null || value.isEmpty()) {
return false;
}
Matcher m = STR_PATTERN.matcher(value);
if (m.find()) {
rule.setNumPattern(false);
return true;
}
m = STR_NUM_PATTERN.matcher(value);
if (m.find()) {
rule.setNumPattern(true);
return true;
}
return false;
}
@Deprecated @Deprecated
public MappingRule create(Configuration config, ImportType type) { public MappingRule create(final Configuration config, final ImportType type) {
MappingRule rule = new MappingRule(); final MappingRule rule = new MappingRule();
rule.setId(config.getString(Key.ID)); rule.setId(config.getString(Key.ID));
rule.setLabel(config.getString(Key.LABEL)); rule.setLabel(config.getString(Key.LABEL));
if (type == ImportType.EDGE) { if (type == ImportType.EDGE) {
@ -40,10 +69,10 @@ public class MappingRuleFactory {
rule.setImportType(type); rule.setImportType(type);
List<Configuration> configurations = config.getListConfiguration(Key.PROPERTIES); final List<Configuration> configurations = config.getListConfiguration(Key.PROPERTIES);
if (configurations != null) { if (configurations != null) {
for (Configuration prop : config.getListConfiguration(Key.PROPERTIES)) { for (final Configuration prop : config.getListConfiguration(Key.PROPERTIES)) {
PropertyMappingRule propRule = new PropertyMappingRule(); final PropertyMappingRule propRule = new PropertyMappingRule();
propRule.setKey(prop.getString(Key.PROP_KEY)); propRule.setKey(prop.getString(Key.PROP_KEY));
propRule.setValue(prop.getString(Key.PROP_VALUE)); propRule.setValue(prop.getString(Key.PROP_VALUE));
propRule.setValueType(ValueType.fromShortName(prop.getString(Key.PROP_TYPE).toLowerCase())); propRule.setValueType(ValueType.fromShortName(prop.getString(Key.PROP_TYPE).toLowerCase()));
@ -51,7 +80,7 @@ public class MappingRuleFactory {
} }
} }
String propertiesJsonStr = config.getString(Key.PROPERTIES_JSON_STR, null); final String propertiesJsonStr = config.getString(Key.PROPERTIES_JSON_STR, null);
if (propertiesJsonStr != null) { if (propertiesJsonStr != null) {
rule.setPropertiesJsonStr(propertiesJsonStr); rule.setPropertiesJsonStr(propertiesJsonStr);
} }
@ -59,23 +88,25 @@ public class MappingRuleFactory {
return rule; return rule;
} }
public MappingRule createV2(Configuration config) { public MappingRule createV2(final Configuration config) {
try { try {
ImportType type = ImportType.valueOf(config.getString(Key.IMPORT_TYPE)); final ImportType type = ImportType.valueOf(config.getString(Key.IMPORT_TYPE));
return createV2(config, type); return createV2(config, type);
} catch (NullPointerException e) { } catch (final NullPointerException e) {
throw DataXException.asDataXException(GdbWriterErrorCode.CONFIG_ITEM_MISS, Key.IMPORT_TYPE); throw DataXException.asDataXException(GdbWriterErrorCode.CONFIG_ITEM_MISS, Key.IMPORT_TYPE);
} catch (IllegalArgumentException e) { } catch (final IllegalArgumentException e) {
throw DataXException.asDataXException(GdbWriterErrorCode.BAD_CONFIG_VALUE, Key.IMPORT_TYPE); throw DataXException.asDataXException(GdbWriterErrorCode.BAD_CONFIG_VALUE, Key.IMPORT_TYPE);
} }
} }
public MappingRule createV2(Configuration config, ImportType type) { public MappingRule createV2(final Configuration config, final ImportType type) {
MappingRule rule = new MappingRule(); final MappingRule rule = new MappingRule();
boolean patternChecked = false;
ConfigHelper.assertHasContent(config, Key.LABEL); ConfigHelper.assertHasContent(config, Key.LABEL);
rule.setLabel(config.getString(Key.LABEL)); rule.setLabel(config.getString(Key.LABEL));
rule.setImportType(type); rule.setImportType(type);
patternChecked = isPattern(rule.getLabel(), rule, patternChecked);
IdTransRule srcTransRule = IdTransRule.none; IdTransRule srcTransRule = IdTransRule.none;
IdTransRule dstTransRule = IdTransRule.none; IdTransRule dstTransRule = IdTransRule.none;
@ -95,27 +126,29 @@ public class MappingRuleFactory {
} }
} }
ConfigHelper.assertHasContent(config, Key.ID_TRANS_RULE); ConfigHelper.assertHasContent(config, Key.ID_TRANS_RULE);
IdTransRule transRule = IdTransRule.valueOf(config.getString(Key.ID_TRANS_RULE)); final IdTransRule transRule = IdTransRule.valueOf(config.getString(Key.ID_TRANS_RULE));
List<Configuration> configurationList = config.getListConfiguration(Key.COLUMN); final List<Configuration> configurationList = config.getListConfiguration(Key.COLUMN);
ConfigHelper.assertConfig(Key.COLUMN, () -> (configurationList != null && !configurationList.isEmpty())); ConfigHelper.assertConfig(Key.COLUMN, () -> (configurationList != null && !configurationList.isEmpty()));
for (Configuration column : configurationList) { for (final Configuration column : configurationList) {
ConfigHelper.assertHasContent(column, Key.COLUMN_NAME); ConfigHelper.assertHasContent(column, Key.COLUMN_NAME);
ConfigHelper.assertHasContent(column, Key.COLUMN_VALUE); ConfigHelper.assertHasContent(column, Key.COLUMN_VALUE);
ConfigHelper.assertHasContent(column, Key.COLUMN_TYPE); ConfigHelper.assertHasContent(column, Key.COLUMN_TYPE);
ConfigHelper.assertHasContent(column, Key.COLUMN_NODE_TYPE); ConfigHelper.assertHasContent(column, Key.COLUMN_NODE_TYPE);
String columnValue = column.getString(Key.COLUMN_VALUE); final String columnValue = column.getString(Key.COLUMN_VALUE);
ColumnType columnType = ColumnType.valueOf(column.getString(Key.COLUMN_NODE_TYPE)); final ColumnType columnType = ColumnType.valueOf(column.getString(Key.COLUMN_NODE_TYPE));
if (columnValue == null || columnValue.isEmpty()) { if (columnValue == null || columnValue.isEmpty()) {
// only allow edge empty id // only allow edge empty id
ConfigHelper.assertConfig("empty column value", ConfigHelper.assertConfig("empty column value",
() -> (type == ImportType.EDGE && columnType == ColumnType.primaryKey)); () -> (type == ImportType.EDGE && columnType == ColumnType.primaryKey));
} }
patternChecked = isPattern(columnValue, rule, patternChecked);
if (columnType == ColumnType.primaryKey) { if (columnType == ColumnType.primaryKey) {
ValueType propType = ValueType.fromShortName(column.getString(Key.COLUMN_TYPE)); final ValueType propType = ValueType.fromShortName(column.getString(Key.COLUMN_TYPE));
ConfigHelper.assertConfig("only string is allowed in primary key", () -> (propType == ValueType.STRING)); ConfigHelper.assertConfig("only string is allowed in primary key",
() -> (propType == ValueType.STRING));
if (transRule == IdTransRule.labelPrefix) { if (transRule == IdTransRule.labelPrefix) {
rule.setId(config.getString(Key.LABEL) + columnValue); rule.setId(config.getString(Key.LABEL) + columnValue);
@ -127,14 +160,18 @@ public class MappingRuleFactory {
ConfigHelper.assertConfig("multi JsonProperty", () -> (rule.getPropertiesJsonStr() == null)); ConfigHelper.assertConfig("multi JsonProperty", () -> (rule.getPropertiesJsonStr() == null));
rule.setPropertiesJsonStr(columnValue); rule.setPropertiesJsonStr(columnValue);
} else if (columnType == ColumnType.vertexProperty || columnType == ColumnType.edgeProperty) { } else if (columnType == ColumnType.vertexProperty || columnType == ColumnType.edgeProperty
PropertyMappingRule propertyMappingRule = new PropertyMappingRule(); || columnType == ColumnType.vertexSetProperty) {
final PropertyMappingRule propertyMappingRule = new PropertyMappingRule();
propertyMappingRule.setKey(column.getString(Key.COLUMN_NAME)); propertyMappingRule.setKey(column.getString(Key.COLUMN_NAME));
propertyMappingRule.setValue(columnValue); propertyMappingRule.setValue(columnValue);
ValueType propType = ValueType.fromShortName(column.getString(Key.COLUMN_TYPE)); final ValueType propType = ValueType.fromShortName(column.getString(Key.COLUMN_TYPE));
ConfigHelper.assertConfig("unsupported property type", () -> propType != null); ConfigHelper.assertConfig("unsupported property type", () -> propType != null);
if (columnType == ColumnType.vertexSetProperty) {
propertyMappingRule.setPType(Key.PropertyType.set);
}
propertyMappingRule.setValueType(propType); propertyMappingRule.setValueType(propType);
rule.getProperties().add(propertyMappingRule); rule.getProperties().add(propertyMappingRule);
} else if (columnType == ColumnType.srcPrimaryKey) { } else if (columnType == ColumnType.srcPrimaryKey) {
@ -142,8 +179,9 @@ public class MappingRuleFactory {
continue; continue;
} }
ValueType propType = ValueType.fromShortName(column.getString(Key.COLUMN_TYPE)); final ValueType propType = ValueType.fromShortName(column.getString(Key.COLUMN_TYPE));
ConfigHelper.assertConfig("only string is allowed in primary key", () -> (propType == ValueType.STRING)); ConfigHelper.assertConfig("only string is allowed in primary key",
() -> (propType == ValueType.STRING));
if (srcTransRule == IdTransRule.labelPrefix) { if (srcTransRule == IdTransRule.labelPrefix) {
rule.setFrom(config.getString(Key.SRC_LABEL) + columnValue); rule.setFrom(config.getString(Key.SRC_LABEL) + columnValue);
@ -155,8 +193,9 @@ public class MappingRuleFactory {
continue; continue;
} }
ValueType propType = ValueType.fromShortName(column.getString(Key.COLUMN_TYPE)); final ValueType propType = ValueType.fromShortName(column.getString(Key.COLUMN_TYPE));
ConfigHelper.assertConfig("only string is allowed in primary key", () -> (propType == ValueType.STRING)); ConfigHelper.assertConfig("only string is allowed in primary key",
() -> (propType == ValueType.STRING));
if (dstTransRule == IdTransRule.labelPrefix) { if (dstTransRule == IdTransRule.labelPrefix) {
rule.setTo(config.getString(Key.DST_LABEL) + columnValue); rule.setTo(config.getString(Key.DST_LABEL) + columnValue);

View File

@ -8,6 +8,7 @@ import java.util.Map;
import java.util.function.Function; import java.util.function.Function;
import com.alibaba.datax.common.element.Column; import com.alibaba.datax.common.element.Column;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
/** /**
@ -16,7 +17,11 @@ import lombok.extern.slf4j.Slf4j;
*/ */
@Slf4j @Slf4j
public enum ValueType { public enum ValueType {
/**
* property value type
*/
INT(Integer.class, "int", Column::asLong, Integer::valueOf), INT(Integer.class, "int", Column::asLong, Integer::valueOf),
INTEGER(Integer.class, "integer", Column::asLong, Integer::valueOf),
LONG(Long.class, "long", Column::asLong, Long::valueOf), LONG(Long.class, "long", Column::asLong, Long::valueOf),
DOUBLE(Double.class, "double", Column::asDouble, Double::valueOf), DOUBLE(Double.class, "double", Column::asDouble, Double::valueOf),
FLOAT(Float.class, "float", Column::asDouble, Float::valueOf), FLOAT(Float.class, "float", Column::asDouble, Float::valueOf),
@ -28,7 +33,8 @@ public enum ValueType {
private Function<Column, Object> columnFunc = null; private Function<Column, Object> columnFunc = null;
private Function<String, Object> fromStrFunc = null; private Function<String, Object> fromStrFunc = null;
private ValueType(Class<?> type, String name, Function<Column, Object> columnFunc, Function<String, Object> fromStrFunc) { private ValueType(final Class<?> type, final String name, final Function<Column, Object> columnFunc,
final Function<String, Object> fromStrFunc) {
this.type = type; this.type = type;
this.shortName = name; this.shortName = name;
this.columnFunc = columnFunc; this.columnFunc = columnFunc;
@ -37,7 +43,7 @@ public enum ValueType {
ValueTypeHolder.shortName2type.put(name, this); ValueTypeHolder.shortName2type.put(name, this);
} }
public static ValueType fromShortName(String name) { public static ValueType fromShortName(final String name) {
return ValueTypeHolder.shortName2type.get(name); return ValueTypeHolder.shortName2type.get(name);
} }
@ -49,20 +55,20 @@ public enum ValueType {
return this.shortName; return this.shortName;
} }
public Object applyColumn(Column column) { public Object applyColumn(final Column column) {
try { try {
if (column == null) { if (column == null) {
return null; return null;
} }
return columnFunc.apply(column); return this.columnFunc.apply(column);
} catch (Exception e) { } catch (final Exception e) {
log.error("applyColumn error {}, column {}", e.toString(), column); log.error("applyColumn error {}, column {}", e.toString(), column);
throw e; throw e;
} }
} }
public Object fromStrFunc(String str) { public Object fromStrFunc(final String str) {
return fromStrFunc.apply(str); return this.fromStrFunc.apply(str);
} }
private static class ValueTypeHolder { private static class ValueTypeHolder {

View File

@ -3,20 +3,24 @@
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.model; package com.alibaba.datax.plugin.writer.gdbwriter.model;
import com.alibaba.datax.common.util.Configuration; import static com.alibaba.datax.plugin.writer.gdbwriter.client.GdbWriterConfig.DEFAULT_BATCH_PROPERTY_NUM;
import com.alibaba.datax.plugin.writer.gdbwriter.Key; import static com.alibaba.datax.plugin.writer.gdbwriter.client.GdbWriterConfig.MAX_REQUEST_LENGTH;
import com.alibaba.datax.plugin.writer.gdbwriter.client.GdbWriterConfig;
import java.util.Map;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j;
import org.apache.tinkerpop.gremlin.driver.Client; import org.apache.tinkerpop.gremlin.driver.Client;
import org.apache.tinkerpop.gremlin.driver.Cluster; import org.apache.tinkerpop.gremlin.driver.Cluster;
import org.apache.tinkerpop.gremlin.driver.RequestOptions; import org.apache.tinkerpop.gremlin.driver.RequestOptions;
import org.apache.tinkerpop.gremlin.driver.ResultSet; import org.apache.tinkerpop.gremlin.driver.ResultSet;
import org.apache.tinkerpop.gremlin.driver.ser.Serializers; import org.apache.tinkerpop.gremlin.driver.ser.Serializers;
import java.util.Map; import com.alibaba.datax.common.util.Configuration;
import java.util.UUID; import com.alibaba.datax.plugin.writer.gdbwriter.Key;
import java.util.concurrent.TimeUnit; import com.alibaba.datax.plugin.writer.gdbwriter.client.GdbWriterConfig;
import lombok.extern.slf4j.Slf4j;
/** /**
* @author jerrywang * @author jerrywang
@ -28,28 +32,28 @@ public abstract class AbstractGdbGraph implements GdbGraph {
protected Client client = null; protected Client client = null;
protected Key.UpdateMode updateMode = Key.UpdateMode.INSERT; protected Key.UpdateMode updateMode = Key.UpdateMode.INSERT;
protected int propertiesBatchNum = GdbWriterConfig.DEFAULT_BATCH_PROPERTY_NUM; protected int propertiesBatchNum = DEFAULT_BATCH_PROPERTY_NUM;
protected boolean session = false; protected boolean session = false;
protected int maxRequestLength = GdbWriterConfig.MAX_REQUEST_LENGTH;
protected AbstractGdbGraph() {} protected AbstractGdbGraph() {}
protected AbstractGdbGraph(Configuration config, boolean session) { protected AbstractGdbGraph(final Configuration config, final boolean session) {
initClient(config, session); initClient(config, session);
} }
protected void initClient(Configuration config, boolean session) { protected void initClient(final Configuration config, final boolean session) {
updateMode = Key.UpdateMode.valueOf(config.getString(Key.UPDATE_MODE, "INSERT")); this.updateMode = Key.UpdateMode.valueOf(config.getString(Key.UPDATE_MODE, "INSERT"));
log.info("init graphdb client"); log.info("init graphdb client");
String host = config.getString(Key.HOST); final String host = config.getString(Key.HOST);
int port = config.getInt(Key.PORT); final int port = config.getInt(Key.PORT);
String username = config.getString(Key.USERNAME); final String username = config.getString(Key.USERNAME);
String password = config.getString(Key.PASSWORD); final String password = config.getString(Key.PASSWORD);
int maxDepthPerConnection = config.getInt(Key.MAX_IN_PROCESS_PER_CONNECTION, int maxDepthPerConnection =
GdbWriterConfig.DEFAULT_MAX_IN_PROCESS_PER_CONNECTION); config.getInt(Key.MAX_IN_PROCESS_PER_CONNECTION, GdbWriterConfig.DEFAULT_MAX_IN_PROCESS_PER_CONNECTION);
int maxConnectionPoolSize = config.getInt(Key.MAX_CONNECTION_POOL_SIZE, int maxConnectionPoolSize =
GdbWriterConfig.DEFAULT_MAX_CONNECTION_POOL_SIZE); config.getInt(Key.MAX_CONNECTION_POOL_SIZE, GdbWriterConfig.DEFAULT_MAX_CONNECTION_POOL_SIZE);
int maxSimultaneousUsagePerConnection = config.getInt(Key.MAX_SIMULTANEOUS_USAGE_PER_CONNECTION, int maxSimultaneousUsagePerConnection = config.getInt(Key.MAX_SIMULTANEOUS_USAGE_PER_CONNECTION,
GdbWriterConfig.DEFAULT_MAX_SIMULTANEOUS_USAGE_PER_CONNECTION); GdbWriterConfig.DEFAULT_MAX_SIMULTANEOUS_USAGE_PER_CONNECTION);
@ -62,79 +66,75 @@ public abstract class AbstractGdbGraph implements GdbGraph {
} }
try { try {
Cluster cluster = Cluster.build(host).port(port).credentials(username, password) final Cluster cluster = Cluster.build(host).port(port).credentials(username, password)
.serializer(Serializers.GRAPHBINARY_V1D0) .serializer(Serializers.GRAPHBINARY_V1D0).maxContentLength(1048576)
.maxContentLength(1048576) .maxInProcessPerConnection(maxDepthPerConnection).minInProcessPerConnection(0)
.maxInProcessPerConnection(maxDepthPerConnection) .maxConnectionPoolSize(maxConnectionPoolSize).minConnectionPoolSize(maxConnectionPoolSize)
.minInProcessPerConnection(0) .maxSimultaneousUsagePerConnection(maxSimultaneousUsagePerConnection).resultIterationBatchSize(64)
.maxConnectionPoolSize(maxConnectionPoolSize)
.minConnectionPoolSize(maxConnectionPoolSize)
.maxSimultaneousUsagePerConnection(maxSimultaneousUsagePerConnection)
.resultIterationBatchSize(64)
.create(); .create();
client = session ? cluster.connect(UUID.randomUUID().toString()).init() : cluster.connect().init(); this.client = session ? cluster.connect(UUID.randomUUID().toString()).init() : cluster.connect().init();
warmClient(maxConnectionPoolSize * maxDepthPerConnection); warmClient(maxConnectionPoolSize * maxDepthPerConnection);
} catch (RuntimeException e) { } catch (final RuntimeException e) {
log.error("Failed to connect to GDB {}:{}, due to {}", host, port, e); log.error("Failed to connect to GDB {}:{}, due to {}", host, port, e);
throw e; throw e;
} }
propertiesBatchNum = config.getInt(Key.MAX_PROPERTIES_BATCH_NUM, GdbWriterConfig.DEFAULT_BATCH_PROPERTY_NUM); this.propertiesBatchNum = config.getInt(Key.MAX_PROPERTIES_BATCH_NUM, DEFAULT_BATCH_PROPERTY_NUM);
this.maxRequestLength = config.getInt(Key.MAX_GDB_REQUEST_LENGTH, MAX_REQUEST_LENGTH);
} }
/** /**
* @param dsl * @param dsl
* @param parameters * @param parameters
*/ */
protected void runInternal(String dsl, final Map<String, Object> parameters) throws Exception { protected void runInternal(final String dsl, final Map<String, Object> parameters) throws Exception {
RequestOptions.Builder options = RequestOptions.build().timeout(DEFAULT_TIMEOUT); final RequestOptions.Builder options = RequestOptions.build().timeout(DEFAULT_TIMEOUT);
if (parameters != null && !parameters.isEmpty()) { if (parameters != null && !parameters.isEmpty()) {
parameters.forEach(options::addParameter); parameters.forEach(options::addParameter);
} }
ResultSet results = client.submitAsync(dsl, options.create()).get(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS); final ResultSet results = this.client.submitAsync(dsl, options.create()).get(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
results.all().get(DEFAULT_TIMEOUT + 1000, TimeUnit.MILLISECONDS); results.all().get(DEFAULT_TIMEOUT + 1000, TimeUnit.MILLISECONDS);
} }
void beginTx() { void beginTx() {
if (!session) { if (!this.session) {
return; return;
} }
String dsl = "g.tx().open()"; final String dsl = "g.tx().open()";
client.submit(dsl).all().join(); this.client.submit(dsl).all().join();
} }
void doCommit() { void doCommit() {
if (!session) { if (!this.session) {
return; return;
} }
try { try {
String dsl = "g.tx().commit()"; final String dsl = "g.tx().commit()";
client.submit(dsl).all().join(); this.client.submit(dsl).all().join();
} catch (Exception e) { } catch (final Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
void doRollback() { void doRollback() {
if (!session) { if (!this.session) {
return; return;
} }
String dsl = "g.tx().rollback()"; final String dsl = "g.tx().rollback()";
client.submit(dsl).all().join(); this.client.submit(dsl).all().join();
} }
private void warmClient(int num) { private void warmClient(final int num) {
try { try {
beginTx(); beginTx();
runInternal("g.V('test')", null); runInternal("g.V('test')", null);
doCommit(); doCommit();
log.info("warm graphdb client over"); log.info("warm graphdb client over");
} catch (Exception e) { } catch (final Exception e) {
log.error("warmClient error"); log.error("warmClient error");
doRollback(); doRollback();
throw new RuntimeException(e); throw new RuntimeException(e);
@ -143,9 +143,9 @@ public abstract class AbstractGdbGraph implements GdbGraph {
@Override @Override
public void close() { public void close() {
if (client != null) { if (this.client != null) {
log.info("close graphdb client"); log.info("close graphdb client");
client.close(); this.client.close();
} }
} }
} }

View File

@ -3,7 +3,8 @@
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.model; package com.alibaba.datax.plugin.writer.gdbwriter.model;
import lombok.Data; import com.alibaba.datax.plugin.writer.gdbwriter.mapping.MapperConfig;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
@ -11,10 +12,33 @@ import lombok.ToString;
* @author jerrywang * @author jerrywang
* *
*/ */
@Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true) @ToString(callSuper = true)
public class GdbEdge extends GdbElement { public class GdbEdge extends GdbElement {
private String from = null; private String from = null;
private String to = null; private String to = null;
public String getFrom() {
return this.from;
}
public void setFrom(final String from) {
final int maxIdLength = MapperConfig.getInstance().getMaxIdLength();
if (from.length() > maxIdLength) {
throw new IllegalArgumentException("from length over limit(" + maxIdLength + ")");
}
this.from = from;
}
public String getTo() {
return this.to;
}
public void setTo(final String to) {
final int maxIdLength = MapperConfig.getInstance().getMaxIdLength();
if (to.length() > maxIdLength) {
throw new IllegalArgumentException("to length over limit(" + maxIdLength + ")");
}
this.to = to;
}
} }

View File

@ -3,18 +3,107 @@
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.model; package com.alibaba.datax.plugin.writer.gdbwriter.model;
import java.util.HashMap; import java.util.LinkedList;
import java.util.Map; import java.util.List;
import lombok.Data; import com.alibaba.datax.plugin.writer.gdbwriter.Key.PropertyType;
import com.alibaba.datax.plugin.writer.gdbwriter.mapping.MapperConfig;
/** /**
* @author jerrywang * @author jerrywang
* *
*/ */
@Data
public class GdbElement { public class GdbElement {
String id = null; private String id = null;
String label = null; private String label = null;
Map<String, Object> properties = new HashMap<>(); private List<GdbProperty> properties = new LinkedList<>();
public String getId() {
return this.id;
}
public void setId(final String id) {
final int maxIdLength = MapperConfig.getInstance().getMaxIdLength();
if (id.length() > maxIdLength) {
throw new IllegalArgumentException("id length over limit(" + maxIdLength + ")");
}
this.id = id;
}
public String getLabel() {
return this.label;
}
public void setLabel(final String label) {
final int maxLabelLength = MapperConfig.getInstance().getMaxLabelLength();
if (label.length() > maxLabelLength) {
throw new IllegalArgumentException("label length over limit(" + maxLabelLength + ")");
}
this.label = label;
}
public List<GdbProperty> getProperties() {
return this.properties;
}
public void addProperty(final String propKey, final Object propValue, final PropertyType card) {
if (propKey == null || propValue == null) {
return;
}
final int maxPropKeyLength = MapperConfig.getInstance().getMaxPropKeyLength();
if (propKey.length() > maxPropKeyLength) {
throw new IllegalArgumentException("property key length over limit(" + maxPropKeyLength + ")");
}
if (propValue instanceof String) {
final int maxPropValueLength = MapperConfig.getInstance().getMaxPropValueLength();
if (((String)propValue).length() > maxPropKeyLength) {
throw new IllegalArgumentException("property value length over limit(" + maxPropValueLength + ")");
}
}
this.properties.add(new GdbProperty(propKey, propValue, card));
}
public void addProperty(final String propKey, final Object propValue) {
addProperty(propKey, propValue, PropertyType.single);
}
@Override
public String toString() {
final StringBuffer sb = new StringBuffer(this.id + "[" + this.label + "]{");
this.properties.forEach(n -> {
sb.append(n.cardinality.name());
sb.append("[");
sb.append(n.key);
sb.append(" - ");
sb.append(String.valueOf(n.value));
sb.append("]");
});
return sb.toString();
}
public static class GdbProperty {
private String key;
private Object value;
private PropertyType cardinality;
private GdbProperty(final String key, final Object value, final PropertyType card) {
this.key = key;
this.value = value;
this.cardinality = card;
}
public PropertyType getCardinality() {
return this.cardinality;
}
public String getKey() {
return this.key;
}
public Object getValue() {
return this.value;
}
}
} }

View File

@ -3,11 +3,12 @@
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.model; package com.alibaba.datax.plugin.writer.gdbwriter.model;
import com.alibaba.datax.common.element.Record;
import groovy.lang.Tuple2;
import java.util.List; import java.util.List;
import com.alibaba.datax.common.element.Record;
import groovy.lang.Tuple2;
/** /**
* @author jerrywang * @author jerrywang
* *

View File

@ -3,15 +3,17 @@
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.model; package com.alibaba.datax.plugin.writer.gdbwriter.model;
import java.util.*; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import com.alibaba.datax.common.element.Record; import com.alibaba.datax.common.element.Record;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.writer.gdbwriter.Key; import com.alibaba.datax.plugin.writer.gdbwriter.Key;
import com.alibaba.datax.plugin.writer.gdbwriter.util.GdbDuplicateIdException; import com.alibaba.datax.plugin.writer.gdbwriter.util.GdbDuplicateIdException;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import groovy.lang.Tuple2; import groovy.lang.Tuple2;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -29,70 +31,68 @@ public class ScriptGdbGraph extends AbstractGdbGraph {
private static final String VAR_PROP_KEY = VAR_PREFIX + "PK"; private static final String VAR_PROP_KEY = VAR_PREFIX + "PK";
private static final String VAR_PROP_VALUE = VAR_PREFIX + "PV"; private static final String VAR_PROP_VALUE = VAR_PREFIX + "PV";
private static final String ADD_V_START = "g.addV(" + VAR_LABEL + ").property(id, " + VAR_ID + ")"; private static final String ADD_V_START = "g.addV(" + VAR_LABEL + ").property(id, " + VAR_ID + ")";
private static final String ADD_E_START = "g.addE(" + VAR_LABEL + ").property(id, " + VAR_ID + ").from(V(" private static final String ADD_E_START =
+ VAR_FROM + ")).to(V(" + VAR_TO + "))"; "g.addE(" + VAR_LABEL + ").property(id, " + VAR_ID + ").from(V(" + VAR_FROM + ")).to(V(" + VAR_TO + "))";
private static final String UPDATE_V_START = "g.V(" + VAR_ID + ")"; private static final String UPDATE_V_START = "g.V(" + VAR_ID + ")";
private static final String UPDATE_E_START = "g.E(" + VAR_ID + ")"; private static final String UPDATE_E_START = "g.E(" + VAR_ID + ")";
private Cache<Integer, String> propertyCache;
private Random random; private Random random;
public ScriptGdbGraph() { public ScriptGdbGraph() {
propertyCache = Caffeine.newBuilder().maximumSize(1024).build(); this.random = new Random();
random = new Random();
} }
public ScriptGdbGraph(Configuration config, boolean session) { public ScriptGdbGraph(final Configuration config, final boolean session) {
super(config, session); super(config, session);
propertyCache = Caffeine.newBuilder().maximumSize(1024).build(); this.random = new Random();
random = new Random();
log.info("Init as ScriptGdbGraph."); log.info("Init as ScriptGdbGraph.");
} }
/** /**
* Apply list of {@link GdbElement} to GDB, return the failed records * Apply list of {@link GdbElement} to GDB, return the failed records
* @param records list of element to apply *
* @param records
* list of element to apply
* @return * @return
*/ */
@Override @Override
public List<Tuple2<Record, Exception>> add(List<Tuple2<Record, GdbElement>> records) { public List<Tuple2<Record, Exception>> add(final List<Tuple2<Record, GdbElement>> records) {
List<Tuple2<Record, Exception>> errors = new ArrayList<>(); final List<Tuple2<Record, Exception>> errors = new ArrayList<>();
try { try {
beginTx(); beginTx();
for (Tuple2<Record, GdbElement> elementTuple2 : records) { for (final Tuple2<Record, GdbElement> elementTuple2 : records) {
try { try {
addInternal(elementTuple2.getSecond()); addInternal(elementTuple2.getSecond());
} catch (Exception e) { } catch (final Exception e) {
errors.add(new Tuple2<>(elementTuple2.getFirst(), e)); errors.add(new Tuple2<>(elementTuple2.getFirst(), e));
} }
} }
doCommit(); doCommit();
} catch (Exception ex) { } catch (final Exception ex) {
doRollback(); doRollback();
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
return errors; return errors;
} }
private void addInternal(GdbElement element) { private void addInternal(final GdbElement element) {
try { try {
addInternal(element, false); addInternal(element, false);
} catch (GdbDuplicateIdException e) { } catch (final GdbDuplicateIdException e) {
if (updateMode == Key.UpdateMode.SKIP) { if (this.updateMode == Key.UpdateMode.SKIP) {
log.debug("Skip duplicate id {}", element.getId()); log.debug("Skip duplicate id {}", element.getId());
} else if (updateMode == Key.UpdateMode.INSERT) { } else if (this.updateMode == Key.UpdateMode.INSERT) {
throw new RuntimeException(e); throw new RuntimeException(e);
} else if (updateMode == Key.UpdateMode.MERGE) { } else if (this.updateMode == Key.UpdateMode.MERGE) {
if (element.getProperties().isEmpty()) { if (element.getProperties().isEmpty()) {
return; return;
} }
try { try {
addInternal(element, true); addInternal(element, true);
} catch (GdbDuplicateIdException e1) { } catch (final GdbDuplicateIdException e1) {
log.error("duplicate id {} while update...", element.getId()); log.error("duplicate id {} while update...", element.getId());
throw new RuntimeException(e1); throw new RuntimeException(e1);
} }
@ -100,83 +100,107 @@ public class ScriptGdbGraph extends AbstractGdbGraph {
} }
} }
private void addInternal(GdbElement element, boolean update) throws GdbDuplicateIdException { private void addInternal(final GdbElement element, final boolean update) throws GdbDuplicateIdException {
Map<String, Object> params = element.getProperties();
Map<String, Object> subParams = new HashMap<>(propertiesBatchNum);
boolean firstAdd = !update; boolean firstAdd = !update;
boolean isVertex = (element instanceof GdbVertex); final boolean isVertex = (element instanceof GdbVertex);
final List<GdbElement.GdbProperty> params = element.getProperties();
final List<GdbElement.GdbProperty> subParams = new ArrayList<>(this.propertiesBatchNum);
for (Map.Entry<String, Object> entry : params.entrySet()) { final int idLength = element.getId().length();
subParams.put(entry.getKey(), entry.getValue()); int attachLength = element.getLabel().length();
if (subParams.size() >= propertiesBatchNum) { if (element instanceof GdbEdge) {
attachLength += ((GdbEdge)element).getFrom().length();
attachLength += ((GdbEdge)element).getTo().length();
}
int requestLength = idLength;
for (final GdbElement.GdbProperty entry : params) {
final String propKey = entry.getKey();
final Object propValue = entry.getValue();
int appendLength = propKey.length();
if (propValue instanceof String) {
appendLength += ((String)propValue).length();
}
if (checkSplitDsl(firstAdd, requestLength, attachLength, appendLength, subParams.size())) {
setGraphDbElement(element, subParams, isVertex, firstAdd); setGraphDbElement(element, subParams, isVertex, firstAdd);
firstAdd = false; firstAdd = false;
subParams.clear(); subParams.clear();
requestLength = idLength;
} }
requestLength += appendLength;
subParams.add(entry);
} }
if (!subParams.isEmpty() || firstAdd) { if (!subParams.isEmpty() || firstAdd) {
checkSplitDsl(firstAdd, requestLength, attachLength, 0, 0);
setGraphDbElement(element, subParams, isVertex, firstAdd); setGraphDbElement(element, subParams, isVertex, firstAdd);
} }
} }
private Tuple2<String, Map<String, Object>> buildDsl(GdbElement element, private boolean checkSplitDsl(final boolean firstAdd, final int requestLength, final int attachLength, final int appendLength,
Map<String, Object> properties, final int propNum) {
boolean isVertex, boolean firstAdd) { final int length = firstAdd ? requestLength + attachLength : requestLength;
Map<String, Object> params = new HashMap<>(); if (length > this.maxRequestLength) {
throw new IllegalArgumentException("request length over limit(" + this.maxRequestLength + ")");
}
return length + appendLength > this.maxRequestLength || propNum >= this.propertiesBatchNum;
}
String dslPropertyPart = propertyCache.get(properties.size(), keys -> { private Tuple2<String, Map<String, Object>> buildDsl(final GdbElement element, final List<GdbElement.GdbProperty> properties,
final boolean isVertex, final boolean firstAdd) {
final Map<String, Object> params = new HashMap<>();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
for (int i = 0; i < keys; i++) {
sb.append(".property(").append(VAR_PROP_KEY).append(i)
.append(", ").append(VAR_PROP_VALUE).append(i).append(")");
}
return sb.toString();
});
String dsl;
if (isVertex) { if (isVertex) {
dsl = (firstAdd ? ADD_V_START : UPDATE_V_START) + dslPropertyPart; sb.append(firstAdd ? ADD_V_START : UPDATE_V_START);
} else { } else {
dsl = (firstAdd ? ADD_E_START : UPDATE_E_START) + dslPropertyPart; sb.append(firstAdd ? ADD_E_START : UPDATE_E_START);
if (firstAdd) {
params.put(VAR_FROM, ((GdbEdge)element).getFrom());
params.put(VAR_TO, ((GdbEdge)element).getTo());
}
} }
int index = 0; for (int i = 0; i < properties.size(); i++) {
for (Map.Entry<String, Object> entry : properties.entrySet()) { final GdbElement.GdbProperty prop = properties.get(i);
params.put(VAR_PROP_KEY+index, entry.getKey());
params.put(VAR_PROP_VALUE+index, entry.getValue()); sb.append(".property(");
index++; if (prop.getCardinality() == Key.PropertyType.set) {
sb.append("set, ");
}
sb.append(VAR_PROP_KEY).append(i).append(", ").append(VAR_PROP_VALUE).append(i).append(")");
params.put(VAR_PROP_KEY + i, prop.getKey());
params.put(VAR_PROP_VALUE + i, prop.getValue());
} }
if (firstAdd) { if (firstAdd) {
params.put(VAR_LABEL, element.getLabel()); params.put(VAR_LABEL, element.getLabel());
if (!isVertex) {
params.put(VAR_FROM, ((GdbEdge)element).getFrom());
params.put(VAR_TO, ((GdbEdge)element).getTo());
}
} }
params.put(VAR_ID, element.getId()); params.put(VAR_ID, element.getId());
return new Tuple2<>(dsl, params); return new Tuple2<>(sb.toString(), params);
} }
private void setGraphDbElement(GdbElement element, Map<String, Object> properties, private void setGraphDbElement(final GdbElement element, final List<GdbElement.GdbProperty> properties, final boolean isVertex,
boolean isVertex, boolean firstAdd) throws GdbDuplicateIdException { final boolean firstAdd) throws GdbDuplicateIdException {
int retry = 10; int retry = 10;
int idleTime = random.nextInt(10) + 10; int idleTime = this.random.nextInt(10) + 10;
Tuple2<String, Map<String, Object>> elementDsl = buildDsl(element, properties, isVertex, firstAdd); final Tuple2<String, Map<String, Object>> elementDsl = buildDsl(element, properties, isVertex, firstAdd);
while (retry > 0) { while (retry > 0) {
try { try {
runInternal(elementDsl.getFirst(), elementDsl.getSecond()); runInternal(elementDsl.getFirst(), elementDsl.getSecond());
log.debug("AddElement {}", element.getId()); log.debug("AddElement {}", element.getId());
return; return;
} catch (Exception e) { } catch (final Exception e) {
String cause = e.getCause() == null ? "" : e.getCause().toString(); final String cause = e.getCause() == null ? "" : e.getCause().toString();
if (cause.contains("rejected from")) { if (cause.contains("rejected from") || cause.contains("Timeout waiting to lock key")) {
retry--; retry--;
try { try {
Thread.sleep(idleTime); Thread.sleep(idleTime);
} catch (InterruptedException e1) { } catch (final InterruptedException e1) {
// ... // ...
} }
idleTime = Math.min(idleTime * 2, 2000); idleTime = Math.min(idleTime * 2, 2000);
@ -184,13 +208,13 @@ public class ScriptGdbGraph extends AbstractGdbGraph {
} else if (firstAdd && cause.contains("GraphDB id exists")) { } else if (firstAdd && cause.contains("GraphDB id exists")) {
throw new GdbDuplicateIdException(e); throw new GdbDuplicateIdException(e);
} }
log.error("Add Failed id {}, dsl {}, params {}, e {}", element.getId(), log.error("Add Failed id {}, dsl {}, params {}, e {}", element.getId(), elementDsl.getFirst(),
elementDsl.getFirst(), elementDsl.getSecond(), e); elementDsl.getSecond(), e);
throw new RuntimeException(e); throw new RuntimeException(e);
} }
} }
log.error("Add Failed id {}, dsl {}, params {}", element.getId(), log.error("Add Failed id {}, dsl {}, params {}", element.getId(), elementDsl.getFirst(),
elementDsl.getFirst(), elementDsl.getSecond()); elementDsl.getSecond());
throw new RuntimeException("failed to queue new element to server"); throw new RuntimeException("failed to queue new element to server");
} }
} }

View File

@ -7,52 +7,56 @@ import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.function.Supplier; import java.util.function.Supplier;
import org.apache.commons.lang3.StringUtils;
import com.alibaba.datax.common.exception.DataXException; import com.alibaba.datax.common.exception.DataXException;
import com.alibaba.datax.common.util.Configuration; import com.alibaba.datax.common.util.Configuration;
import com.alibaba.datax.plugin.writer.gdbwriter.GdbWriterErrorCode; import com.alibaba.datax.plugin.writer.gdbwriter.GdbWriterErrorCode;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.apache.commons.lang3.StringUtils;
/** /**
* @author jerrywang * @author jerrywang
* *
*/ */
public interface ConfigHelper { public interface ConfigHelper {
static void assertConfig(String key, Supplier<Boolean> f) { static void assertConfig(final String key, final Supplier<Boolean> f) {
if (!f.get()) { if (!f.get()) {
throw DataXException.asDataXException(GdbWriterErrorCode.BAD_CONFIG_VALUE, key); throw DataXException.asDataXException(GdbWriterErrorCode.BAD_CONFIG_VALUE, key);
} }
} }
static void assertHasContent(Configuration config, String key) { static void assertHasContent(final Configuration config, final String key) {
assertConfig(key, () -> StringUtils.isNotBlank(config.getString(key))); assertConfig(key, () -> StringUtils.isNotBlank(config.getString(key)));
} }
/** /**
* NOTE: {@code Configuration::get(String, Class<T>)} doesn't work. * NOTE: {@code Configuration::get(String, Class<T>)} doesn't work.
* *
* @param conf Configuration * @param conf
* @param key key path to configuration * Configuration
* @param cls Class of result type * @param key
* key path to configuration
* @param cls
* Class of result type
* @return the target configuration object of type T * @return the target configuration object of type T
*/ */
static <T> T getConfig(Configuration conf, String key, Class<T> cls) { static <T> T getConfig(final Configuration conf, final String key, final Class<T> cls) {
JSONObject j = (JSONObject) conf.get(key); final JSONObject j = (JSONObject)conf.get(key);
return JSON.toJavaObject(j, cls); return JSON.toJavaObject(j, cls);
} }
/** /**
* Create a configuration from the specified file on the classpath. * Create a configuration from the specified file on the classpath.
* *
* @param name file name * @param name
* file name
* @return Configuration instance. * @return Configuration instance.
*/ */
static Configuration fromClasspath(String name) { static Configuration fromClasspath(final String name) {
try (InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(name)) { try (final InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(name)) {
return Configuration.from(is); return Configuration.from(is);
} catch (IOException e) { } catch (final IOException e) {
throw new IllegalArgumentException("File not found: " + name); throw new IllegalArgumentException("File not found: " + name);
} }
} }

View File

@ -1,9 +1,8 @@
/* /*
* (C) 2019-present Alibaba Group Holding Limited. * (C) 2019-present Alibaba Group Holding Limited.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public
* it under the terms of the GNU General Public License version 2 as * License version 2 as published by the Free Software Foundation.
* published by the Free Software Foundation.
*/ */
package com.alibaba.datax.plugin.writer.gdbwriter.util; package com.alibaba.datax.plugin.writer.gdbwriter.util;