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

[NativeIO] Upgrade datafusion and arrow-rs version #531

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[NativeIO] Upgrade datafusion and arrow-rs version #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
294f680
upgrade datafusion to 41 and arrow-rs to 52.2 and objec_store to 0.10.2
dmetasoul01 Aug 20, 2024
756b4d2
address filter parser
dmetasoul01 Aug 20, 2024
8920fcd
pass all build
dmetasoul01 Aug 21, 2024
a328efa
fix hdfs write
dmetasoul01 Aug 22, 2024
b54ab96
fix rust tests
dmetasoul01 Aug 22, 2024
6de2fc8
fix listing path order. fix filter parser
dmetasoul01 Aug 23, 2024
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
10 changes: 9 additions & 1 deletion .github/workflows/rust-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,15 @@ jobs:
- name: Install requirement
uses: ConorMacBride/install-package@v1
with:
apt: postgresql-client-14 cargo
apt: postgresql-client-14
- uses: actions-rs/toolchain@v1
with:
profile: minimal
toolchain: stable
default: true
- uses: Swatinem/rust-cache@v2
with:
workspaces: "./rust -> target"
- name: Init PG
run: |
./script/meta_init_for_local_test.sh -j 2
Expand Down
12 changes: 8 additions & 4 deletions lakesoul-flink/src/main/java/org/apache/flink/lakesoul/entry/SyncDatabase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import org.apache.flink.table.api.Table;
import org.apache.flink.streaming.api.environment.CheckpointConfig;
import org.apache.flink.streaming.api.environment.StreamExecutionEnvironment;
import org.apache.flink.table.api.TableDescriptor;
import org.apache.flink.table.api.TableResult;
import org.apache.flink.table.api.bridge.java.StreamTableEnvironment;
import org.apache.flink.table.catalog.Catalog;
Expand Down Expand Up @@ -255,10 +256,13 @@ public static void xsyncToMysql(StreamExecutionEnvironment env) throws SQLExcept
Catalog lakesoulCatalog = new LakeSoulCatalog();
tEnvs.registerCatalog("lakeSoul", lakesoulCatalog);
String jdbcUrl = url + targetDatabase;
TableResult schemaResult = tEnvs.executeSql(
"SELECT * FROM lakeSoul.`" + sourceDatabase + "`.`" + sourceTableName + "` LIMIT 1");
DataType[] fieldDataTypes = schemaResult.getTableSchema().getFieldDataTypes();
String[] fieldNames = schemaResult.getTableSchema().getFieldNames();
// TableResult schemaResult = tEnvs.executeSql(
// "SELECT * FROM lakeSoul.`" + sourceDatabase + "`.`" + sourceTableName + "` LIMIT 1");
Table lakesoulTable = tEnvs.from("`lakesoul`.`" + sourceDatabase + "`.`" + sourceTableName + "`");
DataType[] fieldDataTypes = lakesoulTable.getSchema().getFieldDataTypes();
String[] fieldNames = lakesoulTable.getSchema().getFieldNames();
// DataType[] fieldDataTypes = schemaResult.getTableSchema().getFieldDataTypes();
// String[] fieldNames = schemaResult.getTableSchema().getFieldNames();
String tablePk = getTablePk(sourceDatabase, sourceTableName);
String[] stringFieldsTypes = getMysqlFieldsTypes(fieldDataTypes, fieldNames, tablePk);
String createTableSql = pgAndMsqlCreateTableSql(stringFieldsTypes, fieldNames, targetTableName, tablePk);
Expand Down
4 changes: 4 additions & 0 deletions lakesoul-flink/src/main/java/org/apache/flink/lakesoul/substrait/SubstraitFlinkUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
//
// SPDX-License-Identifier: Apache-2.0

package org.apache.flink.lakesoul.substrait;

import io.substrait.expression.Expression;
Expand Down
4 changes: 4 additions & 0 deletions lakesoul-flink/src/main/java/org/apache/flink/lakesoul/substrait/SubstraitVisitor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// SPDX-FileCopyrightText: 2023 LakeSoul Contributors
//
// SPDX-License-Identifier: Apache-2.0

package org.apache.flink.lakesoul.substrait;

import com.dmetasoul.lakesoul.lakesoul.io.DateTimeUtils;
Expand Down
Loading
Loading