-
Notifications
You must be signed in to change notification settings - Fork 173
BigQuery performance improvements and bugfixes #3782
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
768713a
feat(bigquery): batch url table function calls
jkaflik 54dff65
Merge branch 'main' into kk/bq-batch
jkaflik 1fb0077
Merge remote-tracking branch 'origin/main' into kk/bq-batch
jkaflik fc9bcaf
adjust number of partitions
jkaflik 36998fc
use Parquet
jkaflik 3ea42c8
cleanups
jkaflik c5f854a
restore S3 validation for CH connector
jkaflik 574d929
remove avro mentions
jkaflik 11d5940
Merge branch 'main' into customer-kuba-bq-improvements
jkaflik 1f1cb0c
fix JSON column export for Parquet
jkaflik e3e3e33
fix Geo type handling
jkaflik 30fe0ab
fix linter errors
jkaflik 23fb96b
fix linter errors
jkaflik ffa3f31
use parquet metadata retrieval in reader
jkaflik 255c3c3
ensure identifier is escaped
jkaflik b95c0c0
fix linter errors
jkaflik 684fa3f
quotedIdentifier helper for BigQuery
jkaflik 9a311a2
fix linter issue
jkaflik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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 was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or 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 hidden or 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,50 @@ | ||
| package connbigquery | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestDatasetTableStringQuoted(t *testing.T) { | ||
| testCases := []struct { | ||
| datasetTable datasetTable | ||
| expected string | ||
| }{ | ||
| { | ||
| datasetTable: datasetTable{ | ||
| dataset: "my_dataset", | ||
| table: "my_table", | ||
| }, | ||
| expected: "`my_dataset`.`my_table`", | ||
| }, | ||
| { | ||
| datasetTable: datasetTable{ | ||
| dataset: `data"set`, | ||
| table: `ta"ble`, | ||
| }, | ||
| expected: "`data\"set`.`ta\"ble`", | ||
| }, | ||
| { | ||
| datasetTable: datasetTable{ | ||
| dataset: "data`set", | ||
| table: "ta`ble", | ||
| }, | ||
| expected: "`data\\`set`.`ta\\`ble`", | ||
| }, | ||
| { | ||
| datasetTable: datasetTable{ | ||
| project: "my_project`; DROP TABLE users;--", | ||
| dataset: "my_dataset", | ||
| table: "my_table", | ||
| }, | ||
| expected: "`my_project\\`; DROP TABLE users;--`.`my_dataset`.`my_table`", | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range testCases { | ||
| t.Run(tc.expected, func(t *testing.T) { | ||
| assert.Equal(t, tc.expected, tc.datasetTable.stringQuoted()) | ||
| }) | ||
| } | ||
| } |
This file contains hidden or 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,135 @@ | ||
| package connbigquery | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "io" | ||
| "log/slog" | ||
|
|
||
| "cloud.google.com/go/storage" | ||
| "github.com/apache/arrow-go/v18/parquet" | ||
| "github.com/apache/arrow-go/v18/parquet/file" | ||
| "go.temporal.io/sdk/log" | ||
| ) | ||
|
|
||
| const defaultCompressedRowSize = 512 // bytes. Should be a reasonable low default for analytical data | ||
|
|
||
| // gcsObjectSeeker implements io.ReadSeeker for a GCS object using range reads. | ||
| // Designed for a quick reading specific parts of a Parquet file. Like file header. | ||
| // Not efficient for many small reads/seeks. | ||
| type gcsObjectSeeker struct { | ||
| ctx context.Context //nolint:containedctx // context for GCS operations | ||
|
|
||
| object *storage.ObjectHandle | ||
| fileSize int64 | ||
| offset int64 | ||
| } | ||
|
|
||
| func (r *gcsObjectSeeker) Read(p []byte) (int, error) { | ||
| length := int64(len(p)) | ||
|
|
||
| if r.offset < 0 || length <= 0 || r.offset+length > r.fileSize { | ||
| return 0, fmt.Errorf( | ||
| "invalid offset/length for reading GCS object chunk: offset=%d, length=%d, fileSize=%d", | ||
| r.offset, | ||
| length, | ||
| r.fileSize, | ||
| ) | ||
| } | ||
|
|
||
| reader, err := r.object.NewRangeReader(r.ctx, r.offset, length) | ||
| if err != nil { | ||
| return 0, err | ||
| } | ||
|
|
||
| defer reader.Close() | ||
|
|
||
| n, err := io.ReadFull(reader, p) | ||
| if err != nil { | ||
| return n, err | ||
| } | ||
| r.offset += int64(n) | ||
| return n, nil | ||
| } | ||
|
|
||
| func (r *gcsObjectSeeker) Seek(offset int64, whence int) (int64, error) { | ||
| var newOffset int64 | ||
| switch whence { | ||
| case io.SeekStart: | ||
| newOffset = offset | ||
| case io.SeekCurrent: | ||
| newOffset = r.offset + offset | ||
| case io.SeekEnd: | ||
| newOffset = r.fileSize + offset | ||
| default: | ||
| return 0, fmt.Errorf("invalid whence: %d", whence) | ||
| } | ||
|
|
||
| if newOffset < 0 || newOffset > r.fileSize { | ||
| return 0, fmt.Errorf("invalid seek offset: %d", newOffset) | ||
| } | ||
|
|
||
| r.offset = newOffset | ||
| return r.offset, nil | ||
| } | ||
|
|
||
| func (r *gcsObjectSeeker) ReadAt(p []byte, off int64) (int, error) { | ||
| currentOffset := r.offset | ||
| if _, err := r.Seek(off, io.SeekStart); err != nil { | ||
| return 0, err | ||
| } | ||
| n, err := r.Read(p) | ||
| if _, seekErr := r.Seek(currentOffset, io.SeekStart); seekErr != nil { | ||
| return n, seekErr | ||
| } | ||
| return n, err | ||
| } | ||
|
|
||
| var _ parquet.ReaderAtSeeker = (*gcsObjectSeeker)(nil) | ||
|
|
||
| func readParquetTotalRows(r parquet.ReaderAtSeeker) (int64, error) { | ||
| pr, err := file.NewParquetReader(r) | ||
| if err != nil { | ||
| return 0, fmt.Errorf("failed to create parquet reader: %w", err) | ||
| } | ||
|
|
||
| return pr.NumRows(), nil | ||
| } | ||
|
|
||
| func parquetObjectAverageRowSize(ctx context.Context, logger log.Logger, object *storage.ObjectHandle) uint64 { | ||
| attrs, err := object.Attrs(ctx) | ||
| if err != nil { | ||
| logger.Error("failed to get object attrs for parquet object, using default compressed row size", | ||
jkaflik marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| slog.String("object", object.ObjectName()), | ||
| slog.Int("default_size", defaultCompressedRowSize), | ||
| slog.Any("error", err)) | ||
|
|
||
| return defaultCompressedRowSize | ||
| } | ||
|
|
||
| r := &gcsObjectSeeker{ | ||
| ctx: ctx, | ||
| object: object, | ||
| fileSize: attrs.Size, | ||
| offset: 0, | ||
| } | ||
|
|
||
| n, err := readParquetTotalRows(r) | ||
| if err != nil { | ||
| logger.Error("failed to read parquet object metadata, using default compressed row size", | ||
| slog.String("object", object.ObjectName()), | ||
| slog.Int("default_size", defaultCompressedRowSize), | ||
| slog.Any("error", err)) | ||
|
|
||
| return defaultCompressedRowSize | ||
| } | ||
|
|
||
| if n == 0 { | ||
| logger.Info("parquet object has zero rows, using default compressed row size", | ||
| slog.String("object", object.ObjectName())) | ||
|
|
||
| return defaultCompressedRowSize | ||
| } | ||
|
|
||
| return uint64(attrs.Size) / uint64(n) | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.