refactor meta string write/read

Author: chaokunyang

.idea/vcs.xml

@@ -35,6 +35,8 @@
 import org.apache.fory.context.MapRefReader;
 import org.apache.fory.context.MapRefWriter;
 import org.apache.fory.context.MetaContext;
+import org.apache.fory.context.MetaStringReader;
+import org.apache.fory.context.MetaStringWriter;
 import org.apache.fory.context.NoRefReader;
 import org.apache.fory.context.NoRefWriter;
 import org.apache.fory.context.ReadContext;
@@ -53,8 +55,6 @@
 import org.apache.fory.memory.MemoryUtils;
 import org.apache.fory.meta.MetaCompressor;
 import org.apache.fory.resolver.ClassResolver;
-import org.apache.fory.resolver.MetaStringReader;
-import org.apache.fory.resolver.MetaStringWriter;
 import org.apache.fory.resolver.SharedRegistry;
 import org.apache.fory.resolver.TypeInfo;
 import org.apache.fory.resolver.TypeResolver;
@@ -155,7 +155,10 @@ public Fory(ForyBuilder builder, ClassLoader classLoader, SharedRegistry sharedR
     stringSerializer = new StringSerializer(config);
     typeResolver = crossLanguage ? new XtypeResolver(this) : new ClassResolver(this);
     typeResolver.initialize();
-    MetaStringWriter metaStringWriter = new MetaStringWriter(sharedRegistry);
+    MetaStringWriter metaStringWriter =
+        config.forVirtualThread()
+            ? new MetaStringWriter.MapStateMetaStringWriter(sharedRegistry)
+            : new MetaStringWriter.FieldStateMetaStringWriter(sharedRegistry);
     MetaStringReader metaStringReader = new MetaStringReader(sharedRegistry);
     writeContext =
         new WriteContext(

java/fory-core/src/main/java/org/apache/fory/Fory.java

@@ -17,10 +17,11 @@
  * under the License.
  */
 
-package org.apache.fory.resolver;
+package org.apache.fory.context;
 
 import java.util.Arrays;
 import java.util.Objects;
+import org.apache.fory.annotation.Internal;
 import org.apache.fory.collection.LongLongByteMap;
 import org.apache.fory.collection.LongMap;
 import org.apache.fory.collection.ObjectMap;
@@ -29,11 +30,14 @@
 import org.apache.fory.meta.EncodedMetaString;
 import org.apache.fory.meta.Encoders;
 import org.apache.fory.meta.MetaStringDecoder;
+import org.apache.fory.resolver.MetaStringRef;
+import org.apache.fory.resolver.SharedRegistry;
 import org.apache.fory.util.MurmurHash3;
 
 /** Read-side state for meta-string references. */
+@Internal
 public final class MetaStringReader {
-  private static final int INITIAL_CAPACITY = 4;
+  private static final int INITIAL_CAPACITY = 2;
   private static final float LOAD_FACTOR = 0.5f;
   private static final int SMALL_STRING_THRESHOLD = 16;
 
@@ -56,7 +60,7 @@ public MetaStringReader(SharedRegistry sharedRegistry) {
 
   public String readMetaString(MemoryBuffer buffer) {
     MetaStringRef metaStringRef = readMetaStringBytes(buffer);
-    EncodedMetaString encodedMetaString = metaStringRef.encoded;
+    EncodedMetaString encodedMetaString = metaStringRef.getEncoded();
     String str = metaString2StringMap.get(encodedMetaString);
     if (str == null) {
       str = metaStringRef.decode(Encoders.GENERIC_DECODER);
@@ -106,7 +110,7 @@ public MetaStringRef readMetaStringBytes(MemoryBuffer buffer) {
     return dynamicReadStringIds[len - 1];
   }
 
-  MetaStringRef readMetaStringBytes(MemoryBuffer buffer, MetaStringRef cache) {
+  public MetaStringRef readMetaStringBytes(MemoryBuffer buffer, MetaStringRef cache) {
     int header = buffer.readVarUint32Small7();
     int len = header >>> 1;
     if ((header & 0b1) == 0) {
@@ -122,7 +126,7 @@ MetaStringRef readMetaStringBytes(MemoryBuffer buffer, MetaStringRef cache) {
 
   private MetaStringRef readBigMetaStringBytes(MemoryBuffer buffer, MetaStringRef cache, int len) {
     long hashCode = buffer.readInt64();
-    if (cache.encoded.hash == hashCode) {
+    if (cache.getEncoded().hash == hashCode) {
       buffer.increaseReaderIndex(len);
       return cache;
     }
@@ -134,7 +138,7 @@ private MetaStringRef readBigMetaStringBytes(MemoryBuffer buffer, int len, long
     if (encodedMetaString == null) {
       EncodedMetaString newMetaString = new EncodedMetaString(buffer.readBytes(len), hashCode);
       MetaStringRef metaStringRef = sharedRegistry.getOrCreateMetaStringRef(newMetaString);
-      hash2MetaStringMap.put(hashCode, metaStringRef.encoded);
+      hash2MetaStringMap.put(hashCode, metaStringRef.getEncoded());
       return metaStringRef;
     }
     buffer.increaseReaderIndex(len);
@@ -175,7 +179,7 @@ private MetaStringRef readSmallMetaStringBytes(
       v1 = buffer.readInt64();
       v2 = buffer.readBytesAsInt64(len - 8);
     }
-    EncodedMetaString cachedMetaString = cache.encoded;
+    EncodedMetaString cachedMetaString = cache.getEncoded();
     if (cachedMetaString.first8Bytes == v1 && cachedMetaString.second8Bytes == v2) {
       return cache;
     }
@@ -195,23 +199,27 @@ private MetaStringRef createSmallMetaStringBytes(int len, byte encoding, long v1
     hashCode = (hashCode & 0xffffffffffffff00L) | encoding;
     EncodedMetaString encodedMetaString = new EncodedMetaString(Arrays.copyOf(data, len), hashCode);
     MetaStringRef metaStringRef = sharedRegistry.getOrCreateMetaStringRef(encodedMetaString);
-    longLongMetaStringMap.put(v1, v2, encoding, metaStringRef.encoded);
+    longLongMetaStringMap.put(v1, v2, encoding, metaStringRef.getEncoded());
     return metaStringRef;
   }
 
   private void updateDynamicString(MetaStringRef metaStringRef) {
     short currentDynamicReadId = dynamicReadStringId++;
     MetaStringRef[] readStringIds = dynamicReadStringIds;
     if (readStringIds.length <= currentDynamicReadId) {
-      readStringIds = growRead(currentDynamicReadId);
+      readStringIds = dynamicReadStringIds = growRead(readStringIds, currentDynamicReadId);
     }
     readStringIds[currentDynamicReadId] = metaStringRef;
   }
 
-  private MetaStringRef[] growRead(int id) {
-    MetaStringRef[] tmp = new MetaStringRef[id * 2];
-    System.arraycopy(dynamicReadStringIds, 0, tmp, 0, dynamicReadStringIds.length);
-    return dynamicReadStringIds = tmp;
+  private MetaStringRef[] growRead(MetaStringRef[] current, int id) {
+    int newLength = current.length;
+    while (newLength <= id) {
+      newLength <<= 1;
+    }
+    MetaStringRef[] expanded = new MetaStringRef[newLength];
+    System.arraycopy(current, 0, expanded, 0, current.length);
+    return expanded;
   }
 
   public void reset() {