refactor go struct serializer

Author: chaokunyang

go/fory/codegen/utils.go

@@ -33,6 +33,7 @@ type FieldInfo struct {
 	Index         int        // Original field index in struct
 	IsPrimitive   bool       // Whether it's a Fory primitive type
 	IsPointer     bool       // Whether it's a pointer type
+	Nullable      bool       // Whether the field can be null (pointer types)
 	TypeID        string     // Fory TypeID for sorting
 	PrimitiveSize int        // Size for primitive type sorting
 }
@@ -138,8 +139,33 @@ func getTypeID(t types.Type) string {
 		t = ptr.Elem()
 	}
 
-	// Check slice types
-	if _, ok := t.(*types.Slice); ok {
+	// Check slice types - distinguish primitive arrays from generic lists
+	if slice, ok := t.(*types.Slice); ok {
+		elemType := slice.Elem()
+		// For pointer to primitive, unwrap the pointer
+		if ptr, ok := elemType.(*types.Pointer); ok {
+			elemType = ptr.Elem()
+		}
+		// Check if element is a primitive type (primitive arrays use specific typeIDs)
+		if basic, ok := elemType.Underlying().(*types.Basic); ok {
+			switch basic.Kind() {
+			case types.Bool:
+				return "BOOL_ARRAY"
+			case types.Int8:
+				return "INT8_ARRAY"
+			case types.Int16:
+				return "INT16_ARRAY"
+			case types.Int32:
+				return "INT32_ARRAY"
+			case types.Int, types.Int64:
+				return "INT64_ARRAY"
+			case types.Float32:
+				return "FLOAT32_ARRAY"
+			case types.Float64:
+				return "FLOAT64_ARRAY"
+			}
+		}
+		// Non-primitive slices use LIST
 		return "LIST"
 	}
 
@@ -263,17 +289,36 @@ func getTypeIDValue(typeID string) int {
 	case "FLOAT64":
 		return int(fory.FLOAT64)
 	case "STRING":
-		return int(fory.STRING) // 12
+		return int(fory.STRING) // 9
+	case "BINARY":
+		return int(fory.BINARY) // 10
+	case "LIST":
+		return int(fory.LIST) // 20
+	case "SET":
+		return int(fory.SET) // 21
+	case "MAP":
+		return int(fory.MAP) // 22
 	case "TIMESTAMP":
 		return int(fory.TIMESTAMP) // 25
 	case "LOCAL_DATE":
 		return int(fory.LOCAL_DATE) // 26
 	case "NAMED_STRUCT":
 		return int(fory.NAMED_STRUCT) // 17
-	case "LIST":
-		return int(fory.LIST) // 21
-	case "MAP":
-		return int(fory.MAP) // 23
+	// Primitive array types
+	case "BOOL_ARRAY":
+		return int(fory.BOOL_ARRAY) // 39
+	case "INT8_ARRAY":
+		return int(fory.INT8_ARRAY) // 40
+	case "INT16_ARRAY":
+		return int(fory.INT16_ARRAY) // 41
+	case "INT32_ARRAY":
+		return int(fory.INT32_ARRAY) // 42
+	case "INT64_ARRAY":
+		return int(fory.INT64_ARRAY) // 43
+	case "FLOAT32_ARRAY":
+		return int(fory.FLOAT32_ARRAY) // 49
+	case "FLOAT64_ARRAY":
+		return int(fory.FLOAT64_ARRAY) // 50
 	default:
 		return 999 // Unknown types sort last
 	}
@@ -329,14 +374,15 @@ func sortFields(fields []*FieldInfo) {
 			return f1.SnakeName < f2.SnakeName
 
 		case groupOtherInternalType:
-			// Other internal type fields: sort by type id then snake case field name
+			// Internal type fields (STRING, BINARY, LIST, SET, MAP): sort by type id then name only.
+			// Java does NOT sort by nullable flag for these types.
 			if f1.TypeID != f2.TypeID {
 				return getTypeIDValue(f1.TypeID) < getTypeIDValue(f2.TypeID)
 			}
 			return f1.SnakeName < f2.SnakeName
 
-		case groupList, groupSet, groupMap, groupOther:
-			// List/Set/Map/Other fields: sort by snake case field name only
+		case groupPrimitiveArray, groupOther:
+			// Primitive arrays and other fields: sort by snake case field name only
 			return f1.SnakeName < f2.SnakeName
 
 		default:
@@ -347,13 +393,13 @@ func sortFields(fields []*FieldInfo) {
 }
 
 // Field group constants for sorting
+// This matches reflection's field ordering in field_info.go:
+// primitives → boxed → otherInternalType (STRING/BINARY/LIST/SET/MAP) → primitiveArray → other
 const (
 	groupPrimitive         = 0 // primitive and nullable primitive fields
-	groupOtherInternalType = 1 // other internal type fields (string, timestamp, etc.)
-	groupList              = 2 // list fields
-	groupSet               = 3 // set fields
-	groupMap               = 4 // map fields
-	groupOther             = 5 // other fields
+	groupOtherInternalType = 1 // STRING, BINARY, LIST, SET, MAP (sorted by typeId, name)
+	groupPrimitiveArray    = 2 // primitive arrays (BOOL_ARRAY, INT32_ARRAY, etc.) - sorted by name
+	groupOther             = 3 // structs, enums, and unknown types - sorted by name
 )
 
 // getFieldGroup categorizes a field into its sorting group
@@ -366,38 +412,29 @@ func getFieldGroup(field *FieldInfo) int {
 		return groupPrimitive
 	}
 
-	// List fields
-	if typeID == "LIST" {
-		return groupList
-	}
-
-	// Set fields
-	if typeID == "SET" {
-		return groupSet
+	// Primitive array fields - sorted by name only
+	primitiveArrayTypes := map[string]bool{
+		"BOOL_ARRAY":    true,
+		"INT8_ARRAY":    true,
+		"INT16_ARRAY":   true,
+		"INT32_ARRAY":   true,
+		"INT64_ARRAY":   true,
+		"FLOAT32_ARRAY": true,
+		"FLOAT64_ARRAY": true,
 	}
-
-	// Map fields
-	if typeID == "MAP" {
-		return groupMap
+	if primitiveArrayTypes[typeID] {
+		return groupPrimitiveArray
 	}
 
-	// Other internal type fields
-	// These are fory internal types that are not primitives/lists/sets/maps
-	// Examples: STRING, TIMESTAMP, LOCAL_DATE, NAMED_STRUCT, etc.
+	// Internal types (STRING, BINARY, LIST, SET, MAP) - sorted by typeId, nullable, name
+	// These match reflection's category 1 in getFieldCategory
 	internalTypes := map[string]bool{
-		"STRING":       true,
-		"TIMESTAMP":    true,
-		"LOCAL_DATE":   true,
-		"NAMED_STRUCT": true,
-		"STRUCT":       true,
-		"BINARY":       true,
-		"ENUM":         true,
-		"NAMED_ENUM":   true,
-		"EXT":          true,
-		"NAMED_EXT":    true,
-		"INTERFACE":    true, // for interface{} types
+		"STRING": true,
+		"BINARY": true,
+		"LIST":   true,
+		"SET":    true,
+		"MAP":    true,
 	}
-
 	if internalTypes[typeID] {
 		return groupOtherInternalType
 	}
@@ -448,6 +485,7 @@ func analyzeField(field *types.Var, index int) (*FieldInfo, error) {
 		Index:         index,
 		IsPrimitive:   isPrimitive,
 		IsPointer:     isPointer,
+		Nullable:      isPointer, // Pointer types are nullable, slices/maps are non-nullable in xlang mode
 		TypeID:        typeID,
 		PrimitiveSize: primitiveSize,
 	}, nil