Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Improve][SourceConnector] Unifie InfluxDB source fields to schema #3897

Merged
merged 6 commits into from
Jan 17, 2023
Merged

[Improve][SourceConnector] Unifie InfluxDB source fields to schema #3897

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b0baf5e
Unifie InfluxDB source fields to schema
Jan 9, 2023
7b292dd
improve config e.g indentation
Jan 9, 2023
bd82c6d
fix import order
Jan 9, 2023
5b26e60
update influxdb source doc and e2e conf
Jan 10, 2023
bdd3384
Update docs/en/connector-v2/source/InfluxDB.md
wfrong Jan 12, 2023
ac33d08
add change log to release-note.md
Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 21 additions & 18 deletions docs/en/connector-v2/source/InfluxDB.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ supports query SQL and can achieve projection effect.
|--------------------|--------|----------|---------------|
| url | string | yes | - |
| sql | string | yes | - |
| fields | config | yes | - |
| schema | object | yes | - |
| database | string | yes | |
| username | string | no | - |
| password | string | no | - |
Expand All @@ -51,19 +51,20 @@ The query sql used to search data
select name,age from test
```

### fields [string]
### schema [config]

the fields of the InfluxDB when you select

the field type is SeaTunnel field type `org.apache.seatunnel.api.table.type.SqlType`
#### fields [Config]

The schema information of upstream data.
e.g.

```
fields{
name=STRING
age=INT
schema {
fields {
name = string
age = int
}
}
```

### database [string]
Expand Down Expand Up @@ -147,11 +148,12 @@ source {
lower_bound = 1
partition_num = 4
split_column = "value"
fields {
label = STRING
value = INT
rt = STRING
time = BIGINT
schema {
fields {
label = STRING
value = INT
rt = STRING
time = BIGINT
}
}

Expand All @@ -166,11 +168,12 @@ source {
url = "http://influxdb-host:8086"
sql = "select label, value, rt, time from test"
database = "test"
fields {
label = STRING
value = INT
rt = STRING
time = BIGINT
schema {
fields {
label = STRING
value = INT
rt = STRING
time = BIGINT
}
}

Expand Down
6 changes: 3 additions & 3 deletions ...c/main/java/org/apache/seatunnel/connectors/seatunnel/influxdb/source/InfluxDBSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public String getPluginName() {

@Override
public void prepare(Config config) throws PrepareFailException {
CheckResult result = CheckConfigUtil.checkAllExists(config, SQL.key());
CheckResult result = CheckConfigUtil.checkAllExists(config, SQL.key(), SeaTunnelSchema.SCHEMA.key());
if (!result.isSuccess()) {
throw new InfluxdbConnectorException(SeaTunnelAPIErrorCode.CONFIG_VALIDATION_FAILED,
String.format("PluginName: %s, PluginType: %s, Message: %s",
Expand All @@ -82,8 +82,8 @@ public void prepare(Config config) throws PrepareFailException {
}
try {
this.sourceConfig = SourceConfig.loadConfig(config);
SeaTunnelSchema seatunnelSchema = SeaTunnelSchema.buildWithConfig(config);
this.typeInfo = seatunnelSchema.getSeaTunnelRowType();
Config schema = config.getConfig(SeaTunnelSchema.SCHEMA.key());
this.typeInfo = SeaTunnelSchema.buildWithConfig(schema).getSeaTunnelRowType();
this.columnsIndexList = initColumnsIndex(InfluxDBClient.getInfluxDB(sourceConfig));
} catch (Exception e) {
throw new InfluxdbConnectorException(SeaTunnelAPIErrorCode.CONFIG_VALIDATION_FAILED,
Expand Down
4 changes: 3 additions & 1 deletion ...java/org/apache/seatunnel/connectors/seatunnel/influxdb/source/InfluxDBSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import org.apache.seatunnel.api.source.SeaTunnelSource;
import org.apache.seatunnel.api.table.factory.Factory;
import org.apache.seatunnel.api.table.factory.TableSourceFactory;
import org.apache.seatunnel.connectors.seatunnel.common.schema.SeaTunnelSchema;

import com.google.auto.service.AutoService;

Expand All @@ -50,7 +51,8 @@ public OptionRule optionRule() {
.required(
URL,
SQL,
DATABASES
DATABASES,
SeaTunnelSchema.SCHEMA
)
.bundled(USERNAME, PASSWORD)
.bundled(LOWER_BOUND, UPPER_BOUND, PARTITION_NUM, SPLIT_COLUMN)
Expand Down
22 changes: 12 additions & 10 deletions ...nnel-connector-v2-e2e/connector-influxdb-e2e/src/test/resources/influxdb-to-influxdb.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,19 @@ source {
lower_bound = 0
partition_num = 4
split_column = "c_int"
fields {
label = STRING
c_string = STRING
c_double = DOUBLE
c_bigint = BIGINT
c_float = FLOAT
c_int = INT
c_smallint = SMALLINT
c_boolean = BOOLEAN
time = BIGINT
schema {
fields {
label = STRING
c_string = STRING
c_double = DOUBLE
c_bigint = BIGINT
c_float = FLOAT
c_int = INT
c_smallint = SMALLINT
c_boolean = BOOLEAN
time = BIGINT
}
}
}
}

Expand Down