Skip to content

Commit 1e1f33f

Browse files
evoskuilevoskuil
authored
Merge pull request #835 from evoskuil/master
Add TABLE_COLUMN(...) macro/defines for striped tables, stub sp table.
2 parents a77b874 + 272c1c0 commit 1e1f33f

21 files changed

Lines changed: 295 additions & 13 deletions

‎Makefile.am‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ test_libbitcoin_database_test_SOURCES = \
139139
test/tables/caches/ecdsa.cpp \
140140
test/tables/caches/prevout.cpp \
141141
test/tables/caches/schnorr.cpp \
142+
test/tables/caches/silent.cpp \
142143
test/tables/caches/validated_bk.cpp \
143144
test/tables/caches/validated_tx.cpp \
144145
test/tables/indexes/height.cpp \
@@ -332,6 +333,7 @@ include_bitcoin_database_tables_caches_HEADERS = \
332333
include/bitcoin/database/tables/caches/ecdsa.hpp \
333334
include/bitcoin/database/tables/caches/prevout.hpp \
334335
include/bitcoin/database/tables/caches/schnorr.hpp \
336+
include/bitcoin/database/tables/caches/silent.hpp \
335337
include/bitcoin/database/tables/caches/validated_bk.hpp \
336338
include/bitcoin/database/tables/caches/validated_tx.hpp
337339

‎builds/msvc/properties/Link.props‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<ItemDefinitionGroup>
1010
<ClCompile>
1111
<WholeProgramOptimization>true</WholeProgramOptimization>
12+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
1213
</ClCompile>
1314
<Link>
1415
<LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

‎builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,7 @@
196196
<ClCompile Include="..\..\..\..\test\tables\caches\ecdsa.cpp" />
197197
<ClCompile Include="..\..\..\..\test\tables\caches\prevout.cpp" />
198198
<ClCompile Include="..\..\..\..\test\tables\caches\schnorr.cpp" />
199+
<ClCompile Include="..\..\..\..\test\tables\caches\silent.cpp" />
199200
<ClCompile Include="..\..\..\..\test\tables\caches\validated_bk.cpp" />
200201
<ClCompile Include="..\..\..\..\test\tables\caches\validated_tx.cpp" />
201202
<ClCompile Include="..\..\..\..\test\tables\indexes\height.cpp">

‎builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,9 @@
276276
<ClCompile Include="..\..\..\..\test\tables\caches\schnorr.cpp">
277277
<Filter>src\tables\caches</Filter>
278278
</ClCompile>
279+
<ClCompile Include="..\..\..\..\test\tables\caches\silent.cpp">
280+
<Filter>src\tables\caches</Filter>
281+
</ClCompile>
279282
<ClCompile Include="..\..\..\..\test\tables\caches\validated_bk.cpp">
280283
<Filter>src\tables\caches</Filter>
281284
</ClCompile>

‎builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@
186186
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\ecdsa.hpp" />
187187
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\prevout.hpp" />
188188
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\schnorr.hpp" />
189+
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\silent.hpp" />
189190
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_bk.hpp" />
190191
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_tx.hpp" />
191192
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\context.hpp" />

‎builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,9 @@
275275
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\schnorr.hpp">
276276
<Filter>include\bitcoin\database\tables\caches</Filter>
277277
</ClInclude>
278+
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\silent.hpp">
279+
<Filter>include\bitcoin\database\tables\caches</Filter>
280+
</ClInclude>
278281
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_bk.hpp">
279282
<Filter>include\bitcoin\database\tables\caches</Filter>
280283
</ClInclude>

‎builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,10 @@
117117
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
118118
<Import Project="$(ProjectDir)$(ProjectName).props" />
119119
</ImportGroup>
120+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'">
121+
<Linkage-secp256k1 />
122+
<Linkage-ultrafast>static</Linkage-ultrafast>
123+
</PropertyGroup>
120124
<ItemGroup>
121125
<ClCompile Include="..\..\..\..\test\error.cpp" />
122126
<ClCompile Include="..\..\..\..\test\file\rotator.cpp" />
@@ -196,6 +200,7 @@
196200
<ClCompile Include="..\..\..\..\test\tables\caches\ecdsa.cpp" />
197201
<ClCompile Include="..\..\..\..\test\tables\caches\prevout.cpp" />
198202
<ClCompile Include="..\..\..\..\test\tables\caches\schnorr.cpp" />
203+
<ClCompile Include="..\..\..\..\test\tables\caches\silent.cpp" />
199204
<ClCompile Include="..\..\..\..\test\tables\caches\validated_bk.cpp" />
200205
<ClCompile Include="..\..\..\..\test\tables\caches\validated_tx.cpp" />
201206
<ClCompile Include="..\..\..\..\test\tables\indexes\height.cpp">
@@ -235,7 +240,7 @@
235240
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets')" />
236241
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" />
237242
<Import Project="$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets')" />
238-
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.1\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.1\build\native\UltrafastSecp256k1-vc145.targets')" />
243+
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.2\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.2\build\native\UltrafastSecp256k1-vc145.targets')" />
239244
</ImportGroup>
240245
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
241246
<PropertyGroup>
@@ -251,7 +256,7 @@
251256
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_unit_test_framework-vc145.1.91.0\build\libbitcoin-boost_unit_test_framework-vc145.targets'))" />
252257
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets'))" />
253258
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets'))" />
254-
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.1\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.1\build\native\UltrafastSecp256k1-vc145.targets'))" />
259+
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.2\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.2\build\native\UltrafastSecp256k1-vc145.targets'))" />
255260
</Target>
256261
<ItemGroup>
257262
<ProjectReference Include="..\libbitcoin-database\libbitcoin-database.vcxproj">

‎builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,9 @@
276276
<ClCompile Include="..\..\..\..\test\tables\caches\schnorr.cpp">
277277
<Filter>src\tables\caches</Filter>
278278
</ClCompile>
279+
<ClCompile Include="..\..\..\..\test\tables\caches\silent.cpp">
280+
<Filter>src\tables\caches</Filter>
281+
</ClCompile>
279282
<ClCompile Include="..\..\..\..\test\tables\caches\validated_bk.cpp">
280283
<Filter>src\tables\caches</Filter>
281284
</ClCompile>

‎builds/msvc/vs2026/libbitcoin-database-test/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
|
77
-->
88
<packages>
9-
<package id="UltrafastSecp256k1-vc145" version="4.4.0.1" targetFramework="Native" />
9+
<package id="UltrafastSecp256k1-vc145" version="4.4.0.2" targetFramework="Native" />
1010
<package id="libbitcoin-boost" version="1.91.0" targetFramework="Native" />
1111
<package id="libbitcoin-boost_container-vc145" version="1.91.0" targetFramework="Native" />
1212
<package id="libbitcoin-boost_iostreams-vc145" version="1.91.0" targetFramework="Native" />

‎builds/msvc/vs2026/libbitcoin-database-tools/libbitcoin-database-tools.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets')" />
140140
<Import Project="$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets" Condition="Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" />
141141
<Import Project="$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets" Condition="Exists('$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets')" />
142-
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.1\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.1\build\native\UltrafastSecp256k1-vc145.targets')" />
142+
<Import Project="$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.2\build\native\UltrafastSecp256k1-vc145.targets" Condition="Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.2\build\native\UltrafastSecp256k1-vc145.targets')" />
143143
</ImportGroup>
144144
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
145145
<PropertyGroup>
@@ -154,7 +154,7 @@
154154
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_thread-vc145.1.91.0\build\libbitcoin-boost_thread-vc145.targets'))" />
155155
<Error Condition="!Exists('$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)libbitcoin-boost_url-vc145.1.91.0\build\libbitcoin-boost_url-vc145.targets'))" />
156156
<Error Condition="!Exists('$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)secp256k1_vc145.0.6.1.2\build\native\secp256k1_vc145.targets'))" />
157-
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.1\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.1\build\native\UltrafastSecp256k1-vc145.targets'))" />
157+
<Error Condition="!Exists('$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.2\build\native\UltrafastSecp256k1-vc145.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(NuGetPackageRoot)UltrafastSecp256k1-vc145.4.4.0.2\build\native\UltrafastSecp256k1-vc145.targets'))" />
158158
</Target>
159159
<ItemGroup>
160160
<ProjectReference Include="..\libbitcoin-database\libbitcoin-database.vcxproj">

0 commit comments

Comments
 (0)