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

fix data copy in replaying from checkpoint - main #21233

Merged
merged 2 commits into from
Jan 15, 2025
Merged

fix data copy in replaying from checkpoint - main #21233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e627a5
fix
aptend Jan 15, 2025
091dbcf
Merge branch 'main' into fix-replay-copy-main
mergify[bot] Jan 15, 2025
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
7 changes: 7 additions & 0 deletions pkg/container/vector/vector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,13 @@ func GetFixedAtWithTypeCheck[T any](v *Vector, idx int) T {
return slice[idx]
}

func (v *Vector) CloneBytesAt(i int) []byte {
bs := v.GetBytesAt(i)
ret := make([]byte, len(bs))
copy(ret, bs)
return ret
}

func (v *Vector) GetBytesAt(i int) []byte {
if v.IsConst() {
i = 0
Expand Down
3 changes: 2 additions & 1 deletion pkg/vm/engine/tae/catalog/catalogreplay.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,12 +387,13 @@ func (catalog *Catalog) ReplayMOTables(ctx context.Context, txnNode *txnbase.Txn
schema.Relkind = tblBat.GetVectorByName(pkgcatalog.SystemRelAttr_Kind).GetDownstreamVector().GetStringAt(i)
schema.Createsql = tblBat.GetVectorByName(pkgcatalog.SystemRelAttr_CreateSQL).GetDownstreamVector().GetStringAt(i)
schema.View = tblBat.GetVectorByName(pkgcatalog.SystemRelAttr_ViewDef).GetDownstreamVector().GetStringAt(i)
schema.Constraint = tblBat.GetVectorByName(pkgcatalog.SystemRelAttr_Constraint).GetDownstreamVector().GetBytesAt(i)
schema.Constraint = tblBat.GetVectorByName(pkgcatalog.SystemRelAttr_Constraint).GetDownstreamVector().CloneBytesAt(i)
schema.AcInfo = accessInfo{}
schema.AcInfo.RoleID = roleIDs[i]
schema.AcInfo.UserID = userIDs[i]
schema.AcInfo.CreateAt = createAts[i]
schema.AcInfo.TenantID = tenantIDs[i]
// unmarshal before releasing, no need to copy
extra := tblBat.GetVectorByName(pkgcatalog.SystemRelAttr_ExtraInfo).GetDownstreamVector().GetBytesAt(i)
schema.MustRestoreExtra(extra)
if err := schema.Finalize(true); err != nil {
Expand Down
5 changes: 3 additions & 2 deletions pkg/vm/engine/tae/catalog/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,7 @@ func (s *Schema) ReadFromBatch(
}
def := new(ColDef)
def.Name = bat.GetVectorByName((pkgcatalog.SystemColAttr_Name)).GetDownstreamVector().GetStringAt(offset)
// unmarshal before releasing, no need to copy
data := bat.GetVectorByName((pkgcatalog.SystemColAttr_Type)).GetDownstreamVector().GetBytesAt(offset)
types.Decode(data, &def.Type)
nullable := nullables[offset]
Expand All @@ -636,8 +637,8 @@ func (s *Schema) ReadFromBatch(
isAutoIncrement := autoIncrements[offset]
def.AutoIncrement = i82bool(isAutoIncrement)
def.Comment = bat.GetVectorByName((pkgcatalog.SystemColAttr_Comment)).GetDownstreamVector().GetStringAt(offset)
def.OnUpdate = bat.GetVectorByName((pkgcatalog.SystemColAttr_Update)).GetDownstreamVector().GetBytesAt(offset)
def.Default = bat.GetVectorByName((pkgcatalog.SystemColAttr_DefaultExpr)).GetDownstreamVector().GetBytesAt(offset)
def.OnUpdate = bat.GetVectorByName((pkgcatalog.SystemColAttr_Update)).GetDownstreamVector().CloneBytesAt(offset)
def.Default = bat.GetVectorByName((pkgcatalog.SystemColAttr_DefaultExpr)).GetDownstreamVector().CloneBytesAt(offset)
def.Idx = int(idxes[offset]) - 1
def.SeqNum = seqNums[offset]
def.EnumValues = bat.GetVectorByName((pkgcatalog.SystemColAttr_EnumValues)).GetDownstreamVector().GetStringAt(offset)
Expand Down
Loading