Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
49 changes: 46 additions & 3 deletions dumper/dataWriter.go
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,16 @@ func printTableData(db *sql.DB, writer *bufio.Writer, schemaMetadata map[string]
tableData, dataOK := data.TableData[table.Name]
if dataOK {
rows := GetRowsFromKeys(db, schemaMetadata, tableData)
for _, rowValue := range rows {
rowToInsert := generateRowInsertStatement(db, rowValue, table, schemaMetadata, options.OnlyIfParentExistsTables)
writer.WriteString(rowToInsert + "\n")
if strings.Compare(table.MainUniqueIndexName, schemareader.VirtualIndexName) == 0 ||
utils.Contains(options.OnlyIfParentExistsTables, table.Name) ||
// FIXME remove this hack and do it in a better way
utils.Contains([]string{"rhnerrata", "rhnpackageevr", "rhnpackagecapability"}, table.Name){
for _, rowValue := range rows {
rowToInsert := generateRowInsertStatement(db, rowValue, table, schemaMetadata, options.OnlyIfParentExistsTables)
writer.WriteString(rowToInsert + "\n")
}
}else{
generateBulkInsert(db, writer, rows, table, schemaMetadata)
}
}

Expand Down Expand Up @@ -487,3 +494,39 @@ func generateRowInsertStatement(db *sql.DB, values []sqlUtil.RowDataStructure, t
}


func generateBulkInsert(db *sql.DB, writer *bufio.Writer, values [][]sqlUtil.RowDataStructure, table schemareader.Table, schemaMetadata map[string]schemareader.Table) []string {
result := make([]string, 0)
exportPoint := 0
batch := 100
for len(values) > exportPoint {
upperLimit := exportPoint + batch
if upperLimit > len(values) {
upperLimit = len(values)
}
genereatedRows := generateBulkInsertSub(db, values[exportPoint:upperLimit], table, schemaMetadata)
writer.WriteString(genereatedRows + "\n")
exportPoint = upperLimit
}
return result
}

func generateBulkInsertSub(db *sql.DB, values [][]sqlUtil.RowDataStructure, table schemareader.Table,
schemaMetadata map[string]schemareader.Table) string {
var valueFiltered []string
for _, rowValue := range values {
rowKeysProcessed := substituteKeys(db, table, rowValue, schemaMetadata)
filteredRowValue := filterRowData(rowKeysProcessed, table)
valueFiltered = append(valueFiltered, "("+formatRowValue(filteredRowValue)+")")

}
allValues := strings.Join(valueFiltered, ", ")

tableName := table.Name
columnNames := prepareColumnNames(table)
onConflictFormatted := formatOnConflict(values[0], table)

insertStatement := fmt.Sprintf(`INSERT INTO %s (%s) VALUES %s ON CONFLICT %s;`,
tableName, columnNames, allValues, onConflictFormatted)

return insertStatement
}
15 changes: 13 additions & 2 deletions dumper/dumpAllTableData.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"github.com/rs/zerolog/log"
"github.com/uyuni-project/inter-server-sync/schemareader"
"github.com/uyuni-project/inter-server-sync/sqlUtil"
"github.com/uyuni-project/inter-server-sync/utils"
"strings"
)

Expand Down Expand Up @@ -75,8 +76,18 @@ func exportAllTableData(db *sql.DB, writer *bufio.Writer, schemaMetadata map[str
sql := fmt.Sprintf(`SELECT %s FROM %s %s;`, formattedColumns, table.Name, whereFilterClause(table))
rows := sqlUtil.ExecuteQueryWithResults(db, sql)

for _, row := range rows {
writer.WriteString(generateRowInsertStatement(db, row, table, schemaMetadata, onlyIfParentExistsTables) + "\n")
//for _, row := range rows {
// writer.WriteString(generateRowInsertStatement(db, row, table, schemaMetadata, onlyIfParentExistsTables) + "\n")
//}

if strings.Compare(table.MainUniqueIndexName, schemareader.VirtualIndexName) == 0 ||
utils.Contains(onlyIfParentExistsTables, table.Name) {
for _, rowValue := range rows {
rowToInsert := generateRowInsertStatement(db, rowValue, table, schemaMetadata, onlyIfParentExistsTables)
writer.WriteString(rowToInsert + "\n")
}
}else{
generateBulkInsert(db, writer, rows, table, schemaMetadata)
}

}