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

Jump to bottom

loaddata: revert concurrent writing to TiKV and WITH detached #44056

Merged
merged 7 commits into from
May 23, 2023
Merged

loaddata: revert concurrent writing to TiKV and WITH detached #44056

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c234398
loaddata: revert concurrent writing to TiKV
lance6716 May 22, 2023
76e47bb
fix bazel_prepare
lance6716 May 22, 2023
b0a4b5a
fix lint
lance6716 May 22, 2023
0445238
fix missing warning
lance6716 May 22, 2023
daf2edd
remove WITH detached
lance6716 May 22, 2023
aa7b766
address comment
lance6716 May 23, 2023
56ec756
fix bazel
lance6716 May 23, 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
1 change: 0 additions & 1 deletion executor/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ go_test(
"join_pkg_test.go",
"join_test.go",
"joiner_test.go",
"load_data_test.go",
"main_test.go",
"memtable_reader_test.go",
"merge_join_test.go",
Expand Down
3 changes: 1 addition & 2 deletions executor/importer/import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,13 @@ const (
maxWriteSpeedOption = "max_write_speed"
splitFileOption = "split_file"
recordErrorsOption = "record_errors"
detachedOption = "detached"

// test option, not for user
distributedOption = "__distributed"
)

var (
detachedOption = plannercore.DetachedOption

// name -> whether the option has value
supportedOptions = map[string]bool{
importModeOption: true,
Expand Down
10 changes: 10 additions & 0 deletions executor/insert_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"context"
"fmt"
"math"
"sync"
"time"

"github.com/pingcap/errors"
Expand Down Expand Up @@ -93,6 +94,11 @@ type InsertValues struct {

stats *InsertRuntimeStat

// in LOAD DATA, one InsertValues is used by two goroutine, we need to lock
// when using the txn
isLoadData bool
txnInUse sync.Mutex

// fkChecks contains the foreign key checkers.
fkChecks []*FKCheckExec
fkCascades []*FKCascadeExec
Expand Down Expand Up @@ -1050,6 +1056,10 @@ func (e *InsertValues) allocAutoRandomID(ctx context.Context, fieldType *types.F
if shardFmt.IncrementalMask()&autoRandomID != autoRandomID {
return 0, autoid.ErrAutoRandReadFailed
}
if e.isLoadData {
e.txnInUse.Lock()
defer e.txnInUse.Unlock()
}
_, err = e.ctx.Txn(true)
if err != nil {
return 0, err
Expand Down
Loading