Skip to content

fix(tables): Flatten stripping relations #884

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 3 commits into from
May 17, 2023
Merged

fix(tables): Flatten stripping relations #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b42bf64
flatten stripping relations
candiduslynx May 16, 2023
7fd6b1d
dedup
candiduslynx May 17, 2023
246059c
clip
candiduslynx May 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
25 changes: 15 additions & 10 deletions schema/table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/apache/arrow/go/v13/arrow"
"github.com/cloudquery/plugin-sdk/v3/internal/glob"
"golang.org/x/exp/slices"
)

// TableResolver is the main entry point when a table is sync is called.
Expand Down Expand Up @@ -173,9 +174,10 @@ func (tt Tables) FilterDfsFunc(include, exclude func(*Table) bool, skipDependent
}

func (tt Tables) ToArrowSchemas() Schemas {
schemas := make(Schemas, 0, len(tt.FlattenTables()))
for _, t := range tt.FlattenTables() {
schemas = append(schemas, t.ToArrowSchema())
flattened := tt.FlattenTables()
schemas := make(Schemas, len(flattened))
for i, t := range flattened {
schemas[i] = t.ToArrowSchema()
}
return schemas
}
Expand Down Expand Up @@ -228,19 +230,22 @@ func (tt Tables) FilterDfs(tables, skipTables []string, skipDependentTables bool
func (tt Tables) FlattenTables() Tables {
tables := make(Tables, 0, len(tt))
for _, t := range tt {
tables = append(tables, t)
table := *t
table.Relations = nil
tables = append(tables, &table)
tables = append(tables, t.Relations.FlattenTables()...)
}
tableNames := make(map[string]bool)
dedupedTables := make(Tables, 0, len(tables))

seen := make(map[string]struct{})
deduped := make(Tables, 0, len(tables))
for _, t := range tables {
if _, found := tableNames[t.Name]; !found {
dedupedTables = append(dedupedTables, t)
tableNames[t.Name] = true
if _, found := seen[t.Name]; !found {
deduped = append(deduped, t)
seen[t.Name] = struct{}{}
}
}

return dedupedTables
return slices.Clip(deduped)
}

func (tt Tables) TableNames() []string {
Expand Down
23 changes: 19 additions & 4 deletions schema/table_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (

"github.com/apache/arrow/go/v13/arrow"
"github.com/google/go-cmp/cmp"
"github.com/stretchr/testify/require"
)

var testTable = &Table{
Expand All @@ -19,11 +20,25 @@ var testTable = &Table{
}

func TestTablesFlatten(t *testing.T) {
tables := Tables{testTable}.FlattenTables()
if len(tables) != 2 {
t.Fatal("expected 2 tables")
srcTables := Tables{testTable}
tables := srcTables.FlattenTables()
require.Equal(t, 1, len(srcTables)) // verify that the source Tables were left untouched
require.Equal(t, 1, len(testTable.Relations))
require.Equal(t, 2, len(tables))
for _, table := range tables {
require.Nil(t, table.Relations)
}
tables = Tables{testTable}.FlattenTables()

srcTables = Tables{testTable, testTable}
tables = srcTables.FlattenTables()
require.Equal(t, 2, len(srcTables)) // verify that the source Tables were left untouched
require.Equal(t, 1, len(testTable.Relations))
require.Equal(t, 2, len(tables))
for _, table := range tables {
require.Nil(t, table.Relations)
}

tables = tables.FlattenTables()
if len(tables) != 2 {
t.Fatal("expected 2 tables")
}
Expand Down