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

Tidy up database class files

Browse Source
This commit is contained in:
Vinnie Falco
2013-06-21 07:18:21 -07:00
parent 30213d24fa
commit 8a6d53ac64
9 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Builds/VisualStudio2012/RippleD.vcxproj
View File

@@ -176,6 +176,18 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_websocket\ripple_websocket.cpp" />
<ClCompile Include="..\..\src\cpp\ripple\ripple_Database.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>
<ClCompile Include="..\..\src\cpp\ripple\ripple_SqliteDatabase.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>
<ClCompile Include="..\..\Subtrees\leveldb\db\builder.cc">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -753,19 +765,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\cpp\database\database.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>
<ClCompile Include="..\..\src\cpp\database\sqlite3.c" />
<ClCompile Include="..\..\src\cpp\database\SqliteDatabase.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>
<ClCompile Include="..\..\src\cpp\leveldb_core.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -1023,7 +1023,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\cpp\ripple\DBInit.cpp">
<ClCompile Include="..\..\src\cpp\ripple\ripple_DBInit.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>
@@ -1575,8 +1575,6 @@
<ClInclude Include="..\..\modules\ripple_net\ripple_net.h" />
<ClInclude Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.h" />
<ClInclude Include="..\..\modules\ripple_websocket\ripple_websocket.h" />
<ClInclude Include="..\..\src\cpp\database\database.h" />
<ClInclude Include="..\..\src\cpp\database\SqliteDatabase.h" />
<ClInclude Include="..\..\src\cpp\protobuf\src\google\protobuf\descriptor.h">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1746,6 +1744,7 @@
<ClInclude Include="..\..\src\cpp\ripple\ripple_AccountState.h" />
<ClInclude Include="..\..\src\cpp\ripple\ripple_AccountItem.h" />
<ClInclude Include="..\..\src\cpp\ripple\ripple_AccountItems.h" />
<ClInclude Include="..\..\src\cpp\ripple\ripple_Database.h" />
<ClInclude Include="..\..\src\cpp\ripple\ripple_DisputedTx.h" />
<ClInclude Include="..\..\src\cpp\ripple\ripple_IApplication.h" />
<ClInclude Include="..\..\src\cpp\ripple\CallRPC.h" />
@@ -1810,6 +1809,7 @@
<ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapNode.h" />
<ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapSyncFilter.h" />
<ClInclude Include="..\..\src\cpp\ripple\ripple_SHAMapTreeNode.h" />
<ClInclude Include="..\..\src\cpp\ripple\ripple_SqliteDatabase.h" />
<ClInclude Include="..\..\src\cpp\ripple\ripple_TransactionAcquire.h" />
<ClInclude Include="..\..\src\cpp\ripple\RPC.h" />
<ClInclude Include="..\..\src\cpp\ripple\RPCDoor.h" />

30
Builds/VisualStudio2012/RippleD.vcxproj.filters
View File

@@ -318,15 +318,6 @@
<ClCompile Include="..\..\modules\ripple_db\ripple_db.cpp">
<Filter>2. %28Unused%29\ripple_db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\database\database.cpp">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\ripple\DBInit.cpp">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\database\SqliteDatabase.cpp">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp">
<Filter>2. %28Unused%29\ripple_net</Filter>
</ClCompile>
@@ -903,6 +894,15 @@
<ClCompile Include="..\..\Subtrees\websocket\src\sha1\shatest.cpp">
<Filter>1. Modules\ripple_websocket\subtree</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\ripple\ripple_DBInit.cpp">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\ripple\ripple_Database.cpp">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClCompile>
<ClCompile Include="..\..\src\cpp\ripple\ripple_SqliteDatabase.cpp">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\src\cpp\protobuf\src\google\protobuf\service.h">
@@ -1085,9 +1085,6 @@
<ClInclude Include="..\..\modules\ripple_db\ripple_db.h">
<Filter>2. %28Unused%29\ripple_db</Filter>
</ClInclude>
<ClInclude Include="..\..\src\cpp\database\database.h">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_net\ripple_net.h">
<Filter>2. %28Unused%29\ripple_net</Filter>
</ClInclude>
@@ -1506,9 +1503,6 @@
<ClInclude Include="..\..\modules\ripple_basics\utility\ripple_CountedObject.h">
<Filter>1. Modules\ripple_basics\utility</Filter>
</ClInclude>
<ClInclude Include="..\..\src\cpp\database\SqliteDatabase.h">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClInclude>
<ClInclude Include="..\..\database\sqlite3.h">
<Filter>0. Third Party Code\SQLite</Filter>
</ClInclude>
@@ -1728,6 +1722,12 @@
<ClInclude Include="..\..\Subtrees\websocket\src\utf8_validator\utf8_validator.hpp">
<Filter>1. Modules\ripple_websocket\subtree</Filter>
</ClInclude>
<ClInclude Include="..\..\src\cpp\ripple\ripple_SqliteDatabase.h">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClInclude>
<ClInclude Include="..\..\src\cpp\ripple\ripple_Database.h">
<Filter>1. Modules\ripple_app\_unfactored\db</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\src\cpp\protobuf\src\google\protobuf\descriptor.proto">

10
modules/ripple_app/ripple_app.cpp
View File

@@ -166,8 +166,8 @@
#include "src/cpp/ripple/ripple_InboundLedger.h"
#include "src/cpp/ripple/ripple_InboundLedgers.h"
#include "src/cpp/database/database.h"
#include "src/cpp/database/SqliteDatabase.h"
#include "src/cpp/ripple/ripple_Database.h"
#include "src/cpp/ripple/ripple_SqliteDatabase.h"
// VFALCO END CLEAN AREA
@@ -272,8 +272,8 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 1
#include "src/cpp/database/database.cpp"
#include "src/cpp/database/SqliteDatabase.cpp"
#include "src/cpp/ripple/ripple_Database.cpp"
#include "src/cpp/ripple/ripple_SqliteDatabase.cpp"
#include "src/cpp/ripple/ripple_AccountItem.cpp"
#include "src/cpp/ripple/ripple_AccountItems.cpp"
@@ -283,7 +283,7 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#include "src/cpp/ripple/ripple_CanonicalTXSet.cpp"
#include "src/cpp/ripple/ChangeTransactor.cpp" // no log
#include "src/cpp/ripple/Contract.cpp" // no log
#include "src/cpp/ripple/DBInit.cpp"
#include "src/cpp/ripple/ripple_DBInit.cpp"
#include "src/cpp/ripple/HTTPRequest.cpp"
#include "src/cpp/ripple/HttpsClient.cpp"
#include "src/cpp/ripple/Interpreter.cpp" // no log

2
src/cpp/ripple/ripple.proto
View File

@@ -1,5 +1,3 @@
// VFALCO TODO Rename the protobuf namespace from ripple to 'wire' or something
//
package protocol;
enum MessageType

0
src/cpp/ripple/DBInit.cpp → src/cpp/ripple/ripple_DBInit.cpp
View File

0
src/cpp/database/database.cpp → src/cpp/ripple/ripple_Database.cpp
View File

29
src/cpp/database/database.h → src/cpp/ripple/ripple_Database.h
View File

@@ -4,9 +4,11 @@
*/
//==============================================================================
#ifndef __DATABASE__
#define __DATABASE__
#ifndef RIPPLE_DATABASE_RIPPLEHEADER
#define RIPPLE_DATABASE_RIPPLEHEADER
// VFALCO Get rid of these macros
//
#define SQL_FOREACH(_db, _strQuery) \
if ((_db)->executeSQL(_strQuery)) \
for (bool _bMore = (_db)->startIterRows(); _bMore; _bMore = (_db)->getNextRow())
@@ -23,21 +25,15 @@ class JobQueue;
class Database
{
protected:
int mNumCol;
std::string mUser;
std::string mHost;
std::string mDBPass;
std::vector<std::string> mColNameTable;
bool getColNumber (const char* colName, int* retIndex);
public:
// VFALCO TODO how are user and password even used?
//
Database (const char* host, const char* user, const char* pass);
static Database* newMysqlDatabase (const char* host, const char* user, const char* pass);
virtual ~Database ();
virtual void connect () = 0;
virtual void disconnect () = 0;
std::string& getPass ()
@@ -104,6 +100,15 @@ public:
{
return -1;
}
protected:
bool getColNumber (const char* colName, int* retIndex);
int mNumCol;
std::string mUser;
std::string mHost;
std::string mDBPass;
std::vector <std::string> mColNameTable;
};
#endif

2
src/cpp/database/SqliteDatabase.cpp → src/cpp/ripple/ripple_SqliteDatabase.cpp
View File

@@ -6,7 +6,7 @@
SETUP_LOG (SqliteDatabase)
using namespace std;
//using namespace std;
SqliteStatement::SqliteStatement (SqliteDatabase* db, const char* sql, bool aux)
{

4
src/cpp/database/SqliteDatabase.h → src/cpp/ripple/ripple_SqliteDatabase.h
View File

@@ -4,8 +4,8 @@
*/
//==============================================================================
#ifndef RIPPLE_SQLITEDATABASE_H
#define RIPPLE_SQLITEDATABASE_H
#ifndef RIPPLE_SQLITEDATABASE_RIPPLEHEADER
#define RIPPLE_SQLITEDATABASE_RIPPLEHEADER
struct sqlite3;
struct sqlite3_stmt;