store: IndexList.indexes_for_table: split concurrent and if_not_exists

At the end of copying, we do not want to create indexes concurrently, but
we do want the creation to be idempotent, i.e., have a 'if not exists'
clause

Author: lutter

store/postgres/src/copy.rs

@@ -731,6 +731,7 @@ impl Connection {
                 &table.dst,
                 true,
                 false,
+                true,
             )?;
 
             for (_, sql) in arr {

store/postgres/src/relational/ddl.rs

@@ -408,7 +408,14 @@ impl Table {
         if index_def.is_some() && ENV_VARS.postpone_attribute_index_creation {
             let arr = index_def
                 .unwrap()
-                .indexes_for_table(&self.nsp, &self.name.to_string(), &self, false, false)
+                .indexes_for_table(
+                    &self.nsp,
+                    &self.name.to_string(),
+                    &self,
+                    false,
+                    false,
+                    false,
+                )
                 .map_err(|_| fmt::Error)?;
             for (_, sql) in arr {
                 writeln!(out, "{};", sql).expect("properly formated index statements")

store/postgres/src/relational/ddl_tests.rs

@@ -408,14 +408,28 @@ fn postponed_indexes_with_block_column() {
 
     let dst_nsp = Namespace::new("sgd2".to_string()).unwrap();
     let arr = index_list()
-        .indexes_for_table(&dst_nsp, &table.name.to_string(), &table, true, false)
+        .indexes_for_table(
+            &dst_nsp,
+            &table.name.to_string(),
+            &table,
+            true,
+            false,
+            false,
+        )
         .unwrap();
     assert_eq!(1, arr.len());
     assert!(!arr[0].1.contains(BLOCK_IDX));
     assert!(arr[0].1.contains(ATTR_IDX));
 
     let arr = index_list()
-        .indexes_for_table(&dst_nsp, &table.name.to_string(), &table, false, false)
+        .indexes_for_table(
+            &dst_nsp,
+            &table.name.to_string(),
+            &table,
+            false,
+            false,
+            false,
+        )
         .unwrap();
     assert_eq!(0, arr.len());
 }

store/postgres/src/relational/index.rs

@@ -784,7 +784,8 @@ impl IndexList {
         table_name: &String,
         dest_table: &Table,
         postponed: bool,
-        concurrent_if_not_exist: bool,
+        concurrent: bool,
+        if_not_exists: bool,
     ) -> Result<Vec<(Option<String>, String)>, Error> {
         let mut arr = vec![];
         if let Some(vec) = self.indexes.get(table_name) {
@@ -805,7 +806,7 @@ impl IndexList {
                 {
                     if let Ok(sql) = ci
                         .with_nsp(namespace.to_string())?
-                        .to_sql(concurrent_if_not_exist, concurrent_if_not_exist)
+                        .to_sql(concurrent, if_not_exists)
                     {
                         arr.push((ci.name(), sql))
                     }
@@ -829,7 +830,7 @@ impl IndexList {
         let namespace = &layout.catalog.site.namespace;
         for table in layout.tables.values() {
             for (ind_name, create_query) in
-                self.indexes_for_table(namespace, &table.name.to_string(), table, true, true)?
+                self.indexes_for_table(namespace, &table.name.to_string(), table, true, true, true)?
             {
                 if let Some(index_name) = ind_name {
                     let table_name = table.name.clone();