ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-20 11:05:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move varint out of NuDB

Browse Source 
varint is no longer used by NuDB.  It is now only used by codec.h in
nodestore and so has been moved there.
This commit is contained in:
Howard Hinnant
2016-08-22 14:57:01 -04:00
committed by Nik Bougalis
parent fd061bba8a
commit 8a6c7f9208
8 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Builds/VisualStudio2015/RippleD.vcxproj
View File

@@ -1830,8 +1830,6 @@
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\beast\nudb\detail\stream.h"> <ClInclude Include="..\..\src\ripple\beast\nudb\detail\stream.h">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\beast\nudb\detail\varint.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\beast\nudb\file.h"> <ClInclude Include="..\..\src\ripple\beast\nudb\file.h">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\beast\nudb\identity.h"> <ClInclude Include="..\..\src\ripple\beast\nudb\identity.h">
@@ -1856,10 +1854,6 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_varint_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_verify_test.cpp"> <ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_verify_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
@@ -2456,6 +2450,8 @@
</ClCompile> </ClCompile>
<ClInclude Include="..\..\src\ripple\nodestore\impl\Tuning.h"> <ClInclude Include="..\..\src\ripple\nodestore\impl\Tuning.h">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\nodestore\impl\varint.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\nodestore\Manager.h"> <ClInclude Include="..\..\src\ripple\nodestore\Manager.h">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\nodestore\NodeObject.h"> <ClInclude Include="..\..\src\ripple\nodestore\NodeObject.h">
@@ -2496,6 +2492,12 @@
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\ripple\nodestore\tests\varint_test.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug|x64'">True</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release|x64'">True</ExcludedFromBuild>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='debug.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='release.classic|x64'">..\..\src\rocksdb2\include;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ClInclude Include="..\..\src\ripple\nodestore\Types.h"> <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\Cluster.h"> <ClInclude Include="..\..\src\ripple\overlay\Cluster.h">

12
Builds/VisualStudio2015/RippleD.vcxproj.filters
View File

@@ -2385,9 +2385,6 @@
<ClInclude Include="..\..\src\ripple\beast\nudb\detail\stream.h"> <ClInclude Include="..\..\src\ripple\beast\nudb\detail\stream.h">
<Filter>ripple\beast\nudb\detail</Filter> <Filter>ripple\beast\nudb\detail</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\beast\nudb\detail\varint.h">
<Filter>ripple\beast\nudb\detail</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\beast\nudb\file.h"> <ClInclude Include="..\..\src\ripple\beast\nudb\file.h">
<Filter>ripple\beast\nudb</Filter> <Filter>ripple\beast\nudb</Filter>
</ClInclude> </ClInclude>
@@ -2415,9 +2412,6 @@
<ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_store_test.cpp"> <ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_store_test.cpp">
<Filter>ripple\beast\nudb\test</Filter> <Filter>ripple\beast\nudb\test</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_varint_test.cpp">
<Filter>ripple\beast\nudb\test</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_verify_test.cpp"> <ClCompile Include="..\..\src\ripple\beast\nudb\test\beast_nudb_verify_test.cpp">
<Filter>ripple\beast\nudb\test</Filter> <Filter>ripple\beast\nudb\test</Filter>
</ClCompile> </ClCompile>
@@ -2961,6 +2955,9 @@
<ClInclude Include="..\..\src\ripple\nodestore\impl\Tuning.h"> <ClInclude Include="..\..\src\ripple\nodestore\impl\Tuning.h">
<Filter>ripple\nodestore\impl</Filter> <Filter>ripple\nodestore\impl</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\src\ripple\nodestore\impl\varint.h">
<Filter>ripple\nodestore\impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\nodestore\Manager.h"> <ClInclude Include="..\..\src\ripple\nodestore\Manager.h">
<Filter>ripple\nodestore</Filter> <Filter>ripple\nodestore</Filter>
</ClInclude> </ClInclude>
@@ -2991,6 +2988,9 @@
<ClCompile Include="..\..\src\ripple\nodestore\tests\Timing.test.cpp"> <ClCompile Include="..\..\src\ripple\nodestore\tests\Timing.test.cpp">
<Filter>ripple\nodestore\tests</Filter> <Filter>ripple\nodestore\tests</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\src\ripple\nodestore\tests\varint_test.cpp">
<Filter>ripple\nodestore\tests</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\nodestore\Types.h"> <ClInclude Include="..\..\src\ripple\nodestore\Types.h">
<Filter>ripple\nodestore</Filter> <Filter>ripple\nodestore</Filter>
</ClInclude> </ClInclude>

1
src/ripple/beast/unity/beast_nudb_unity.cpp
View File

@@ -20,5 +20,4 @@
#include <ripple/beast/nudb/test/beast_nudb_callgrind_test.cpp> #include <ripple/beast/nudb/test/beast_nudb_callgrind_test.cpp>
#include <ripple/beast/nudb/test/beast_nudb_recover_test.cpp> #include <ripple/beast/nudb/test/beast_nudb_recover_test.cpp>
#include <ripple/beast/nudb/test/beast_nudb_store_test.cpp> #include <ripple/beast/nudb/test/beast_nudb_store_test.cpp>
#include <ripple/beast/nudb/test/beast_nudb_varint_test.cpp>
#include <ripple/beast/nudb/test/beast_nudb_verify_test.cpp> #include <ripple/beast/nudb/test/beast_nudb_verify_test.cpp>

1
src/ripple/nodestore/backend/NuDBFactory.cpp
View File

@@ -26,7 +26,6 @@
#include <ripple/nodestore/impl/DecodedBlob.h> #include <ripple/nodestore/impl/DecodedBlob.h>
#include <ripple/nodestore/impl/EncodedBlob.h> #include <ripple/nodestore/impl/EncodedBlob.h>
#include <ripple/beast/nudb.h> #include <ripple/beast/nudb.h>
#include <ripple/beast/nudb/detail/varint.h>
#include <ripple/beast/nudb/visit.h> #include <ripple/beast/nudb/visit.h>
#include <ripple/beast/hash/xxhasher.h> #include <ripple/beast/hash/xxhasher.h>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>

6
src/ripple/nodestore/impl/codec.h
View File

@@ -21,11 +21,11 @@
#define RIPPLE_NODESTORE_CODEC_H_INCLUDED #define RIPPLE_NODESTORE_CODEC_H_INCLUDED
#include <ripple/basics/contract.h> #include <ripple/basics/contract.h>
#include <ripple/nodestore/NodeObject.h>
#include <ripple/protocol/HashPrefix.h>
#include <ripple/beast/nudb/common.h> #include <ripple/beast/nudb/common.h>
#include <ripple/beast/nudb/detail/field.h> #include <ripple/beast/nudb/detail/field.h>
#include <ripple/beast/nudb/detail/varint.h> #include <ripple/nodestore/impl/varint.h>
#include <ripple/nodestore/NodeObject.h>
#include <ripple/protocol/HashPrefix.h>
#include <lz4/lib/lz4.h> #include <lz4/lib/lz4.h>
#include <snappy.h> #include <snappy.h>
#include <cstddef> #include <cstddef>

14
src/ripple/beast/nudb/detail/varint.h → src/ripple/nodestore/impl/varint.h
View File

@@ -24,11 +24,11 @@
#include <cstdint> #include <cstdint>
#include <type_traits> #include <type_traits>
namespace beast { namespace ripple {
namespace nudb { namespace NodeStore {
namespace detail { namespace detail {
// base128 varint format is from // This is a variant of the base128 varint format from
// google protocol buffers: // google protocol buffers:
// https://developers.google.com/protocol-buffers/docs/encoding#varints // https://developers.google.com/protocol-buffers/docs/encoding#varints
@@ -127,7 +127,7 @@ write_varint (void* p0, std::size_t v)
template <class T, std::enable_if_t< template <class T, std::enable_if_t<
std::is_same<T, varint>::value>* = nullptr> std::is_same<T, varint>::value>* = nullptr>
void void
read (istream& is, std::size_t& u) read (beast::nudb::detail::istream& is, std::size_t& u)
{ {
auto p0 = is(1); auto p0 = is(1);
auto p1 = p0; auto p1 = p0;
@@ -141,14 +141,14 @@ read (istream& is, std::size_t& u)
template <class T, std::enable_if_t< template <class T, std::enable_if_t<
std::is_same<T, varint>::value>* = nullptr> std::is_same<T, varint>::value>* = nullptr>
void void
write (ostream& os, std::size_t t) write (beast::nudb::detail::ostream& os, std::size_t t)
{ {
write_varint(os.data( write_varint(os.data(
size_varint(t)), t); size_varint(t)), t);
} }
} // detail } // detail
} // nudb } // NodeStore
} // beast } // ripple
#endif #endif

14
src/ripple/beast/nudb/test/beast_nudb_varint_test.cpp → src/ripple/nodestore/tests/varint_test.cpp
View File

@@ -17,16 +17,16 @@
*/ */
//============================================================================== //==============================================================================
#include <ripple/beast/nudb/detail/varint.h>
#include <ripple/beast/unit_test.h> #include <ripple/beast/unit_test.h>
#include <ripple/nodestore/impl/varint.h>
#include <array> #include <array>
#include <vector> #include <vector>
namespace beast { namespace ripple {
namespace nudb { namespace NodeStore {
namespace tests { namespace tests {
class varint_test : public unit_test::suite class varint_test : public beast::unit_test::suite
{ {
public: public:
void void
@@ -67,8 +67,8 @@ public:
} }
}; };
BEAST_DEFINE_TESTSUITE(varint,nudb,beast); BEAST_DEFINE_TESTSUITE(varint,NodeStore,ripple);
} // test } // test
} // nudb } // NodeStore
} // beast } // ripple

2
src/ripple/unity/nodestore.cpp
View File

@@ -39,4 +39,4 @@
#include <ripple/nodestore/tests/Database.test.cpp> #include <ripple/nodestore/tests/Database.test.cpp>
#include <ripple/nodestore/tests/import_test.cpp> #include <ripple/nodestore/tests/import_test.cpp>
#include <ripple/nodestore/tests/Timing.test.cpp> #include <ripple/nodestore/tests/Timing.test.cpp>
#include <ripple/nodestore/tests/varint_test.cpp>