Import KeyvaDB to Beast

Builds/QtCreator/rippled.pro

@@ -63,6 +63,7 @@ SOURCES += \
     ../../Subtrees/beast/modules/beast_basics/beast_basics.cpp \
     ../../Subtrees/beast/modules/beast_core/beast_core.cpp \
     ../../Subtrees/beast/modules/beast_crypto/beast_crypto.cpp \
+    ../../Subtrees/beast/modules/beast_db/beast_db.cpp \
     ../../modules/ripple_app/ripple_app_pt1.cpp \
     ../../modules/ripple_app/ripple_app_pt2.cpp \
     ../../modules/ripple_app/ripple_app_pt3.cpp \

Builds/VisualStudio2012/RippleD.vcxproj

@@ -1039,6 +1039,7 @@
     <ClCompile Include="..\..\Subtrees\beast\modules\beast_basics\beast_basics.cpp" />
     <ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp" />
     <ClCompile Include="..\..\Subtrees\beast\modules\beast_crypto\beast_crypto.cpp" />
+    <ClCompile Include="..\..\Subtrees\beast\modules\beast_db\beast_db.cpp" />
     <ClCompile Include="..\..\Subtrees\leveldb\db\builder.cc">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>

Builds/VisualStudio2012/RippleD.vcxproj.filters

@@ -903,6 +903,9 @@
     <ClCompile Include="..\..\modules\ripple_app\node\ripple_MdbBackendFactory.cpp">
       <Filter>[1] Ripple\ripple_app\node</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Subtrees\beast\modules\beast_db\beast_db.cpp">
+      <Filter>[0] Subtrees\beast</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Subtrees\sqlite\sqlite3.h">

SConstruct

@@ -122,6 +122,7 @@ COMPILED_FILES = [
     'Subtrees/beast/modules/beast_basics/beast_basics.cpp',
     'Subtrees/beast/modules/beast_core/beast_core.cpp',
     'Subtrees/beast/modules/beast_crypto/beast_crypto.cpp',
+    'Subtrees/beast/modules/beast_db/beast_db.cpp',
     'modules/ripple_app/ripple_app_pt1.cpp',
     'modules/ripple_app/ripple_app_pt2.cpp',
     'modules/ripple_app/ripple_app_pt3.cpp',

Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj

@@ -78,6 +78,12 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </None>
+    <None Include="..\..\modules\beast_db\beast_db.mm">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </None>
     <None Include="..\..\README.md" />
   </ItemGroup>
   <ItemGroup>
@@ -249,6 +255,8 @@
     <ClInclude Include="..\..\modules\beast_core\zip\zlib\zutil.h" />
     <ClInclude Include="..\..\modules\beast_crypto\beast_crypto.h" />
     <ClInclude Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.h" />
+    <ClInclude Include="..\..\modules\beast_db\beast_db.h" />
+    <ClInclude Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.h" />
     <ClInclude Include="BeastConfig.h" />
   </ItemGroup>
   <ItemGroup>
@@ -933,6 +941,13 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\modules\beast_db\beast_db.cpp" />
+    <ClCompile Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\TODO.txt" />

Subtrees/beast/Builds/VisualStudio2012/beast.vcxproj.filters

@@ -36,6 +36,9 @@
     <None Include="..\..\modules\beast_basics\beast_basics.mm">
       <Filter>beast_basics</Filter>
     </None>
+    <None Include="..\..\modules\beast_db\beast_db.mm">
+      <Filter>beast_db</Filter>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="beast_core">
@@ -125,6 +128,12 @@
     <Filter Include="beast_crypto\math">
       <UniqueIdentifier>{1170f2bc-2456-410a-ab2b-c45f6ed37b9e}</UniqueIdentifier>
     </Filter>
+    <Filter Include="beast_db">
+      <UniqueIdentifier>{4834218f-f13f-41bc-a8a0-50314a3a99a3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="beast_db\keyvalue">
+      <UniqueIdentifier>{15a98fee-1b52-45eb-9480-514b8750d755}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\modules\beast_core\beast_core.h">
@@ -632,6 +641,12 @@
     <ClInclude Include="..\..\modules\beast_core\memory\beast_RecycledObjectPool.h">
       <Filter>beast_core\memory</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\modules\beast_db\beast_db.h">
+      <Filter>beast_db</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.h">
+      <Filter>beast_db\keyvalue</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\modules\beast_core\beast_core.cpp">
@@ -982,6 +997,12 @@
     <ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTestUtilities.cpp">
       <Filter>beast_core\diagnostic</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\modules\beast_db\beast_db.cpp">
+      <Filter>beast_db</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.cpp">
+      <Filter>beast_db\keyvalue</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\TODO.txt" />

Subtrees/beast/modules/beast_db/beast_db.cpp

@@ -0,0 +1,31 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "BeastConfig.h"
+
+#include "beast_db.h"
+
+#include "../beast_crypto/beast_crypto.h"
+
+namespace beast
+{
+
+#include "keyvalue/beast_KeyvaDB.cpp"
+
+}

Subtrees/beast/modules/beast_db/beast_db.h

@@ -0,0 +1,52 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_BEAST_DB_H_INCLUDED
+#define BEAST_BEAST_DB_H_INCLUDED
+
+//------------------------------------------------------------------------------
+
+/*  If you fail to make sure that all your compile units are building Beast with
+    the same set of option flags, then there's a risk that different compile
+    units will treat the classes as having different memory layouts, leading to
+    very nasty memory corruption errors when they all get linked together.
+    That's why it's best to always include the BeastConfig.h file before any
+    beast headers.
+*/
+#ifndef BEAST_BEASTCONFIG_H_INCLUDED
+# ifdef _MSC_VER
+#  pragma message ("Have you included your BeastConfig.h file before including the Beast headers?")
+# else
+#  warning "Have you included your BeastConfig.h file before including the Beast headers?"
+# endif
+#endif
+
+#include "../beast_core/beast_core.h"
+#include "../beast_basics/beast_basics.h"
+
+//------------------------------------------------------------------------------
+
+namespace beast
+{
+
+#include "keyvalue/beast_KeyvaDB.h"
+
+}
+
+#endif

Subtrees/beast/modules/beast_db/beast_db.mm

@@ -0,0 +1,20 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#include "beast_db.cpp"

Subtrees/beast/modules/beast_db/keyvalue/beast_KeyvaDB.cpp

@@ -1,8 +1,22 @@
 //------------------------------------------------------------------------------
 /*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 //==============================================================================
+
 /*
 
 TODO
@@ -110,7 +124,7 @@ public:
     };
 
     // Key records are indexed starting at one.
-    struct KeyRecord
+    struct KeyRecord : Uncopyable
     {
         explicit KeyRecord (void* const keyStorage)
             : key (keyStorage)
@@ -139,7 +153,7 @@ public:
     // are identical to the format on disk. Therefore it is necessary to
     // use the serialization routines to extract or update the key records.
     //
-    class KeyBlock
+    class KeyBlock : Uncopyable
     {
     public:
         KeyBlock (int depth, int keyBytes)
@@ -177,6 +191,7 @@ public:
             stream.read (keyRecord->key, m_keyBytes);
         }
 
+#if 0
         void writeKeyRecord (KeyRecord const& keyRecord, int keyIndex)
         {
             bassert (keyIndex >=1 && keyIndex <= calcKeysAtDepth (m_depth));
@@ -195,6 +210,7 @@ public:
             stream.write (keyRecord.key, m_keyBytes);
 #endif
         }
+#endif
 
     private:
         int const m_depth;
@@ -459,7 +475,7 @@ public:
 
     //--------------------------------------------------------------------------
 
-    struct FindResult
+    struct FindResult : Uncopyable
     {
         FindResult (void* const keyStorage)
             : keyRecord (keyStorage)

Subtrees/beast/modules/beast_db/keyvalue/beast_KeyvaDB.h

@@ -0,0 +1,55 @@
+//------------------------------------------------------------------------------
+/*
+    This file is part of Beast: https://github.com/vinniefalco/Beast
+    Copyright 2013, Vinnie Falco <vinnie.falco@gmail.com>
+
+    Permission to use, copy, modify, and/or distribute this software for any
+    purpose  with  or without fee is hereby granted, provided that the above
+    copyright notice and this permission notice appear in all copies.
+
+    THE  SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+    WITH  REGARD  TO  THIS  SOFTWARE  INCLUDING  ALL  IMPLIED  WARRANTIES  OF
+    MERCHANTABILITY  AND  FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+    ANY  SPECIAL ,  DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+    WHATSOEVER  RESULTING  FROM  LOSS  OF USE, DATA OR PROFITS, WHETHER IN AN
+    ACTION  OF  CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+*/
+//==============================================================================
+
+#ifndef BEAST_KEYVADB_H_INCLUDED
+#define BEAST_KEYVADB_H_INCLUDED
+
+/** Specialized Key/value database
+
+    Once written, a value can never be modified.
+*/
+class KeyvaDB : LeakChecked <KeyvaDB>
+{
+public:
+    class GetCallback
+    {
+    public:
+        virtual void* getStorageForValue (int valueBytes) = 0;
+    };
+
+    static KeyvaDB* New (int keyBytes,
+                         int keyBlockDepth,
+                         File keyPath,
+                         File valPath);
+
+    virtual ~KeyvaDB () { }
+
+    // VFALCO TODO Make the return value a Result so we can
+    //             detect corruption and errors!
+    //
+    virtual bool get (void const* key, GetCallback* callback) = 0;
+
+    // VFALCO TODO Use Result for return value
+    //
+    virtual void put (void const* key, void const* value, int valueBytes) = 0;
+
+    virtual void flush () = 0;
+};
+
+#endif

TODO.txt

@@ -4,6 +4,7 @@ RIPPLE TODO
 
 Items marked '*' can be handled by third parties.
 
+
 Vinnie's Short List (Changes day to day)
 - Make theConfig a SharedSingleton to prevent leak warnings
 - Add fast backend to the unit test
@@ -20,6 +21,8 @@ Vinnie's Short List (Changes day to day)
 
 --------------------------------------------------------------------------------
 
+- Raise the warning level and fix everything
+
 * Restyle all the macros in ripple_ConfigSection.h
 
 * Replace all throw with beast::Throw
@@ -139,8 +142,6 @@ Vinnie's Short List (Changes day to day)
 
 - Make LevelDB and Ripple code work with both Unicode and non-Unicode Windows APIs
 
-- Raise the warning level and fix everything
-
 - Go searching through VFALCO notes and fix everything
 
 - Deal with function-level statics used for SqliteDatabase (like in

modules/ripple_app/node/ripple_KeyvaDB.h

@@ -1,40 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_KEYVADB_H_INCLUDED
-#define RIPPLE_KEYVADB_H_INCLUDED
-
-/** Key/value database optimized for Ripple usage.
-*/
-class KeyvaDB : LeakChecked <KeyvaDB>
-{
-public:
-    class GetCallback
-    {
-    public:
-        virtual void* getStorageForValue (int valueBytes) = 0;
-    };
-
-    static KeyvaDB* New (int keyBytes,
-                         int keyBlockDepth,
-                         File keyPath,
-                         File valPath);
-
-    virtual ~KeyvaDB () { }
-
-    // VFALCO TODO Make the return value a Result so we can
-    //             detect corruption and errors!
-    //
-    virtual bool get (void const* key, GetCallback* callback) = 0;
-
-    // VFALCO TODO Use Result for return value
-    //
-    virtual void put (void const* key, void const* value, int valueBytes) = 0;
-
-    virtual void flush () = 0;
-};
-
-#endif

modules/ripple_app/ripple_app.cpp

@@ -65,6 +65,8 @@
 
 #include "../ripple_core/ripple_core.h"
 
+#include "beast/modules/beast_db/beast_db.h"
+
 // VFALCO TODO fix these warnings!
 #ifdef _MSC_VER
 //#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
@@ -246,8 +248,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
 #include "node/ripple_NodeObject.cpp"
 #include "node/ripple_NodeStore.cpp"
 #include "node/ripple_HyperLevelDBBackendFactory.cpp"
-#include "node/ripple_KeyvaDB.h" // private
-#include "node/ripple_KeyvaDB.cpp"
 #include "node/ripple_KeyvaDBBackendFactory.cpp"
 #include "node/ripple_LevelDBBackendFactory.cpp"
 #include "node/ripple_NullBackendFactory.cpp"