Skip to content

Commit

Permalink
Merge remote-tracking branch 'github/master' into github_master
Browse files Browse the repository at this point in the history
  • Loading branch information
haoke committed Jul 18, 2023
2 parents 1b8755c + d251f99 commit acf6eae
Show file tree
Hide file tree
Showing 57 changed files with 1,577 additions and 1,565 deletions.
12 changes: 12 additions & 0 deletions bitsail-common/src/main/java/com/bytedance/bitsail/common/row/Row.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,4 +153,16 @@ public boolean isNullAt(int pos) {
return this.fields[pos] == null;
}

public java.time.LocalTime getLocalTime(int pos) {
return (java.time.LocalTime) this.fields[pos];
}

public java.time.LocalDateTime getLocalDateTime(int pos) {
return (java.time.LocalDateTime) this.fields[pos];
}

public java.time.LocalDate getLocalDate(int pos) {
return (java.time.LocalDate) this.fields[pos];
}

}
1 change: 1 addition & 0 deletions ...test/java/com/bytedance/bitsail/common/typeinfo/TypeInfoCompatiblesColumnCompareTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public class TypeInfoCompatiblesColumnCompareTest {
@Before
public void before() {
typeInfoCompatibles = new TypeInfoCompatibles(BitSailConfiguration.newDefault());
ColumnCast.refresh();
ColumnCast.initColumnCast(BitSailConfiguration.newDefault());
}

Expand Down
58 changes: 7 additions & 51 deletions bitsail-components/bitsail-component-formats-flink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,62 +32,18 @@
<module>bitsail-component-format-flink-api</module>
</modules>

<properties>
<maven.compiler.source>8</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-base</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>

<profiles>
<profile>
<id>flink-1.11</id>
<properties>
<flink.version>${flink-1.11.version}</flink.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-core-flink-1.11-bridge</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>

<profile>
<id>flink-1.16</id>
<properties>
<flink.version>${flink-1.16.version}</flink.version>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-core-flink-1.16-bridge</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>
<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-core-flink-bridge-provider</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
53 changes: 7 additions & 46 deletions bitsail-components/bitsail-flink-row-parser/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,53 +119,14 @@
<version>${revision}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<profiles>
<profile>
<id>flink-1.11</id>
<properties>
<flink.version>${flink-1.11.version}</flink.version>
</properties>
<dependencies>
<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-core-flink-1.11-bridge</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>

<profile>
<id>flink-1.16</id>
<properties>
<flink.version>${flink-1.16.version}</flink.version>
</properties>
<dependencies>

<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-core-flink-1.16-bridge</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-core-flink-bridge-provider</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>
</dependencies>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>

</project>
217 changes: 8 additions & 209 deletions bitsail-connectors/bitsail-connectors-legacy/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,213 +59,12 @@
</dependencies>
</dependencyManagement>

<profiles>
<profile>
<id>flink-1.11</id>
<properties>
<flink.version>${flink-1.11.version}</flink.version>
<scala.version>${scala-2.11.version}</scala.version>
<scala.binary.version>2.11</scala.binary.version>
</properties>
<dependencies>
<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-core-flink-1.11-bridge</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>

<!-- flink -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-api-java</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner-blink_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-runtime_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<type>test-jar</type>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>

<profile>
<id>flink-1.16</id>
<properties>
<flink.version>${flink-1.16.version}</flink.version>
<scala.binary.version>2.12</scala.binary.version>
<scala.version>${scala-2.12.version}</scala.version>
</properties>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>com.esotericsoftware.kryo</groupId>
<artifactId>kryo</artifactId>
<version>2.24.0</version>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics-dropwizard</artifactId>
<version>${flink.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-core-flink-1.16-bridge</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>

<!-- Flink -->
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-clients</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
<exclusion>
<groupId>org.objenesis</groupId>
<artifactId>objenesis</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-api-java-bridge</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-pool2</artifactId>
</exclusion>
<exclusion>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-http</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-api-scala-bridge_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-scala_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
<groupId>org.scala-lang.modules</groupId>
<artifactId>scala-parser-combinators_${scala.binary.version}</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-scala_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-api-java</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-planner_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-metrics-dropwizard</artifactId>
<version>${flink.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>
<dependencies>
<dependency>
<groupId>com.bytedance.bitsail</groupId>
<artifactId>bitsail-core-flink-bridge-provider</artifactId>
<version>${revision}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
3 changes: 3 additions & 0 deletions ...ctor-fake/src/main/java/com/bytedance/bitsail/connector/fake/source/FakeRowGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ private Object fakeRawValue(TypeInfo<?> typeInfo) {
} else if (TypeInfos.SHORT_TYPE_INFO.getTypeClass() == typeInfo.getTypeClass()) {
return Long.valueOf(faker.number().randomNumber()).shortValue();

} else if (TypeInfos.BYTE_TYPE_INFO.getTypeClass() == typeInfo.getTypeClass()) {
return Long.valueOf(faker.number().randomNumber()).byteValue();

} else if (TypeInfos.STRING_TYPE_INFO.getTypeClass() == typeInfo.getTypeClass()) {
return faker.name().fullName();

Expand Down
1 change: 1 addition & 0 deletions ...s/connector-kudu/src/main/java/com/bytedance/bitsail/connector/kudu/core/KuduFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ public KuduSession getSession() {

if (sessionConfig.getMutationBufferSize() != null) {
kuduSession.setMutationBufferSpace(sessionConfig.getMutationBufferSize());
kuduSession.setErrorCollectorSpace(sessionConfig.getMutationBufferSize());
}

if (sessionConfig.getFlushInterval() != null) {
Expand Down
Loading

0 comments on commit acf6eae

Please sign in to comment.