Diff
Modified: trunk/Source/WebCore/ChangeLog (187998 => 187999)
--- trunk/Source/WebCore/ChangeLog 2015-08-05 23:17:18 UTC (rev 187998)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 23:23:30 UTC (rev 187999)
@@ -1,6 +1,46 @@
2015-08-05 Anders Carlsson <ander...@apple.com>
Move more functions from DatabaseBackendBase to Database
+ https://bugs.webkit.org/show_bug.cgi?id=147705
+
+ Reviewed by Tim Horton.
+
+ * Modules/webdatabase/Database.cpp:
+ (WebCore::guidMutex):
+ (WebCore::guidToVersionMap):
+ (WebCore::updateGuidVersionMap):
+ (WebCore::guidToDatabaseMap):
+ (WebCore::guidForOriginAndName):
+ (WebCore::Database::Database):
+ (WebCore::DoneCreatingDatabaseOnExitCaller::DoneCreatingDatabaseOnExitCaller):
+ (WebCore::DoneCreatingDatabaseOnExitCaller::~DoneCreatingDatabaseOnExitCaller):
+ (WebCore::DoneCreatingDatabaseOnExitCaller::setOpenSucceeded):
+ (WebCore::Database::performOpenAndVerify):
+ (WebCore::Database::closeDatabase):
+ (WebCore::Database::getCachedVersion):
+ (WebCore::Database::setCachedVersion):
+ * Modules/webdatabase/Database.h:
+ * Modules/webdatabase/DatabaseBackendBase.cpp:
+ (WebCore::DatabaseBackendBase::version):
+ (WebCore::formatErrorMessage): Deleted.
+ (WebCore::guidMutex): Deleted.
+ (WebCore::guidToVersionMap): Deleted.
+ (WebCore::updateGuidVersionMap): Deleted.
+ (WebCore::guidToDatabaseMap): Deleted.
+ (WebCore::guidForOriginAndName): Deleted.
+ (WebCore::DatabaseBackendBase::DatabaseBackendBase): Deleted.
+ (WebCore::DatabaseBackendBase::closeDatabase): Deleted.
+ (WebCore::DoneCreatingDatabaseOnExitCaller::DoneCreatingDatabaseOnExitCaller): Deleted.
+ (WebCore::DoneCreatingDatabaseOnExitCaller::~DoneCreatingDatabaseOnExitCaller): Deleted.
+ (WebCore::DoneCreatingDatabaseOnExitCaller::setOpenSucceeded): Deleted.
+ (WebCore::DatabaseBackendBase::performOpenAndVerify): Deleted.
+ (WebCore::DatabaseBackendBase::getCachedVersion): Deleted.
+ (WebCore::DatabaseBackendBase::setCachedVersion): Deleted.
+ * Modules/webdatabase/DatabaseBackendBase.h:
+
+2015-08-05 Anders Carlsson <ander...@apple.com>
+
+ Move more functions from DatabaseBackendBase to Database
https://bugs.webkit.org/show_bug.cgi?id=147703
Reviewed by Tim Horton.
Modified: trunk/Source/WebCore/Modules/webdatabase/Database.cpp (187998 => 187999)
--- trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-05 23:17:18 UTC (rev 187998)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.cpp 2015-08-05 23:23:30 UTC (rev 187999)
@@ -48,9 +48,11 @@
#include "SQLTransactionErrorCallback.h"
#include "SQLiteDatabaseTracker.h"
#include "SQLiteStatement.h"
+#include "SQLiteTransaction.h"
#include "ScriptExecutionContext.h"
#include "SecurityOrigin.h"
#include "VoidCallback.h"
+#include <wtf/NeverDestroyed.h>
#include <wtf/PassRefPtr.h>
#include <wtf/RefPtr.h>
#include <wtf/StdLibExtras.h>
@@ -125,6 +127,62 @@
return false;
}
+// FIXME: move all guid-related functions to a DatabaseVersionTracker class.
+static std::mutex& guidMutex()
+{
+ static std::once_flag onceFlag;
+ static LazyNeverDestroyed<std::mutex> mutex;
+
+ std::call_once(onceFlag, [] {
+ mutex.construct();
+ });
+
+ return mutex;
+}
+
+typedef HashMap<DatabaseGuid, String> GuidVersionMap;
+static GuidVersionMap& guidToVersionMap()
+{
+ static NeverDestroyed<GuidVersionMap> map;
+ return map;
+}
+
+// NOTE: Caller must lock guidMutex().
+static inline void updateGuidVersionMap(DatabaseGuid guid, String newVersion)
+{
+ // Note: It is not safe to put an empty string into the guidToVersionMap() map.
+ // That's because the map is cross-thread, but empty strings are per-thread.
+ // The copy() function makes a version of the string you can use on the current
+ // thread, but we need a string we can keep in a cross-thread data structure.
+ // FIXME: This is a quite-awkward restriction to have to program with.
+
+ // Map null string to empty string (see comment above).
+ guidToVersionMap().set(guid, newVersion.isEmpty() ? String() : newVersion.isolatedCopy());
+}
+
+typedef HashMap<DatabaseGuid, std::unique_ptr<HashSet<DatabaseBackendBase*>>> GuidDatabaseMap;
+
+static GuidDatabaseMap& guidToDatabaseMap()
+{
+ static NeverDestroyed<GuidDatabaseMap> map;
+ return map;
+}
+
+static DatabaseGuid guidForOriginAndName(const String& origin, const String& name)
+{
+ String stringID = origin + "/" + name;
+
+ static NeverDestroyed<HashMap<String, int>> map;
+ DatabaseGuid guid = map.get().get(stringID);
+ if (!guid) {
+ static int currentNewGUID = 1;
+ guid = currentNewGUID++;
+ map.get().set(stringID, guid);
+ }
+
+ return guid;
+}
+
Database::Database(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
: DatabaseBackendBase(databaseContext.get(), name, expectedVersion, displayName, estimatedSize)
, m_transactionInProgress(false)
@@ -133,6 +191,25 @@
, m_databaseContext(databaseContext)
, m_deleted(false)
{
+ m_contextThreadSecurityOrigin = m_databaseContext->securityOrigin()->isolatedCopy();
+
+ m_databaseAuthorizer = DatabaseAuthorizer::create(unqualifiedInfoTableName);
+
+ if (m_name.isNull())
+ m_name = emptyString();
+
+ {
+ std::lock_guard<std::mutex> locker(guidMutex());
+
+ m_guid = guidForOriginAndName(securityOrigin()->toString(), name);
+ std::unique_ptr<HashSet<DatabaseBackendBase*>>& hashSet = guidToDatabaseMap().add(m_guid, nullptr).iterator->value;
+ if (!hashSet)
+ hashSet = std::make_unique<HashSet<DatabaseBackendBase*>>();
+ hashSet->add(this);
+ }
+
+ m_filename = DatabaseManager::singleton().fullPathForDatabase(securityOrigin(), m_name);
+
m_databaseThreadSecurityOrigin = m_contextThreadSecurityOrigin->isolatedCopy();
setFrontend(this);
@@ -201,18 +278,163 @@
databaseContext()->databaseThread()->unscheduleDatabaseTasks(this);
}
-bool Database::performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError& error, String& errorMessage)
+class DoneCreatingDatabaseOnExitCaller {
+public:
+ DoneCreatingDatabaseOnExitCaller(DatabaseBackendBase* database)
+ : m_database(database)
+ , m_openSucceeded(false)
+ {
+ }
+ ~DoneCreatingDatabaseOnExitCaller()
+ {
+ DatabaseTracker::tracker().doneCreatingDatabase(static_cast<Database*>(m_database));
+ }
+
+ void setOpenSucceeded() { m_openSucceeded = true; }
+
+private:
+ DatabaseBackendBase* m_database;
+ bool m_openSucceeded;
+};
+
+bool Database::performOpenAndVerify(bool shouldSetVersionInNewDatabase, DatabaseError& error, String& errorMessage)
{
- if (DatabaseBackendBase::performOpenAndVerify(setVersionInNewDatabase, error, errorMessage)) {
- if (databaseContext()->databaseThread())
- databaseContext()->databaseThread()->recordDatabaseOpen(this);
+ DoneCreatingDatabaseOnExitCaller onExitCaller(this);
+ ASSERT(errorMessage.isEmpty());
+ ASSERT(error == DatabaseError::None); // Better not have any errors already.
+ error = DatabaseError::InvalidDatabaseState; // Presumed failure. We'll clear it if we succeed below.
- return true;
+ const int maxSqliteBusyWaitTime = 30000;
+
+#if PLATFORM(IOS)
+ {
+ // Make sure we wait till the background removal of the empty database files finished before trying to open any database.
+ DeprecatedMutexLocker locker(DatabaseTracker::openDatabaseMutex());
}
+#endif
- return false;
+ SQLiteTransactionInProgressAutoCounter transactionCounter;
+
+ if (!m_sqliteDatabase.open(m_filename, true)) {
+ errorMessage = formatErrorMessage("unable to open database", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
+ return false;
+ }
+ if (!m_sqliteDatabase.turnOnIncrementalAutoVacuum())
+ LOG_ERROR("Unable to turn on incremental auto-vacuum (%d %s)", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
+
+ m_sqliteDatabase.setBusyTimeout(maxSqliteBusyWaitTime);
+
+ String currentVersion;
+ {
+ std::lock_guard<std::mutex> locker(guidMutex());
+
+ auto entry = guidToVersionMap().find(m_guid);
+ if (entry != guidToVersionMap().end()) {
+ // Map null string to empty string (see updateGuidVersionMap()).
+ currentVersion = entry->value.isNull() ? emptyString() : entry->value.isolatedCopy();
+ LOG(StorageAPI, "Current cached version for guid %i is %s", m_guid, currentVersion.ascii().data());
+ } else {
+ LOG(StorageAPI, "No cached version for guid %i", m_guid);
+
+ SQLiteTransaction transaction(m_sqliteDatabase);
+ transaction.begin();
+ if (!transaction.inProgress()) {
+ errorMessage = formatErrorMessage("unable to open database, failed to start transaction", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
+ m_sqliteDatabase.close();
+ return false;
+ }
+
+ String tableName(unqualifiedInfoTableName);
+ if (!m_sqliteDatabase.tableExists(tableName)) {
+ m_new = true;
+
+ if (!m_sqliteDatabase.executeCommand("CREATE TABLE " + tableName + " (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE,value TEXT NOT NULL ON CONFLICT FAIL);")) {
+ errorMessage = formatErrorMessage("unable to open database, failed to create 'info' table", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
+ transaction.rollback();
+ m_sqliteDatabase.close();
+ return false;
+ }
+ } else if (!m_frontend->getVersionFromDatabase(currentVersion, false)) {
+ errorMessage = formatErrorMessage("unable to open database, failed to read current version", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
+ transaction.rollback();
+ m_sqliteDatabase.close();
+ return false;
+ }
+
+ if (currentVersion.length()) {
+ LOG(StorageAPI, "Retrieved current version %s from database %s", currentVersion.ascii().data(), databaseDebugName().ascii().data());
+ } else if (!m_new || shouldSetVersionInNewDatabase) {
+ LOG(StorageAPI, "Setting version %s in database %s that was just created", m_expectedVersion.ascii().data(), databaseDebugName().ascii().data());
+ if (!m_frontend->setVersionInDatabase(m_expectedVersion, false)) {
+ errorMessage = formatErrorMessage("unable to open database, failed to write current version", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
+ transaction.rollback();
+ m_sqliteDatabase.close();
+ return false;
+ }
+ currentVersion = m_expectedVersion;
+ }
+ updateGuidVersionMap(m_guid, currentVersion);
+ transaction.commit();
+ }
+ }
+
+ if (currentVersion.isNull()) {
+ LOG(StorageAPI, "Database %s does not have its version set", databaseDebugName().ascii().data());
+ currentVersion = "";
+ }
+
+ // If the expected version isn't the empty string, ensure that the current database version we have matches that version. Otherwise, set an exception.
+ // If the expected version is the empty string, then we always return with whatever version of the database we have.
+ if ((!m_new || shouldSetVersionInNewDatabase) && m_expectedVersion.length() && m_expectedVersion != currentVersion) {
+ errorMessage = "unable to open database, version mismatch, '" + m_expectedVersion + "' does not match the currentVersion of '" + currentVersion + "'";
+ m_sqliteDatabase.close();
+ return false;
+ }
+
+ ASSERT(m_databaseAuthorizer);
+ m_sqliteDatabase.setAuthorizer(m_databaseAuthorizer);
+
+ // See comment at the top this file regarding calling addOpenDatabase().
+ DatabaseTracker::tracker().addOpenDatabase(static_cast<Database*>(this));
+ m_opened = true;
+
+ // Declare success:
+ error = DatabaseError::None; // Clear the presumed error from above.
+ onExitCaller.setOpenSucceeded();
+
+ if (m_new && !shouldSetVersionInNewDatabase)
+ m_expectedVersion = ""; // The caller provided a creationCallback which will set the expected version.
+
+ if (databaseContext()->databaseThread())
+ databaseContext()->databaseThread()->recordDatabaseOpen(this);
+
+ return true;
}
+void Database::closeDatabase()
+{
+ if (!m_opened)
+ return;
+
+ m_sqliteDatabase.close();
+ m_opened = false;
+ // See comment at the top this file regarding calling removeOpenDatabase().
+ DatabaseTracker::tracker().removeOpenDatabase(this);
+ {
+ std::lock_guard<std::mutex> locker(guidMutex());
+
+ auto it = guidToDatabaseMap().find(m_guid);
+ ASSERT(it != guidToDatabaseMap().end());
+ ASSERT(it->value);
+ ASSERT(it->value->contains(this));
+ it->value->remove(this);
+ if (it->value->isEmpty()) {
+ guidToDatabaseMap().remove(it);
+ guidToVersionMap().remove(m_guid);
+ }
+ }
+}
+
bool Database::getVersionFromDatabase(String& version, bool shouldCacheVersion)
{
String query(String("SELECT value FROM ") + fullyQualifiedInfoTableName() + " WHERE key = '" + versionKey + "';");
@@ -251,6 +473,21 @@
return result;
}
+String Database::getCachedVersion() const
+{
+ std::lock_guard<std::mutex> locker(guidMutex());
+
+ return guidToVersionMap().get(m_guid).isolatedCopy();
+}
+
+void Database::setCachedVersion(const String& actualVersion)
+{
+ // Update the in memory database version map.
+ std::lock_guard<std::mutex> locker(guidMutex());
+
+ updateGuidVersionMap(m_guid, actualVersion);
+}
+
void Database::scheduleTransaction()
{
ASSERT(!m_transactionInProgressMutex.tryLock()); // Locked by caller.
Modified: trunk/Source/WebCore/Modules/webdatabase/Database.h (187998 => 187999)
--- trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-05 23:17:18 UTC (rev 187998)
+++ trunk/Source/WebCore/Modules/webdatabase/Database.h 2015-08-05 23:23:30 UTC (rev 187999)
@@ -100,7 +100,7 @@
void scheduleTransactionCallback(SQLTransaction*);
- virtual bool performOpenAndVerify(bool setVersionInNewDatabase, DatabaseError&, String& errorMessage);
+ bool performOpenAndVerify(bool shouldSetVersionInNewDatabase, DatabaseError&, String& errorMessage);
Vector<String> performGetTableNames();
void incrementalVacuumIfNeeded();
@@ -108,8 +108,12 @@
private:
Database(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
+ void closeDatabase();
+
bool getVersionFromDatabase(String& version, bool shouldCacheVersion = true);
bool setVersionInDatabase(const String& version, bool shouldCacheVersion = true);
+ String getCachedVersion()const;
+ void setCachedVersion(const String&);
void scheduleTransaction();
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp (187998 => 187999)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-08-05 23:17:18 UTC (rev 187998)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.cpp 2015-08-05 23:23:30 UTC (rev 187999)
@@ -39,7 +39,6 @@
#include "Logging.h"
#include "SQLiteDatabaseTracker.h"
#include "SQLiteStatement.h"
-#include "SQLiteTransaction.h"
#include "SecurityOrigin.h"
#include <wtf/HashMap.h>
#include <wtf/HashSet.h>
@@ -81,69 +80,6 @@
namespace WebCore {
-static const char unqualifiedInfoTableName[] = "__WebKitDatabaseInfoTable__";
-
-static String formatErrorMessage(const char* message, int sqliteErrorCode, const char* sqliteErrorMessage)
-{
- return String::format("%s (%d %s)", message, sqliteErrorCode, sqliteErrorMessage);
-}
-
-// FIXME: move all guid-related functions to a DatabaseVersionTracker class.
-static std::mutex& guidMutex()
-{
- static std::once_flag onceFlag;
- static LazyNeverDestroyed<std::mutex> mutex;
-
- std::call_once(onceFlag, []{
- mutex.construct();
- });
-
- return mutex;
-}
-
-typedef HashMap<DatabaseGuid, String> GuidVersionMap;
-static GuidVersionMap& guidToVersionMap()
-{
- static NeverDestroyed<GuidVersionMap> map;
- return map;
-}
-
-// NOTE: Caller must lock guidMutex().
-static inline void updateGuidVersionMap(DatabaseGuid guid, String newVersion)
-{
- // Note: It is not safe to put an empty string into the guidToVersionMap() map.
- // That's because the map is cross-thread, but empty strings are per-thread.
- // The copy() function makes a version of the string you can use on the current
- // thread, but we need a string we can keep in a cross-thread data structure.
- // FIXME: This is a quite-awkward restriction to have to program with.
-
- // Map null string to empty string (see comment above).
- guidToVersionMap().set(guid, newVersion.isEmpty() ? String() : newVersion.isolatedCopy());
-}
-
-typedef HashMap<DatabaseGuid, std::unique_ptr<HashSet<DatabaseBackendBase*>>> GuidDatabaseMap;
-
-static GuidDatabaseMap& guidToDatabaseMap()
-{
- static NeverDestroyed<GuidDatabaseMap> map;
- return map;
-}
-
-static DatabaseGuid guidForOriginAndName(const String& origin, const String& name)
-{
- String stringID = origin + "/" + name;
-
- static NeverDestroyed<HashMap<String, int>> map;
- DatabaseGuid guid = map.get().get(stringID);
- if (!guid) {
- static int currentNewGUID = 1;
- guid = currentNewGUID++;
- map.get().set(stringID, guid);
- }
-
- return guid;
-}
-
#if !LOG_DISABLED || !ERROR_DISABLED
String DatabaseBackendBase::databaseDebugName() const
{
@@ -160,24 +96,6 @@
, m_opened(false)
, m_new(false)
{
- m_contextThreadSecurityOrigin = m_databaseContext->securityOrigin()->isolatedCopy();
-
- m_databaseAuthorizer = DatabaseAuthorizer::create(unqualifiedInfoTableName);
-
- if (m_name.isNull())
- m_name = emptyString();
-
- {
- std::lock_guard<std::mutex> locker(guidMutex());
-
- m_guid = guidForOriginAndName(securityOrigin()->toString(), name);
- std::unique_ptr<HashSet<DatabaseBackendBase*>>& hashSet = guidToDatabaseMap().add(m_guid, nullptr).iterator->value;
- if (!hashSet)
- hashSet = std::make_unique<HashSet<DatabaseBackendBase*>>();
- hashSet->add(this);
- }
-
- m_filename = DatabaseManager::singleton().fullPathForDatabase(securityOrigin(), m_name);
}
DatabaseBackendBase::~DatabaseBackendBase()
@@ -194,167 +112,14 @@
ASSERT(!m_opened);
}
-void DatabaseBackendBase::closeDatabase()
-{
- if (!m_opened)
- return;
-
- m_sqliteDatabase.close();
- m_opened = false;
- // See comment at the top this file regarding calling removeOpenDatabase().
- DatabaseTracker::tracker().removeOpenDatabase(static_cast<Database*>(this));
- {
- std::lock_guard<std::mutex> locker(guidMutex());
-
- auto it = guidToDatabaseMap().find(m_guid);
- ASSERT(it != guidToDatabaseMap().end());
- ASSERT(it->value);
- ASSERT(it->value->contains(this));
- it->value->remove(this);
- if (it->value->isEmpty()) {
- guidToDatabaseMap().remove(it);
- guidToVersionMap().remove(m_guid);
- }
- }
-}
-
String DatabaseBackendBase::version() const
{
// Note: In multi-process browsers the cached value may be accurate, but we cannot read the
// actual version from the database without potentially inducing a deadlock.
// FIXME: Add an async version getter to the DatabaseAPI.
- return getCachedVersion();
+ return m_frontend->getCachedVersion();
}
-class DoneCreatingDatabaseOnExitCaller {
-public:
- DoneCreatingDatabaseOnExitCaller(DatabaseBackendBase* database)
- : m_database(database)
- , m_openSucceeded(false)
- {
- }
- ~DoneCreatingDatabaseOnExitCaller()
- {
- DatabaseTracker::tracker().doneCreatingDatabase(static_cast<Database*>(m_database));
- }
-
- void setOpenSucceeded() { m_openSucceeded = true; }
-
-private:
- DatabaseBackendBase* m_database;
- bool m_openSucceeded;
-};
-
-bool DatabaseBackendBase::performOpenAndVerify(bool shouldSetVersionInNewDatabase, DatabaseError& error, String& errorMessage)
-{
- DoneCreatingDatabaseOnExitCaller onExitCaller(this);
- ASSERT(errorMessage.isEmpty());
- ASSERT(error == DatabaseError::None); // Better not have any errors already.
- error = DatabaseError::InvalidDatabaseState; // Presumed failure. We'll clear it if we succeed below.
-
- const int maxSqliteBusyWaitTime = 30000;
-
-#if PLATFORM(IOS)
- {
- // Make sure we wait till the background removal of the empty database files finished before trying to open any database.
- DeprecatedMutexLocker locker(DatabaseTracker::openDatabaseMutex());
- }
-#endif
-
- SQLiteTransactionInProgressAutoCounter transactionCounter;
-
- if (!m_sqliteDatabase.open(m_filename, true)) {
- errorMessage = formatErrorMessage("unable to open database", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
- return false;
- }
- if (!m_sqliteDatabase.turnOnIncrementalAutoVacuum())
- LOG_ERROR("Unable to turn on incremental auto-vacuum (%d %s)", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
-
- m_sqliteDatabase.setBusyTimeout(maxSqliteBusyWaitTime);
-
- String currentVersion;
- {
- std::lock_guard<std::mutex> locker(guidMutex());
-
- auto entry = guidToVersionMap().find(m_guid);
- if (entry != guidToVersionMap().end()) {
- // Map null string to empty string (see updateGuidVersionMap()).
- currentVersion = entry->value.isNull() ? emptyString() : entry->value.isolatedCopy();
- LOG(StorageAPI, "Current cached version for guid %i is %s", m_guid, currentVersion.ascii().data());
- } else {
- LOG(StorageAPI, "No cached version for guid %i", m_guid);
-
- SQLiteTransaction transaction(m_sqliteDatabase);
- transaction.begin();
- if (!transaction.inProgress()) {
- errorMessage = formatErrorMessage("unable to open database, failed to start transaction", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
- m_sqliteDatabase.close();
- return false;
- }
-
- String tableName(unqualifiedInfoTableName);
- if (!m_sqliteDatabase.tableExists(tableName)) {
- m_new = true;
-
- if (!m_sqliteDatabase.executeCommand("CREATE TABLE " + tableName + " (key TEXT NOT NULL ON CONFLICT FAIL UNIQUE ON CONFLICT REPLACE,value TEXT NOT NULL ON CONFLICT FAIL);")) {
- errorMessage = formatErrorMessage("unable to open database, failed to create 'info' table", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
- transaction.rollback();
- m_sqliteDatabase.close();
- return false;
- }
- } else if (!m_frontend->getVersionFromDatabase(currentVersion, false)) {
- errorMessage = formatErrorMessage("unable to open database, failed to read current version", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
- transaction.rollback();
- m_sqliteDatabase.close();
- return false;
- }
-
- if (currentVersion.length()) {
- LOG(StorageAPI, "Retrieved current version %s from database %s", currentVersion.ascii().data(), databaseDebugName().ascii().data());
- } else if (!m_new || shouldSetVersionInNewDatabase) {
- LOG(StorageAPI, "Setting version %s in database %s that was just created", m_expectedVersion.ascii().data(), databaseDebugName().ascii().data());
- if (!m_frontend->setVersionInDatabase(m_expectedVersion, false)) {
- errorMessage = formatErrorMessage("unable to open database, failed to write current version", m_sqliteDatabase.lastError(), m_sqliteDatabase.lastErrorMsg());
- transaction.rollback();
- m_sqliteDatabase.close();
- return false;
- }
- currentVersion = m_expectedVersion;
- }
- updateGuidVersionMap(m_guid, currentVersion);
- transaction.commit();
- }
- }
-
- if (currentVersion.isNull()) {
- LOG(StorageAPI, "Database %s does not have its version set", databaseDebugName().ascii().data());
- currentVersion = "";
- }
-
- // If the expected version isn't the empty string, ensure that the current database version we have matches that version. Otherwise, set an exception.
- // If the expected version is the empty string, then we always return with whatever version of the database we have.
- if ((!m_new || shouldSetVersionInNewDatabase) && m_expectedVersion.length() && m_expectedVersion != currentVersion) {
- errorMessage = "unable to open database, version mismatch, '" + m_expectedVersion + "' does not match the currentVersion of '" + currentVersion + "'";
- m_sqliteDatabase.close();
- return false;
- }
-
- ASSERT(m_databaseAuthorizer);
- m_sqliteDatabase.setAuthorizer(m_databaseAuthorizer);
-
- // See comment at the top this file regarding calling addOpenDatabase().
- DatabaseTracker::tracker().addOpenDatabase(static_cast<Database*>(this));
- m_opened = true;
-
- // Declare success:
- error = DatabaseError::None; // Clear the presumed error from above.
- onExitCaller.setOpenSucceeded();
-
- if (m_new && !shouldSetVersionInNewDatabase)
- m_expectedVersion = ""; // The caller provided a creationCallback which will set the expected version.
- return true;
-}
-
SecurityOrigin* DatabaseBackendBase::securityOrigin() const
{
return m_contextThreadSecurityOrigin.get();
@@ -394,21 +159,6 @@
m_expectedVersion = version.isolatedCopy();
}
-String DatabaseBackendBase::getCachedVersion() const
-{
- std::lock_guard<std::mutex> locker(guidMutex());
-
- return guidToVersionMap().get(m_guid).isolatedCopy();
-}
-
-void DatabaseBackendBase::setCachedVersion(const String& actualVersion)
-{
- // Update the in memory database version map.
- std::lock_guard<std::mutex> locker(guidMutex());
-
- updateGuidVersionMap(m_guid, actualVersion);
-}
-
bool DatabaseBackendBase::getActualVersionForTransaction(String &actualVersion)
{
ASSERT(m_sqliteDatabase.transactionInProgress());
Modified: trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h (187998 => 187999)
--- trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-08-05 23:17:18 UTC (rev 187998)
+++ trunk/Source/WebCore/Modules/webdatabase/DatabaseBackendBase.h 2015-08-05 23:23:30 UTC (rev 187999)
@@ -77,14 +77,9 @@
DatabaseBackendBase(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize);
- void closeDatabase();
- virtual bool performOpenAndVerify(bool shouldSetVersionInNewDatabase, DatabaseError&, String& errorMessage);
-
void setExpectedVersion(const String&);
const String& expectedVersion() const { return m_expectedVersion; }
- String getCachedVersion()const;
- void setCachedVersion(const String&);
bool getActualVersionForTransaction(String& version);
#if !LOG_DISABLED || !ERROR_DISABLED
