Skip to content

Fix table diagnostic JSON reading from database header #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dajiaohuang wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix table diagnostic JSON reading from database header #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/MasterMemory/MemoryDatabaseBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ public static TableInfo[] GetTableInfo(byte[] databaseBinary, bool storeTableDat
var reader = new MessagePackReader(databaseBinary);
var header = formatter.Deserialize(ref reader, HeaderFormatterResolver.StandardOptions);

return header.Select(x => new TableInfo(x.Key, x.Value.Item2, storeTableData ? databaseBinary : null, x.Value.Item1)).ToArray();
var headerSize = (int)reader.Consumed;
return header.Select(x => new TableInfo(x.Key, x.Value.Item2, storeTableData ? databaseBinary : null, headerSize + x.Value.Item1)).ToArray();
}

protected void ValidateTable<TElement>(IReadOnlyList<TElement> table, ValidationDatabase database, string pkName, Delegate pkSelector, ValidateResult result)
Expand Down
14 changes: 14 additions & 0 deletions tests/MasterMemory.Tests/DatabaseTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,20 @@ public void SingleDb()
tableInfo[0].TableName.ShouldBe("s_a_m_p_l_e");
}

[Fact]
public void DumpTableDataAsJson()
{
var samples = CreateData();
var items = new[] { new TestStructures.ItemMaster { ItemId = 42 } };
var bin = new DatabaseBuilder().Append(samples).Append(items).Build();
var tableInfo = MemoryDatabase.GetTableInfo(bin);

tableInfo.Single(x => x.TableName == "s_a_m_p_l_e").DumpAsJson()
.ShouldBe(MessagePackSerializer.ConvertToJson(MessagePackSerializer.Serialize(samples.OrderBy(x => x.Id).ToArray())));
tableInfo.Single(x => x.TableName == "item_master").DumpAsJson(MessagePackSerializer.DefaultOptions)
.ShouldBe(MessagePackSerializer.ConvertToJson(MessagePackSerializer.Serialize(items)));
}

[Fact]
public void All()
{
Expand Down