From: Michael Vrable <vrable@cs.hmc.edu>
Date: Wed, 27 Feb 2013 18:12:36 +0000 (-0800)
Subject: Drop intent field from the database.
X-Git-Url: https://git.vrable.net/?a=commitdiff_plain;h=cdcf66f45ce73b29f8e7e7c4b6c6d20fc3c93575;p=cumulus.git

Drop intent field from the database.
---

diff --git a/localdb.cc b/localdb.cc
index 7cabcb1..a23ca5e 100644
--- a/localdb.cc
+++ b/localdb.cc
@@ -70,7 +70,7 @@ void LocalDb::ReportError(int rc)
 }
 
 void LocalDb::Open(const char *path, const char *snapshot_name,
-                   const char *snapshot_scheme, double intent)
+                   const char *snapshot_scheme)
 {
     int rc;
 
@@ -115,13 +115,12 @@ void LocalDb::Open(const char *path, const char *snapshot_name,
 
     /* Insert this snapshot into the database, and determine the integer key
      * which will be used to identify it. */
-    stmt = Prepare("insert into snapshots(name, scheme, timestamp, intent) "
-                   "values (?, ?, julianday('now'), ?)");
+    stmt = Prepare("insert into snapshots(name, scheme, timestamp) "
+                   "values (?, ?, julianday('now'))");
     sqlite3_bind_text(stmt, 1, snapshot_name, strlen(snapshot_name),
                       SQLITE_TRANSIENT);
     sqlite3_bind_text(stmt, 2, snapshot_scheme, strlen(snapshot_scheme),
                       SQLITE_TRANSIENT);
-    sqlite3_bind_double(stmt, 3, intent);
 
     rc = sqlite3_step(stmt);
     if (rc != SQLITE_DONE) {
diff --git a/localdb.h b/localdb.h
index 6d2190d..2ffb196 100644
--- a/localdb.h
+++ b/localdb.h
@@ -39,7 +39,7 @@
 class LocalDb {
 public:
     void Open(const char *path, const char *snapshot_name,
-              const char *snapshot_scheme, double intent);
+              const char *snapshot_scheme);
     void Close();
     void StoreObject(const ObjectReference& ref, double age);
     ObjectReference FindObject(const std::string &checksum, int64_t size);
diff --git a/main.cc b/main.cc
index fa8e4c9..cd31189 100644
--- a/main.cc
+++ b/main.cc
@@ -82,11 +82,6 @@ static char *block_buf;
  * invocations to help in creating incremental snapshots. */
 LocalDb *db;
 
-/* Snapshot intent: 1=daily, 7=weekly, etc.  This is not used directly, but is
- * stored in the local database and can help guide segment cleaning and
- * snapshot expiration policies. */
-double snapshot_intent = 1.0;
-
 /* Selection of files to include/exclude in the snapshot. */
 PathFilterList filter_rules;
 
@@ -657,8 +652,7 @@ void usage(const char *program)
         "  --signature-filter=COMMAND\n"
         "                       program though which to filter descriptor\n"
         "  --scheme=NAME        optional name for this snapshot\n"
-        "  --intent=FLOAT       intended backup type: 1=daily, 7=weekly, ...\n"
-        "                           (defaults to \"1\")\n"
+        "  --intent=FLOAT       DEPRECATED: ignored, and will be removed soon\n"
         "  --full-metadata      do not re-use metadata from previous backups\n"
         "  --rebuild-statcache  re-read all file data to verify statcache\n"
         "  -v --verbose         list files as they are backed up\n"
@@ -689,7 +683,7 @@ int main(int argc, char *argv[])
             {"dest", 1, 0, 0},              // 3
             {"scheme", 1, 0, 0},            // 4
             {"signature-filter", 1, 0, 0},  // 5
-            {"intent", 1, 0, 0},            // 6
+            {"intent", 1, 0, 0},            // 6, DEPRECATED
             {"full-metadata", 0, 0, 0},     // 7
             {"tmpdir", 1, 0, 0},            // 8
             {"upload-script", 1, 0, 0},     // 9
@@ -729,9 +723,9 @@ int main(int argc, char *argv[])
                 signature_filter = optarg;
                 break;
             case 6:     // --intent
-                snapshot_intent = atof(optarg);
-                if (snapshot_intent <= 0)
-                    snapshot_intent = 1;
+                fprintf(stderr,
+                        "Warning: The --intent= option is deprecated and will "
+                        "be removed in the future.\n");
                 break;
             case 7:     // --full-metadata
                 flag_full_metadata = true;
@@ -832,8 +826,7 @@ int main(int argc, char *argv[])
      * snapshot. */
     string database_path = localdb_dir + "/localdb.sqlite";
     db = new LocalDb;
-    db->Open(database_path.c_str(), desc_buf, backup_scheme.c_str(),
-             snapshot_intent);
+    db->Open(database_path.c_str(), desc_buf, backup_scheme.c_str());
 
     tss = new TarSegmentStore(remote, db);
 
@@ -937,7 +930,6 @@ int main(int argc, char *argv[])
     fprintf(descriptor, "Date: %s\n", desc_buf);
     if (backup_scheme.size() > 0)
         fprintf(descriptor, "Scheme: %s\n", backup_scheme.c_str());
-    fprintf(descriptor, "Backup-Intent: %g\n", snapshot_intent);
     fprintf(descriptor, "Root: %s\n", backup_root.c_str());
 
     if (csum.size() > 0) {