Method for reading query results during upgrade modification (#18731)

Method for reading query results during upgrade modification Change from `UnsafeStringAt()` to call `GetStringAt()` Approved by: @daviszhen, @zhangxu19830126, @sukki37
matrixorigin · Sep 12, 2024 · 60bdf4f · 60bdf4f
1 parent 3c6e4c5
commit 60bdf4f
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/pkg/bootstrap/versions/upgrade_strategy.go b/pkg/bootstrap/versions/upgrade_strategy.go
@@ -240,15 +240,15 @@ func CheckTableColumn(txn executor.TxnExecutor,
 
 	res.ReadRows(func(rows int, cols []*vector.Vector) bool {
 		data_type := cols[0].UnsafeGetStringAt(0)
-		is_nullable := cols[1].UnsafeGetStringAt(0)
+		is_nullable := cols[1].GetStringAt(0)
 		character_length := vector.GetFixedAt[int64](cols[2], 0)
 		numeric_precision := vector.GetFixedAt[int64](cols[3], 0)
 		numeric_scale := vector.GetFixedAt[int64](cols[4], 0)
 		datetime_precision := vector.GetFixedAt[int64](cols[5], 0)
 		ordinal_position := vector.GetFixedAt[int32](cols[6], 0)
-		column_default := cols[7].UnsafeGetStringAt(0)
-		extra := cols[8].UnsafeGetStringAt(0)
-		column_comment := cols[9].UnsafeGetStringAt(0)
+		column_default := cols[7].GetStringAt(0)
+		extra := cols[8].GetStringAt(0)
+		column_comment := cols[9].GetStringAt(0)
 
 		colInfo.IsExits = true
 		colInfo.ColType = data_type
@@ -284,7 +284,7 @@ func CheckViewDefinition(txn executor.TxnExecutor, accountId uint32, schema stri
 	loaded := false
 	n := 0
 	res.ReadRows(func(rows int, cols []*vector.Vector) bool {
-		view_def = cols[0].UnsafeGetStringAt(0)
+		view_def = cols[0].GetStringAt(0)
 		n++
 		loaded = true
 		return false
@@ -353,7 +353,7 @@ func CheckTableComment(txn executor.TxnExecutor, accountId uint32, schema string
 	comment := ""
 	res.ReadRows(func(rows int, cols []*vector.Vector) bool {
 		loaded = true
-		comment = cols[3].UnsafeGetStringAt(0)
+		comment = cols[3].GetStringAt(0)
 		return false
 	})
 

diff --git a/pkg/bootstrap/versions/upgrade_tenant_task.go b/pkg/bootstrap/versions/upgrade_tenant_task.go
@@ -111,7 +111,7 @@ func GetUpgradeTenantTasks(
 		res.ReadRows(func(rows int, cols []*vector.Vector) bool {
 			for i := 0; i < rows; i++ {
 				tenants = append(tenants, vector.GetFixedAt[int32](cols[0], i))
-				versions = append(versions, cols[1].UnsafeGetStringAt(i))
+				versions = append(versions, cols[1].GetStringAt(i))
 			}
 			return true
 		})
@@ -131,7 +131,7 @@ func GetTenantCreateVersionForUpdate(
 	defer res.Close()
 	version := ""
 	res.ReadRows(func(rows int, cols []*vector.Vector) bool {
-		version = cols[0].UnsafeGetStringAt(0)
+		version = cols[0].GetStringAt(0)
 		return true
 	})
 	if version == "" {
@@ -174,7 +174,7 @@ func GetTenantVersion(
 	defer res.Close()
 	version := ""
 	res.ReadRows(func(rows int, cols []*vector.Vector) bool {
-		version = cols[0].UnsafeGetStringAt(0)
+		version = cols[0].GetStringAt(0)
 		return true
 	})
 	if version == "" {

diff --git a/pkg/bootstrap/versions/version.go b/pkg/bootstrap/versions/version.go
@@ -82,7 +82,7 @@ func GetLatestVersion(txn executor.TxnExecutor) (Version, error) {
 
 	var version Version
 	res.ReadRows(func(rows int, cols []*vector.Vector) bool {
-		version.Version = cols[0].UnsafeGetStringAt(0)
+		version.Version = cols[0].GetStringAt(0)
 		version.VersionOffset = vector.GetFixedAt[uint32](cols[1], 0)
 		version.State = vector.GetFixedAt[int32](cols[2], 0)
 		return true
@@ -102,7 +102,7 @@ func GetLatestUpgradeVersion(txn executor.TxnExecutor) (Version, error) {
 
 	var version Version
 	res.ReadRows(func(rows int, cols []*vector.Vector) bool {
-		version.Version = cols[0].UnsafeGetStringAt(0)
+		version.Version = cols[0].GetStringAt(0)
 		return true
 	})
 	return version, nil
@@ -124,7 +124,7 @@ func MustGetLatestReadyVersion(
 
 	version := ""
 	res.ReadRows(func(rows int, cols []*vector.Vector) bool {
-		version = cols[0].UnsafeGetStringAt(0)
+		version = cols[0].GetStringAt(0)
 		return true
 	})
 	if version == "" {

diff --git a/pkg/bootstrap/versions/version_upgrade.go b/pkg/bootstrap/versions/version_upgrade.go
@@ -241,9 +241,9 @@ func getVersionUpgradesBySQL(
 		for i := 0; i < rows; i++ {
 			value := VersionUpgrade{}
 			value.ID = vector.GetFixedAt[uint64](cols[0], i)
-			value.FromVersion = cols[1].UnsafeGetStringAt(i)
-			value.ToVersion = cols[2].UnsafeGetStringAt(i)
-			value.FinalVersion = cols[3].UnsafeGetStringAt(i)
+			value.FromVersion = cols[1].GetStringAt(i)
+			value.ToVersion = cols[2].GetStringAt(i)
+			value.FinalVersion = cols[3].GetStringAt(i)
 			value.FinalVersionOffset = vector.GetFixedAt[uint32](cols[4], i)
 			value.State = vector.GetFixedAt[int32](cols[5], i)
 			value.UpgradeOrder = vector.GetFixedAt[int32](cols[6], i)