Remove usage of columns in table_config (#1047)

artie-labs · Nov 17, 2024 · 8035d19 · 8035d19
1 parent eb230f4
commit 8035d19
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/clients/redshift/staging.go b/clients/redshift/staging.go
@@ -26,7 +26,7 @@ func (s *Store) PrepareTemporaryTable(ctx context.Context, tableData *optimizati
 
 	for colName, newValue := range colToNewLengthMap {
 		// Try to upsert columns first. If this fails, we won't need to update the destination table.
-		err = tableConfig.Columns().UpsertColumn(colName, columns.UpsertColumnArg{
+		err = tableConfig.UpsertColumn(colName, columns.UpsertColumnArg{
 			StringPrecision: typing.ToPtr(newValue),
 		})
 

diff --git a/clients/shared/merge.go b/clients/shared/merge.go
@@ -78,7 +78,7 @@ func Merge(ctx context.Context, dwh destination.DataWarehouse, tableData *optimi
 		for attempts := 0; attempts < backfillMaxRetries; attempts++ {
 			backfillErr = BackfillColumn(dwh, col, tableID)
 			if backfillErr == nil {
-				err = tableConfig.Columns().UpsertColumn(col.Name(), columns.UpsertColumnArg{
+				err = tableConfig.UpsertColumn(col.Name(), columns.UpsertColumnArg{
 					Backfilled: typing.ToPtr(true),
 				})
 

diff --git a/lib/destination/types/table_config.go b/lib/destination/types/table_config.go
@@ -59,12 +59,12 @@ func (d *DwhTableConfig) GetColumns() []columns.Column {
 	return d.columns.GetColumns()
 }
 
-func (d *DwhTableConfig) Columns() *columns.Columns {
-	if d == nil {
-		return nil
-	}
+func (d *DwhTableConfig) UpdateColumn(col columns.Column) {
+	d.columns.UpdateColumn(col)
+}
 
-	return d.columns
+func (d *DwhTableConfig) UpsertColumn(colName string, arg columns.UpsertColumnArg) error {
+	return d.columns.UpsertColumn(colName, arg)
 }
 
 func (d *DwhTableConfig) MutateInMemoryColumns(columnOp constants.ColumnOperation, cols ...columns.Column) {

diff --git a/lib/destination/types/table_config_test.go b/lib/destination/types/table_config_test.go
@@ -70,7 +70,7 @@ func TestDwhTableConfig_ColumnsConcurrency(t *testing.T) {
 					kindDetails = typing.Array
 				}
 
-				tableCfg.Columns().UpdateColumn(columns.NewColumn("foo", kindDetails))
+				tableCfg.UpdateColumn(columns.NewColumn("foo", kindDetails))
 				assert.Len(t, tableCfg.GetColumns(), 3)
 			}
 		}(dwhTableCfg)