From 09e9c9ef80bbc62133604b35ff3faca69efd34db Mon Sep 17 00:00:00 2001 From: Gregory Salaun Date: Thu, 24 Oct 2024 21:58:29 +0700 Subject: [PATCH 1/3] go routines for Db query --- TCPClient.go | 8 ++++---- database.go | 57 ++++++++++++++++++++++++++-------------------------- spot.go | 35 +++++++++++++++++++++----------- xml.go | 12 +++++------ 4 files changed, 61 insertions(+), 51 deletions(-) diff --git a/TCPClient.go b/TCPClient.go index 65df7c8..514db3c 100644 --- a/TCPClient.go +++ b/TCPClient.go @@ -150,10 +150,10 @@ func (c *TCPClient) ReadLine() { c.Log.Info("Start receiving spots") } - // start := time.Now() - go ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries) - // elapsed := time.Since(start) - // Log.Infof("Total time for processing spot: %s", elapsed) + start := time.Now() + ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries) + elapsed := time.Since(start) + Log.Infof("Total time for processing spot: %s", elapsed) // Send the spot message to TCP server if len(c.TCPServer.Clients) > 0 { diff --git a/database.go b/database.go index af77bf6..30edd3d 100644 --- a/database.go +++ b/database.go @@ -6,6 +6,7 @@ import ( "fmt" "os" "strconv" + "sync" "time" log "github.com/sirupsen/logrus" @@ -94,114 +95,112 @@ func NewFlexDXDatabase(filePath string) *FlexDXClusterRepository { } } -func (r *Log4OMContactsRepository) ListByCountry(countryID string) ([]*Contact, error) { +func (r *Log4OMContactsRepository) ListByCountry(countryID string, contactsChan chan []Contact, wg *sync.WaitGroup) { + defer wg.Done() rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ?", countryID) if err != nil { log.Error("could not query database", err) - return nil, err } defer rows.Close() - contacts := []*Contact{} + contacts := []Contact{} for rows.Next() { c := Contact{} if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { log.Error("could not query database", err) - return nil, err } - contacts = append(contacts, &c) + contacts = append(contacts, c) } - return contacts, nil + contactsChan <- contacts } -func (r *Log4OMContactsRepository) ListByCountryMode(countryID string, mode string) ([]*Contact, error) { +func (r *Log4OMContactsRepository) ListByCountryMode(countryID string, mode string, contactsModeChan chan []Contact, wg *sync.WaitGroup) { + defer wg.Done() if mode == "USB" || mode == "LSB" { rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND (mode = ? OR mode = ?)", countryID, "USB", "LSB") if err != nil { log.Error("could not query database", err) - return nil, err } defer rows.Close() - contacts := []*Contact{} + contacts := []Contact{} for rows.Next() { c := Contact{} if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { log.Error("could not query database", err) - return nil, err + } - contacts = append(contacts, &c) + contacts = append(contacts, c) } - return contacts, nil + contactsModeChan <- contacts } else { rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND mode = ?", countryID, mode) if err != nil { log.Error("could not query the database", err) - return nil, err } defer rows.Close() - contacts := []*Contact{} + contacts := []Contact{} for rows.Next() { c := Contact{} if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { fmt.Println(err) - return nil, err + } - contacts = append(contacts, &c) + contacts = append(contacts, c) } - return contacts, nil + contactsModeChan <- contacts } } -func (r *Log4OMContactsRepository) ListByCountryBand(countryID string, band string) ([]*Contact, error) { +func (r *Log4OMContactsRepository) ListByCountryBand(countryID string, band string, contactsBandChan chan []Contact, wg *sync.WaitGroup) { + defer wg.Done() rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE dxcc = ? AND band = ?", countryID, band) if err != nil { fmt.Println(err) - return nil, err } defer rows.Close() - contacts := []*Contact{} + contacts := []Contact{} for rows.Next() { c := Contact{} if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { fmt.Println(err) - return nil, err + } - contacts = append(contacts, &c) + contacts = append(contacts, c) } - return contacts, nil + contactsBandChan <- contacts } -func (r *Log4OMContactsRepository) ListByCallSign(callSign string, band string, mode string) ([]*Contact, error) { +func (r *Log4OMContactsRepository) ListByCallSign(callSign string, band string, mode string, contactsCallChan chan []Contact, wg *sync.WaitGroup) { + defer wg.Done() rows, err := r.db.Query("SELECT callsign, band, mode, dxcc, stationcallsign, country FROM log WHERE callsign = ? AND band = ? AND mode = ?", callSign, band, mode) if err != nil { fmt.Println(err) - return nil, err } defer rows.Close() - contacts := []*Contact{} + contacts := []Contact{} for rows.Next() { c := Contact{} if err := rows.Scan(&c.Callsign, &c.Band, &c.Mode, &c.DXCC, &c.StationCallsign, &c.Country); err != nil { fmt.Println(err) - return nil, err + } - contacts = append(contacts, &c) + contacts = append(contacts, c) } - return contacts, nil + contactsCallChan <- contacts } func (r *FlexDXClusterRepository) GetAllSpots(limit string) []FlexSpot { diff --git a/spot.go b/spot.go index 71c83d3..61e13c6 100644 --- a/spot.go +++ b/spot.go @@ -4,6 +4,7 @@ import ( "regexp" "strconv" "strings" + "sync" _ "github.com/mattn/go-sqlite3" ) @@ -49,20 +50,30 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te contactRepo := NewLog4OMContactsRepository(Cfg.SQLite.SQLitePath) defer contactRepo.db.Close() - contacts, _ := contactRepo.ListByCountry(spot.DXCC) - contactsMode, _ := contactRepo.ListByCountryMode(spot.DXCC, spot.Mode) - contactsBand, _ := contactRepo.ListByCountryBand(spot.DXCC, spot.Band) - contactsCall, _ := contactRepo.ListByCallSign(spot.DX, spot.Band, spot.Mode) + contactsChan := make(chan []Contact) + contactsModeChan := make(chan []Contact) + contactsBandChan := make(chan []Contact) + contactsCallChan := make(chan []Contact) + + wg := new(sync.WaitGroup) + wg.Add(4) + + go contactRepo.ListByCountry(spot.DXCC, contactsChan, wg) + contacts := <-contactsChan + + go contactRepo.ListByCountryMode(spot.DXCC, spot.Mode, contactsModeChan, wg) + contactsMode := <-contactsModeChan + + go contactRepo.ListByCountryBand(spot.DXCC, spot.Band, contactsBandChan, wg) + contactsBand := <-contactsBandChan + + go contactRepo.ListByCallSign(spot.DX, spot.Band, spot.Mode, contactsCallChan, wg) + contactsCall := <-contactsCallChan + + wg.Wait() if len(contacts) == 0 { - switch spot.DXCC { - case "997": - spot.NewDXCC = false - case "1000": - spot.NewDXCC = false - default: - spot.NewDXCC = true - } + spot.NewDXCC = true } if len(contactsMode) == 0 { diff --git a/xml.go b/xml.go index 8427e0f..3aa314c 100644 --- a/xml.go +++ b/xml.go @@ -66,13 +66,13 @@ func LoadCountryFile() Countries { func GetDXCC(dxCall string, Countries Countries) string { for i := 0; i < len(Countries.Countries); i++ { - for j := 0; j < len(Countries.Countries[i].CountryPrefixList.CountryPrefixList); j++ { - regExp := regexp.MustCompile(Countries.Countries[i].CountryPrefixList.CountryPrefixList[j].PrefixList) - match := regExp.FindStringSubmatch(dxCall) - if len(match) != 0 { - return Countries.Countries[i].Dxcc - } + // for j := 0; j < len(Countries.Countries[i].CountryPrefixList.CountryPrefixList); j++ { + regExp := regexp.MustCompile(Countries.Countries[i].CountryPrefixList.CountryPrefixList[len(Countries.Countries[i].CountryPrefixList.CountryPrefixList)-1].PrefixList) + match := regExp.FindStringSubmatch(dxCall) + if len(match) != 0 { + return Countries.Countries[i].Dxcc } + // } } return "" } From ab7a2e487fe119ab35da147d0afe8c881cf22220 Mon Sep 17 00:00:00 2001 From: Gregory Salaun Date: Thu, 24 Oct 2024 22:06:07 +0700 Subject: [PATCH 2/3] up --- TCPClient.go | 8 ++++---- spot.go | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/TCPClient.go b/TCPClient.go index 514db3c..65df7c8 100644 --- a/TCPClient.go +++ b/TCPClient.go @@ -150,10 +150,10 @@ func (c *TCPClient) ReadLine() { c.Log.Info("Start receiving spots") } - start := time.Now() - ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries) - elapsed := time.Since(start) - Log.Infof("Total time for processing spot: %s", elapsed) + // start := time.Now() + go ProcessTelnetSpot(spotRe, message, c.SpotChanToFlex, c.SpotChanToHTTPServer, c.Countries) + // elapsed := time.Since(start) + // Log.Infof("Total time for processing spot: %s", elapsed) // Send the spot message to TCP server if len(c.TCPServer.Clients) > 0 { diff --git a/spot.go b/spot.go index 61e13c6..068b3a2 100644 --- a/spot.go +++ b/spot.go @@ -5,6 +5,7 @@ import ( "strconv" "strings" "sync" + "time" _ "github.com/mattn/go-sqlite3" ) @@ -58,6 +59,8 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te wg := new(sync.WaitGroup) wg.Add(4) + start := time.Now() + go contactRepo.ListByCountry(spot.DXCC, contactsChan, wg) contacts := <-contactsChan @@ -71,6 +74,8 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te contactsCall := <-contactsCallChan wg.Wait() + elapsed := time.Since(start) + Log.Infof("Checking Db took: %s", elapsed) if len(contacts) == 0 { spot.NewDXCC = true From 0f43c3232d3c919fb3e3b45c704f0151c4da17cd Mon Sep 17 00:00:00 2001 From: Gregory Salaun Date: Thu, 24 Oct 2024 22:43:05 +0700 Subject: [PATCH 3/3] up --- spot.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/spot.go b/spot.go index 068b3a2..61e13c6 100644 --- a/spot.go +++ b/spot.go @@ -5,7 +5,6 @@ import ( "strconv" "strings" "sync" - "time" _ "github.com/mattn/go-sqlite3" ) @@ -59,8 +58,6 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te wg := new(sync.WaitGroup) wg.Add(4) - start := time.Now() - go contactRepo.ListByCountry(spot.DXCC, contactsChan, wg) contacts := <-contactsChan @@ -74,8 +71,6 @@ func ProcessTelnetSpot(re *regexp.Regexp, spotRaw string, SpotChanToFlex chan Te contactsCall := <-contactsCallChan wg.Wait() - elapsed := time.Since(start) - Log.Infof("Checking Db took: %s", elapsed) if len(contacts) == 0 { spot.NewDXCC = true