minetest/minetestmapper
1
0
Fork 0
mirror of https://github.com/minetest/minetestmapper.git synced 2025-07-06 02:20:20 +02:00
Code Issues Projects Releases Wiki Activity

Allow database backend to optimize group-by-XZ operation

Browse Source
This commit is contained in:
sfan5
2025-02-19 22:57:58 +01:00
parent 7685e548f0
commit cd36f16775
11 changed files with 89 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/db-sqlite3.cpp
View File

@ -79,9 +79,9 @@ DBSQLite3::DBSQLite3(const std::string &mapdir)
"SELECT data FROM blocks WHERE x = ? AND y = ? AND z = ?"));
SQLOK(prepare(stmt_get_block_pos_range,
"SELECT x, y, z FROM blocks WHERE "
"SELECT x, z FROM blocks WHERE "
"x >= ? AND y >= ? AND z >= ? AND "
"x < ? AND y < ? AND z < ?"));
"x < ? AND y < ? AND z < ? GROUP BY x, z"));
} else {
SQLOK(prepare(stmt_get_blocks_z,
"SELECT pos, data FROM blocks WHERE pos BETWEEN ? AND ?"));
@ -119,7 +119,7 @@ inline void DBSQLite3::getPosRange(int64_t &min, int64_t &max,
}
std::vector<BlockPos> DBSQLite3::getBlockPos(BlockPos min, BlockPos max)
std::vector<BlockPos> DBSQLite3::getBlockPosXZ(BlockPos min, BlockPos max)
{
int result;
sqlite3_stmt *stmt;
@ -152,12 +152,13 @@ std::vector<BlockPos> DBSQLite3::getBlockPos(BlockPos min, BlockPos max)
if (newFormat) {
pos.x = sqlite3_column_int(stmt, 0);
pos.y = sqlite3_column_int(stmt, 1);
pos.z = sqlite3_column_int(stmt, 2);
pos.z = sqlite3_column_int(stmt, 1);
} else {
pos = decodeBlockPos(sqlite3_column_int64(stmt, 0));
if (pos.x < min.x || pos.x >= max.x || pos.y < min.y || pos.y >= max.y)
continue;
// note that we can't try to deduplicate these because the order
// of the encoded pos (if sorted) is ZYX.
}
positions.emplace_back(pos);
}