Remove migration code

diff --git a/src/main.cpp b/src/main.cpp
index e957e63..9a3dca1 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -76,10 +76,6 @@ const string strMessageMagic = "NovaCoin Signed Message:\n";
 int64 nTransactionFee = MIN_TX_FEE;
 bool fStakeUsePooledKeys = false;
 
-// Used during database migration.
-bool fDisableSignatureChecking = false;
-
-
 //////////////////////////////////////////////////////////////////////////////
 //
 // dispatching functions
@@ -2871,7 +2867,7 @@ void PrintBlockTree()
     }
 }
 
-bool LoadExternalBlockFile(FILE* fileIn, ExternalBlockFileProgress *progress)
+bool LoadExternalBlockFile(FILE* fileIn)
 {
     int64 nStart = GetTimeMillis();
 
@@ -2920,8 +2916,6 @@ bool LoadExternalBlockFile(FILE* fileIn, ExternalBlockFileProgress *progress)
                         nPos += 4 + nSize;
                     }
                 }
-                if (progress != NULL)
-                    (*progress)(4 + nSize);
             }
         }
         catch (std::exception &e) {

diff --git a/src/main.h b/src/main.h
index 328b321..f7918fc 100644 (file)
--- a/src/main.h
+++ b/src/main.h
@@ -111,11 +111,7 @@ void PrintBlockTree();
 CBlockIndex* FindBlockByHeight(int nHeight);
 bool ProcessMessages(CNode* pfrom);
 bool SendMessages(CNode* pto, bool fSendTrickle);
-
-// Processes a blk*.dat file and fires the given signal to indicate how far
-// through the file the load has reached, if provided.
-typedef boost::signals2::signal<void (unsigned int bytesRead)> ExternalBlockFileProgress;
-bool LoadExternalBlockFile(FILE* fileIn, ExternalBlockFileProgress *progress=NULL);
+bool LoadExternalBlockFile(FILE* fileIn);
 
 bool CheckProofOfWork(uint256 hash, unsigned int nBits);
 unsigned int GetNextTargetRequired(const CBlockIndex* pindexLast, bool fProofOfStake);

diff --git a/src/txdb-leveldb.cpp b/src/txdb-leveldb.cpp
index 591f309..5be8753 100644 (file)
--- a/src/txdb-leveldb.cpp
+++ b/src/txdb-leveldb.cpp
@@ -533,120 +533,3 @@ bool CTxDB::LoadBlockIndex()
 
     return true;
 }
-
-extern bool fDisableSignatureChecking;
-
-static uint64 nTotalBytes;
-static uint64 nTotalBytesCompleted;
-static double nProgressPercent;
-static LevelDBMigrationProgress *callbackTotalOperationProgress;
-
-void MigrationProgress(unsigned int bytesRead) {
-    // Called from inside LoadExternalBlockFile with how many bytes were
-    // processed so far.
-    nTotalBytesCompleted += bytesRead;
-    double newProgressPercent = 100.0 * ((double)nTotalBytesCompleted / (double)nTotalBytes);
-    // Throttle UI notifications.
-    if (newProgressPercent - nProgressPercent < 0.01)
-        return;
-    nProgressPercent = newProgressPercent;
-    printf("LevelDB migration %0.2f%% complete.\n", nProgressPercent);
-    (*callbackTotalOperationProgress)(nProgressPercent);
-}
-
-LevelDBMigrationResult MaybeMigrateToLevelDB(LevelDBMigrationProgress &progress) {
-    // Check if we have a blkindex.dat: if so, delete it. Because leveldb is
-    // more efficient (space-wise) than bdb, this should ensure we have enough
-    // disk space to perform the migration. We delete before migrate because if
-    // we got here, the code to handle the BDB based block index is not compiled
-    // in anymore, so there's no point in keeping the old file around - it's
-    // onwards and upwards.
-    //
-    // The act of replaying would normally append data to the blk data files,
-    // but we're reading from them so we don't want that. We disable it here,
-    // along with the signature checking as it doesn't help us right now. Note
-    // that replaying the chain could b0rk the wallet, but this process takes
-    // place before any wallets are registered.
-    //
-    // TODO(hearn): Assert on lack of a wallet here.
-
-    int64 nStart = GetTimeMillis();
-
-    boost::filesystem::path oldIndex = GetDataDir() / "blkindex.dat";
-    if (!boost::filesystem::exists(oldIndex)) {
-        return NONE_NEEDED;
-    }
-
-    // Check we have enough disk space for migration. We need at least 2GB free
-    // to hold the blk file we are migrating, and leveldb may have transient
-    // storage spikes, so we ask for at least 3GB.
-    uint64 nFreeBytesAvailable = filesystem::space(GetDataDir()).available;
-    if (nFreeBytesAvailable < 3UL * 1024UL * 1024UL * 1024UL) {
-        return INSUFFICIENT_DISK_SPACE;
-    }
-
-    printf("Deleting old blkindex.dat to make space for leveldb import.\n");
-    boost::filesystem::remove(oldIndex);
-    FILE *file;
-    int nFile = 1;
-    // Firstly, figure out the total number of bytes we need to migrate, for
-    // the progress indicator.
-    nTotalBytes = 0;
-    while (true)
-    {
-        std::string filename = strprintf("blk%04d.dat", nFile);
-        boost::filesystem::path blkpath = GetDataDir() / filename;
-        if (!boost::filesystem::exists(blkpath))
-            break;
-        uintmax_t nFileSize = boost::filesystem::file_size(blkpath);
-        if (nFileSize == static_cast<uintmax_t>(-1))   // Some other error.
-            break;
-        nTotalBytes += nFileSize;
-        nFile++;
-    }
-    nFile = 1;
-
-    // Set up progress calculations and callbacks.
-    callbackTotalOperationProgress = &progress;
-    ExternalBlockFileProgress callbackProgress;
-    callbackProgress.connect(MigrationProgress);
-    (*callbackTotalOperationProgress)(0.0);
-
-    // We don't need to re-run scripts during migration as they were run already
-    // and this saves a lot of time.
-    fDisableSignatureChecking = true;
-    // There may be multiple blk0000?.dat files, iterate over each one, rename
-    // it and then reimport it. For the first one, we need to initialize the
-    // fresh file with the genesis block.
-    while (true)
-    {
-        std::string filename = strprintf("blk%04d.dat", nFile);
-        std::string tmpname = strprintf("tmp-blk%04d.dat", nFile);
-        boost::filesystem::path blkpath = GetDataDir() / filename;
-        if (!boost::filesystem::exists(blkpath)) {
-            // No more work to do.
-            break;
-        }
-        boost::filesystem::path tmppath = GetDataDir() / tmpname;
-        boost::filesystem::rename(blkpath, tmppath);
-        printf("Migrating blk%04d.dat to leveldb\n", nFile);
-        file = fopen(tmppath.string().c_str(), "rb");
-        if (nFile == 1) {
-            // This will create a fresh blk0001.dat ready for usage.
-            LoadBlockIndex();
-        }
-        // LoadExternalBlockFile will close the given input file itself.
-        // It reads each block from the storage files and calls ProcessBlock
-        // on each one, which will go back and add to the database.
-        if (!LoadExternalBlockFile(file, &callbackProgress)) {
-            // We can't really clean up elegantly here.
-            fDisableSignatureChecking = false;
-            return OTHER_ERROR;
-        }
-        boost::filesystem::remove(tmppath);
-        nFile++;
-    }
-    fDisableSignatureChecking = false;
-    printf("LevelDB migration took %fs\n", (GetTimeMillis() - nStart) / 1000.0);
-    return COMPLETED;
-}

diff --git a/src/txdb-leveldb.h b/src/txdb-leveldb.h
index ab3f9ee..85e412f 100644 (file)
--- a/src/txdb-leveldb.h
+++ b/src/txdb-leveldb.h
@@ -204,18 +204,5 @@ private:
     bool LoadBlockIndexGuts();
 };
 
-// Called from the initialization code. Checks to see if there is an old
-// blkindex.dat file. If so, deletes it and begins re-importing the block
-// chain, which will create the new database.
-enum LevelDBMigrationResult {
-  NONE_NEEDED,
-  INSUFFICIENT_DISK_SPACE,
-  COMPLETED,
-  OTHER_ERROR,
-};
-
-typedef boost::signals2::signal<void (double progress)> LevelDBMigrationProgress;
-
-LevelDBMigrationResult MaybeMigrateToLevelDB(LevelDBMigrationProgress &progress);
 
 #endif // BITCOIN_DB_H