mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-07-06 10:01:53 +00:00
Code Issues Projects Releases Wiki Activity

leveldb: use writebatch for chunk saving (faster I/O)

Browse Source 
i don't know why this wasn't already using a writebatch, but it should have been.
This commit is contained in:
Dylan K. Taylor 2019-03-15 15:27:33 +00:00
parent 9205bbaa42
commit 7d72b8e756
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/pocketmine/level/format/io/leveldb/LevelDB.php
View File

@ -356,13 +356,15 @@ class LevelDB extends BaseLevelProvider implements WritableLevelProvider{
$idMap = array_flip(json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . '/legacy_id_map.json'), true)); $idMap = array_flip(json_decode(file_get_contents(\pocketmine\RESOURCE_PATH . '/legacy_id_map.json'), true));
} }
$index = LevelDB::chunkIndex($chunk->getX(), $chunk->getZ()); $index = LevelDB::chunkIndex($chunk->getX(), $chunk->getZ());
$this->db->put($index . self::TAG_VERSION, chr(self::CURRENT_LEVEL_CHUNK_VERSION));
$write = new \LevelDBWriteBatch();
$write->put($index . self::TAG_VERSION, chr(self::CURRENT_LEVEL_CHUNK_VERSION));
$subChunks = $chunk->getSubChunks(); $subChunks = $chunk->getSubChunks();
foreach($subChunks as $y => $subChunk){ foreach($subChunks as $y => $subChunk){
$key = $index . self::TAG_SUBCHUNK_PREFIX . chr($y); $key = $index . self::TAG_SUBCHUNK_PREFIX . chr($y);
if($subChunk->isEmpty(false)){ //MCPE doesn't save light anymore as of 1.1 if($subChunk->isEmpty(false)){ //MCPE doesn't save light anymore as of 1.1
$this->db->delete($key); $write->delete($key);
}else{ }else{
$subStream = new BinaryStream(); $subStream = new BinaryStream();
$subStream->putByte(self::CURRENT_LEVEL_SUBCHUNK_VERSION); $subStream->putByte(self::CURRENT_LEVEL_SUBCHUNK_VERSION);
@ -387,32 +389,35 @@ class LevelDB extends BaseLevelProvider implements WritableLevelProvider{
$subStream->put((new LittleEndianNbtSerializer())->writeMultiple($tags)); $subStream->put((new LittleEndianNbtSerializer())->writeMultiple($tags));
} }
$this->db->put($key, $subStream->getBuffer()); $write->put($key, $subStream->getBuffer());
} }
} }
$this->db->put($index . self::TAG_DATA_2D, str_repeat("\x00", 512) . $chunk->getBiomeIdArray()); $write->put($index . self::TAG_DATA_2D, str_repeat("\x00", 512) . $chunk->getBiomeIdArray());
//TODO: use this properly //TODO: use this properly
$this->db->put($index . self::TAG_STATE_FINALISATION, chr(self::FINALISATION_DONE)); $write->put($index . self::TAG_STATE_FINALISATION, chr(self::FINALISATION_DONE));
$this->writeTags($chunk->getNBTtiles(), $index . self::TAG_BLOCK_ENTITY); $this->writeTags($chunk->getNBTtiles(), $index . self::TAG_BLOCK_ENTITY, $write);
$this->writeTags($chunk->getNBTentities(), $index . self::TAG_ENTITY); $this->writeTags($chunk->getNBTentities(), $index . self::TAG_ENTITY, $write);
$this->db->delete($index . self::TAG_DATA_2D_LEGACY); $write->delete($index . self::TAG_DATA_2D_LEGACY);
$this->db->delete($index . self::TAG_LEGACY_TERRAIN); $write->delete($index . self::TAG_LEGACY_TERRAIN);
$this->db->write($write);
} }
/** /**
* @param CompoundTag[] $targets * @param CompoundTag[] $targets
* @param string $index * @param string $index
* @param \LevelDBWriteBatch $write
*/ */
private function writeTags(array $targets, string $index) : void{ private function writeTags(array $targets, string $index, \LevelDBWriteBatch $write) : void{
if(!empty($targets)){ if(!empty($targets)){
$nbt = new LittleEndianNbtSerializer(); $nbt = new LittleEndianNbtSerializer();
$this->db->put($index, $nbt->writeMultiple($targets)); $write->put($index, $nbt->writeMultiple($targets));
}else{ }else{
$this->db->delete($index); $write->delete($index);
} }
} }