echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Blockfile: Upgrade to Blockfile format 4 on non-Android ARM

Browse Source
This commit is contained in:
zzz
2017-03-25 11:32:05 +00:00
parent a0b2f5738a
commit cff8eafc43
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/src/net/i2p/client/naming/BlockfileNamingService.java
View File

@ -418,10 +418,10 @@ public class BlockfileNamingService extends DummyNamingService {
// version 3 -> version 4 // version 3 -> version 4
// support multiple destinations per hostname // support multiple destinations per hostname
if (VersionComparator.comp(_version, "4") < 0) { if (VersionComparator.comp(_version, "4") < 0) {
// Upgrade of 4K entry DB on RPi 2 is over 2 1/2 minutes, disable for now // Upgrade of 4K entry DB on RPi 2 is over 2 1/2 minutes, probably worse on Android, disable for now
if (SystemVersion.isAndroid() || SystemVersion.isARM()) { if (SystemVersion.isAndroid()) {
if (_log.shouldWarn()) if (_log.shouldWarn())
_log.warn("Deferring upgrade to version 4 on Android/ARM"); _log.warn("Deferring upgrade to version 4 on Android");
return true; return true;
} }
SkipList<String, Properties> hdr = _bf.getIndex(INFO_SKIPLIST, _stringSerializer, _infoSerializer); SkipList<String, Properties> hdr = _bf.getIndex(INFO_SKIPLIST, _stringSerializer, _infoSerializer);

4
history.txt
View File

@ -1,3 +1,7 @@
2017-03-25 zzz
* Blockfile: Upgrade to Blockfile format 4 on non-Android ARM
* i2ptunnel: Allow alt priv key file to be added without restarting I2P
2017-03-24 zzz 2017-03-24 zzz
* Addressbook: Remove static reference, hide implementation * Addressbook: Remove static reference, hide implementation
* CPUID: Recognize Ryzen * CPUID: Recognize Ryzen

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 10; public final static long BUILD = 11;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = ""; public final static String EXTRA = "";