Skip to content

changed PayloadHelper.GetTypeId to use switch expression #1239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aadvark-pancakes wants to merge 1 commit into
base: main
Choose a base branch
from
Open

changed PayloadHelper.GetTypeId to use switch expression #1239

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
89 changes: 23 additions & 66 deletions src/csharp/Microsoft.Spark/Interop/Ipc/PayloadHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,73 +310,30 @@ internal static void ConvertArgsToBytes(

internal static byte[] GetTypeId(Type type)
{
switch (Type.GetTypeCode(type))
return Type.GetTypeCode(type) switch
{
case TypeCode.Int32:
return s_int32TypeId;
case TypeCode.Int64:
return s_int64TypeId;
case TypeCode.String:
return s_stringTypeId;
case TypeCode.Boolean:
return s_boolTypeId;
case TypeCode.Double:
return s_doubleTypeId;
case TypeCode.Object:
if (typeof(IJvmObjectReferenceProvider).IsAssignableFrom(type))
{
return s_jvmObjectTypeId;
}

if (type == typeof(byte[]))
{
return s_byteArrayTypeId;
}

if (type == typeof(int[]) ||
type == typeof(long[]) ||
type == typeof(double[]) ||
type == typeof(double[][]) ||
typeof(IEnumerable<byte[]>).IsAssignableFrom(type) ||
typeof(IEnumerable<string>).IsAssignableFrom(type))
{
return s_arrayTypeId;
}

if (IsDictionary(type))
{
return s_dictionaryTypeId;
}

if (typeof(IEnumerable<IJvmObjectReferenceProvider>).IsAssignableFrom(type))
{
return s_arrayTypeId;
}

if (typeof(IEnumerable<GenericRow>).IsAssignableFrom(type))
{
return s_rowArrTypeId;
}

if (typeof(IEnumerable<object>).IsAssignableFrom(type))
{
return s_objectArrTypeId;
}

if (typeof(Date).IsAssignableFrom(type))
{
return s_dateTypeId;
}

if (typeof(Timestamp).IsAssignableFrom(type))
{
return s_timestampTypeId;
}
break;
}

// TODO: Support other types.
throw new NotSupportedException(string.Format("Type {0} not supported yet", type));
TypeCode.Int32 => s_int32TypeId,
TypeCode.Int64 => s_int64TypeId,
TypeCode.String => s_stringTypeId,
TypeCode.Boolean => s_boolTypeId,
TypeCode.Double => s_doubleTypeId,
TypeCode.Object when typeof(IJvmObjectReferenceProvider).IsAssignableFrom(type) => s_jvmObjectTypeId,
TypeCode.Object when type == typeof(byte[]) => s_byteArrayTypeId,
TypeCode.Object when type == typeof(int[]) ||
type == typeof(long[]) ||
type == typeof(double[]) ||
type == typeof(double[][]) ||
typeof(IEnumerable<byte[]>).IsAssignableFrom(type) ||
typeof(IEnumerable<string>).IsAssignableFrom(type) ||
typeof(IEnumerable<IJvmObjectReferenceProvider>).IsAssignableFrom(type)
=> s_arrayTypeId,
TypeCode.Object when IsDictionary(type) => s_dictionaryTypeId,
TypeCode.Object when typeof(IEnumerable<GenericRow>).IsAssignableFrom(type) => s_rowArrTypeId,
TypeCode.Object when typeof(IEnumerable<object>).IsAssignableFrom(type) => s_objectArrTypeId,
TypeCode.Object when typeof(Date).IsAssignableFrom(type) => s_dateTypeId,
TypeCode.Object when typeof(Timestamp).IsAssignableFrom(type) => s_timestampTypeId,
_ => throw new NotSupportedException(string.Format("Type {0} not supported yet", type))
};
}

private static bool IsDictionary(Type type)
Expand Down