[core] code style cleanups

- puts function definitions in a namespace ... {} rather than using namespace ...;
- remove trailing whitespace
- add trailing newline
- protect SQL statements from being formatted by clang-format

2 files changed, 56 insertions, 10 deletions

diff --git a/platform/default/mbgl/storage/offline_database.cpp b/platform/default/mbgl/storage/offline_database.cpp
index e46fc42225..46a2c2bc25 100644
--- a/platform/default/mbgl/storage/offline_database.cpp
+++ b/platform/default/mbgl/storage/offline_database.cpp
@@ -11,8 +11,6 @@
 
 namespace mbgl {
 
-using namespace mapbox::sqlite;
-
 OfflineDatabase::Statement::~Statement() {
     stmt.reset();
     stmt.clearBindings();
@@ -36,7 +34,7 @@ OfflineDatabase::~OfflineDatabase() {
 }
 
 void OfflineDatabase::connect(int flags) {
-    db = std::make_unique<Database>(path.c_str(), flags);
+    db = std::make_unique<mapbox::sqlite::Database>(path.c_str(), flags);
     db->setBusyTimeout(Milliseconds::max());
     db->exec("PRAGMA foreign_keys = ON");
 }
@@ -44,7 +42,7 @@ void OfflineDatabase::connect(int flags) {
 void OfflineDatabase::ensureSchema() {
     if (path != ":memory:") {
         try {
-            connect(ReadWrite);
+            connect(mapbox::sqlite::ReadWrite);
 
             switch (userVersion()) {
             case 0: break; // cache-only database; ok to delete
@@ -55,7 +53,7 @@ void OfflineDatabase::ensureSchema() {
             }
 
             removeExisting();
-            connect(ReadWrite | Create);
+            connect(mapbox::sqlite::ReadWrite | mapbox::sqlite::Create);
         } catch (mapbox::sqlite::Exception& ex) {
             if (ex.code != SQLITE_CANTOPEN && ex.code != SQLITE_NOTADB) {
                 Log::Error(Event::Database, "Unexpected error connecting to database: %s", ex.what());
@@ -66,7 +64,7 @@ void OfflineDatabase::ensureSchema() {
                 if (ex.code == SQLITE_NOTADB) {
                     removeExisting();
                 }
-                connect(ReadWrite | Create);
+                connect(mapbox::sqlite::ReadWrite | mapbox::sqlite::Create);
             } catch (...) {
                 Log::Error(Event::Database, "Unexpected error creating database: %s", util::toString(std::current_exception()).c_str());
                 throw;
@@ -77,7 +75,7 @@ void OfflineDatabase::ensureSchema() {
     try {
         #include "offline_schema.cpp.include"
 
-        connect(ReadWrite | Create);
+        connect(mapbox::sqlite::ReadWrite | mapbox::sqlite::Create);
 
         // If you change the schema you must write a migration from the previous version.
         db->exec("PRAGMA auto_vacuum = INCREMENTAL");
@@ -178,18 +176,22 @@ std::pair<bool, uint64_t> OfflineDatabase::putInternal(const Resource& resource,
 }
 
 optional<std::pair<Response, uint64_t>> OfflineDatabase::getResource(const Resource& resource) {
+    // clang-format off
     Statement accessedStmt = getStatement(
         "UPDATE resources SET accessed = ?1 WHERE url = ?2");
+    // clang-format on
 
     accessedStmt->bind(1, util::now());
     accessedStmt->bind(2, resource.url);
     accessedStmt->run();
 
+    // clang-format off
     Statement stmt = getStatement(
         //        0      1        2       3        4
         "SELECT etag, expires, modified, data, compressed "
         "FROM resources "
         "WHERE url = ?");
+    // clang-format on
 
     stmt->bind(1, resource.url);
 
@@ -223,11 +225,13 @@ bool OfflineDatabase::putResource(const Resource& resource,
                                   const std::string& data,
                                   bool compressed) {
     if (response.notModified) {
+        // clang-format off
         Statement update = getStatement(
             "UPDATE resources "
             "SET accessed = ?1, "
             "    expires  = ?2 "
             "WHERE url    = ?3 ");
+        // clang-format on
 
         update->bind(1, util::now());
         update->bind(2, response.expires);
@@ -240,8 +244,9 @@ bool OfflineDatabase::putResource(const Resource& resource,
 
     // Begin an immediate-mode transaction to ensure that two writers do not attempt
     // to INSERT a resource at the same moment.
-    Transaction transaction(*db, Transaction::Immediate);
+    mapbox::sqlite::Transaction transaction(*db, mapbox::sqlite::Transaction::Immediate);
 
+    // clang-format off
     Statement update = getStatement(
         "UPDATE resources "
         "SET kind       = ?1, "
@@ -252,6 +257,7 @@ bool OfflineDatabase::putResource(const Resource& resource,
         "    data       = ?6, "
         "    compressed = ?7 "
         "WHERE url      = ?8 ");
+    // clang-format on
 
     update->bind(1, int(resource.kind));
     update->bind(2, response.etag);
@@ -274,9 +280,11 @@ bool OfflineDatabase::putResource(const Resource& resource,
         return false;
     }
 
+    // clang-format off
     Statement insert = getStatement(
         "INSERT INTO resources (url, kind, etag, expires, modified, accessed, data, compressed) "
         "VALUES                (?1,  ?2,   ?3,   ?4,      ?5,       ?6,       ?7,   ?8) ");
+    // clang-format on
 
     insert->bind(1, resource.url);
     insert->bind(2, int(resource.kind));
@@ -300,6 +308,7 @@ bool OfflineDatabase::putResource(const Resource& resource,
 }
 
 optional<std::pair<Response, uint64_t>> OfflineDatabase::getTile(const Resource::TileData& tile) {
+    // clang-format off
     Statement accessedStmt = getStatement(
         "UPDATE tiles "
         "SET accessed       = ?1 "
@@ -308,6 +317,7 @@ optional<std::pair<Response, uint64_t>> OfflineDatabase::getTile(const Resource:
         "  AND x            = ?4 "
         "  AND y            = ?5 "
         "  AND z            = ?6 ");
+    // clang-format on
 
     accessedStmt->bind(1, util::now());
     accessedStmt->bind(2, tile.urlTemplate);
@@ -317,6 +327,7 @@ optional<std::pair<Response, uint64_t>> OfflineDatabase::getTile(const Resource:
     accessedStmt->bind(6, tile.z);
     accessedStmt->run();
 
+    // clang-format off
     Statement stmt = getStatement(
         //        0      1        2       3        4
         "SELECT etag, expires, modified, data, compressed "
@@ -326,6 +337,7 @@ optional<std::pair<Response, uint64_t>> OfflineDatabase::getTile(const Resource:
         "  AND x            = ?3 "
         "  AND y            = ?4 "
         "  AND z            = ?5 ");
+    // clang-format on
 
     stmt->bind(1, tile.urlTemplate);
     stmt->bind(2, tile.pixelRatio);
@@ -363,6 +375,7 @@ bool OfflineDatabase::putTile(const Resource::TileData& tile,
                               const std::string& data,
                               bool compressed) {
     if (response.notModified) {
+        // clang-format off
         Statement update = getStatement(
             "UPDATE tiles "
             "SET accessed       = ?1, "
@@ -372,6 +385,7 @@ bool OfflineDatabase::putTile(const Resource::TileData& tile,
             "  AND x            = ?5 "
             "  AND y            = ?6 "
             "  AND z            = ?7 ");
+        // clang-format on
 
         update->bind(1, util::now());
         update->bind(2, response.expires);
@@ -388,8 +402,9 @@ bool OfflineDatabase::putTile(const Resource::TileData& tile,
 
     // Begin an immediate-mode transaction to ensure that two writers do not attempt
     // to INSERT a resource at the same moment.
-    Transaction transaction(*db, Transaction::Immediate);
+    mapbox::sqlite::Transaction transaction(*db, mapbox::sqlite::Transaction::Immediate);
 
+    // clang-format off
     Statement update = getStatement(
         "UPDATE tiles "
         "SET modified       = ?1, "
@@ -403,6 +418,7 @@ bool OfflineDatabase::putTile(const Resource::TileData& tile,
         "  AND x            = ?9 "
         "  AND y            = ?10 "
         "  AND z            = ?11 ");
+    // clang-format on
 
     update->bind(1, response.modified);
     update->bind(2, response.etag);
@@ -428,9 +444,11 @@ bool OfflineDatabase::putTile(const Resource::TileData& tile,
         return false;
     }
 
+    // clang-format off
     Statement insert = getStatement(
         "INSERT INTO tiles (url_template, pixel_ratio, x,  y,  z,  modified,  etag,  expires,  accessed,  data, compressed) "
         "VALUES            (?1,           ?2,          ?3, ?4, ?5, ?6,        ?7,    ?8,       ?9,        ?10,  ?11) ");
+    // clang-format on
 
     insert->bind(1, tile.urlTemplate);
     insert->bind(2, tile.pixelRatio);
@@ -457,8 +475,10 @@ bool OfflineDatabase::putTile(const Resource::TileData& tile,
 }
 
 std::vector<OfflineRegion> OfflineDatabase::listRegions() {
+    // clang-format off
     Statement stmt = getStatement(
         "SELECT id, definition, description FROM regions");
+    // clang-format on
 
     std::vector<OfflineRegion> result;
 
@@ -474,9 +494,11 @@ std::vector<OfflineRegion> OfflineDatabase::listRegions() {
 
 OfflineRegion OfflineDatabase::createRegion(const OfflineRegionDefinition& definition,
                                             const OfflineRegionMetadata& metadata) {
+    // clang-format off
     Statement stmt = getStatement(
         "INSERT INTO regions (definition, description) "
         "VALUES              (?1,         ?2) ");
+    // clang-format on
 
     stmt->bind(1, encodeOfflineRegionDefinition(definition));
     stmt->bindBlob(2, metadata);
@@ -486,8 +508,10 @@ OfflineRegion OfflineDatabase::createRegion(const OfflineRegionDefinition& defin
 }
 
 void OfflineDatabase::deleteRegion(OfflineRegion&& region) {
+    // clang-format off
     Statement stmt = getStatement(
         "DELETE FROM regions WHERE id = ?");
+    // clang-format on
 
     stmt->bind(1, region.getID());
     stmt->run();
@@ -525,6 +549,7 @@ uint64_t OfflineDatabase::putRegionResource(int64_t regionID, const Resource& re
 
 bool OfflineDatabase::markUsed(int64_t regionID, const Resource& resource) {
     if (resource.kind == Resource::Kind::Tile) {
+        // clang-format off
         Statement insert = getStatement(
             "INSERT OR IGNORE INTO region_tiles (region_id, tile_id) "
             "SELECT                              ?1,        tiles.id "
@@ -534,6 +559,7 @@ bool OfflineDatabase::markUsed(int64_t regionID, const Resource& resource) {
             "  AND x            = ?4 "
             "  AND y            = ?5 "
             "  AND z            = ?6 ");
+        // clang-format on
 
         const Resource::TileData& tile = *resource.tileData;
         insert->bind(1, regionID);
@@ -548,6 +574,7 @@ bool OfflineDatabase::markUsed(int64_t regionID, const Resource& resource) {
             return false;
         }
 
+        // clang-format off
         Statement select = getStatement(
             "SELECT region_id "
             "FROM region_tiles, tiles "
@@ -558,6 +585,7 @@ bool OfflineDatabase::markUsed(int64_t regionID, const Resource& resource) {
             "  AND y            = ?5 "
             "  AND z            = ?6 "
             "LIMIT 1 ");
+        // clang-format on
 
         select->bind(1, regionID);
         select->bind(2, tile.urlTemplate);
@@ -567,11 +595,13 @@ bool OfflineDatabase::markUsed(int64_t regionID, const Resource& resource) {
         select->bind(6, tile.z);
         return !select->run();
     } else {
+        // clang-format off
         Statement insert = getStatement(
             "INSERT OR IGNORE INTO region_resources (region_id, resource_id) "
             "SELECT                                  ?1,        resources.id "
             "FROM resources "
             "WHERE resources.url = ?2 ");
+        // clang-format on
 
         insert->bind(1, regionID);
         insert->bind(2, resource.url);
@@ -581,12 +611,14 @@ bool OfflineDatabase::markUsed(int64_t regionID, const Resource& resource) {
             return false;
         }
 
+        // clang-format off
         Statement select = getStatement(
             "SELECT region_id "
             "FROM region_resources, resources "
             "WHERE region_id    != ?1 "
             "  AND resources.url = ?2 "
             "LIMIT 1 ");
+        // clang-format on
 
         select->bind(1, regionID);
         select->bind(2, resource.url);
@@ -595,8 +627,10 @@ bool OfflineDatabase::markUsed(int64_t regionID, const Resource& resource) {
 }
 
 OfflineRegionDefinition OfflineDatabase::getRegionDefinition(int64_t regionID) {
+    // clang-format off
     Statement stmt = getStatement(
         "SELECT definition FROM regions WHERE id = ?1");
+    // clang-format on
 
     stmt->bind(1, regionID);
     stmt->run();
@@ -619,22 +653,26 @@ OfflineRegionStatus OfflineDatabase::getRegionCompletedStatus(int64_t regionID)
 }
 
 std::pair<int64_t, int64_t> OfflineDatabase::getCompletedResourceCountAndSize(int64_t regionID) {
+    // clang-format off
     Statement stmt = getStatement(
         "SELECT COUNT(*), SUM(LENGTH(data)) "
         "FROM region_resources, resources "
         "WHERE region_id = ?1 "
         "AND resource_id = resources.id ");
+    // clang-format on
     stmt->bind(1, regionID);
     stmt->run();
     return { stmt->get<int64_t>(0), stmt->get<int64_t>(1) };
 }
 
 std::pair<int64_t, int64_t> OfflineDatabase::getCompletedTileCountAndSize(int64_t regionID) {
+    // clang-format off
     Statement stmt = getStatement(
         "SELECT COUNT(*), SUM(LENGTH(data)) "
         "FROM region_tiles, tiles "
         "WHERE region_id = ?1 "
         "AND tile_id = tiles.id ");
+    // clang-format on
     stmt->bind(1, regionID);
     stmt->run();
     return { stmt->get<int64_t>(0), stmt->get<int64_t>(1) };
@@ -668,6 +706,7 @@ bool OfflineDatabase::evict(uint64_t neededFreeSize) {
     // The addition of pageSize is a fudge factor to account for non `data` column
     // size, and because pages can get fragmented on the database.
     while (usedSize() + neededFreeSize + pageSize > maximumCacheSize) {
+        // clang-format off
         Statement stmt1 = getStatement(
             "DELETE FROM resources "
             "WHERE id IN ( "
@@ -677,10 +716,12 @@ bool OfflineDatabase::evict(uint64_t neededFreeSize) {
             "  WHERE resource_id IS NULL "
             "  ORDER BY accessed ASC LIMIT ?1 "
             ") ");
+        // clang-format on
         stmt1->bind(1, 50);
         stmt1->run();
         uint64_t changes1 = db->changes();
 
+        // clang-format off
         Statement stmt2 = getStatement(
             "DELETE FROM tiles "
             "WHERE id IN ( "
@@ -690,6 +731,7 @@ bool OfflineDatabase::evict(uint64_t neededFreeSize) {
             "  WHERE tile_id IS NULL "
             "  ORDER BY accessed ASC LIMIT ?1 "
             ") ");
+        // clang-format on
         stmt2->bind(1, 50);
         stmt2->run();
         uint64_t changes2 = db->changes();
@@ -727,11 +769,13 @@ uint64_t OfflineDatabase::getOfflineMapboxTileCount() {
         return *offlineMapboxTileCount;
     }
 
+    // clang-format off
     Statement stmt = getStatement(
         "SELECT COUNT(DISTINCT id) "
         "FROM region_tiles, tiles "
         "WHERE tile_id = tiles.id "
         "AND url_template LIKE 'mapbox://%' ");
+    // clang-format on
 
     stmt->run();
 
diff --git a/platform/default/settings_json.cpp b/platform/default/settings_json.cpp
index 2c1bb3d242..ef53aa83e7 100644
--- a/platform/default/settings_json.cpp
+++ b/platform/default/settings_json.cpp
@@ -1,7 +1,7 @@
 #include <mbgl/platform/default/settings_json.hpp>
 #include <fstream>
 
-using namespace mbgl;
+namespace mbgl {
 
 Settings_JSON::Settings_JSON() { load(); }
 
@@ -37,3 +37,5 @@ void Settings_JSON::clear() {
     pitch = 0;
     debug = 0;
 }
+
+} // namespace mbgl