Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support DMLs in ExecuteStreamingSql #93

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Support DMLs in ExecuteStreamingSql #93

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2de3b75
support DMLs in ExecuteStreamingSql
apstndb May 19, 2023
54205a1
refactor ExecuteStreamingSql
apstndb May 19, 2023
30cdc09
refactor ExecuteStreamingSql
apstndb May 19, 2023
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
48 changes: 38 additions & 10 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,16 @@ type server struct {
sessions map[string]*session
}

type emptyRowIterator struct{}

func (ri emptyRowIterator) ResultSet() []ResultItem {
return nil
}

func (ri emptyRowIterator) Do(f func([]interface{}) error) error {
return nil
}

func (s *server) ApplyDDL(ctx context.Context, databaseName string, stmt ast.DDL) error {
db, err := s.getOrCreateDatabase(databaseName)
if err != nil {
Expand Down Expand Up @@ -594,7 +604,7 @@ func (s *server) ExecuteStreamingSql(req *spannerpb.ExecuteSqlRequest, stream sp
Lexer: &parser.Lexer{
File: &token.File{FilePath: "", Buffer: req.Sql},
},
}).ParseQuery()
}).ParseStatement()
if err != nil {
return status.Errorf(codes.InvalidArgument, "Syntax error: %q: %v", req.Sql, err)
}
Expand All @@ -618,19 +628,32 @@ func (s *server) ExecuteStreamingSql(req *spannerpb.ExecuteSqlRequest, stream sp
params[key] = v
}

iter, err := session.database.Query(ctx, tx, stmt, params)
stats := queryStats{
Mode: req.QueryMode,
ReceivedAt: receivedAt,
QueryText: req.Sql,
}

var iter RowIterator
switch stmt := stmt.(type) {
case *ast.QueryStatement:
iter, err = session.database.Query(ctx, tx, stmt, params)
case ast.DML:
var result *spannerpb.ResultSet
result, err = s.executeParsedDML(ctx, session, tx, stmt, req.GetParams(), req.GetParamTypes())
stats.RowCount = result.GetStats().GetRowCountExact()
iter = emptyRowIterator{}
default:
return status.Errorf(codes.InvalidArgument, "Unknown query: %q", req.Sql)
}

if err != nil {
if !tx.Available() {
return checkAvailability()
}
return err
}

stats := queryStats{
Mode: req.QueryMode,
ReceivedAt: receivedAt,
QueryText: req.Sql,
}
if err := sendResult(stream, tx, iter, txCreated, stats); err != nil {
if !tx.Available() {
return checkAvailability()
Expand Down Expand Up @@ -728,8 +751,11 @@ func (s *server) executeDML(ctx context.Context, session *session, tx *transacti
return nil, status.Errorf(codes.InvalidArgument, "%q is not valid DML: %v", stmt.Sql, err)
}

fields := stmt.GetParams().GetFields()
paramTypes := stmt.ParamTypes
return s.executeParsedDML(ctx, session, tx, dml, stmt.GetParams(), stmt.GetParamTypes())
}

func (s *server) executeParsedDML(ctx context.Context, session *session, tx *transaction, dml ast.DML, paramStruct *structpb.Struct, paramTypes map[string]*spannerpb.Type) (*spannerpb.ResultSet, error) {
fields := paramStruct.GetFields()
params := make(map[string]Value, len(fields))
defaultType := &spannerpb.Type{Code: spannerpb.TypeCode_INT64}
for key, val := range fields {
Expand Down Expand Up @@ -883,7 +909,9 @@ func sendResult(stream spannerpb.Spanner_StreamingReadServer, tx *transaction, i
return err
}

qs.RowCount = rowCount
if qs.RowCount == 0 {
qs.RowCount = rowCount
}
stats := &spannerpb.ResultSetStats{
QueryStats: createQueryStats(qs),
}
Expand Down