-
Notifications
You must be signed in to change notification settings - Fork 3.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
clisqlshell: implement
COPY ... FROM STDIN for CLI
Steps: * Add a lower level API to lib/pq for use. * Add some abstraction boundary breakers in `clisqlclient` that allow a lower level handling of the COPY protocol. * Altered the state machine in `clisqlshell` to account for copy. Release note (cli change): COPY ... FROM STDIN now works from the cockroach CLI. It is not supported inside transactions.
- Loading branch information
Showing
15 changed files
with
495 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| // Copyright 2022 The Cockroach Authors. | ||
| // | ||
| // Use of this software is governed by the Business Source License | ||
| // included in the file licenses/BSL.txt. | ||
| // | ||
| // As of the Change Date specified in that file, in accordance with | ||
| // the Business Source License, use of this software will be governed | ||
| // by the Apache License, Version 2.0, included in the file | ||
| // licenses/APL.txt. | ||
|
|
||
| package clisqlclient | ||
|
|
||
| import ( | ||
| "context" | ||
| "database/sql/driver" | ||
| "io" | ||
| "reflect" | ||
| "strings" | ||
|
|
||
| "github.com/cockroachdb/errors" | ||
| ) | ||
|
|
||
| type copyFromer interface { | ||
| CopyData(ctx context.Context, line string) (r driver.Result, err error) | ||
| Close() error | ||
| } | ||
|
|
||
| // CopyFromState represents an in progress COPY FROM. | ||
| type CopyFromState struct { | ||
| driver.Tx | ||
| copyFromer | ||
| } | ||
|
|
||
| // BeginCopyFrom starts a COPY FROM query. | ||
| func BeginCopyFrom(ctx context.Context, conn Conn, query string) (*CopyFromState, error) { | ||
| txn, err := conn.(*sqlConn).conn.(driver.ConnBeginTx).BeginTx(ctx, driver.TxOptions{}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| stmt, err := txn.(driver.Conn).Prepare(query) | ||
| if err != nil { | ||
| return nil, errors.CombineErrors(err, txn.Rollback()) | ||
| } | ||
| return &CopyFromState{Tx: txn, copyFromer: stmt.(copyFromer)}, nil | ||
| } | ||
|
|
||
| // copyFromRows is a mock Rows interface for COPY results. | ||
| type copyFromRows struct { | ||
| r driver.Result | ||
| } | ||
|
|
||
| func (c copyFromRows) Close() error { | ||
| return nil | ||
| } | ||
|
|
||
| func (c copyFromRows) Columns() []string { | ||
| return nil | ||
| } | ||
|
|
||
| func (c copyFromRows) ColumnTypeScanType(index int) reflect.Type { | ||
| return nil | ||
| } | ||
|
|
||
| func (c copyFromRows) ColumnTypeDatabaseTypeName(index int) string { | ||
| return "" | ||
| } | ||
|
|
||
| func (c copyFromRows) ColumnTypeNames() []string { | ||
| return nil | ||
| } | ||
|
|
||
| func (c copyFromRows) Result() driver.Result { | ||
| return c.r | ||
| } | ||
|
|
||
| func (c copyFromRows) Tag() string { | ||
| return "COPY" | ||
| } | ||
|
|
||
| func (c copyFromRows) Next(values []driver.Value) error { | ||
| return io.EOF | ||
| } | ||
|
|
||
| func (c copyFromRows) NextResultSet() (bool, error) { | ||
| return false, nil | ||
| } | ||
|
|
||
| // Cancel cancels a COPY FROM query from completing. | ||
| func (c *CopyFromState) Cancel() error { | ||
| return errors.CombineErrors(c.copyFromer.Close(), c.Tx.Rollback()) | ||
| } | ||
|
|
||
| // Commit completes a COPY FROM query by committing lines to the database. | ||
| func (c *CopyFromState) Commit(ctx context.Context, cleanupFunc func(), lines string) QueryFn { | ||
| return func(ctx context.Context, conn Conn) (Rows, bool, error) { | ||
| defer cleanupFunc() | ||
| rows, isMulti, err := func() (Rows, bool, error) { | ||
| for _, l := range strings.Split(lines, "\n") { | ||
| _, err := c.copyFromer.CopyData(ctx, l) | ||
| if err != nil { | ||
| return nil, false, err | ||
| } | ||
| } | ||
| // Empty line signifies completion. | ||
| r, err := c.copyFromer.CopyData(ctx, "") | ||
| if err != nil { | ||
| return nil, false, err | ||
| } | ||
| return copyFromRows{r: r}, false, c.Tx.Commit() | ||
| }() | ||
| if err != nil { | ||
| return rows, isMulti, errors.CombineErrors(err, errors.CombineErrors(c.copyFromer.Close(), c.Tx.Rollback())) | ||
| } | ||
| return rows, isMulti, err | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.