sql/types: JSONWrapper: Thread Context on some methods on JSON-related types, such as ToInterface and Compare.

enginetest/evaluation.go

@@ -852,7 +852,7 @@ func WidenRow(t *testing.T, sch sql.Schema, row sql.Row) sql.Row {
 	widened := make(sql.Row, len(row))
 	for i, v := range row {
 		if i < len(sch) && types.IsJSON(sch[i].Type) {
-			widened[i] = widenJSONValues(v)
+			widened[i] = widenJSONValues(t.Context(), v)
 			continue
 		}
 
@@ -893,7 +893,7 @@ func widenValue(t *testing.T, v interface{}) (vw interface{}) {
 	return vw
 }
 
-func widenJSONValues(val interface{}) sql.JSONWrapper {
+func widenJSONValues(ctx context.Context, val interface{}) sql.JSONWrapper {
 	if val == nil {
 		return nil
 	}
@@ -907,7 +907,7 @@ func widenJSONValues(val interface{}) sql.JSONWrapper {
 		js = types.MustJSON(str)
 	}
 
-	doc, err := js.ToInterface()
+	doc, err := js.ToInterface(ctx)
 	if err != nil {
 		panic(err)
 	}

sql/core.go

@@ -15,6 +15,7 @@
 package sql
 
 import (
+	"context"
 	"encoding/json"
 	"fmt"
 	trace2 "runtime/trace"
@@ -324,7 +325,7 @@ func ConvertToBool(ctx *Context, v interface{}) (bool, error) {
 	}
 }
 
-func ConvertToVector(v interface{}) ([]float64, error) {
+func ConvertToVector(ctx context.Context, v interface{}) ([]float64, error) {
 	switch b := v.(type) {
 	case []float64:
 		return b, nil
@@ -336,7 +337,7 @@ func ConvertToVector(v interface{}) ([]float64, error) {
 		}
 		return convertJsonInterfaceToVector(val)
 	case JSONWrapper:
-		val, err := b.ToInterface()
+		val, err := b.ToInterface(ctx)
 		if err != nil {
 			return nil, err
 		}

sql/expression/function/aggregation/json_agg.go

@@ -163,7 +163,7 @@ func (j *jsonObjectBuffer) Update(ctx *sql.Context, row sql.Row) error {
 		return err
 	}
 	if js, ok := val.(sql.JSONWrapper); ok {
-		val, err = js.ToInterface()
+		val, err = js.ToInterface(ctx)
 		if err != nil {
 			return err
 		}

sql/expression/function/aggregation/unary_agg_buffers.go

@@ -655,7 +655,7 @@ func (j *jsonArrayBuffer) Update(ctx *sql.Context, row sql.Row) error {
 		return err
 	}
 	if js, ok := v.(sql.JSONWrapper); ok {
-		v, err = js.ToInterface()
+		v, err = js.ToInterface(ctx)
 		if err != nil {
 			return err
 		}

sql/expression/function/aggregation/window_functions.go

@@ -1055,7 +1055,7 @@ func (a *WindowedJSONArrayAgg) aggregateVals(ctx *sql.Context, interval sql.Wind
 			return nil, err
 		}
 		if js, ok := v.(sql.JSONWrapper); ok {
-			v, err = js.ToInterface()
+			v, err = js.ToInterface(ctx)
 			if err != nil {
 				return nil, err
 			}
@@ -1146,7 +1146,7 @@ func (a *WindowedJSONObjectAgg) aggregateVals(ctx *sql.Context, interval sql.Win
 			return nil, err
 		}
 		if js, ok := val.(sql.JSONWrapper); ok {
-			val, err = js.ToInterface()
+			val, err = js.ToInterface(ctx)
 			if err != nil {
 				return nil, err
 			}

sql/expression/function/json/json_array.go

@@ -113,7 +113,7 @@ func (j *JSONArray) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 
 		switch v := val.(type) {
 		case sql.JSONWrapper:
-			val, err = v.ToInterface()
+			val, err = v.ToInterface(ctx)
 			if err != nil {
 				return nil, err
 			}

sql/expression/function/json/json_array_append.go

@@ -88,7 +88,7 @@ func (j JSONArrayAppend) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 
 	// Apply the path-value pairs to the document.
 	for _, pair := range pairs {
-		doc, _, err = doc.ArrayAppend(pair.path, pair.val)
+		doc, _, err = doc.ArrayAppend(ctx, pair.path, pair.val)
 		if err != nil {
 			return nil, err
 		}

sql/expression/function/json/json_array_insert.go

@@ -89,7 +89,7 @@ func (j JSONArrayInsert) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 
 	// Apply the path-value pairs to the document.
 	for _, pair := range pairs {
-		doc, _, err = doc.ArrayInsert(pair.path, pair.val)
+		doc, _, err = doc.ArrayInsert(ctx, pair.path, pair.val)
 		if err != nil {
 			return nil, err
 		}

sql/expression/function/json/json_common.go

@@ -102,7 +102,7 @@ func MutableJsonDoc(ctx context.Context, wrapper sql.JSONWrapper) (types.Mutable
 		return mutable, nil
 	}
 
-	val, err := clonedJsonWrapper.ToInterface()
+	val, err := clonedJsonWrapper.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}

sql/expression/function/json/json_contains.go

@@ -147,7 +147,7 @@ func (j *JSONContains) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 			return nil, err
 		}
 
-		extracted, err := types.LookupJSONValue(target, path.(string))
+		extracted, err := types.LookupJSONValue(ctx, target, path.(string))
 		if err != nil {
 			return nil, err
 		}
@@ -162,11 +162,11 @@ func (j *JSONContains) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 	}
 
 	// Now determine whether the candidate value exists in the target
-	targetVal, err := target.ToInterface()
+	targetVal, err := target.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
-	candidateVal, err := candidate.ToInterface()
+	candidateVal, err := candidate.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}

sql/expression/function/json/json_contains_path.go

@@ -76,7 +76,7 @@ func (j JSONContainsPath) Eval(ctx *sql.Context, row sql.Row) (interface{}, erro
 			return nil, err
 		}
 
-		result, err := types.LookupJSONValue(target, path.(string))
+		result, err := types.LookupJSONValue(ctx, target, path.(string))
 		if err != nil {
 			return nil, err
 		}

sql/expression/function/json/json_depth.go

@@ -114,7 +114,7 @@ func (j *JSONDepth) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, nil
 	}
 
-	val, err := doc.ToInterface()
+	val, err := doc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}

sql/expression/function/json/json_extract.go

@@ -106,7 +106,7 @@ func (j *JSONExtract) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 			return nil, nil
 		}
 
-		results[i], err = types.LookupJSONValue(searchable, path.(string))
+		results[i], err = types.LookupJSONValue(ctx, searchable, path.(string))
 		if err != nil {
 			return nil, fmt.Errorf("failed to extract from expression '%s'; %s", j.JSON.String(), err.Error())
 		}

sql/expression/function/json/json_keys.go

@@ -105,7 +105,7 @@ func (j *JSONKeys) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, nil
 	}
 
-	js, err := types.LookupJSONValue(doc, *path)
+	js, err := types.LookupJSONValue(ctx, doc, *path)
 	if err != nil {
 		if errors.Is(err, jsonpath.ErrKeyError) {
 			return nil, nil
@@ -117,7 +117,7 @@ func (j *JSONKeys) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, nil
 	}
 
-	val, err := js.ToInterface()
+	val, err := js.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}

sql/expression/function/json/json_length.go

@@ -95,7 +95,7 @@ func (j *JsonLength) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, strErr
 	}
 
-	res, err := types.LookupJSONValue(doc, path)
+	res, err := types.LookupJSONValue(ctx, doc, path)
 	if err != nil {
 		return nil, err
 	}
@@ -104,7 +104,7 @@ func (j *JsonLength) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return nil, nil
 	}
 
-	val, err := res.ToInterface()
+	val, err := res.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}

sql/expression/function/json/json_merge_patch.go

@@ -116,7 +116,7 @@ func (j *JSONMergePatch) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 		return nil, nil
 	}
 
-	val, err := initDoc.ToInterface()
+	val, err := initDoc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -131,7 +131,7 @@ func (j *JSONMergePatch) Eval(ctx *sql.Context, row sql.Row) (interface{}, error
 		if doc == nil {
 			return nil, nil
 		}
-		val, err = doc.ToInterface()
+		val, err = doc.ToInterface(ctx)
 		if err != nil {
 			return nil, err
 		}

sql/expression/function/json/json_merge_preserve.go

@@ -124,7 +124,7 @@ func (j *JSONMergePreserve) Eval(ctx *sql.Context, row sql.Row) (interface{}, er
 		return nil, nil
 	}
 
-	val, err := initDoc.ToInterface()
+	val, err := initDoc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -138,7 +138,7 @@ func (j *JSONMergePreserve) Eval(ctx *sql.Context, row sql.Row) (interface{}, er
 		if doc == nil {
 			return nil, nil
 		}
-		val, err = doc.ToInterface()
+		val, err = doc.ToInterface(ctx)
 		if err != nil {
 			return nil, err
 		}

sql/expression/function/json/json_object.go

@@ -116,7 +116,7 @@ func (j JSONObject) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 				return nil, err
 			}
 			if json, ok := val.(sql.JSONWrapper); ok {
-				val, err = json.ToInterface()
+				val, err = json.ToInterface(ctx)
 				if err != nil {
 					return nil, err
 				}

sql/expression/function/json/json_overlaps.go

@@ -190,7 +190,7 @@ func (j *JSONOverlaps) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 	if left == nil {
 		return nil, nil
 	}
-	leftVal, err := left.ToInterface()
+	leftVal, err := left.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -202,7 +202,7 @@ func (j *JSONOverlaps) Eval(ctx *sql.Context, row sql.Row) (interface{}, error)
 	if right == nil {
 		return nil, nil
 	}
-	rightVal, err := right.ToInterface()
+	rightVal, err := right.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}

sql/expression/function/json/json_pretty.go

@@ -83,7 +83,7 @@ func (j *JSONPretty) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	if doc == nil {
 		return nil, nil
 	}
-	val, err := doc.ToInterface()
+	val, err := doc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}

sql/expression/function/json/json_search.go

@@ -295,7 +295,7 @@ func (j *JSONSearch) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		}
 	}
 
-	val, err := doc.ToInterface()
+	val, err := doc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}

sql/expression/function/json/json_type.go

@@ -109,7 +109,7 @@ func (j JSONType) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		return comparableDoc.Type(ctx)
 	}
 
-	val, err := doc.ToInterface()
+	val, err := doc.ToInterface(ctx)
 	if err != nil {
 		return nil, err
 	}

sql/expression/function/json/json_value.go

@@ -95,7 +95,7 @@ func (j *JsonValue) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	}
 
 	// json NULLs also result in sql NULLs.
-	cmp, err := types.CompareJSON(js, types.JSONDocument{Val: nil})
+	cmp, err := types.CompareJSON(ctx, js, types.JSONDocument{Val: nil})
 	if cmp == 0 {
 		return nil, nil
 	}
@@ -111,7 +111,7 @@ func (j *JsonValue) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	}
 
 	var res interface{}
-	res, err = types.LookupJSONValue(searchable, path.(string))
+	res, err = types.LookupJSONValue(ctx, searchable, path.(string))
 	if err != nil || res == nil {
 		return nil, err
 	}
@@ -120,7 +120,7 @@ func (j *JsonValue) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 	// bad lookups on arrays, instead of an error. Note that this will cause lookups that expect [] to return incorrect
 	// results.
 	// See https://github.com/dolthub/dolt/issues/7905 for more information.
-	cmp, err = types.CompareJSON(res, types.JSONDocument{Val: []interface{}{}})
+	cmp, err = types.CompareJSON(ctx, res, types.JSONDocument{Val: []interface{}{}})
 	if err != nil {
 		return nil, err
 	}
@@ -185,7 +185,7 @@ func GetJSONFromWrapperOrCoercibleString(ctx *sql.Context, js interface{}, funct
 		}
 		return jsonData, nil
 	case sql.JSONWrapper:
-		return jsType.ToInterface()
+		return jsType.ToInterface(ctx)
 	default:
 		return nil, sql.ErrInvalidJSONArgument.New(argumentPosition, functionName)
 	}

sql/expression/function/json/jsontests/json_extract_tests.go

@@ -15,6 +15,7 @@
 package jsontests
 
 import (
+	"context"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -67,7 +68,7 @@ func JsonExtractTestCases(t *testing.T, prepare prepareJsonValue) []testCase {
 	}}
 	// Workaround for https://github.com/dolthub/dolt/issues/7998
 	// Otherwise, converting this to a string will create invalid JSON
-	jsonBytes, err := types.MarshallJson(jsonDocument)
+	jsonBytes, err := types.MarshallJson(context.Background(), jsonDocument)
 	require.NoError(t, err)
 	jsonInput := prepare(t, jsonBytes)
 

sql/expression/function/json/jsontests/json_function_tests.go

@@ -49,7 +49,7 @@ var jsonFormatTests = []jsonFormatTest{
 		prepareFunc: func(t *testing.T, js interface{}) interface{} {
 			doc, _, err := types.JSON.Convert(sqlCtx, js)
 			require.NoError(t, err)
-			val, err := doc.(sql.JSONWrapper).ToInterface()
+			val, err := doc.(sql.JSONWrapper).ToInterface(t.Context())
 			require.NoError(t, err)
 			return types.JSONDocument{Val: val}
 		},
@@ -59,7 +59,7 @@ var jsonFormatTests = []jsonFormatTest{
 		prepareFunc: func(t *testing.T, js interface{}) interface{} {
 			doc, _, err := types.JSON.Convert(sqlCtx, js)
 			require.NoError(t, err)
-			bytes, err := types.MarshallJson(doc.(sql.JSONWrapper))
+			bytes, err := types.MarshallJson(sqlCtx, doc.(sql.JSONWrapper))
 			require.NoError(t, err)
 			return types.NewLazyJSONDocument(bytes)
 		},