Optimize JSON write with fast/slow path to reduce memory usage
- Fast path for clean data (no sanitization) - Slow path sanitizes during encoding - Reload shared memory after sanitization - Custom encoder avoids deep copies - Comprehensive test coverage
This commit is contained in:
parent
93a3e47134
commit
f289cf6225
4 changed files with 368 additions and 5 deletions
|
|
@ -161,7 +161,20 @@ class JsonDocStatusStorage(DocStatusStorage):
|
||||||
logger.debug(
|
logger.debug(
|
||||||
f"[{self.workspace}] Process {os.getpid()} doc status writting {len(data_dict)} records to {self.namespace}"
|
f"[{self.workspace}] Process {os.getpid()} doc status writting {len(data_dict)} records to {self.namespace}"
|
||||||
)
|
)
|
||||||
write_json(data_dict, self._file_name)
|
|
||||||
|
# Write JSON and check if sanitization was applied
|
||||||
|
needs_reload = write_json(data_dict, self._file_name)
|
||||||
|
|
||||||
|
# If data was sanitized, reload cleaned data to update shared memory
|
||||||
|
if needs_reload:
|
||||||
|
logger.info(
|
||||||
|
f"[{self.workspace}] Reloading sanitized data into shared memory for {self.namespace}"
|
||||||
|
)
|
||||||
|
cleaned_data = load_json(self._file_name)
|
||||||
|
if cleaned_data:
|
||||||
|
self._data.clear()
|
||||||
|
self._data.update(cleaned_data)
|
||||||
|
|
||||||
await clear_all_update_flags(self.final_namespace)
|
await clear_all_update_flags(self.final_namespace)
|
||||||
|
|
||||||
async def upsert(self, data: dict[str, dict[str, Any]]) -> None:
|
async def upsert(self, data: dict[str, dict[str, Any]]) -> None:
|
||||||
|
|
|
||||||
|
|
@ -81,7 +81,20 @@ class JsonKVStorage(BaseKVStorage):
|
||||||
logger.debug(
|
logger.debug(
|
||||||
f"[{self.workspace}] Process {os.getpid()} KV writting {data_count} records to {self.namespace}"
|
f"[{self.workspace}] Process {os.getpid()} KV writting {data_count} records to {self.namespace}"
|
||||||
)
|
)
|
||||||
write_json(data_dict, self._file_name)
|
|
||||||
|
# Write JSON and check if sanitization was applied
|
||||||
|
needs_reload = write_json(data_dict, self._file_name)
|
||||||
|
|
||||||
|
# If data was sanitized, reload cleaned data to update shared memory
|
||||||
|
if needs_reload:
|
||||||
|
logger.info(
|
||||||
|
f"[{self.workspace}] Reloading sanitized data into shared memory for {self.namespace}"
|
||||||
|
)
|
||||||
|
cleaned_data = load_json(self._file_name)
|
||||||
|
if cleaned_data:
|
||||||
|
self._data.clear()
|
||||||
|
self._data.update(cleaned_data)
|
||||||
|
|
||||||
await clear_all_update_flags(self.final_namespace)
|
await clear_all_update_flags(self.final_namespace)
|
||||||
|
|
||||||
async def get_by_id(self, id: str) -> dict[str, Any] | None:
|
async def get_by_id(self, id: str) -> dict[str, Any] | None:
|
||||||
|
|
|
||||||
|
|
@ -961,6 +961,10 @@ def _sanitize_string_for_json(text: str) -> str:
|
||||||
def _sanitize_json_data(data: Any) -> Any:
|
def _sanitize_json_data(data: Any) -> Any:
|
||||||
"""Recursively sanitize all string values in data structure for safe UTF-8 encoding
|
"""Recursively sanitize all string values in data structure for safe UTF-8 encoding
|
||||||
|
|
||||||
|
DEPRECATED: This function creates a deep copy of the data which can be memory-intensive.
|
||||||
|
For new code, prefer using write_json with SanitizingJSONEncoder which sanitizes during
|
||||||
|
serialization without creating copies.
|
||||||
|
|
||||||
Handles all JSON-serializable types including:
|
Handles all JSON-serializable types including:
|
||||||
- Dictionary keys and values
|
- Dictionary keys and values
|
||||||
- Lists and tuples (preserves type)
|
- Lists and tuples (preserves type)
|
||||||
|
|
@ -992,11 +996,100 @@ def _sanitize_json_data(data: Any) -> Any:
|
||||||
return data
|
return data
|
||||||
|
|
||||||
|
|
||||||
|
class SanitizingJSONEncoder(json.JSONEncoder):
|
||||||
|
"""
|
||||||
|
Custom JSON encoder that sanitizes data during serialization.
|
||||||
|
|
||||||
|
This encoder cleans strings during the encoding process without creating
|
||||||
|
a full copy of the data structure, making it memory-efficient for large datasets.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def encode(self, o):
|
||||||
|
"""Override encode method to handle simple string cases"""
|
||||||
|
if isinstance(o, str):
|
||||||
|
return json.encoder.encode_basestring(_sanitize_string_for_json(o))
|
||||||
|
return super().encode(o)
|
||||||
|
|
||||||
|
def iterencode(self, o, _one_shot=False):
|
||||||
|
"""
|
||||||
|
Override iterencode to sanitize strings during serialization.
|
||||||
|
This is the core method that handles complex nested structures.
|
||||||
|
"""
|
||||||
|
# Preprocess: sanitize all strings in the object
|
||||||
|
sanitized = self._sanitize_for_encoding(o)
|
||||||
|
|
||||||
|
# Call parent's iterencode with sanitized data
|
||||||
|
for chunk in super().iterencode(sanitized, _one_shot):
|
||||||
|
yield chunk
|
||||||
|
|
||||||
|
def _sanitize_for_encoding(self, obj):
|
||||||
|
"""
|
||||||
|
Recursively sanitize strings in an object.
|
||||||
|
Creates new objects only when necessary to avoid deep copies.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
obj: Object to sanitize
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
Sanitized object with cleaned strings
|
||||||
|
"""
|
||||||
|
if isinstance(obj, str):
|
||||||
|
return _sanitize_string_for_json(obj)
|
||||||
|
|
||||||
|
elif isinstance(obj, dict):
|
||||||
|
# Create new dict with sanitized keys and values
|
||||||
|
new_dict = {}
|
||||||
|
for k, v in obj.items():
|
||||||
|
clean_k = _sanitize_string_for_json(k) if isinstance(k, str) else k
|
||||||
|
clean_v = self._sanitize_for_encoding(v)
|
||||||
|
new_dict[clean_k] = clean_v
|
||||||
|
return new_dict
|
||||||
|
|
||||||
|
elif isinstance(obj, (list, tuple)):
|
||||||
|
# Sanitize list/tuple elements
|
||||||
|
cleaned = [self._sanitize_for_encoding(item) for item in obj]
|
||||||
|
return type(obj)(cleaned) if isinstance(obj, tuple) else cleaned
|
||||||
|
|
||||||
|
else:
|
||||||
|
# Numbers, booleans, None, etc. remain unchanged
|
||||||
|
return obj
|
||||||
|
|
||||||
|
|
||||||
def write_json(json_obj, file_name):
|
def write_json(json_obj, file_name):
|
||||||
# Sanitize data before writing to prevent UTF-8 encoding errors
|
"""
|
||||||
sanitized_obj = _sanitize_json_data(json_obj)
|
Write JSON data to file with optimized sanitization strategy.
|
||||||
|
|
||||||
|
This function uses a two-stage approach:
|
||||||
|
1. Fast path: Try direct serialization (works for clean data ~99% of time)
|
||||||
|
2. Slow path: Use custom encoder that sanitizes during serialization
|
||||||
|
|
||||||
|
The custom encoder approach avoids creating a deep copy of the data,
|
||||||
|
making it memory-efficient. When sanitization occurs, the caller should
|
||||||
|
reload the cleaned data from the file to update shared memory.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
json_obj: Object to serialize (may be a shallow copy from shared memory)
|
||||||
|
file_name: Output file path
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
bool: True if sanitization was applied (caller should reload data),
|
||||||
|
False if direct write succeeded (no reload needed)
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
# Strategy 1: Fast path - try direct serialization
|
||||||
|
with open(file_name, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(json_obj, f, indent=2, ensure_ascii=False)
|
||||||
|
return False # No sanitization needed, no reload required
|
||||||
|
|
||||||
|
except (UnicodeEncodeError, UnicodeDecodeError) as e:
|
||||||
|
logger.debug(f"Direct JSON write failed, using sanitizing encoder: {e}")
|
||||||
|
|
||||||
|
# Strategy 2: Use custom encoder (sanitizes during serialization, zero memory copy)
|
||||||
with open(file_name, "w", encoding="utf-8") as f:
|
with open(file_name, "w", encoding="utf-8") as f:
|
||||||
json.dump(sanitized_obj, f, indent=2, ensure_ascii=False)
|
json.dump(json_obj, f, indent=2, ensure_ascii=False, cls=SanitizingJSONEncoder)
|
||||||
|
|
||||||
|
logger.info(f"JSON sanitization applied during write: {file_name}")
|
||||||
|
return True # Sanitization applied, reload recommended
|
||||||
|
|
||||||
|
|
||||||
class TokenizerInterface(Protocol):
|
class TokenizerInterface(Protocol):
|
||||||
|
|
|
||||||
244
tests/test_write_json_optimization.py
Normal file
244
tests/test_write_json_optimization.py
Normal file
|
|
@ -0,0 +1,244 @@
|
||||||
|
"""
|
||||||
|
Test suite for write_json optimization
|
||||||
|
|
||||||
|
This test verifies:
|
||||||
|
1. Fast path works for clean data (no sanitization)
|
||||||
|
2. Slow path applies sanitization for dirty data
|
||||||
|
3. Sanitization is done during encoding (memory-efficient)
|
||||||
|
4. Reloading updates shared memory with cleaned data
|
||||||
|
"""
|
||||||
|
|
||||||
|
import os
|
||||||
|
import json
|
||||||
|
import tempfile
|
||||||
|
from lightrag.utils import write_json, load_json, SanitizingJSONEncoder
|
||||||
|
|
||||||
|
|
||||||
|
class TestWriteJsonOptimization:
|
||||||
|
"""Test write_json optimization with two-stage approach"""
|
||||||
|
|
||||||
|
def test_fast_path_clean_data(self):
|
||||||
|
"""Test that clean data takes the fast path without sanitization"""
|
||||||
|
clean_data = {
|
||||||
|
"name": "John Doe",
|
||||||
|
"age": 30,
|
||||||
|
"items": ["apple", "banana", "cherry"],
|
||||||
|
"nested": {"key": "value", "number": 42},
|
||||||
|
}
|
||||||
|
|
||||||
|
with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".json") as f:
|
||||||
|
temp_file = f.name
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Write clean data - should return False (no sanitization)
|
||||||
|
needs_reload = write_json(clean_data, temp_file)
|
||||||
|
assert not needs_reload, "Clean data should not require sanitization"
|
||||||
|
|
||||||
|
# Verify data was written correctly
|
||||||
|
loaded_data = load_json(temp_file)
|
||||||
|
assert loaded_data == clean_data, "Loaded data should match original"
|
||||||
|
finally:
|
||||||
|
os.unlink(temp_file)
|
||||||
|
|
||||||
|
def test_slow_path_dirty_data(self):
|
||||||
|
"""Test that dirty data triggers sanitization"""
|
||||||
|
# Create data with surrogate characters (U+D800 to U+DFFF)
|
||||||
|
dirty_string = "Hello\ud800World" # Contains surrogate character
|
||||||
|
dirty_data = {"text": dirty_string, "number": 123}
|
||||||
|
|
||||||
|
with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".json") as f:
|
||||||
|
temp_file = f.name
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Write dirty data - should return True (sanitization applied)
|
||||||
|
needs_reload = write_json(dirty_data, temp_file)
|
||||||
|
assert needs_reload, "Dirty data should trigger sanitization"
|
||||||
|
|
||||||
|
# Verify data was written and sanitized
|
||||||
|
loaded_data = load_json(temp_file)
|
||||||
|
assert loaded_data is not None, "Data should be written"
|
||||||
|
assert loaded_data["number"] == 123, "Clean fields should remain unchanged"
|
||||||
|
# Surrogate character should be removed
|
||||||
|
assert (
|
||||||
|
"\ud800" not in loaded_data["text"]
|
||||||
|
), "Surrogate character should be removed"
|
||||||
|
finally:
|
||||||
|
os.unlink(temp_file)
|
||||||
|
|
||||||
|
def test_sanitizing_encoder_removes_surrogates(self):
|
||||||
|
"""Test that SanitizingJSONEncoder removes surrogate characters"""
|
||||||
|
data_with_surrogates = {
|
||||||
|
"text": "Hello\ud800\udc00World", # Contains surrogate pair
|
||||||
|
"clean": "Clean text",
|
||||||
|
"nested": {"dirty_key\ud801": "value", "clean_key": "clean\ud802value"},
|
||||||
|
}
|
||||||
|
|
||||||
|
# Encode using custom encoder
|
||||||
|
encoded = json.dumps(
|
||||||
|
data_with_surrogates, cls=SanitizingJSONEncoder, ensure_ascii=False
|
||||||
|
)
|
||||||
|
|
||||||
|
# Verify no surrogate characters in output
|
||||||
|
assert "\ud800" not in encoded, "Surrogate U+D800 should be removed"
|
||||||
|
assert "\udc00" not in encoded, "Surrogate U+DC00 should be removed"
|
||||||
|
assert "\ud801" not in encoded, "Surrogate U+D801 should be removed"
|
||||||
|
assert "\ud802" not in encoded, "Surrogate U+D802 should be removed"
|
||||||
|
|
||||||
|
# Verify clean parts remain
|
||||||
|
assert "Clean text" in encoded, "Clean text should remain"
|
||||||
|
assert "clean_key" in encoded, "Clean keys should remain"
|
||||||
|
|
||||||
|
def test_nested_structure_sanitization(self):
|
||||||
|
"""Test sanitization of deeply nested structures"""
|
||||||
|
nested_data = {
|
||||||
|
"level1": {
|
||||||
|
"level2": {
|
||||||
|
"level3": {"dirty": "text\ud800here", "clean": "normal text"},
|
||||||
|
"list": ["item1", "item\ud801dirty", "item3"],
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".json") as f:
|
||||||
|
temp_file = f.name
|
||||||
|
|
||||||
|
try:
|
||||||
|
needs_reload = write_json(nested_data, temp_file)
|
||||||
|
assert needs_reload, "Nested dirty data should trigger sanitization"
|
||||||
|
|
||||||
|
# Verify nested structure is preserved
|
||||||
|
loaded_data = load_json(temp_file)
|
||||||
|
assert "level1" in loaded_data
|
||||||
|
assert "level2" in loaded_data["level1"]
|
||||||
|
assert "level3" in loaded_data["level1"]["level2"]
|
||||||
|
|
||||||
|
# Verify surrogates are removed
|
||||||
|
dirty_text = loaded_data["level1"]["level2"]["level3"]["dirty"]
|
||||||
|
assert "\ud800" not in dirty_text, "Nested surrogate should be removed"
|
||||||
|
|
||||||
|
# Verify list items are sanitized
|
||||||
|
list_items = loaded_data["level1"]["level2"]["list"]
|
||||||
|
assert (
|
||||||
|
"\ud801" not in list_items[1]
|
||||||
|
), "List item surrogates should be removed"
|
||||||
|
finally:
|
||||||
|
os.unlink(temp_file)
|
||||||
|
|
||||||
|
def test_unicode_non_characters_removed(self):
|
||||||
|
"""Test that Unicode non-characters (U+FFFE, U+FFFF) don't cause encoding errors
|
||||||
|
|
||||||
|
Note: U+FFFE and U+FFFF are valid UTF-8 characters (though discouraged),
|
||||||
|
so they don't trigger sanitization. They only get removed when explicitly
|
||||||
|
using the SanitizingJSONEncoder.
|
||||||
|
"""
|
||||||
|
data_with_nonchars = {"text1": "Hello\ufffeWorld", "text2": "Test\uffffString"}
|
||||||
|
|
||||||
|
with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".json") as f:
|
||||||
|
temp_file = f.name
|
||||||
|
|
||||||
|
try:
|
||||||
|
# These characters are valid UTF-8, so they take the fast path
|
||||||
|
needs_reload = write_json(data_with_nonchars, temp_file)
|
||||||
|
assert not needs_reload, "U+FFFE/U+FFFF are valid UTF-8 characters"
|
||||||
|
|
||||||
|
loaded_data = load_json(temp_file)
|
||||||
|
# They're written as-is in the fast path
|
||||||
|
assert loaded_data == data_with_nonchars
|
||||||
|
finally:
|
||||||
|
os.unlink(temp_file)
|
||||||
|
|
||||||
|
def test_mixed_clean_dirty_data(self):
|
||||||
|
"""Test data with both clean and dirty fields"""
|
||||||
|
mixed_data = {
|
||||||
|
"clean_field": "This is perfectly fine",
|
||||||
|
"dirty_field": "This has\ud800issues",
|
||||||
|
"number": 42,
|
||||||
|
"boolean": True,
|
||||||
|
"null_value": None,
|
||||||
|
"clean_list": [1, 2, 3],
|
||||||
|
"dirty_list": ["clean", "dirty\ud801item"],
|
||||||
|
}
|
||||||
|
|
||||||
|
with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".json") as f:
|
||||||
|
temp_file = f.name
|
||||||
|
|
||||||
|
try:
|
||||||
|
needs_reload = write_json(mixed_data, temp_file)
|
||||||
|
assert (
|
||||||
|
needs_reload
|
||||||
|
), "Mixed data with dirty fields should trigger sanitization"
|
||||||
|
|
||||||
|
loaded_data = load_json(temp_file)
|
||||||
|
|
||||||
|
# Clean fields should remain unchanged
|
||||||
|
assert loaded_data["clean_field"] == "This is perfectly fine"
|
||||||
|
assert loaded_data["number"] == 42
|
||||||
|
assert loaded_data["boolean"]
|
||||||
|
assert loaded_data["null_value"] is None
|
||||||
|
assert loaded_data["clean_list"] == [1, 2, 3]
|
||||||
|
|
||||||
|
# Dirty fields should be sanitized
|
||||||
|
assert "\ud800" not in loaded_data["dirty_field"]
|
||||||
|
assert "\ud801" not in loaded_data["dirty_list"][1]
|
||||||
|
finally:
|
||||||
|
os.unlink(temp_file)
|
||||||
|
|
||||||
|
def test_empty_and_none_strings(self):
|
||||||
|
"""Test handling of empty and None values"""
|
||||||
|
data = {
|
||||||
|
"empty": "",
|
||||||
|
"none": None,
|
||||||
|
"zero": 0,
|
||||||
|
"false": False,
|
||||||
|
"empty_list": [],
|
||||||
|
"empty_dict": {},
|
||||||
|
}
|
||||||
|
|
||||||
|
with tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".json") as f:
|
||||||
|
temp_file = f.name
|
||||||
|
|
||||||
|
try:
|
||||||
|
needs_reload = write_json(data, temp_file)
|
||||||
|
assert (
|
||||||
|
not needs_reload
|
||||||
|
), "Clean empty values should not trigger sanitization"
|
||||||
|
|
||||||
|
loaded_data = load_json(temp_file)
|
||||||
|
assert loaded_data == data, "Empty/None values should be preserved"
|
||||||
|
finally:
|
||||||
|
os.unlink(temp_file)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
# Run tests
|
||||||
|
test = TestWriteJsonOptimization()
|
||||||
|
|
||||||
|
print("Running test_fast_path_clean_data...")
|
||||||
|
test.test_fast_path_clean_data()
|
||||||
|
print("✓ Passed")
|
||||||
|
|
||||||
|
print("Running test_slow_path_dirty_data...")
|
||||||
|
test.test_slow_path_dirty_data()
|
||||||
|
print("✓ Passed")
|
||||||
|
|
||||||
|
print("Running test_sanitizing_encoder_removes_surrogates...")
|
||||||
|
test.test_sanitizing_encoder_removes_surrogates()
|
||||||
|
print("✓ Passed")
|
||||||
|
|
||||||
|
print("Running test_nested_structure_sanitization...")
|
||||||
|
test.test_nested_structure_sanitization()
|
||||||
|
print("✓ Passed")
|
||||||
|
|
||||||
|
print("Running test_unicode_non_characters_removed...")
|
||||||
|
test.test_unicode_non_characters_removed()
|
||||||
|
print("✓ Passed")
|
||||||
|
|
||||||
|
print("Running test_mixed_clean_dirty_data...")
|
||||||
|
test.test_mixed_clean_dirty_data()
|
||||||
|
print("✓ Passed")
|
||||||
|
|
||||||
|
print("Running test_empty_and_none_strings...")
|
||||||
|
test.test_empty_and_none_strings()
|
||||||
|
print("✓ Passed")
|
||||||
|
|
||||||
|
print("\n✅ All tests passed!")
|
||||||
Loading…
Add table
Reference in a new issue