Ticket #12167: mythtv_poc_improve_caching_of_host_settings_v2.patch

mythtv/libs/libmyth/mythcontext.cpp

@@ -1178 +1178 @@
         return false;
     }
 
+    gCoreContext->ActivateSettingsCache(true);
+
     if (!d->Init(gui, promptForBackend, disableAutoDiscovery, ignoreDB))
     {
         return false;
     }
 
-    gCoreContext->ActivateSettingsCache(true);
-
     return true;
 }
 

mythtv/libs/libmyth/settings.h

@@ -673 +673 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class MPUBLIC HostSlider : public SliderSetting, public HostDBStorage
+class MPUBLIC HostSlider : public SliderSetting, public HostSettingStorage
 {
     Q_OBJECT
   public:
     HostSlider(const QString &name, int min, int max, int step) :
         SliderSetting(this, min, max, step),
-        HostDBStorage(this, name) { }
+        HostSettingStorage(this, name) { }
 };
 
-class MPUBLIC HostSpinBox: public SpinBoxSetting, public HostDBStorage
+class MPUBLIC HostSpinBox: public SpinBoxSetting, public HostSettingStorage
 {
     Q_OBJECT
   public:
     HostSpinBox(const QString &name, int min, int max, int step,
                 bool allow_single_step = false) :
         SpinBoxSetting(this, min, max, step, allow_single_step),
-        HostDBStorage(this, name) { }
+        HostSettingStorage(this, name) { }
 };
 
-class MPUBLIC HostCheckBox : public CheckBoxSetting, public HostDBStorage
+class MPUBLIC HostCheckBox : public CheckBoxSetting, public HostSettingStorage
 {
     Q_OBJECT
   public:
     HostCheckBox(const QString &name) :
-        CheckBoxSetting(this), HostDBStorage(this, name) { }
+        CheckBoxSetting(this), HostSettingStorage(this, name) { }
     virtual ~HostCheckBox() { ; }
 };
 
-class MPUBLIC HostComboBox : public ComboBoxSetting, public HostDBStorage
+class MPUBLIC HostComboBox : public ComboBoxSetting, public HostSettingStorage
 {
     Q_OBJECT
   public:
     HostComboBox(const QString &name, bool rw = false) :
-        ComboBoxSetting(this, rw), HostDBStorage(this, name) { }
+        ComboBoxSetting(this, rw), HostSettingStorage(this, name) { }
     virtual ~HostComboBox() { ; }
 };
 
@@ -725 +725 @@
     static const vector<double> GetRefreshRates(const QString &resolution);
 };
 
-class MPUBLIC HostTimeBox : public ComboBoxSetting, public HostDBStorage
+class MPUBLIC HostTimeBox : public ComboBoxSetting, public HostSettingStorage
 {
     Q_OBJECT
   public:
     HostTimeBox(const QString &name, const QString &defaultTime = "00:00",
                 const int interval = 1) :
         ComboBoxSetting(this, false, 30 / interval),
-        HostDBStorage(this, name)
+        HostSettingStorage(this, name)
     {
         int hour;
         int minute;
@@ -750 +750 @@
     }
 };
 
-class MPUBLIC HostLineEdit: public LineEditSetting, public HostDBStorage
+class MPUBLIC HostLineEdit: public LineEditSetting, public HostSettingStorage
 {
     Q_OBJECT
   public:
     HostLineEdit(const QString &name, bool rw = true) :
-        LineEditSetting(this, rw), HostDBStorage(this, name) { }
+        LineEditSetting(this, rw), HostSettingStorage(this, name) { }
 };
 
 ///////////////////////////////////////////////////////////////////////////////

mythtv/libs/libmythbase/mythdb.cpp

@@ -376 +376 @@
             d->settingsCacheLock.unlock();
             return value;
         }
+        d->settingsCacheLock.unlock();
+        return defaultval;
     }
     SettingsMap::const_iterator it = d->overriddenSettings.find(key);
     if (it != d->overriddenSettings.end())
@@ -609 +611 @@
             d->settingsCacheLock.unlock();
             return value;
         }
+        d->settingsCacheLock.unlock();
+        return defaultval;
     }
     SettingsMap::const_iterator it = d->overriddenSettings.find(myKey);
     if (it != d->overriddenSettings.end())
@@ -855 +859 @@
             d->settingsCache[it.key()] = *it;
             d->settingsCache[mk2] = *it;
         }
+
+        if (!d->useSettingsCache || d->ignoreDatabase || !HaveValidDatabase())
+        {
+            d->settingsCacheLock.unlock();
+            return;
+        }
+
+        MSqlQuery query(MSqlQuery::InitCon());
+        if (!query.isConnected())
+        {
+            d->settingsCacheLock.unlock();
+            return;
+        }
+
+        query.prepare(
+            "SELECT value, data "
+            "FROM settings "
+            "WHERE hostname = :HOSTNAME");
+        query.bindValue(":HOSTNAME", d->m_localhostname);
+
+        QString value;
+        QString data;
+        if (query.exec())
+            while (query.next())
+            {
+                value = query.value(0).toString();
+                data = query.value(1).toString();
+
+                QString &cacheValue = d->settingsCache[value.toLower()];
+                if( cacheValue.isEmpty() )
+                {
+                    cacheValue = data;
+                }
+            }
+
+        if (!query.isConnected())
+        {
+            d->settingsCacheLock.unlock();
+            return;
+        }
+
+        query.prepare(
+            "SELECT value, data "
+            "FROM settings "
+            "WHERE hostname IS NULL");
+
+        if (query.exec())
+            while (query.next())
+            {
+                value = query.value(0).toString();
+                data = query.value(1).toString();
+
+                QString &cacheValue = d->settingsCache[value.toLower()];
+                if( cacheValue.isEmpty() )
+                {
+                    cacheValue = data;
+                }
+            }
     }
     else
     {

mythtv/libs/libmythbase/mythstorage.cpp

@@ -196 +196 @@
 
     return clause;
 }
+
+void HostSettingStorage::Load(void)
+{
+    QString result = GetMythDB()->GetSetting(key, QString());
+    if (!result.isNull())
+    {
+        initval = result;
+        user->SetDBValue(result);
+    }
+}
+
+void HostSettingStorage::Save(QString _table)
+{
+    // not implementable, and not needed for settings
+}
+
+void HostSettingStorage::Save(void)
+{
+    if (!IsSaveRequired())
+        return;
+
+    GetMythDB()->SaveSetting(key, user->GetDBValue());
+}
+
+bool HostSettingStorage::IsSaveRequired(void) const
+{
+    return user->GetDBValue() != initval;
+}
+
+void HostSettingStorage::SetSaveRequired(void)
+{
+    initval.clear();
+}

mythtv/libs/libmythbase/mythstorage.h

@@ -129 +129 @@
     QString settingname;
 };
 
+class MBASE_PUBLIC HostSettingStorage : public Storage
+{
+  public:
+    HostSettingStorage(StorageUser *_user,
+                    QString _key) : user(_user), key(_key)
+        {}
+    virtual ~HostSettingStorage() { }
+
+    virtual void Load(void);
+    virtual void Save(void);
+    virtual void Save(QString destination);
+    virtual bool IsSaveRequired(void) const;
+    virtual void SetSaveRequired(void);
+
+  protected:
+    StorageUser *user;
+    QString key;
+    QString initval;
+};
 ///////////////////////////////////////////////////////////////////////////////
 
 #endif // MYTHSTORAGE_H