chore: remove the backend package

Author: olavloite

.github/workflows/spanner-lib-tests.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Build shared lib
-        working-directory: spannerlib
+        working-directory: spannerlib/shared
         run: go build -o spannerlib.so -buildmode=c-shared shared_lib.go
 
   test-dotnet-ubuntu:
@@ -51,21 +51,21 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Build shared lib
-        working-directory: spannerlib
+        working-directory: spannerlib/shared
         run: go build -o spannerlib.so -buildmode=c-shared shared_lib.go
       - name: Copy lib to dotnet folder
         working-directory: spannerlib
         run: |
           mkdir -p dotnet-spannerlib/Google.Cloud.SpannerLib.Native/libraries/any
-          cp spannerlib.so dotnet-spannerlib/Google.Cloud.SpannerLib.Native/libraries/any/spannerlib.so
+          cp shared/spannerlib.so dotnet-spannerlib/Google.Cloud.SpannerLib.Native/libraries/any/spannerlib.so
       - name: Build gRPC server
-        working-directory: spannerlib
+        working-directory: spannerlib/grpc-server
         run: go build grpc_server.go
       - name: Copy gRPC server to dotnet folder
         working-directory: spannerlib
         run: |
           mkdir -p dotnet-spannerlib/Google.Cloud.SpannerLib.Grpc/binaries/any
-          cp grpc_server dotnet-spannerlib/Google.Cloud.SpannerLib.Grpc/binaries/any/grpc_server
+          cp grpc-server/grpc_server dotnet-spannerlib/Google.Cloud.SpannerLib.Grpc/binaries/any/grpc_server
       - name: Install dotnet
         uses: actions/setup-dotnet@v4
         with:

spannerlib/README.md

@@ -0,0 +1,6 @@
+# Shared Library (Internal)
+
+__This module can receive breaking changes without prior notice.__
+
+This is an internal module that is used to expose the features in the database/sql driver
+to drivers in other programming languages.

spannerlib/api/README.md

@@ -0,0 +1,6 @@
+# Shared Library (Internal)
+
+__This module can receive breaking changes without prior notice.__
+
+This is the common internal API for the various external APIs for exposing the
+features in the database/sql driver to drivers in other programming languages.

spannerlib/api/connection.go

@@ -16,7 +16,6 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"google.golang.org/protobuf/types/known/timestamppb"
-	"spannerlib/backend"
 )
 
 func CloseConnection(poolId, connId int64) error {
@@ -66,7 +65,7 @@ type Connection struct {
 	transactions    *sync.Map
 	transactionsIdx atomic.Int64
 
-	backend *backend.SpannerConnection
+	backend *sql.Conn
 }
 
 type queryExecutor interface {
@@ -77,12 +76,12 @@ type queryExecutor interface {
 func (conn *Connection) close() error {
 	conn.results.Range(func(key, value interface{}) bool {
 		res := value.(*rows)
-		res.Close()
+		_ = res.Close()
 		return true
 	})
 	conn.transactions.Range(func(key, value interface{}) bool {
 		res := value.(*transaction)
-		res.Close()
+		_ = res.Close()
 		return true
 	})
 	err := conn.backend.Close()
@@ -103,7 +102,7 @@ func (conn *Connection) apply(mutation *spannerpb.BatchWriteRequest_MutationGrou
 		mutations = append(mutations, spannerMutation)
 	}
 	var commitTimestamp time.Time
-	if err := conn.backend.Conn.Raw(func(driverConn any) (err error) {
+	if err := conn.backend.Raw(func(driverConn any) (err error) {
 		spannerConn, _ := driverConn.(spannerdriver.SpannerConn)
 		commitTimestamp, err = spannerConn.Apply(ctx, mutations)
 		return err
@@ -121,12 +120,12 @@ func (conn *Connection) BeginTransaction(txOpts *spannerpb.TransactionOptions) (
 	var err error
 	if txOpts.GetReadOnly() != nil {
 		tx, err = spannerdriver.BeginReadOnlyTransactionOnConn(
-			context.Background(), conn.backend.Conn, convertToReadOnlyOpts(txOpts))
+			context.Background(), conn.backend, convertToReadOnlyOpts(txOpts))
 	} else if txOpts.GetPartitionedDml() != nil {
 		err = spanner.ToSpannerError(status.Error(codes.InvalidArgument, "transaction type not supported"))
 	} else {
 		tx, err = spannerdriver.BeginReadWriteTransactionOnConn(
-			context.Background(), conn.backend.Conn, convertToReadWriteTransactionOptions(txOpts))
+			context.Background(), conn.backend, convertToReadWriteTransactionOptions(txOpts))
 	}
 	if err != nil {
 		return 0, err
@@ -187,11 +186,11 @@ func convertIsolationLevel(level spannerpb.TransactionOptions_IsolationLevel) sq
 }
 
 func (conn *Connection) Execute(statement *spannerpb.ExecuteSqlRequest) (int64, error) {
-	return execute(conn, conn.backend.Conn, statement)
+	return execute(conn, conn.backend, statement)
 }
 
 func (conn *Connection) ExecuteBatch(statements []*spannerpb.ExecuteBatchDmlRequest_Statement) (*spannerpb.ExecuteBatchDmlResponse, error) {
-	return executeBatch(conn, conn.backend.Conn, statements)
+	return executeBatch(conn, conn.backend, statements)
 }
 
 func execute(conn *Connection, executor queryExecutor, statement *spannerpb.ExecuteSqlRequest) (int64, error) {
@@ -242,7 +241,7 @@ func executeBatch(conn *Connection, executor queryExecutor, statements []*spanne
 }
 
 func executeBatchDdl(conn *Connection, executor queryExecutor, statements []*spannerpb.ExecuteBatchDmlRequest_Statement) (*spannerpb.ExecuteBatchDmlResponse, error) {
-	if err := conn.backend.Conn.Raw(func(driverConn any) error {
+	if err := conn.backend.Raw(func(driverConn any) error {
 		spannerConn, _ := driverConn.(spannerdriver.SpannerConn)
 		return spannerConn.StartBatchDDL()
 	}); err != nil {
@@ -255,7 +254,7 @@ func executeBatchDdl(conn *Connection, executor queryExecutor, statements []*spa
 		}
 	}
 	// TODO: Add support for getting the actual Batch DDL response.
-	if err := conn.backend.Conn.Raw(func(driverConn any) (err error) {
+	if err := conn.backend.Raw(func(driverConn any) (err error) {
 		spannerConn, _ := driverConn.(spannerdriver.SpannerConn)
 		return spannerConn.RunBatch(context.Background())
 	}); err != nil {
@@ -271,7 +270,7 @@ func executeBatchDdl(conn *Connection, executor queryExecutor, statements []*spa
 }
 
 func executeBatchDml(conn *Connection, executor queryExecutor, statements []*spannerpb.ExecuteBatchDmlRequest_Statement) (*spannerpb.ExecuteBatchDmlResponse, error) {
-	if err := conn.backend.Conn.Raw(func(driverConn any) error {
+	if err := conn.backend.Raw(func(driverConn any) error {
 		spannerConn, _ := driverConn.(spannerdriver.SpannerConn)
 		return spannerConn.StartBatchDML()
 	}); err != nil {
@@ -290,7 +289,7 @@ func executeBatchDml(conn *Connection, executor queryExecutor, statements []*spa
 		}
 	}
 	var spannerResult spannerdriver.SpannerResult
-	if err := conn.backend.Conn.Raw(func(driverConn any) (err error) {
+	if err := conn.backend.Raw(func(driverConn any) (err error) {
 		spannerConn, _ := driverConn.(spannerdriver.SpannerConn)
 		spannerResult, err = spannerConn.RunDmlBatch(context.Background())
 		return err
@@ -348,21 +347,21 @@ func determineBatchType(conn *Connection, statements []*spannerpb.ExecuteBatchDm
 		return spannerdriver.BatchTypeUnknown, status.Errorf(codes.InvalidArgument, "cannot determine type of an empty batch")
 	}
 	batchType := spannerdriver.BatchTypeUnknown
-	if err := conn.backend.Conn.Raw(func(driverConn any) error {
+	if err := conn.backend.Raw(func(driverConn any) error {
 		spannerConn, _ := driverConn.(spannerdriver.SpannerConn)
 		firstStatementType := spannerConn.DetectStatementType(statements[0].Sql)
 		if firstStatementType == parser.StatementTypeDml {
 			batchType = spannerdriver.BatchTypeDml
 		} else if firstStatementType == parser.StatementTypeDdl {
 			batchType = spannerdriver.BatchTypeDdl
 		} else {
-			return status.Errorf(codes.InvalidArgument, "unsupported statement type for batching: %s", firstStatementType)
+			return status.Errorf(codes.InvalidArgument, "unsupported statement type for batching: %v", firstStatementType)
 		}
 		for i, statement := range statements {
 			if i > 0 {
 				tp := spannerConn.DetectStatementType(statement.Sql)
 				if tp != firstStatementType {
-					return status.Errorf(codes.InvalidArgument, "Batches may not contain different types of statements. The first statement is of type %s. The statement on position %d is of type %s.", firstStatementType, i, tp)
+					return status.Errorf(codes.InvalidArgument, "Batches may not contain different types of statements. The first statement is of type %v. The statement on position %d is of type %v.", firstStatementType, i, tp)
 				}
 			}
 		}

spannerlib/api/pool.go

@@ -2,31 +2,38 @@ package api
 
 import (
 	"context"
+	"database/sql"
 	"fmt"
 	"sync"
 	"sync/atomic"
 
-	"spannerlib/backend"
+	spannerdriver "github.com/googleapis/go-sql-spanner"
 )
 
 var pools = sync.Map{}
 var poolsIdx = atomic.Int64{}
 
 // Pool is the equivalent of a sql.DB. It contains a pool of connections to the same database.
 type Pool struct {
-	backend        *backend.Pool
+	db             *sql.DB
 	connections    *sync.Map
 	connectionsIdx atomic.Int64
 }
 
 func CreatePool(dsn string) (int64, error) {
-	backendPool, err := backend.CreatePool(dsn)
+	config, err := spannerdriver.ExtractConnectorConfig(dsn)
 	if err != nil {
 		return 0, err
 	}
+	connector, err := spannerdriver.CreateConnector(config)
+	if err != nil {
+		return 0, err
+	}
+	db := sql.OpenDB(connector)
+
 	id := poolsIdx.Add(1)
 	pool := &Pool{
-		backend:     backendPool,
+		db:          db,
 		connections: &sync.Map{},
 	}
 	pools.Store(id, pool)
@@ -41,10 +48,10 @@ func ClosePool(id int64) error {
 	pool := p.(*Pool)
 	pool.connections.Range(func(key, value interface{}) bool {
 		conn := value.(*Connection)
-		conn.close()
+		_ = conn.close()
 		return true
 	})
-	if err := pool.backend.Close(); err != nil {
+	if err := pool.db.Close(); err != nil {
 		return err
 	}
 	return nil
@@ -56,13 +63,13 @@ func CreateConnection(poolId int64) (int64, error) {
 		return 0, fmt.Errorf("pool %v not found", poolId)
 	}
 	pool := p.(*Pool)
-	sqlConn, err := pool.backend.Conn(context.Background())
+	sqlConn, err := pool.db.Conn(context.Background())
 	if err != nil {
 		return 0, err
 	}
 	id := poolsIdx.Add(1)
 	conn := &Connection{
-		backend:      &backend.SpannerConnection{Conn: sqlConn},
+		backend:      sqlConn,
 		results:      &sync.Map{},
 		transactions: &sync.Map{},
 	}

spannerlib/api/transaction.go

@@ -78,7 +78,7 @@ func (tx *transaction) bufferWrite(mutation *spannerpb.BatchWriteRequest_Mutatio
 		}
 		mutations = append(mutations, spannerMutation)
 	}
-	if err := tx.conn.backend.Conn.Raw(func(driverConn any) error {
+	if err := tx.conn.backend.Raw(func(driverConn any) error {
 		spannerConn, _ := driverConn.(spannerdriver.SpannerConn)
 		return spannerConn.BufferWrite(mutations)
 	}); err != nil {
@@ -100,7 +100,7 @@ func (tx *transaction) Commit() (*spannerpb.CommitResponse, error) {
 	if tx.txOpts.GetReadWrite() == nil {
 		return &spannerpb.CommitResponse{}, nil
 	}
-	if err := tx.conn.backend.Conn.Raw(func(driverConn any) (err error) {
+	if err := tx.conn.backend.Raw(func(driverConn any) (err error) {
 		spannerConn, _ := driverConn.(spannerdriver.SpannerConn)
 		response, err = spannerConn.CommitResponse()
 		if err != nil {

spannerlib/backend/connection.go

@@ -16,7 +16,7 @@ require (
 
 require (
 	cel.dev/expr v0.24.0 // indirect
-	cloud.google.com/go v0.121.6 // indirect
+	cloud.google.com/go v0.122.0 // indirect
 	cloud.google.com/go/auth v0.16.5 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/compute/metadata v0.8.0 // indirect

spannerlib/backend/db_pool.go

@@ -38,8 +38,8 @@ cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRY
 cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
 cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
 cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
-cloud.google.com/go v0.121.6 h1:waZiuajrI28iAf40cWgycWNgaXPO06dupuS+sgibK6c=
-cloud.google.com/go v0.121.6/go.mod h1:coChdst4Ea5vUpiALcYKXEpR1S9ZgXbhEzzMcMR66vI=
+cloud.google.com/go v0.122.0 h1:0JTLGrcSIs3HIGsgVPvTx3cfyFSP/k9CI8vLPHTd6Wc=
+cloud.google.com/go v0.122.0/go.mod h1:xBoMV08QcqUGuPW65Qfm1o9Y4zKZBpGS+7bImXLTAZU=
 cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
 cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
 cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=