stellar#4909: convert byte[] values to string before sending to fast …

…batch builder rows
sreuland · Nov 1, 2023 · 769a287 · 769a287
1 parent 2be340b
commit 769a287
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git a/services/horizon/internal/db2/history/effect_batch_insert_builder.go b/services/horizon/internal/db2/history/effect_batch_insert_builder.go
@@ -51,7 +51,7 @@ func (i *effectBatchInsertBuilder) Add(
 		"history_operation_id": operationID,
 		"order":                order,
 		"type":                 effectType,
-		"details":              details,
+		"details":              string(details),
 	})
 }
 

diff --git a/services/horizon/internal/db2/history/operation_batch_insert_builder.go b/services/horizon/internal/db2/history/operation_batch_insert_builder.go
@@ -54,7 +54,7 @@ func (i *operationBatchInsertBuilder) Add(
 		"transaction_id":       transactionID,
 		"application_order":    applicationOrder,
 		"type":                 operationType,
-		"details":              details,
+		"details":              string(details),
 		"source_account":       sourceAccount,
 		"source_account_muxed": sourceAccountMuxed,
 		"is_payment":           isPayment,

diff --git a/support/db/batch_insert_builder_test.go b/support/db/batch_insert_builder_test.go
@@ -13,7 +13,7 @@ import (
 type hungerRow struct {
 	Name        string `db:"name"`
 	HungerLevel string `db:"hunger_level"`
-	JsonValue   []byte `db:"json_value"`
+	JsonValue   string `db:"json_value"`
 }
 
 type invalidHungerRow struct {

diff --git a/support/db/fast_batch_insert_builder.go b/support/db/fast_batch_insert_builder.go
@@ -58,10 +58,6 @@ func (b *FastBatchInsertBuilder) Row(row map[string]interface{}) error {
 		if !ok {
 			return errors.Errorf(`column "%s" does not exist`, column)
 		}
-
-		if b, ok := val.([]byte); ok {
-			val = string(b)
-		}
 		rowSlice = append(rowSlice, val)
 	}
 	b.rows = append(b.rows, rowSlice)
@@ -95,11 +91,7 @@ func (b *FastBatchInsertBuilder) RowStruct(row interface{}) error {
 	// convert fields values to interface{}
 	columnValues := make([]interface{}, len(b.columns))
 	for i, rval := range rvals {
-		if b, ok := rval.Interface().([]byte); ok {
-			columnValues[i] = string(b)
-		} else {
-			columnValues[i] = rval.Interface()
-		}
+		columnValues[i] = rval.Interface()
 	}
 
 	b.rows = append(b.rows, columnValues)

diff --git a/support/db/fast_batch_insert_builder_test.go b/support/db/fast_batch_insert_builder_test.go
@@ -22,7 +22,7 @@ func TestFastBatchInsertBuilder(t *testing.T) {
 		insertBuilder.Row(map[string]interface{}{
 			"name":         "bubba",
 			"hunger_level": "1",
-			"json_value":   []byte(`{"bump_to": "97"}`),
+			"json_value":   `{"bump_to": "97"}`,
 		}),
 	)
 
@@ -37,7 +37,7 @@ func TestFastBatchInsertBuilder(t *testing.T) {
 		insertBuilder.Row(map[string]interface{}{
 			"name":       "bubba",
 			"city":       "London",
-			"json_value": []byte(`{"bump_to": "98"}`),
+			"json_value": `{"bump_to": "98"}`,
 		}),
 		"column \"hunger_level\" does not exist",
 	)
@@ -46,7 +46,7 @@ func TestFastBatchInsertBuilder(t *testing.T) {
 		insertBuilder.RowStruct(hungerRow{
 			Name:        "bubba2",
 			HungerLevel: "9",
-			JsonValue:   []byte(`{"bump_to": "98"}`),
+			JsonValue:   `{"bump_to": "98"}`,
 		}),
 	)