Check schema for more table options

daqingest/src/bin/daqingest.rs

@@ -58,6 +58,9 @@ async fn main_run_inner(opts: DaqIngestOpts) -> Result<(), Error> {
                 name: k.pg_name,
             };
             let scyconf = ScyllaIngestConfig::new([k.scylla_host], k.scylla_keyspace);
+            scywr::schema::migrate_scylla_data_schema(&scyconf, netpod::ttl::RetentionTime::Short)
+                .await
+                .map_err(Error::from_string)?;
             match k.sub {
                 DbSub::Data(u) => {
                     use daqingest::opts::DbDataSub;

daqingest/src/daemon.rs

@@ -19,7 +19,6 @@ use netpod::ttl::RetentionTime;
 use netpod::Database;
 use scywr::config::ScyllaIngestConfig;
 use scywr::insertworker::InsertWorkerOpts;
-use scywr::insertworker::Ttls;
 use scywr::iteminsertqueue as scywriiq;
 use scywriiq::QueryItem;
 use stats::DaemonStats;
@@ -46,7 +45,6 @@ const CHECK_CHANNEL_SLOW_WARN: Duration = Duration::from_millis(500);
 pub struct DaemonOpts {
     pgconf: Database,
     scyconf: ScyllaIngestConfig,
-    ttls: Ttls,
     #[allow(unused)]
     test_bsread_addr: Option<String>,
     insert_frac: Arc<AtomicU64>,
@@ -591,12 +589,6 @@ pub async fn run(opts: CaIngestOpts, channels_config: Option<ChannelsConfig>) ->
     let opts2 = DaemonOpts {
         pgconf: opts.postgresql_config().clone(),
         scyconf: opts.scylla_config().clone(),
-        ttls: Ttls {
-            index: opts.ttl_index(),
-            d0: opts.ttl_d0(),
-            d1: opts.ttl_d1(),
-            binned: opts.ttl_binned(),
-        },
         test_bsread_addr: opts.test_bsread_addr.clone(),
         insert_frac: insert_frac.clone(),
         store_workers_rate,

daqingest/src/tools.rs

@@ -34,7 +34,6 @@ pub async fn remove_older(
     pgconf: &Database,
     scyconf: &ScyllaIngestConfig,
 ) -> Result<(), Error> {
-    scywr::schema::migrate_scylla_data_schema(scyconf, netpod::ttl::RetentionTime::Short).await?;
     let date_cut = parse_date_str(&params.date)?;
     let ts_cut = date_to_ts_ns(date_cut);
     debug!("chosen date is  {:?}  {}", date_cut, ts_cut);