Skip decode for value node in CopyStates

planetarium · Nov 3, 2023 · e5b8e66 · e5b8e66
1 parent 278c042
commit e5b8e66
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/Libplanet/Store/Trie/MerkleTrie.cs b/Libplanet/Store/Trie/MerkleTrie.cs
@@ -263,13 +263,18 @@ internal IEnumerable<HashDigest<SHA256>> IterateHashNodes()
                     break;
             }
 
-            bool GuessValueNodeByPath(in ImmutableArray<byte> path)
+            bool GuessValueNode(in ImmutableArray<byte> path, byte[] value)
             {
                 if (path.Length < 2)
                 {
                     return false;
                 }
 
+                if (value.Length > 597)
+                {
+                    return true;
+                }
+
                 bool isStartedWithUnderbar = (path[0] << 4) + path[1] == '_';
 
                 bool isStatePath = !isStartedWithUnderbar &&
@@ -284,29 +289,25 @@ bool GuessValueNodeByPath(in ImmutableArray<byte> path)
 
                 // It assumes every length of value nodes is same with Address' hexadecimal
                 // string's hexadecimal string's size.
-                bool isValueNode = GuessValueNodeByPath(path);
+                bool isValueNode = GuessValueNode(path, value);
                 bool noFingerprint = value.All(x => x != '*');
                 if (noFingerprint)
                 {
                     yield return (key, value);
 
                     // To avoid decode value node, it decodes when only there is '*' character,
                     // fingerprint.
-                    if (isValueNode)
-                    {
-                        continue;
-                    }
                 }
 
-                var node = NodeDecoder.Decode(_codec.Decode(value, LoadIndirectValue));
-                if (!noFingerprint && !(node is null))
+                if (isValueNode)
                 {
-                    yield return (key, _codec.Encode(node.ToBencodex()));
+                    continue;
                 }
 
-                if (isValueNode)
+                var node = NodeDecoder.Decode(_codec.Decode(value, LoadIndirectValue));
+                if (!noFingerprint && !(node is null))
                 {
-                    continue;
+                    yield return (key, _codec.Encode(node.ToBencodex()));
                 }
 
                 switch (node)