Skip to content

feat: upgrade odps version for maxcompute plugin #76

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

Merged
merged 1 commit into from
Dec 12, 2024
Merged

feat: upgrade odps version for maxcompute plugin #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ require (
github.com/ClickHouse/clickhouse-go v1.4.5
github.com/IBM/sarama v1.43.2
github.com/MakeNowJust/heredoc v1.0.0
github.com/aliyun/aliyun-odps-go-sdk v0.3.14
github.com/aliyun/aliyun-odps-go-sdk v0.4.0
github.com/aws/aws-sdk-go v1.44.151
github.com/blastrain/vitess-sqlparser v0.0.0-20201030050434-a139afbb1aba
github.com/cenkalti/backoff/v4 v4.2.1
Expand Down
5 changes: 2 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,8 @@ github.com/alibabacloud-go/debug v1.0.1 h1:MsW9SmUtbb1Fnt3ieC6NNZi6aEwrXfDksD4QA
github.com/alibabacloud-go/debug v1.0.1/go.mod h1:8gfgZCCAC3+SCzjWtY053FrOcd4/qlH6IHTI4QyICOc=
github.com/alibabacloud-go/tea v1.2.2 h1:aTsR6Rl3ANWPfqeQugPglfurloyBJY85eFy7Gc1+8oU=
github.com/alibabacloud-go/tea v1.2.2/go.mod h1:CF3vOzEMAG+bR4WOql8gc2G9H3EkH3ZLAQdpmpXMgwk=
github.com/aliyun/aliyun-odps-go-sdk v0.3.14 h1:H+p9+2n4kSBOiJvndKC7M+0UxK0mW4azQHQzHy2hI2A=
github.com/aliyun/aliyun-odps-go-sdk v0.3.14/go.mod h1:t/tgF/iN5aAs/gLL7sEI8/qdax4NuFCKEjO3OJbHZqI=
github.com/aliyun/aliyun-odps-go-sdk v0.4.0 h1:QzEjRsMnB+FjTbO33PypiCbFJ4Wba55h3swSoZZVqgM=
github.com/aliyun/aliyun-odps-go-sdk v0.4.0/go.mod h1:h3n3Jy9qCcq9GhKakuF7Y47W1EP71hfTDx8MCEeQYbA=
github.com/aliyun/credentials-go v1.3.10 h1:45Xxrae/evfzQL9V10zL3xX31eqgLWEaIdCoPipOEQA=
github.com/aliyun/credentials-go v1.3.10/go.mod h1:Jm6d+xIgwJVLVWT561vy67ZRP4lPTQxMbEYRuT2Ti1U=
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
Expand Down Expand Up @@ -1524,7 +1524,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
Expand Down
4 changes: 2 additions & 2 deletions plugins/extractors/maxcompute/maxcompute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ func (e *Extractor) buildAsset(ctx context.Context, schema *odps.Schema,
Name: col.Name,
DataType: dataTypeToString(col.Type),
Description: col.Comment,
IsNullable: col.IsNullable,
IsNullable: !col.NotNull,
Attributes: utils.TryParseMapToProto(buildColumnAttributesData(&tableSchema.Columns[i])),
Columns: buildColumns(col.Type),
}
Expand Down Expand Up @@ -306,7 +306,7 @@ func (e *Extractor) buildTableAttributesData(schemaName, tableType string, table
attributesData["type"] = tableType

rb := common.ResourceBuilder{ProjectName: e.config.ProjectName}
attributesData["resource_url"] = rb.Table(tableInfo.TableName)
attributesData["resource_url"] = rb.Table(schemaName, tableInfo.TableName)

if tableInfo.ViewText != "" {
attributesData["sql"] = tableInfo.ViewText
Expand Down
24 changes: 12 additions & 12 deletions plugins/extractors/maxcompute/maxcompute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ func TestExtract(t *testing.T) {
}

c1 := tableschema.Column{
Name: "id",
Type: datatype.BigIntType,
IsNullable: true,
Name: "id",
Type: datatype.BigIntType,
NotNull: false,
}

c2 := tableschema.Column{
Expand All @@ -103,7 +103,7 @@ func TestExtract(t *testing.T) {
},
},
},
IsNullable: true,
NotNull: false,
}

// Schema for dummy_table
Expand All @@ -121,17 +121,17 @@ func TestExtract(t *testing.T) {
dummyTableSchema.Comment = "dummy table description"

c3 := tableschema.Column{
Name: "user_id",
Type: datatype.BigIntType,
Comment: "Unique identifier for users",
IsNullable: false,
Name: "user_id",
Type: datatype.BigIntType,
Comment: "Unique identifier for users",
NotNull: true,
}

c4 := tableschema.Column{
Name: "email",
Type: datatype.StringType,
IsNullable: false,
Comment: "User email address",
Name: "email",
Type: datatype.StringType,
NotNull: true,
Comment: "User email address",
}

// Schema for new_table
Expand Down
2 changes: 1 addition & 1 deletion plugins/extractors/maxcompute/testdata/expected-assets-with-table-exclusion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"preview_rows": null,
"attributes": {
"project_name": "test-project-id",
"resource_url": "/projects/test-project-id/tables/new_table",
"resource_url": "/projects/test-project-id/schemas/my_schema/tables/new_table",
"schema": "my_schema",
"sql": "SELECT user_id, email FROM test-project-id.my_schema.new_table",
"type": "MANAGED_TABLE"
Expand Down
4 changes: 2 additions & 2 deletions plugins/extractors/maxcompute/testdata/expected-assets-with-view-lineage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"preview_rows": null,
"attributes": {
"project_name": "test-project-id",
"resource_url": "/projects/test-project-id/tables/dummy_table",
"resource_url": "/projects/test-project-id/schemas/my_schema/tables/dummy_table",
"schema": "my_schema",
"sql": "SELECT id, name, user_info\nFROM test-project-id.default.my_dummy_table",
"type": "VIRTUAL_VIEW"
Expand Down Expand Up @@ -129,7 +129,7 @@
],
"attributes": {
"project_name": "test-project-id",
"resource_url": "/projects/test-project-id/tables/new_table",
"resource_url": "/projects/test-project-id/schemas/my_schema/tables/new_table",
"schema": "my_schema",
"sql": "SELECT user_id, email FROM test-project-id.my_schema.new_table",
"type": "MANAGED_TABLE"
Expand Down
4 changes: 2 additions & 2 deletions plugins/extractors/maxcompute/testdata/expected-assets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"preview_rows": null,
"attributes": {
"project_name": "test-project-id",
"resource_url": "/projects/test-project-id/tables/dummy_table",
"resource_url": "/projects/test-project-id/schemas/my_schema/tables/dummy_table",
"schema": "my_schema",
"sql": "SELECT id, name, user_info\nFROM test-project-id.default.my_dummy_table",
"type": "VIRTUAL_VIEW"
Expand Down Expand Up @@ -119,7 +119,7 @@
],
"attributes": {
"project_name": "test-project-id",
"resource_url": "/projects/test-project-id/tables/new_table",
"resource_url": "/projects/test-project-id/schemas/my_schema/tables/new_table",
"schema": "my_schema",
"sql": "SELECT user_id, email FROM test-project-id.my_schema.new_table",
"type": "MANAGED_TABLE"
Expand Down
Loading