lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DeMemberNode

Browse Source
This commit is contained in:
redkale
2024-09-17 08:57:39 +08:00
parent c8ba21dac2
commit 1cfc17766a
15 changed files with 192 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/org/redkale/convert/DeMember.java
View File

@@ -183,4 +183,5 @@ public final class DeMember<R extends Reader, T, F> {
return "DeMember{" + "attribute=" + attribute.field() + ", position=" + position + ", tag=" + tag + ", decoder="
+ (decoder == null ? null : decoder.getClass().getName()) + '}';
}
}

67
src/main/java/org/redkale/convert/DeMemberNode.java Normal file
View File

@@ -0,0 +1,67 @@
/*
* Copyright (c) 2016-2116 Redkale
* All rights reserved.
*/
package org.redkale.convert;
/**
* 字段的反序列化操作类
*
* <p>详情见: https://redkale.org
*
* @author zhangjx
* @since 2.8.0
*/
public class DeMemberNode {
protected static final int MIN_INDEX = 32;
protected DeMember value;
protected DeMemberNode[] nodes = new DeMemberNode[127 - MIN_INDEX];
public DeMemberNode getNode(char ch) {
if (ch <= MIN_INDEX || ch > 127) {
return null;
}
return nodes[ch - MIN_INDEX];
}
public DeMember getMember(String field) {
char[] chs = field.toCharArray();
DeMemberNode n = this;
for (int i = 0; i < chs.length; i++) {
n = n.nodes[chs[i] - MIN_INDEX];
if (n == null) {
break;
}
}
return n == null ? null : n.value;
}
public DeMember getValue() {
return value;
}
private void add(DeMember member) {
char[] chs = member.attribute.field().toCharArray();
DeMemberNode n = this;
for (int i = 0; i < chs.length; i++) {
DeMemberNode s = n.nodes[chs[i] - MIN_INDEX];
if (s == null) {
s = new DeMemberNode();
n.nodes[chs[i] - MIN_INDEX] = s;
}
n = s;
}
n.value = member;
}
public static DeMemberNode create(DeMember... members) {
DeMemberNode root = new DeMemberNode();
for (DeMember member : members) {
root.add(member);
}
return root;
}
}

30
src/main/java/org/redkale/convert/ObjectDecoder.java
View File

@@ -34,6 +34,8 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
protected DeMember[] members;
protected DeMemberNode memberNode;
protected Map<String, DeMember> memberFieldMap;
protected Map<Integer, DeMember> memberTagMap;
@@ -69,6 +71,7 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
this.factory = factory;
try {
if (type == Object.class) {
this.memberNode = DeMemberNode.create();
this.creatorConstructorMembers = null;
return;
}
@@ -304,15 +307,9 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
}
initForEachDeMember(factory, member);
}
this.members = list.toArray(new DeMember[list.size()]);
DeMember[] deMembers = list.toArray(new DeMember[list.size()]);
Arrays.sort(this.members, (a, b) -> a.compareTo(factory.isFieldSort(), b));
this.memberFieldMap = new HashMap<>(this.members.length);
this.memberTagMap = new HashMap<>(this.members.length);
for (DeMember member : this.members) {
this.memberFieldMap.put(member.getAttribute().field(), member);
this.memberTagMap.put(member.getTag(), member);
}
this.initFieldMember(deMembers);
if (cps != null) {
final String[] fields = cps;
@@ -343,6 +340,17 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
}
}
protected void initFieldMember(DeMember[] deMembers) {
this.members = deMembers;
this.memberFieldMap = new HashMap<>(this.members.length);
this.memberTagMap = new HashMap<>(this.members.length);
for (DeMember member : this.members) {
this.memberFieldMap.put(member.getAttribute().field(), member);
this.memberTagMap.put(member.getTag(), member);
}
this.memberNode = DeMemberNode.create(this.members);
}
/**
* 对象格式: [0x1][short字段个数][字段名][字段值]...[0x2]
*
@@ -376,14 +384,14 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
}
}
DeMember[] memberArray = this.members;
DeMemberNode fieldNode = this.memberNode;
Map<String, DeMember> fieldMap = this.memberFieldMap;
Map<Integer, DeMember> tagMap = this.memberTagMap;
if (this.creatorConstructorMembers == null) { // 空构造函数
final T result = this.creator == null ? null : this.creator.create();
boolean first = true;
while (objin.hasNext()) {
DeMember member = objin.readFieldName(memberArray, fieldMap, tagMap);
DeMember member = objin.readFieldName(fieldNode, fieldMap, tagMap);
objin.readBlank();
if (member == null) {
objin.skipValue(); // 跳过不存在的属性的值
@@ -401,7 +409,7 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
int oc = 0;
boolean first = true;
while (objin.hasNext()) {
DeMember member = objin.readFieldName(memberArray, fieldMap, tagMap);
DeMember member = objin.readFieldName(fieldNode, fieldMap, tagMap);
objin.readBlank();
if (member == null) {
objin.skipValue(); // 跳过不存在的属性的值

10
src/main/java/org/redkale/convert/ObjectEncoder.java
View File

@@ -287,9 +287,9 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
}
initForEachEnMember(factory, member);
}
this.members = list.toArray(new EnMember[list.size()]);
Arrays.sort(this.members, (a, b) -> a.compareTo(factory.isFieldSort(), b));
EnMember[] enMembers = list.toArray(new EnMember[list.size()]);
Arrays.sort(enMembers, (a, b) -> a.compareTo(factory.isFieldSort(), b));
this.initFieldMember(enMembers);
afterInitEnMember(factory);
} catch (Exception ex) {
throw new ConvertException("ObjectEncoder init type=" + this.type + " error", ex);
@@ -305,6 +305,10 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
}
}
protected void initFieldMember(EnMember[] enMembers) {
this.members = enMembers;
}
@Override
public void convertTo(W out, T value) {
if (value == null) {

4
src/main/java/org/redkale/convert/Reader.java
View File

@@ -136,13 +136,13 @@ public abstract class Reader {
/**
* 根据字段读取字段对应的DeMember
*
* @param members DeMember的全量集合
* @param fieldNode DeMember的全量集合
* @param memberFieldMap DeMember的字段名map
* @param memberTagMap DeMember的tag map
* @return 匹配的DeMember
*/
public abstract DeMember readFieldName(
final DeMember[] members, Map<String, DeMember> memberFieldMap, Map<Integer, DeMember> memberTagMap);
final DeMemberNode fieldNode, Map<String, DeMember> memberFieldMap, Map<Integer, DeMember> memberTagMap);
/**
* 读取一个boolean值

23
src/main/java/org/redkale/convert/bson/BsonReader.java
View File

@@ -5,11 +5,10 @@
*/
package org.redkale.convert.bson;
import static org.redkale.convert.Reader.SIGN_NULL;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.redkale.convert.*;
import static org.redkale.convert.Reader.SIGN_NULL;
import org.redkale.convert.ext.ByteSimpledCoder;
import org.redkale.util.ObjectPool;
@@ -253,26 +252,10 @@ public class BsonReader extends Reader {
@Override
public final DeMember readFieldName(
final DeMember[] members, Map<String, DeMember> memberFieldMap, Map<Integer, DeMember> memberTagMap) {
final DeMemberNode fieldNode, Map<String, DeMember> memberFieldMap, Map<Integer, DeMember> memberTagMap) {
final String exceptedField = readSmallString();
this.typeval = readByte();
final int len = members.length;
if (this.fieldIndex >= len) {
this.fieldIndex = 0;
}
for (int k = this.fieldIndex; k < len; k++) {
if (exceptedField.equals(members[k].getAttribute().field())) {
this.fieldIndex = k;
return members[k];
}
}
for (int k = 0; k < this.fieldIndex; k++) {
if (exceptedField.equals(members[k].getAttribute().field())) {
this.fieldIndex = k;
return members[k];
}
}
return null;
return fieldNode.getMember(exceptedField);
}
// ------------------------------------------------------------

11
src/main/java/org/redkale/convert/ext/PatternSimpledCoder.java
View File

@@ -5,7 +5,6 @@
*/
package org.redkale.convert.ext;
import java.util.HashMap;
import java.util.regex.Pattern;
import org.redkale.convert.*;
import org.redkale.util.Attribute;
@@ -48,7 +47,7 @@ public class PatternSimpledCoder<R extends Reader, W extends Writer> extends Sim
Attribute.create(Pattern.class, "pattern", String.class, t -> t.pattern(), null),
2,
StringSimpledCoder.instance);
this.members = new EnMember[] {flagsMember, patternMember};
this.initFieldMember(new EnMember[] {flagsMember, patternMember});
this.inited = true;
}
}
@@ -65,14 +64,8 @@ public class PatternSimpledCoder<R extends Reader, W extends Writer> extends Sim
2,
StringSimpledCoder.instance);
this.creator = args -> Pattern.compile((String) args[1], (Integer) args[0]);
this.members = new DeMember[] {flagsMember, patternMember};
this.initFieldMember(new DeMember[] {flagsMember, patternMember});
this.creatorConstructorMembers = this.members;
this.memberFieldMap = new HashMap<>(this.members.length);
this.memberTagMap = new HashMap<>(this.members.length);
for (DeMember member : this.members) {
this.memberFieldMap.put(member.getAttribute().field(), member);
this.memberTagMap.put(member.getTag(), member);
}
this.inited = true;
}
}

39
src/main/java/org/redkale/convert/json/JsonByteBufferReader.java
View File

@@ -5,11 +5,11 @@
*/
package org.redkale.convert.json;
import static org.redkale.convert.Reader.*;
import java.nio.ByteBuffer;
import java.nio.charset.UnmappableCharacterException;
import java.util.Map;
import org.redkale.convert.*;
import static org.redkale.convert.Reader.*;
/**
* 以ByteBuffer为数据载体的JsonReader <br>
@@ -313,4 +313,39 @@ public class JsonByteBufferReader extends JsonReader {
return "null".equalsIgnoreCase(rs) ? null : rs;
}
}
@Override
public DeMember readFieldName(
final DeMemberNode fieldNode, Map<String, DeMember> memberFieldMap, Map<Integer, DeMember> memberTagMap) {
char ch = nextGoodChar(true);
if (ch == 0) {
return null;
}
DeMemberNode node = fieldNode;
StringBuilder sb = new StringBuilder();
if (ch == '"' || ch == '\'') {
final char quote = ch;
for (; ; ) {
ch = nextChar(sb);
if (ch == quote || ch == 0) {
break;
} else {
node = node == null ? null : node.getNode(ch);
}
}
return node == null ? null : node.getValue();
} else {
node = node == null ? null : node.getNode(ch);
for (; ; ) {
ch = nextChar(sb);
if (ch == ',' || ch == ']' || ch == '}' || ch <= ' ' || ch == ':') { // ch <= ' ' 包含 0
backChar(ch);
break;
} else {
node = node == null ? null : node.getNode(ch);
}
}
return node == null ? null : node.getValue();
}
}
}

59
src/main/java/org/redkale/convert/json/JsonReader.java
View File

@@ -5,11 +5,10 @@
*/
package org.redkale.convert.json;
import static org.redkale.convert.Reader.*;
import java.nio.charset.StandardCharsets;
import java.util.Map;
import org.redkale.convert.*;
import static org.redkale.convert.Reader.*;
import org.redkale.convert.Reader.ValueType;
import org.redkale.util.Utility;
@@ -696,30 +695,48 @@ public class JsonReader extends Reader {
}
@Override
public final DeMember readFieldName(
final DeMember[] members, Map<String, DeMember> memberFieldMap, Map<Integer, DeMember> memberTagMap) {
final String exceptedField = this.readSmallString();
if (exceptedField == null) {
public DeMember readFieldName(
final DeMemberNode fieldNode, Map<String, DeMember> memberFieldMap, Map<Integer, DeMember> memberTagMap) {
final int eof = this.limit;
if (this.position == eof) {
return null;
}
final int len = members.length;
if (this.fieldIndex >= len) {
this.fieldIndex = 0;
}
for (int k = this.fieldIndex; k < len; k++) {
if (exceptedField.equals(members[k].getAttribute().field())) {
this.fieldIndex = k;
return members[k];
DeMemberNode node = fieldNode;
char ch = nextGoodChar(true); // 需要跳过注释
final char[] text0 = this.text;
int currpos = this.position;
if (ch == '"' || ch == '\'') {
final char quote = ch;
for (; ; ) {
ch = text0[++currpos];
if (ch == quote) {
break;
}
node = node == null ? null : node.getNode(ch);
}
}
for (int k = 0; k < this.fieldIndex; k++) {
if (exceptedField.equals(members[k].getAttribute().field())) {
this.fieldIndex = k;
return members[k];
this.position = currpos;
return node == null ? null : node.getValue();
} else {
int start = currpos;
for (; ; ) {
if (currpos == eof) {
break;
}
ch = text0[++currpos];
if (ch == ',' || ch == ']' || ch == '}' || ch <= ' ' || ch == ':') {
break;
}
node = node == null ? null : node.getNode(ch);
}
int len = currpos - start;
if (len < 1) {
this.position = currpos;
} else {
this.position = currpos - 1;
}
return node == null ? null : node.getValue();
}
return null;
// if (result == null && len == 1 && text0[start] == '@') return REFER;
}
// ------------------------------------------------------------

9
src/main/java/org/redkale/convert/pb/ProtobufReader.java
View File

@@ -211,12 +211,11 @@ public class ProtobufReader extends Reader {
@Override
public final DeMember readFieldName(
final DeMember[] members, Map<String, DeMember> memberFieldMap, Map<Integer, DeMember> memberTagMap) {
final DeMemberNode fieldNode, Map<String, DeMember> memberFieldMap, Map<Integer, DeMember> memberTagMap) {
int tag = readTag();
for (DeMember member : members) {
if (member.getTag() == tag) {
return member;
}
DeMember member = memberTagMap.get(tag);
if (member != null) {
return member;
}
backTag(tag);
return null;

4
src/test/java/org/redkale/test/convert/CustMessage2Test.java
View File

@@ -88,7 +88,7 @@ public class CustMessage2Test {
setIndex(member2, 2);
setPosition(member2, 2);
initForEachEnMember(factory, member2);
this.members = new EnMember[] {member1, member2};
this.initFieldMember(new EnMember[] {member1, member2});
}
};
encoder.init(factory);
@@ -117,7 +117,7 @@ public class CustMessage2Test {
setIndex(member2, 2);
setPosition(member2, 2);
initForEachDeMember(factory, member2);
this.members = new DeMember[] {member1, member2};
this.initFieldMember(new DeMember[] {member1, member2});
}
@Override

4
src/test/java/org/redkale/test/convert/CustMessageTest.java
View File

@@ -76,7 +76,7 @@ public class CustMessageTest {
setIndex(member, 1);
setPosition(member, 1);
initForEachEnMember(factory, member);
this.members = new EnMember[] {member};
this.initFieldMember(new EnMember[] {member});
}
};
encoder.init(factory);
@@ -96,7 +96,7 @@ public class CustMessageTest {
setIndex(member, 1);
setPosition(member, 1);
initForEachDeMember(factory, member);
this.members = new DeMember[] {member};
this.initFieldMember(new DeMember[] {member});
}
@Override

5
src/test/java/org/redkale/test/convert/InnerCoderEntity.java
View File

@@ -41,6 +41,8 @@ public class InnerCoderEntity {
final org.redkale.convert.ConvertFactory factory) {
return new SimpledCoder<Reader, Writer, InnerCoderEntity>() {
private DeMemberNode memberNode;
private Map<String, DeMember> deMemberFieldMap;
private Map<Integer, DeMember> deMemberTagMap;
@@ -64,6 +66,7 @@ public class InnerCoderEntity {
this.deMemberFieldMap.put(member.getAttribute().field(), member);
this.deMemberTagMap.put(member.getTag(), member);
}
this.memberNode = DeMemberNode.create(deMembers);
}
@Override
@@ -85,7 +88,7 @@ public class InnerCoderEntity {
int index = 0;
final Object[] params = new Object[deMembers.length];
while (in.hasNext()) {
DeMember member = in.readFieldName(deMembers, deMemberFieldMap, deMemberTagMap); // 读取字段名
DeMember member = in.readFieldName(memberNode, deMemberFieldMap, deMemberTagMap); // 读取字段名
in.readBlank(); // 读取字段名与字段值之间的间隔符，JSON则是跳过冒号:
if (member == null) {
in.skipValue(); // 跳过不存在的字段的值, 一般不会发生

4
src/test/java/org/redkale/test/convert/pb/PBCustMessage2Test.java
View File

@@ -108,7 +108,7 @@ public class PBCustMessage2Test {
setIndex(member2, 2);
setPosition(member2, 2);
initForEachEnMember(factory, member2);
this.members = new EnMember[] {member1, member2};
this.initFieldMember(new EnMember[] {member1, member2});
}
};
encoder.init(factory);
@@ -137,7 +137,7 @@ public class PBCustMessage2Test {
setIndex(member2, 2);
setPosition(member2, 2);
initForEachDeMember(factory, member2);
this.members = new DeMember[] {member1, member2};
this.initFieldMember(new DeMember[] {member1, member2});
}
@Override

4
src/test/java/org/redkale/test/convert/pb/PBCustMessageTest.java
View File

@@ -87,7 +87,7 @@ public class PBCustMessageTest {
setIndex(member, 1);
setPosition(member, 1);
initForEachEnMember(factory, member);
this.members = new EnMember[] {member};
this.initFieldMember(new EnMember[] {member});
}
};
encoder.init(factory);
@@ -107,7 +107,7 @@ public class PBCustMessageTest {
setIndex(member, 1);
setPosition(member, 1);
initForEachDeMember(factory, member);
this.members = new DeMember[] {member};
this.initFieldMember(new DeMember[] {member});
}
@Override