Skip to content

Commit 8b959bc

Browse files
committed
Log the number of currently active connections
1 parent ca8c113 commit 8b959bc

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

‎src/common/duckdb_client.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,25 +67,25 @@ func NewDuckdbClient(config *CommonConfig, bootQueries ...[]string) *DuckdbClien
6767
}
6868

6969
func (client *DuckdbClient) QueryContext(ctx context.Context, query string) (*sql.Rows, error) {
70-
LogDebug(client.Config, "Querying DuckDBClient:", query)
70+
LogDebug(client.Config, "Querying DuckDB:", query)
7171
return client.Db.QueryContext(ctx, query)
7272
}
7373

7474
func (client *DuckdbClient) QueryRowContext(ctx context.Context, query string, args ...map[string]string) *sql.Row {
75-
LogDebug(client.Config, "Querying DuckDBClient:", query)
75+
LogDebug(client.Config, "Querying DuckDB row:", query)
7676
if len(args) == 0 {
7777
return client.Db.QueryRowContext(ctx, query)
7878
}
7979
return client.Db.QueryRowContext(ctx, replaceNamedStringArgs(query, args[0]))
8080
}
8181

8282
func (client *DuckdbClient) PrepareContext(ctx context.Context, query string) (*sql.Stmt, error) {
83-
LogDebug(client.Config, "Preparing DuckDBClient statement:", query)
83+
LogDebug(client.Config, "Preparing DuckDB statement:", query)
8484
return client.Db.PrepareContext(ctx, query)
8585
}
8686

8787
func (client *DuckdbClient) ExecContext(ctx context.Context, query string, args ...map[string]string) (sql.Result, error) {
88-
LogDebug(client.Config, "Querying DuckDBClient:", query)
88+
LogDebug(client.Config, "Executing DuckDB:", query)
8989
if len(args) == 0 {
9090
return client.Db.ExecContext(ctx, query)
9191
}
@@ -95,13 +95,13 @@ func (client *DuckdbClient) ExecContext(ctx context.Context, query string, args
9595

9696
func (client *DuckdbClient) ExecTransactionContext(ctx context.Context, queries []string, args ...[]map[string]string) error {
9797
tx, err := client.Db.Begin()
98-
LogDebug(client.Config, "Querying DuckDBClient: BEGIN")
98+
LogDebug(client.Config, "Executing DuckDB: BEGIN")
9999
if err != nil {
100100
return err
101101
}
102102

103103
for i, query := range queries {
104-
LogDebug(client.Config, "Querying DuckDBClient:", query)
104+
LogDebug(client.Config, "Executing DuckDB in transaction:", query)
105105
var err error
106106
if len(args) == 0 {
107107
_, err = tx.ExecContext(ctx, query)
@@ -114,7 +114,7 @@ func (client *DuckdbClient) ExecTransactionContext(ctx context.Context, queries
114114
}
115115
}
116116

117-
LogDebug(client.Config, "Querying DuckDBClient: COMMIT")
117+
LogDebug(client.Config, "Executing DuckDB: COMMIT")
118118
return tx.Commit()
119119
}
120120

‎src/common/iceberg_table_writer.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,6 @@ func (writer *IcebergTableWriter) UniqueIndexColumnNames() []string {
129129
uniqueIndexColumnNames = append(uniqueIndexColumnNames, icebergSchemaColumn.ColumnName)
130130
}
131131
}
132-
if len(uniqueIndexColumnNames) == 0 {
133-
Panic(writer.Config, "Cannot update Iceberg table without unique index columns: "+writer.IcebergTable.String())
134-
}
135132
return uniqueIndexColumnNames
136133
}
137134

@@ -597,7 +594,7 @@ func (writer *IcebergTableWriter) deleteObject(key string) {
597594
fileName = strings.Split(key, "/metadata/")[1]
598595
}
599596

600-
LogInfo(writer.Config, "Deleting object:", fileName)
597+
LogDebug(writer.Config, "Deleting object:", fileName)
601598
writer.StorageS3.S3Client.DeleteObject(key)
602599
}
603600

‎src/server/main.go‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"net/http"
66
_ "net/http/pprof"
77
"slices"
8+
"sync/atomic"
89

910
"github.com/BemiHQ/BemiDB/src/common"
1011
)
@@ -33,15 +34,18 @@ func main() {
3334

3435
queryHandler := NewQueryHandler(config, duckdbClient)
3536

37+
var connectionCount int64 = 0
3638
for {
3739
conn := AcceptConnection(config, tcpListener)
38-
common.LogInfo(config.CommonConfig, "BemiDB: Accepted connection from", conn.RemoteAddr())
40+
atomic.AddInt64(&connectionCount, 1)
41+
common.LogInfo(config.CommonConfig, "BemiDB: Accepted", common.Int64ToString(atomic.LoadInt64(&connectionCount))+"th", "connection from", conn.RemoteAddr())
3942
server := NewPostgresServer(config, &conn)
4043

4144
go func() {
4245
server.Run(queryHandler)
4346
defer server.Close()
44-
common.LogInfo(config.CommonConfig, "BemiDB: Closed connection from", conn.RemoteAddr())
47+
common.LogInfo(config.CommonConfig, "BemiDB: Closed", common.Int64ToString(atomic.LoadInt64(&connectionCount))+"th", "connection from", conn.RemoteAddr())
48+
atomic.AddInt64(&connectionCount, -1)
4549
}()
4650
}
4751
}

‎src/syncer-postgres/lib/debezium.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ type DebeziumRowSource struct {
1818
Schema string `json:"schema"`
1919
Table string `json:"table"`
2020
CommittedAtNs int64 `json:"ts_ns"`
21+
Position int64 `json:"lsn"`
2122
}
2223

2324
type DebeziumRowData struct {

0 commit comments

Comments
 (0)