asdf

Author: James Cor

sql/cache.go

@@ -40,7 +40,7 @@ func HashOf(ctx context.Context, sch Schema, v Row) (uint64, error) {
 
 		if i < len(sch) {
 			typ := sch[i].Type
-			if strType, ok := typ.(StringType); ok {
+			if strType, ok := typ.(StringType); ok && x != nil {
 				newX, _, err := strType.Convert(ctx, x)
 				if err != nil {
 					return 0, err

sql/plan/subquery.go

@@ -470,8 +470,7 @@ func (s *Subquery) HasResultRow(ctx *sql.Context, row sql.Row) (bool, error) {
 
 // normalizeValue returns a canonical version of a value for use in a sql.KeyValueCache.
 // Two values that compare equal should have the same canonical version.
-// TODO: Fix https://github.com/dolthub/dolt/issues/9049 by making this function collation-aware
-func normalizeForKeyValueCache(ctx *sql.Context, typ sql.Type, val interface{}) (interface{}, error) {
+func normalizeForKeyValueCache(ctx *sql.Context, val interface{}) (interface{}, error) {
 	val, err := sql.UnwrapAny(ctx, val)
 	if err != nil {
 		return nil, err
@@ -480,8 +479,8 @@ func normalizeForKeyValueCache(ctx *sql.Context, typ sql.Type, val interface{})
 }
 
 func putAllRows(ctx *sql.Context, cache sql.KeyValueCache, sch sql.Schema, vals []interface{}) error {
-	for i, val := range vals {
-		normVal, err := normalizeForKeyValueCache(ctx, sch[i].Type, val)
+	for _, val := range vals {
+		normVal, err := normalizeForKeyValueCache(ctx, val)
 		if err != nil {
 			return err
 		}

sql/rowexec/agg.go

@@ -250,22 +250,21 @@ func groupingKey(
 			return 0, err
 		}
 
+		// TODO: this should just use sql.HashOf
+
 		if i > 0 {
 			// separate each expression in the grouping key with a nil byte
 			if _, err = hash.Write([]byte{0}); err != nil {
 				return 0, err
 			}
 		}
 
-		extendedType, isExtendedType := expr.Type().(types.ExtendedType)
-		stringType, isStringType := expr.Type().(sql.StringType)
-
-		if isExtendedType && v != nil {
+		if extendedType, isExtendedType := expr.Type().(types.ExtendedType); isExtendedType && v != nil {
 			bytes, err := extendedType.SerializeValue(ctx, v)
 			if err == nil {
 				_, err = fmt.Fprint(hash, string(bytes))
 			}
-		} else if isStringType && v != nil {
+		} else if stringType, isStringType := expr.Type().(sql.StringType); isStringType && v != nil {
 			v, err = types.ConvertToString(ctx, v, stringType, nil)
 			if err == nil {
 				err = stringType.Collation().WriteWeightString(hash, v.(string))