linbin
/
JfireSE
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ObjectSerializer的编译版本对四种类型的字段都做到了编译化输出的支持。 

下一步是完成数组的序列化器，以及包名输出的优化。包名输出的优化带来可以感知的性能提升。
master
linbin 2024-09-11 02:35:13 +08:00
parent 9a44742544
commit e6c06e8d10
15 changed files with 460 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/jfirer/se2/JfireSE.java
View File

@ -7,11 +7,11 @@ public interface JfireSE
byte NAME_ID_CONTENT_TRACK = 2;
byte NAME_ID_CONTENT_UN_TRACK = 3;
byte ID_INSTANCE_ID = 4;
byte id_content_track = 5;
byte id_content_un_track = 6;
byte instance_id = 7;
byte content_track = 8;
byte content_un_track = 9;
byte ID_CONTENT_TRACK = 5;
byte ID_CONTENT_UN_TRACK = 6;
byte INSTANCE_ID = 7;
byte CONTENT_TRACK = 8;
byte CONTENT_UN_TRACK = 9;
static JfireSEConfig supportRefTracking(boolean support)
{

5
src/main/java/com/jfirer/se2/JfireSEImpl.java
View File

@ -27,6 +27,7 @@ public class JfireSEImpl implements JfireSE
private ByteArray byteArray = new ByteArray(1000);
private ClassInfo classInfoCache;
private Map<Class<?>, ClassInfo> classInfoMap = new HashMap<>();
private Map<byte[], ClassInfo> classInfoCacheMap = new HashMap<>();
public JfireSEImpl(boolean refTracking, StaticClasInfo[] staticClasInfos)
{
@ -116,13 +117,13 @@ public class JfireSEImpl implements JfireSE
int classId = stream.readVarInt();
return getForDeSerialize(classNameBytes, classId).readWithoutTrack(stream);
}
case JfireSE.id_content_track ->
case JfireSE.ID_CONTENT_TRACK ->
{
int classId = stream.readVarInt();
ClassInfo classInfo = getForDeSerialize(classId);
return classInfo.readWithTrack(stream);
}
case JfireSE.id_content_un_track ->
case JfireSE.ID_CONTENT_UN_TRACK ->
{
int classId = stream.readVarInt();
ClassInfo classInfo = getForDeSerialize(classId);

6
src/main/java/com/jfirer/se2/classinfo/ClassInfo.java
View File

@ -70,18 +70,18 @@ public abstract class ClassInfo
int index = addTracking(instance);
if (index == -1)
{
byteArray.put(JfireSE.content_track);
byteArray.put(JfireSE.CONTENT_TRACK);
serializer.writeBytes(byteArray, instance);
}
else
{
byteArray.put(JfireSE.instance_id);
byteArray.put(JfireSE.INSTANCE_ID);
byteArray.writeVarInt(index);
}
}
else
{
byteArray.put(JfireSE.content_un_track);
byteArray.put(JfireSE.CONTENT_UN_TRACK);
serializer.writeBytes(byteArray, instance);
}
}

4
src/main/java/com/jfirer/se2/classinfo/DynamicClassInfo.java
View File

@ -47,7 +47,7 @@ public class DynamicClassInfo extends ClassInfo
int i = addTracking(instance);
if (i == -1)
{
byteArray.put(JfireSE.id_content_track);
byteArray.put(JfireSE.ID_CONTENT_TRACK);
byteArray.writeVarInt(classId);
serializer.writeBytes(byteArray, instance);
}
@ -71,7 +71,7 @@ public class DynamicClassInfo extends ClassInfo
}
else
{
byteArray.put(JfireSE.id_content_un_track);
byteArray.put(JfireSE.ID_CONTENT_UN_TRACK);
byteArray.writeVarInt(classId);
serializer.writeBytes(byteArray, instance);
}

4
src/main/java/com/jfirer/se2/classinfo/StaticClasInfo.java
View File

@ -18,7 +18,7 @@ public class StaticClasInfo extends ClassInfo
int i = addTracking(instance);
if (i == -1)
{
byteArray.put(JfireSE.id_content_track);
byteArray.put(JfireSE.ID_CONTENT_TRACK);
byteArray.writeVarInt(classId);
serializer.writeBytes(byteArray, instance);
}
@ -31,7 +31,7 @@ public class StaticClasInfo extends ClassInfo
}
else
{
byteArray.put(JfireSE.id_content_un_track);
byteArray.put(JfireSE.ID_CONTENT_UN_TRACK);
byteArray.writeVarInt(classId);
serializer.writeBytes(byteArray, instance);
}

1
src/main/java/com/jfirer/se2/serializer/SerializerFactory.java
View File

@ -12,7 +12,6 @@ public class SerializerFactory
public Serializer getSerializer(Class<?> clazz, JfireSEImpl jfireSE)
{
// ObjectSerializer objectSerializer = new ObjectSerializer(clazz, jfireSE);
Serializer objectSerializer = ObjectSerializer.buildCompileVersion(clazz, jfireSE);
store.putIfAbsent(clazz, objectSerializer);
return objectSerializer;

2
src/main/java/com/jfirer/se2/serializer/impl/ObjectSerializer/FieldInfo.java
View File

@ -4,9 +4,11 @@ import com.jfirer.baseutil.reflect.ReflectUtil;
import com.jfirer.baseutil.reflect.ValueAccessor;
import com.jfirer.baseutil.smc.compiler.CompileHelper;
import com.jfirer.se2.ByteArray;
import lombok.Data;
import java.lang.reflect.Field;
@Data
public abstract class FieldInfo
{
protected final int classId;

6
src/main/java/com/jfirer/se2/serializer/impl/ObjectSerializer/FinalFieldInfo.java
View File

@ -45,18 +45,18 @@ public class FinalFieldInfo extends FieldInfo
{
switch (flag)
{
case JfireSE.instance_id ->
case JfireSE.INSTANCE_ID ->
{
int instanceId = byteArray.readVarInt();
Object property = classInfo.getInstanceById(instanceId);
accessor.setObject(instance, property);
}
case JfireSE.content_track ->
case JfireSE.CONTENT_TRACK ->
{
Object property = classInfo.readWithTrack(byteArray);
accessor.setObject(instance, property);
}
case JfireSE.content_un_track ->
case JfireSE.CONTENT_UN_TRACK ->
{
Object property = classInfo.readWithoutTrack(byteArray);
accessor.setObject(instance, property);

428
src/main/java/com/jfirer/se2/serializer/impl/ObjectSerializer/ObjectSerializer.java
View File

@ -7,7 +7,9 @@ import com.jfirer.baseutil.smc.model.ConstructorModel;
import com.jfirer.baseutil.smc.model.FieldModel;
import com.jfirer.baseutil.smc.model.MethodModel;
import com.jfirer.se2.ByteArray;
import com.jfirer.se2.JfireSE;
import com.jfirer.se2.JfireSEImpl;
import com.jfirer.se2.classinfo.ClassInfo;
import com.jfirer.se2.serializer.Serializer;
import io.github.karlatemp.unsafeaccessor.Unsafe;
@ -20,9 +22,8 @@ import java.util.function.Predicate;
public class ObjectSerializer implements Serializer
{
private Class<?> clazz;
private FieldInfo[] fieldInfos;
static int COMPILE_COUNT = 1;
private static int COMPILE_COUNT = 1;
private static final Unsafe UNSAFE = Unsafe.getUnsafe();
public ObjectSerializer(Class<?> clazz, JfireSEImpl jfireSE)
@ -96,14 +97,27 @@ public class ObjectSerializer implements Serializer
COMPILE_COUNT++;
classModel.addInterface(Serializer.class);
classModel.addImport(Unsafe.class);
classModel.addImport(JfireSEImpl.class);
classModel.addImport(JfireSE.class);
classModel.addImport(Integer.class);
classModel.addImport(Short.class);
classModel.addImport(Byte.class);
classModel.addImport(Long.class);
classModel.addImport(Double.class);
classModel.addImport(Float.class);
classModel.addImport(Boolean.class);
classModel.addImport(Character.class);
classModel.addImport(String.class);
classModel.addImport(List.class);
classModel.addImport(FieldInfo.class);
classModel.addImport(ByteArray.class);
classModel.addField(new FieldModel("UNSAFE", Unsafe.class, "Unsafe.getUnsafe()", classModel));
classModel.addField(new FieldModel("jfireSE", JfireSEImpl.class, classModel));
ConstructorModel constructorModel = new ConstructorModel(classModel);
constructorModel.setParamTypes(Class.class, JfireSEImpl.class, List.class);
constructorModel.setParamNames("clazz", "jfireSE", "list");
StringBuilder constructorBody = new StringBuilder();
constructorBody.append("this.jfireSE=jfireSE;\r\n");
try
{
MethodModel writeMethod = new MethodModel(Serializer.class.getDeclaredMethod("writeBytes", ByteArray.class, Object.class), classModel);
@ -167,61 +181,401 @@ public class ObjectSerializer implements Serializer
{
switch (fieldInfo.classId)
{
case ReflectUtil.PRIMITIVE_BYTE ->
case ReflectUtil.CLASS_BYTE ->
{
writeBody.append("byteArray.writeByte((Byte) UNSAFE.getObject(instance, " + l + "));\r\n");
readBody.append("UNSAFE.putObject(instance," + l + ", byteArray.readByte());\r\n");
writeBody.append("""
{
Byte obj = (Byte)UNSAFE.getReference(instance,offset);
if(obj==null)
{
byteArray.put(JfireSE.NULL);
}
else
{
byteArray.put(JfireSE.NOT_NULL);
byteArray.put(obj);
}
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
{
if (byteArray.get() == JfireSE.NOT_NULL)
{
UNSAFE.putReference(instance,offset, byteArray.get());
}
}
""".replace("offset", String.valueOf(l)));
}
case ReflectUtil.PRIMITIVE_INT ->
case ReflectUtil.CLASS_INT ->
{
writeBody.append("byteArray.writeVarInt((Integer) UNSAFE.getObject(instance, " + l + "));\r\n");
readBody.append("UNSAFE.putObject(instance," + l + ", byteArray.readVarInt());\r\n");
writeBody.append("""
{
Integer obj = (Integer)UNSAFE.getReference(instance,offset);
if(obj==null)
{
byteArray.put(JfireSE.NULL);
}
else
{
byteArray.put(JfireSE.NOT_NULL);
byteArray.writeVarInt(obj);
}
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
{
if (byteArray.get() == JfireSE.NOT_NULL)
{
UNSAFE.putReference(instance,offset, byteArray.readVarInt());
}
}
""".replace("offset", String.valueOf(l)));
}
case ReflectUtil.PRIMITIVE_SHORT ->
case ReflectUtil.CLASS_SHORT ->
{
writeBody.append("byteArray.writeVarInt((Short) UNSAFE.getObject(instance, " + l + "));\r\n");
readBody.append("UNSAFE.putObject(instance," + l + ", (short) byteArray.readVarInt());\r\n");
writeBody.append("""
{
Short obj = (Short)UNSAFE.getReference(instance,offset);
if(obj==null)
{
byteArray.put(JfireSE.NULL);
}
else
{
byteArray.put(JfireSE.NOT_NULL);
byteArray.writeVarShort(obj);
}
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
{
if (byteArray.get() == JfireSE.NOT_NULL)
{
UNSAFE.putReference(instance,offset, byteArray.readVarShort());
}
}
""".replace("offset", String.valueOf(l)));
}
case ReflectUtil.PRIMITIVE_LONG ->
case ReflectUtil.CLASS_LONG ->
{
writeBody.append("byteArray.writeVarLong((Long) UNSAFE.getObject(instance, " + l + "));\r\n");
readBody.append("UNSAFE.putObject(instance," + l + ", byteArray.readVarLong());\r\n");
writeBody.append("""
{
Long obj = (Long)UNSAFE.getReference(instance,offset);
if(obj==null)
{
byteArray.put(JfireSE.NULL);
}
else
{
byteArray.put(JfireSE.NOT_NULL);
byteArray.writeVarLong(obj);
}
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
{
if (byteArray.get() == JfireSE.NOT_NULL)
{
UNSAFE.putReference(instance,offset, byteArray.readVarLong());
}
}
""".replace("offset", String.valueOf(l)));
}
case ReflectUtil.PRIMITIVE_FLOAT ->
case ReflectUtil.CLASS_FLOAT ->
{
writeBody.append("byteArray.writeFloat((Float) UNSAFE.getObject(instance, " + l + "));\r\n");
readBody.append("UNSAFE.putObject(instance," + l + ", byteArray.readFloat());");
writeBody.append("""
{
Float obj = (Float)UNSAFE.getReference(instance,offset);
if(obj==null)
{
byteArray.put(JfireSE.NULL);
}
else
{
byteArray.put(JfireSE.NOT_NULL);
byteArray.writeFloat(obj);
}
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
{
if (byteArray.get() == JfireSE.NOT_NULL)
{
UNSAFE.putReference(instance,offset, byteArray.readFloat());
}
}
""".replace("offset", String.valueOf(l)));
}
case ReflectUtil.PRIMITIVE_DOUBLE ->
case ReflectUtil.CLASS_DOUBLE ->
{
writeBody.append("byteArray.writeDouble((Double) UNSAFE.getObject(instance, " + l + "));\r\n");
readBody.append("UNSAFE.putObject(instance," + l + ", byteArray.readDouble());\r\n");
writeBody.append("""
{
Double obj = (Double)UNSAFE.getReference(instance,offset);
if(obj==null)
{
byteArray.put(JfireSE.NULL);
}
else
{
byteArray.put(JfireSE.NOT_NULL);
byteArray.writeDouble(obj);
}
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
{
if (byteArray.get() == JfireSE.NOT_NULL)
{
UNSAFE.putReference(instance,offset, byteArray.readDouble());
}
}
""".replace("offset", String.valueOf(l)));
}
case ReflectUtil.PRIMITIVE_BOOL ->
case ReflectUtil.CLASS_BOOL ->
{
writeBody.append("byteArray.writeBoolean((Boolean) UNSAFE.getObject(instance, " + l + "));\r\n");
readBody.append("UNSAFE.putObject(instance," + l + ", byteArray.readBoolean());\r\n");
writeBody.append("""
{
Boolean obj = (Boolean)UNSAFE.getReference(instance,offset);
if(obj==null)
{
byteArray.put(JfireSE.NULL);
}
else
{
byteArray.put(JfireSE.NOT_NULL);
byteArray.writeBoolean(obj);
}
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
{
if (byteArray.get() == JfireSE.NOT_NULL)
{
UNSAFE.putReference(instance,offset, byteArray.readBoolean());
}
}
""".replace("offset", String.valueOf(l)));
}
case ReflectUtil.PRIMITIVE_CHAR ->
case ReflectUtil.CLASS_CHAR ->
{
writeBody.append("byteArray.writeChar((Character) UNSAFE.getObject(instance, " + l + "));\r\n");
readBody.append("UNSAFE.putObject(instance," + l + ", byteArray.readChar());\r\n");
writeBody.append("""
{
Character obj = (Character)UNSAFE.getReference(instance,offset);
if(obj==null)
{
byteArray.put(JfireSE.NULL);
}
else
{
byteArray.put(JfireSE.NOT_NULL);
byteArray.writeChar(obj);
}
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
{
if (byteArray.get() == JfireSE.NOT_NULL)
{
UNSAFE.putReference(instance,offset, byteArray.readChar());
}
}
""".replace("offset", String.valueOf(l)));
}
case ReflectUtil.CLASS_STRING ->
{
writeBody.append("byteArray.writeString((String) UNSAFE.getObject(instance, " + l + "));\r\n");
readBody.append("UNSAFE.putObject(instance," + l + ", byteArray.readString());\r\n");
writeBody.append("""
{
String obj = (String)UNSAFE.getReference(instance,offset);
if(obj==null)
{
byteArray.put(JfireSE.NULL);
}
else
{
byteArray.put(JfireSE.NOT_NULL);
byteArray.writeString(obj);
}
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
{
if (byteArray.get() == JfireSE.NOT_NULL)
{
UNSAFE.putReference(instance,offset, byteArray.readString());
}
}
""".replace("offset", String.valueOf(l)));
}
default -> throw new RuntimeException("不支持的类型");
}
}
else if (fieldInfo instanceof VariableFieldInfo || fieldInfo instanceof FinalFieldInfo)
else if (fieldInfo instanceof VariableFieldInfo)
{
FieldModel fieldModel = new FieldModel("fieldInfo_$_" + fieldIndex, VariableFieldInfo.class, classModel);
classModel.addField(fieldModel);
constructorBody.append("fieldInfo_$_" + fieldIndex + "=(FieldInfo)list.get(" + fieldIndex + ");\r\n");
writeBody.append("fieldInfo_$_" + fieldIndex + ".write(byteArray,instance);\r\n");
readBody.append("fieldInfo_$_" + fieldIndex + ".read(byteArray,instance);\r\n");
String classInfoProperty = "classInfo_$_" + fieldIndex;
String firstClassInfoProperty = "firstClassInfo_$_" + fieldIndex;
FieldModel classInfoModel = new FieldModel(classInfoProperty, ClassInfo.class, classModel);
FieldModel firstClassInfoModel = new FieldModel(firstClassInfoProperty, ClassInfo.class, classModel);
classModel.addField(classInfoModel, firstClassInfoModel);
constructorBody.append(classInfoProperty + "=jfireSE.getForSerialize(((FieldInfo)list.get(" + fieldIndex + ")).getField().getType());\r\n");
constructorBody.append(" if( ((FieldInfo)list.get(" + fieldIndex + ")).getField().getType().isInterface()) {");
constructorBody.append(firstClassInfoProperty + "=null;\r\n}");
constructorBody.append("else{\r\n");
constructorBody.append(firstClassInfoProperty + "=" + classInfoProperty + ";\r\n}");
String objName = "obj_" + fieldIndex;
writeBody.append("Object " + objName + "= UNSAFE.getReference(instance," + l + ");\r\n");
writeBody.append("if(" + objName + "==null){ byteArray.put(JfireSE.NULL);}\r\n");
writeBody.append("else{\r\n");
String objClassName = "objClass_$_" + fieldIndex;
writeBody.append("Class " + objClassName + " = " + objName + ".getClass();\r\n");
writeBody.append("if(" + objClassName + "==" + classInfoProperty + ".getClazz()){");
writeBody.append("if(" + classInfoProperty + "==" + firstClassInfoProperty + "){\r\n");
writeBody.append(classInfoProperty + ".writeKnownClazz(byteArray," + objName + ");\r\n");
writeBody.append("}\r\n");
writeBody.append("else{\r\n");
writeBody.append(classInfoProperty + ".write(byteArray," + objName + ");\r\n");
writeBody.append("}\r\n");
writeBody.append("}");
writeBody.append("else{");
writeBody.append(classInfoProperty + "=" + "jfireSE.getForSerialize(" + objClassName + ");\r\n");
writeBody.append("if(" + classInfoProperty + "==" + firstClassInfoProperty + "){\r\n");
writeBody.append(classInfoProperty + ".writeKnownClazz(byteArray," + objName + ");\r\n");
writeBody.append("}\r\n");
writeBody.append("else{\r\n");
writeBody.append(classInfoProperty + ".write(byteArray," + objName + ");\r\n");
writeBody.append("}\r\n");
writeBody.append("}\r\n");
writeBody.append("}");
String flagName = "flag_$_" + fieldIndex;
readBody.append("byte " + flagName + " = byteArray.get();\r\n");
readBody.append("if(" + flagName + "==JfireSE.NULL){UNSAFE.putReference(instance," + l + ",null);}\r\n");
readBody.append("else{\r\n");
readBody.append("switch(" + flagName + "){\r\n");
readBody.append("""
case JfireSE.NAME_ID_CONTENT_TRACK->
{
byte[] classNameBytes = byteArray.readBytesWithSizeEmbedded();
int classId = byteArray.readVarInt();
ClassInfo classInfo = jfireSE.getForDeSerialize(classNameBytes, classId);
Object property = classInfo.readWithTrack(byteArray);
UNSAFE.putReference(instance,offset, property);
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
case JfireSE.NAME_ID_CONTENT_UN_TRACK->
{
byte[] classNameBytes = byteArray.readBytesWithSizeEmbedded();
int classId = byteArray.readVarInt();
ClassInfo classInfo = jfireSE.getForDeSerialize(classNameBytes,classId);
Object property = classInfo.readWithoutTrack(byteArray);
UNSAFE.putReference(instance,offset, property);
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
case JfireSE.ID_INSTANCE_ID->
{
int classId = byteArray.readVarInt();
int instanceId = byteArray.readVarInt();
ClassInfo classInfo = jfireSE.getForDeSerialize(classId);
Object property = classInfo.getInstanceById(instanceId);
UNSAFE.putReference(instance,offset, property);
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
case JfireSE.ID_CONTENT_TRACK->
{
int classId = byteArray.readVarInt();
ClassInfo classInfo = jfireSE.getForDeSerialize(classId);
Object property = classInfo.readWithTrack(byteArray);
UNSAFE.putReference(instance,offset, property);
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
case JfireSE.ID_CONTENT_UN_TRACK->
{
int classId = byteArray.readVarInt();
ClassInfo classInfo = jfireSE.getForDeSerialize(classId);
Object property = classInfo.readWithoutTrack(byteArray);
UNSAFE.putReference(instance,offset, property);
}
""".replace("offset", String.valueOf(l)));
readBody.append("""
case JfireSE.INSTANCE_ID ->
{
int instanceId = byteArray.readVarInt();
Object property = firstClassInfo.getInstanceById(instanceId);
UNSAFE.putReference(instance,offset, property);
}
""".replace("offset", String.valueOf(l))//
.replace("firstClassInfo", firstClassInfoProperty));
readBody.append("""
case JfireSE.CONTENT_TRACK ->
{
Object property = firstClassInfo.readWithTrack(byteArray);
UNSAFE.putReference(instance,offset, property);
}
""".replace("offset", String.valueOf(l)).replace("firstClassInfo", firstClassInfoProperty));
readBody.append("""
case JfireSE.CONTENT_UN_TRACK ->
{
Object property = firstClassInfo.readWithoutTrack(byteArray);
UNSAFE.putReference(instance,offset, property);
}
""".replace("offset", String.valueOf(l)).replace("firstClassInfo", firstClassInfoProperty));
readBody.append("default -> throw new RuntimeException(\"flag:\" + " + flagName + ");\r\n");
readBody.append("}\r\n");
readBody.append("}\r\n");
}
else if (fieldInfo instanceof FinalFieldInfo)
{
String classInfoProperty = "classInfo_$_" + fieldIndex;
FieldModel classInfoModel = new FieldModel(classInfoProperty, ClassInfo.class, classModel);
classModel.addField(classInfoModel);
constructorBody.append(classInfoProperty + "=jfireSE.getForSerialize(((FieldInfo)list.get(" + fieldIndex + ")).getField().getType());\r\n");
writeBody.append("""
{
Object obj = UNSAFE.getReference(instance,offset);
if (obj == null)
{
byteArray.put(JfireSE.NULL);
}
else
{
classInfo.writeKnownClazz(byteArray, obj);
}
}
""".replace("offset", String.valueOf(l)).replace("classInfo", classInfoProperty));
readBody.append("""
{
byte flag = byteArray.get();
if (flag == JfireSE.NULL)
{
UNSAFE.putReference(instance,offset,null);
}
else
{
switch (flag)
{
case JfireSE.INSTANCE_ID ->
{
int instanceId = byteArray.readVarInt();
Object property = classInfo.getInstanceById(instanceId);
UNSAFE.putReference(instance,offset,property);
}
case JfireSE.CONTENT_TRACK ->
{
Object property = classInfo.readWithTrack(byteArray);
UNSAFE.putReference(instance,offset,property);
}
case JfireSE.CONTENT_UN_TRACK ->
{
Object property = classInfo.readWithoutTrack(byteArray);
UNSAFE.putReference(instance,offset,property);
}
default -> throw new RuntimeException("flag:" + flag);
}
}
}
""".replace("offset", String.valueOf(l)).replace("classInfo", classInfoProperty));
}
fieldIndex++;
}
@ -231,9 +585,9 @@ public class ObjectSerializer implements Serializer
readMethod.setBody(readBody.toString());
classModel.putMethodModel(writeMethod);
classModel.putMethodModel(readMethod);
CompileHelper compiler = new CompileHelper(Thread.currentThread().getContextClassLoader());
Class<?> compile = compiler.compile(classModel);
Serializer compiledObjectSerializer = (Serializer) compile.getDeclaredConstructor(Class.class, JfireSEImpl.class, List.class).newInstance(clazz, jfireSE, parse);
CompileHelper compiler = new CompileHelper(Thread.currentThread().getContextClassLoader());
Class<?> compile = compiler.compile(classModel);
Serializer compiledObjectSerializer = (Serializer) compile.getDeclaredConstructor(Class.class, JfireSEImpl.class, List.class).newInstance(clazz, jfireSE, parse);
return compiledObjectSerializer;
}
catch (NoSuchMethodException | IOException | ClassNotFoundException | InstantiationException | IllegalAccessException | InvocationTargetException e)

10
src/main/java/com/jfirer/se2/serializer/impl/ObjectSerializer/VariableFieldInfo.java
View File

@ -101,32 +101,32 @@ public class VariableFieldInfo extends FieldInfo
Object proeprty = classInfo.getInstanceById(instanceId);
accessor.setObject(instance, proeprty);
}
case JfireSE.id_content_track ->
case JfireSE.ID_CONTENT_TRACK ->
{
int classId = byteArray.readVarInt();
classInfo = jfireSE.getForDeSerialize(classId);
Object property = classInfo.readWithTrack(byteArray);
accessor.setObject(instance, property);
}
case JfireSE.id_content_un_track ->
case JfireSE.ID_CONTENT_UN_TRACK ->
{
int classId = byteArray.readVarInt();
classInfo = jfireSE.getForDeSerialize(classId);
Object property = classInfo.readWithoutTrack(byteArray);
accessor.setObject(instance, property);
}
case JfireSE.instance_id ->
case JfireSE.INSTANCE_ID ->
{
int instanceId = byteArray.readVarInt();
Object property = firstClassInfo.getInstanceById(instanceId);
accessor.setObject(instance, property);
}
case JfireSE.content_track ->
case JfireSE.CONTENT_TRACK ->
{
Object property = firstClassInfo.readWithTrack(byteArray);
accessor.setObject(instance, property);
}
case JfireSE.content_un_track ->
case JfireSE.CONTENT_UN_TRACK ->
{
Object property = firstClassInfo.readWithoutTrack(byteArray);
accessor.setObject(instance, property);

6
src/test/java/org/example/BenchMark.java
View File

@ -23,7 +23,7 @@ public class BenchMark
{
Fse fse = new Fse();
Fse fse_3 = new Fse().useCompile();
TestData data = new TestData();
TestData data = new TestData().setTestDataSm(new TestDataSm()).setTestDataSm2(new TestDataSm2());
ByteArray buf = ByteArray.allocate(100);
Fury fury = Fury.builder().withLanguage(Language.JAVA)//
.requireClassRegistration(false)//
@ -31,7 +31,7 @@ public class BenchMark
JfireSE jfireSE = JfireSE.supportRefTracking(true).build();
@Benchmark
public void testNoCompile()
public void testFSENoCompile()
{
buf.clear();
fse.serialize(data, buf);
@ -44,7 +44,7 @@ public class BenchMark
}
@Benchmark
public void testDirectCompile()
public void testFSEDirectCompile()
{
buf.clear();
fse_3.serialize(data, buf);

19
src/test/java/org/example/FunctionTest.java
View File

@ -2,8 +2,6 @@ package org.example;
import com.jfirer.se2.ByteArray;
import com.jfirer.se2.JfireSE;
import io.fury.Fury;
import io.fury.config.Language;
import org.junit.Assert;
import org.junit.Test;
@ -26,22 +24,17 @@ public class FunctionTest
@Test
public void test2()
{
TestDataSm sm = new TestDataSm();
sm.setC("dfdfdf");
TestData testData = new TestData();
testData.setB(true);
testData.setTestDataSm(sm);
testData.setTestDataSm2(new TestDataSm2());
JfireSE jfireSE = JfireSE.build();
byte[] bytes = jfireSE.write(testData);
Assert.assertEquals(testData, jfireSE.read(bytes));
Assert.assertEquals(sm, testData.getTestDataSm());
}
@Test
public void test3()
{
Fury fury = Fury.builder().withLanguage(Language.JAVA)//
.requireClassRegistration(false)//
.withRefTracking(true).build();
TestData data = new TestData();
byte[] serialize = fury.serialize(data);
byte[] serialize1 = fury.serialize(data);
Assert.assertArrayEquals(serialize, serialize1);
}
}

24
src/test/java/org/example/TestData.java
View File

@ -1,19 +1,23 @@
package org.example;
import lombok.Data;
import lombok.experimental.Accessors;
@Data
@Accessors(chain = true)
public class TestData
{
private int a = 213212312;
private boolean b = false;
private char c = 'c';
private byte d = 0x11;
private short e = 24;
private long f = 1213124131312321L;
private double g = 231321.2132;
private float h = (float) 4986.2;
private String i = "123452312316789a";
private int a = 213212312;
private boolean b = false;
private char c = 'c';
private byte d = 0x11;
private short e = 24;
private long f = 1213124131312321L;
private double g = 231321.2132;
private float h = (float) 4986.2;
private String i = "123452312316789a";
private TestDataSm testDataSm;
private TestDataSm2 testDataSm2;
// private int[] j = new int[]{1, 2, 4, 5};
// private boolean[] k = new boolean[]{true, false, true, false, false, false, true};
// private char[] l = new char[]{'a', 'v', 'q', 'j', 'h', 'e', 'f'};
@ -23,6 +27,4 @@ public class TestData
// private double[] p = new double[]{6468613646.48646d, 4646.456d, 546864648867.466d};
// private float[] q = new float[]{46486.2f, 49849.2f, 646854.6f};
// private String[] r = new String[]{"abcdf12345", "abdfcgf12323"};
}

12
src/test/java/org/example/TestDataSm.java 100644
View File

@ -0,0 +1,12 @@
package org.example;
import lombok.Data;
@Data
public class TestDataSm
{
private int a = 10;
private long b = 20;
private Integer a1 = 3;
private String c = "sassa";
}

10
src/test/java/org/example/TestDataSm2.java 100644
View File

@ -0,0 +1,10 @@
package org.example;
import lombok.Data;
@Data
public final class TestDataSm2
{
private Float f = 3F;
private Double d = 3D;
}