BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-25 17:08:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[C#] Rework how sorted vectors are looked up (#7441)

Browse Source
This commit is contained in:
Derek Bailey
2022-08-15 09:33:07 -07:00
committed by GitHub
parent 44a7dc9995
commit 214125e417
5 changed files with 104 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
tests/FlatBuffers.Test/FlatBuffersExampleTests.cs
View File

@@ -156,8 +156,11 @@ namespace FlatBuffers.Test
// Example of searching for a table by the key
Assert.IsTrue(monster.TestarrayoftablesByKey("Frodo") != null);
Assert.AreEqual(monster.TestarrayoftablesByKey("Frodo").Value.Name, "Frodo");
Assert.IsTrue(monster.TestarrayoftablesByKey("Barney") != null);
Assert.AreEqual(monster.TestarrayoftablesByKey("Barney").Value.Name, "Barney");
Assert.IsTrue(monster.TestarrayoftablesByKey("Wilma") != null);
Assert.AreEqual(monster.TestarrayoftablesByKey("Wilma").Value.Name, "Wilma");
// testType is an existing field
Assert.AreEqual(monster.TestType, Any.Monster);
@@ -1152,5 +1155,41 @@ namespace FlatBuffers.Test
ScalarStuff scalarStuff = ScalarStuff.GetRootAsScalarStuff(fbb.DataBuffer);
Assert.AreEqual(null, scalarStuff.MaybeEnum);
}
[FlatBuffersTestMethod]
public void SortKey_WithDefaultedValue_IsFindable() {
// This checks if using the `key` attribute that includes the
// default value (e.g., 0) is still searchable. This is a regression
// test for https://github.com/google/flatbuffers/issues/7380.
var fbb = new FlatBufferBuilder(1);
// Create a vector of Stat objects, with Count being the key.
var stat_offsets = new Offset<Stat>[4];
for(ushort i = 0; i < stat_offsets.Length; i++) {
Stat.StartStat(fbb);
Stat.AddCount(fbb, i);
stat_offsets[stat_offsets.Length - 1 - i] = Stat.EndStat(fbb);
}
// Ensure the sort works.
var sort = Stat.CreateSortedVectorOfStat(fbb, stat_offsets);
// Create the monster with the sorted vector of Stat objects.
var str = fbb.CreateString("MyMonster");
Monster.StartMonster(fbb);
Monster.AddName(fbb, str);
Monster.AddScalarKeySortedTables(fbb, sort);
fbb.Finish(Monster.EndMonster(fbb).Value);
// Get the monster.
var monster = Monster.GetRootAsMonster(fbb.DataBuffer);
// Ensure each key is findable.
for(ushort i =0 ; i < stat_offsets.Length; i++) {
Assert.IsTrue(monster.ScalarKeySortedTablesByKey(i) != null);
Assert.AreEqual(monster.ScalarKeySortedTablesByKey(i).Value.Count, i);
}
}
}
}

11
tests/MyGame/Example/Monster.cs
View File

@@ -478,18 +478,21 @@ public struct Monster : IFlatbufferObject
public static void FinishSizePrefixedMonsterBuffer(FlatBufferBuilder builder, Offset<MyGame.Example.Monster> offset) { builder.FinishSizePrefixed(offset.Value, "MONS"); }
public static VectorOffset CreateSortedVectorOfMonster(FlatBufferBuilder builder, Offset<Monster>[] offsets) {
Array.Sort(offsets, (Offset<Monster> o1, Offset<Monster> o2) => Table.CompareStrings(Table.__offset(10, o1.Value, builder.DataBuffer), Table.__offset(10, o2.Value, builder.DataBuffer), builder.DataBuffer));
Array.Sort(offsets,
(Offset<Monster> o1, Offset<Monster> o2) =>
new Monster().__assign(builder.DataBuffer.Length - o1.Value, builder.DataBuffer).Name.CompareTo(new Monster().__assign(builder.DataBuffer.Length - o2.Value, builder.DataBuffer).Name));
return builder.CreateVectorOfTables(offsets);
}
public static Monster? __lookup_by_key(int vectorLocation, string key, ByteBuffer bb) {
byte[] byteKey = System.Text.Encoding.UTF8.GetBytes(key);
Monster obj_ = new Monster();
int span = bb.GetInt(vectorLocation - 4);
int start = 0;
while (span != 0) {
int middle = span / 2;
int tableOffset = Table.__indirect(vectorLocation + 4 * (start + middle), bb);
int comp = Table.CompareStrings(Table.__offset(10, bb.Length - tableOffset, bb), byteKey, bb);
obj_.__assign(tableOffset, bb);
int comp = obj_.Name.CompareTo(key);
if (comp > 0) {
span = middle;
} else if (comp < 0) {
@@ -497,7 +500,7 @@ public struct Monster : IFlatbufferObject
start += middle;
span -= middle;
} else {
return new Monster().__assign(tableOffset, bb);
return obj_;
}
}
return null;

10
tests/MyGame/Example/Referrable.cs
View File

@@ -37,17 +37,21 @@ public struct Referrable : IFlatbufferObject
}
public static VectorOffset CreateSortedVectorOfReferrable(FlatBufferBuilder builder, Offset<Referrable>[] offsets) {
Array.Sort(offsets, (Offset<Referrable> o1, Offset<Referrable> o2) => builder.DataBuffer.GetUlong(Table.__offset(4, o1.Value, builder.DataBuffer)).CompareTo(builder.DataBuffer.GetUlong(Table.__offset(4, o2.Value, builder.DataBuffer))));
Array.Sort(offsets,
(Offset<Referrable> o1, Offset<Referrable> o2) =>
new Referrable().__assign(builder.DataBuffer.Length - o1.Value, builder.DataBuffer).Id.CompareTo(new Referrable().__assign(builder.DataBuffer.Length - o2.Value, builder.DataBuffer).Id));
return builder.CreateVectorOfTables(offsets);
}
public static Referrable? __lookup_by_key(int vectorLocation, ulong key, ByteBuffer bb) {
Referrable obj_ = new Referrable();
int span = bb.GetInt(vectorLocation - 4);
int start = 0;
while (span != 0) {
int middle = span / 2;
int tableOffset = Table.__indirect(vectorLocation + 4 * (start + middle), bb);
int comp = bb.GetUlong(Table.__offset(4, bb.Length - tableOffset, bb)).CompareTo(key);
obj_.__assign(tableOffset, bb);
int comp = obj_.Id.CompareTo(key);
if (comp > 0) {
span = middle;
} else if (comp < 0) {
@@ -55,7 +59,7 @@ public struct Referrable : IFlatbufferObject
start += middle;
span -= middle;
} else {
return new Referrable().__assign(tableOffset, bb);
return obj_;
}
}
return null;

10
tests/MyGame/Example/Stat.cs
View File

@@ -52,17 +52,21 @@ public struct Stat : IFlatbufferObject
}
public static VectorOffset CreateSortedVectorOfStat(FlatBufferBuilder builder, Offset<Stat>[] offsets) {
Array.Sort(offsets, (Offset<Stat> o1, Offset<Stat> o2) => builder.DataBuffer.GetUshort(Table.__offset(8, o1.Value, builder.DataBuffer)).CompareTo(builder.DataBuffer.GetUshort(Table.__offset(8, o2.Value, builder.DataBuffer))));
Array.Sort(offsets,
(Offset<Stat> o1, Offset<Stat> o2) =>
new Stat().__assign(builder.DataBuffer.Length - o1.Value, builder.DataBuffer).Count.CompareTo(new Stat().__assign(builder.DataBuffer.Length - o2.Value, builder.DataBuffer).Count));
return builder.CreateVectorOfTables(offsets);
}
public static Stat? __lookup_by_key(int vectorLocation, ushort key, ByteBuffer bb) {
Stat obj_ = new Stat();
int span = bb.GetInt(vectorLocation - 4);
int start = 0;
while (span != 0) {
int middle = span / 2;
int tableOffset = Table.__indirect(vectorLocation + 4 * (start + middle), bb);
int comp = bb.GetUshort(Table.__offset(8, bb.Length - tableOffset, bb)).CompareTo(key);
obj_.__assign(tableOffset, bb);
int comp = obj_.Count.CompareTo(key);
if (comp > 0) {
span = middle;
} else if (comp < 0) {
@@ -70,7 +74,7 @@ public struct Stat : IFlatbufferObject
start += middle;
span -= middle;
} else {
return new Stat().__assign(tableOffset, bb);
return obj_;
}
}
return null;