Merge pull request #10 from ooemperor/development

Development

Author: ooemperor

.github/workflows/docker_build.yml

@@ -5,7 +5,7 @@ on:
     branches: [ "**" ]
 
 jobs:
-  build:
+  build-test:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

.github/workflows/docker_build_publish_development.yml

@@ -19,7 +19,7 @@ env:
 
 
 jobs:
-  build:
+  build-publish-development:
 
     runs-on: ubuntu-latest
     permissions:

.github/workflows/docker_build_publish_main.yml

@@ -17,7 +17,7 @@ env:
 
 
 jobs:
-  build:
+  build-publish-main:
 
     runs-on: ubuntu-latest
     permissions:

.github/workflows/go_test.yml

@@ -2,7 +2,7 @@ name: Go test
 on: [push]
 
 jobs:
-  build:
+  go-test:
     runs-on: ubuntu-latest
 
     steps:

pkg/builder/Global.go

@@ -58,6 +58,6 @@ ScriptTransactionWrapper Wraps string in transction for postgresql
 */
 func ScriptTransactionWrapper(query string) string {
 	prefix := "DO $$ BEGIN"
-	suffix := "END $$ ;"
+	suffix := "END $$; COMMIT;"
 	return fmt.Sprintf("%v %v %v", prefix, query, suffix)
 }

pkg/builder/Global_test.go

@@ -41,8 +41,8 @@ func TestScriptTransactionWrapper(t *testing.T) {
 		args args
 		want string
 	}{
-		{name: "InbPackageBuildTest1", args: args{query: "SELECT 1;"}, want: "DO $$ BEGIN SELECT 1; END $$ ;"},
-		{name: "InbPackageBuildTest2", args: args{query: "TRUNCATE TABLE public.test;"}, want: "DO $$ BEGIN TRUNCATE TABLE public.test; END $$ ;"},
+		{name: "InbPackageBuildTest1", args: args{query: "SELECT 1;"}, want: "DO $$ BEGIN SELECT 1; END $$; COMMIT;"},
+		{name: "InbPackageBuildTest2", args: args{query: "TRUNCATE TABLE public.test;"}, want: "DO $$ BEGIN TRUNCATE TABLE public.test; END $$; COMMIT;"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {

pkg/builder/InbRdv.go

@@ -53,10 +53,14 @@ func BuildInbRdvSatDeleteQuery(tableName string) (string, error) {
 	if tableName == "" {
 		return "", fmt.Errorf("the tablename cannot be blank")
 	}
-	script += fmt.Sprintf("UPDATE rdv.%s_sat ", tableName)
+	script += fmt.Sprintf("UPDATE rdv.%s_sat s ", tableName)
 	script += "SET delete_dts = NOW() "
-	script += fmt.Sprintf("WHERE frh NOT IN (SELECT frh FROM rdv.%s_sat_cur) ", tableName)
-	script += "AND delete_dts IS NULL;"
+	script += fmt.Sprintf("WHERE s.delete_dts IS NULL AND NOT EXISTS (SELECT 1 FROM rdv.%s_sat_cur sc WHERE sc.frh = s.frh);", tableName)
+	// script += fmt.Sprintf("FROM rdv.%s_sat AS s ", tableName)
+	// script += fmt.Sprintf("LEFT JOIN rdv.%s_sat_cur AS sc on s.frh = sc.frh ", tableName)
+	// script += "WHERE sc.frh IS NULL AND s.delete_dts IS NULL;"
+	// script += fmt.Sprintf("WHERE frh NOT IN (SELECT frh FROM rdv.%s_sat_cur) ", tableName)
+	// script += "AND delete_dts IS NULL;"
 
 	return script, nil
 }
@@ -71,8 +75,9 @@ func BuildInbRdvSatInsertQuery(tableName string) (string, error) {
 	}
 
 	script += fmt.Sprintf("INSERT INTO rdv.%s_sat ", tableName)
-	script += fmt.Sprintf("SELECT * FROM rdv.%s_sat_cur ", tableName)
-	script += fmt.Sprintf("WHERE frh NOT IN (SELECT frh FROM rdv.%s_sat);", tableName)
+	script += fmt.Sprintf("SELECT sc.* FROM rdv.%s_sat_cur AS sc LEFT JOIN rdv.%s_sat AS s ON s.frh = sc.frh ", tableName, tableName)
+	script += "WHERE s.frh IS NULL;"
+	// script += fmt.Sprintf("WHERE frh NOT IN (SELECT frh FROM rdv.%s_sat);", tableName)
 
 	return script, nil
 }

pkg/builder/InbRdv_test.go

@@ -64,7 +64,11 @@ func TestBuildInbRdvSatDeleteQuery(t *testing.T) {
 		t.Fatalf("Error on BuildInbRdvSatDeleteQuery build: %v", err)
 	}
 
-	if query != "UPDATE rdv.TestTable_sat SET delete_dts = NOW() WHERE frh NOT IN (SELECT frh FROM rdv.TestTable_sat_cur) AND delete_dts IS NULL;" {
+	// if query != "UPDATE rdv.TestTable_sat SET delete_dts = NOW() WHERE frh NOT IN (SELECT frh FROM rdv.TestTable_sat_cur) AND delete_dts IS NULL;" {
+	// 	t.Fatalf("BuildInbRdvSatDeleteQuery incorrect: %v", query)
+	// }
+
+	if query != "UPDATE rdv.TestTable_sat s SET delete_dts = NOW() WHERE s.delete_dts IS NULL AND NOT EXISTS (SELECT 1 FROM rdv.TestTable_sat_cur sc WHERE sc.frh = s.frh);" {
 		t.Fatalf("BuildInbRdvSatDeleteQuery incorrect: %v", query)
 	}
 }
@@ -77,7 +81,11 @@ func TestBuildInbRdvSatInsertQuery(t *testing.T) {
 		t.Fatalf("Error on BuildInbRdvSatInsertQuery build: %v", err)
 	}
 
-	if query != "INSERT INTO rdv.TestTable_sat SELECT * FROM rdv.TestTable_sat_cur WHERE frh NOT IN (SELECT frh FROM rdv.TestTable_sat);" {
+	// if query != "INSERT INTO rdv.TestTable_sat SELECT * FROM rdv.TestTable_sat_cur WHERE frh NOT IN (SELECT frh FROM rdv.TestTable_sat);" {
+	// 	t.Fatalf("BuildInbRdvSatInsertQuery incorrect: %v", query)
+	// 	}
+	if query != "INSERT INTO rdv.TestTable_sat SELECT sc.* FROM rdv.TestTable_sat_cur AS sc LEFT JOIN rdv.TestTable_sat AS s ON s.frh = sc.frh WHERE s.frh IS NULL;" {
 		t.Fatalf("BuildInbRdvSatInsertQuery incorrect: %v", query)
 	}
+
 }

pkg/packages/inbrdv/InbPackage.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"sync"
 
 	"github.com/ooemperor/go-db-etl/pkg/logging"
 	"github.com/ooemperor/go-db-etl/pkg/pipeline/inbrdv"
@@ -34,12 +35,19 @@ func (inbP *InbPackage) Run() error {
 		logging.EtlLogger.Error(msg)
 		return errors.New(msg)
 	}
+
+	var wg sync.WaitGroup
+	wg.Add(len(inbP.pipelines))
 	for _, tablePipeline := range inbP.pipelines {
-		c := <-tablePipeline.Run()
-		if c != nil {
-			logging.EtlLogger.Error(c.Error(), tablePipeline.Stats())
-		}
+		go func() {
+			defer wg.Done()
+			c := <-tablePipeline.Run()
+			if c != nil {
+				logging.EtlLogger.Error(c.Error(), tablePipeline.Stats())
+			}
+		}()
 	}
+	wg.Wait()
 	logging.EtlLogger.Info(fmt.Sprintf("END %v", inbP.Name()))
 	return nil
 }

pkg/packages/srcinb/SystemPackage.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
+	"sync"
 
 	"github.com/ooemperor/go-db-etl/pkg/logging"
 	"github.com/ooemperor/go-db-etl/pkg/pipeline/srcinb"
@@ -34,12 +35,19 @@ func (srcP *SystemPackage) Run() error {
 		logging.EtlLogger.Error(msg)
 		return errors.New(msg)
 	}
+
+	var wg sync.WaitGroup
+	wg.Add(len(srcP.pipelines))
 	for _, tablePipeline := range srcP.pipelines {
-		c := <-tablePipeline.Run()
-		if c != nil {
-			logging.EtlLogger.Error(c.Error(), tablePipeline.Stats())
-		}
+		go func() {
+			defer wg.Done()
+			c := <-tablePipeline.Run()
+			if c != nil {
+				logging.EtlLogger.Error(c.Error(), tablePipeline.Stats())
+			}
+		}()
 	}
+	wg.Wait()
 	logging.EtlLogger.Info(fmt.Sprintf("END %v", srcP.Name()))
 	return nil
 }