Rename is_backfilling to retain_delete_markers

Summary:

For `Schema` and `TableProperties`, rename `is_backfilling_` to
`retain_delete_markers_` (and similarly for related getter/setter
functions).  This is clearer because it is set when the index gets
created all the way to the end of backfill.  In other words, it is also
set during the `DELETE_ONLY` and `WRITE_AND_DELETE` permissions _before_
backfill.

Furthermore, this helps disambiguate with the other existing
`TableInfo::is_backfilling_`.

Test Plan:

`./yb_build.sh --cxx-test common_schema-test`

Reviewers: amitanand

Reviewed By: amitanand

Subscribers: ybase, bogdan

Differential Revision: https://phabricator.dev.yugabyte.com/D9636

src/yb/common/common.proto

@@ -260,7 +260,7 @@ message TablePropertiesPB {
   optional bool use_mangled_column_name =  6 [ default = false ];
   optional int32 num_tablets = 7 [ default = 0 ];
   optional bool is_ysql_catalog_table = 8 [ default = false ];
-  optional bool is_backfilling = 9 [ default = false ];
+  optional bool retain_delete_markers = 9 [ default = false ];
   optional uint64 backfilling_timestamp = 10;
 }
 

src/yb/common/schema-test.cc

@@ -99,7 +99,7 @@ TEST(TestSchema, TestSchema) {
             "consistency_level: STRONG "
             "use_mangled_column_name: false "
             "is_ysql_catalog_table: false "
-            "is_backfilling: false",
+            "retain_delete_markers: false",
             schema.ToString());
   EXPECT_EQ("key[string NOT NULL NOT A PARTITION KEY]", schema.column(0).ToString());
   EXPECT_EQ("uint32 NULLABLE NOT A PARTITION KEY", schema.column(1).TypeToString());
@@ -373,7 +373,7 @@ TEST(TestSchema, TestCreateProjection) {
             "consistency_level: STRONG "
             "use_mangled_column_name: false "
             "is_ysql_catalog_table: false "
-            "is_backfilling: false",
+            "retain_delete_markers: false",
             partial_schema.ToString());
 
   // By names, with IDS
@@ -386,7 +386,7 @@ TEST(TestSchema, TestCreateProjection) {
                        "consistency_level: STRONG "
                        "use_mangled_column_name: false "
                        "is_ysql_catalog_table: false "
-                       "is_backfilling: false",
+                       "retain_delete_markers: false",
                        schema_with_ids.column_id(0),
                        schema_with_ids.column_id(1),
                        schema_with_ids.column_id(3)),
@@ -410,7 +410,7 @@ TEST(TestSchema, TestCreateProjection) {
                        "consistency_level: STRONG "
                        "use_mangled_column_name: false "
                        "is_ysql_catalog_table: false "
-                       "is_backfilling: false",
+                       "retain_delete_markers: false",
                        schema_with_ids.column_id(0),
                        schema_with_ids.column_id(1),
                        schema_with_ids.column_id(3)),

src/yb/common/schema.cc

@@ -96,7 +96,7 @@ void TableProperties::ToTablePropertiesPB(TablePropertiesPB *pb) const {
     pb->set_num_tablets(num_tablets_);
   }
   pb->set_is_ysql_catalog_table(is_ysql_catalog_table_);
-  pb->set_is_backfilling(is_backfilling_);
+  pb->set_retain_delete_markers(retain_delete_markers_);
 }
 
 TableProperties TableProperties::FromTablePropertiesPB(const TablePropertiesPB& pb) {
@@ -125,8 +125,8 @@ TableProperties TableProperties::FromTablePropertiesPB(const TablePropertiesPB&
   if (pb.has_is_ysql_catalog_table()) {
     table_properties.set_is_ysql_catalog_table(pb.is_ysql_catalog_table());
   }
-  if (pb.has_is_backfilling()) {
-    table_properties.SetIsBackfilling(pb.is_backfilling());
+  if (pb.has_retain_delete_markers()) {
+    table_properties.SetRetainDeleteMarkers(pb.retain_delete_markers());
   }
   return table_properties;
 }
@@ -153,8 +153,8 @@ void TableProperties::AlterFromTablePropertiesPB(const TablePropertiesPB& pb) {
   if (pb.has_is_ysql_catalog_table()) {
     set_is_ysql_catalog_table(pb.is_ysql_catalog_table());
   }
-  if (pb.has_is_backfilling()) {
-    SetIsBackfilling(pb.is_backfilling());
+  if (pb.has_retain_delete_markers()) {
+    SetRetainDeleteMarkers(pb.retain_delete_markers());
   }
 }
 
@@ -167,7 +167,7 @@ void TableProperties::Reset() {
   use_mangled_column_name_ = false;
   num_tablets_ = 0;
   is_ysql_catalog_table_ = false;
-  is_backfilling_ = false;
+  retain_delete_markers_ = false;
 }
 
 string TableProperties::ToString() const {

src/yb/common/schema.h

@@ -381,7 +381,7 @@ class TableProperties {
            contain_counters_ == other.contain_counters_;
 
     // Ignoring num_tablets_.
-    // Ignoring is_backfilling_.
+    // Ignoring retain_delete_markers_.
     // Ignoring wal_retention_secs_.
   }
 
@@ -412,7 +412,7 @@ class TableProperties {
     // Ignoring num_tablets_.
     // Ignoring use_mangled_column_name_.
     // Ignoring contain_counters_.
-    // Ignoring is_backfilling_.
+    // Ignoring retain_delete_markers_.
     // Ignoring wal_retention_secs_.
     return true;
   }
@@ -493,9 +493,13 @@ class TableProperties {
     return is_ysql_catalog_table_;
   }
 
-  bool IsBackfilling() const { return is_backfilling_; }
+  bool retain_delete_markers() const {
+    return retain_delete_markers_;
+  }
 
-  void SetIsBackfilling(bool is_backfilling) { is_backfilling_ = is_backfilling; }
+  void SetRetainDeleteMarkers(bool retain_delete_markers) {
+    retain_delete_markers_ = retain_delete_markers;
+  }
 
   void ToTablePropertiesPB(TablePropertiesPB *pb) const;
 
@@ -516,7 +520,7 @@ class TableProperties {
   int64_t default_time_to_live_ = kNoDefaultTtl;
   bool contain_counters_ = false;
   bool is_transactional_ = false;
-  bool is_backfilling_ = false;
+  bool retain_delete_markers_ = false;
   YBConsistencyLevel consistency_level_ = YBConsistencyLevel::STRONG;
   TableId copartition_table_id_ = kNoCopartitionTableId;
   boost::optional<uint32_t> wal_retention_secs_;
@@ -729,7 +733,9 @@ class Schema {
     table_properties_.SetTransactional(is_transactional);
   }
 
-  void SetIsBackfilling(bool is_backfilling) { table_properties_.SetIsBackfilling(is_backfilling); }
+  void SetRetainDeleteMarkers(bool retain_delete_markers) {
+    table_properties_.SetRetainDeleteMarkers(retain_delete_markers);
+  }
 
   // Return the column index corresponding to the given column,
   // or kColumnNotFound if the column is not in this schema.
@@ -1007,8 +1013,8 @@ class Schema {
 
   // Return true if the schemas have exactly the same set of columns
   // and respective types, and equivalent properties.
-  // For example, one table property could have a different properties like wal_retention_secs_
-  // is_backfilling_ but still be equivalent.
+  // For example, one table property could have different properties for wal_retention_secs_ and
+  // retain_delete_markers_ but still be equivalent.
   bool EquivalentForDataCopy(const Schema& other) const {
     if (this == &other) return true;
     if (this->num_key_columns_ != other.num_key_columns_) return false;

src/yb/master/backfill_index.cc

@@ -846,7 +846,8 @@ Status BackfillTable::AllowCompactionsToGCDeleteMarkers(
     VLOG(2) << __func__ << ": Trying to lock index table for Write";
     auto l = index_table_info->LockForWrite();
     VLOG(2) << __func__ << ": locked index table for Write";
-    l->mutable_data()->pb.mutable_schema()->mutable_table_properties()->set_is_backfilling(false);
+    l->mutable_data()->pb.mutable_schema()->mutable_table_properties()
+        ->set_retain_delete_markers(false);
 
     // Update sys-catalog with the new indexed table info.
     TRACE("Updating index table metadata on disk");

src/yb/master/catalog_manager.cc

@@ -2341,10 +2341,10 @@ Status CatalogManager::CreateTable(const CreateTableRequestPB* orig_req,
   if ((req.has_index_info() || req.has_indexed_table_id()) &&
       index_backfill_enabled &&
       !req.skip_index_backfill()) {
-    // Start off the index table with major compactions disabled. We need this to preserve
-    // the delete markers until the backfill process is completed.
-    // No need to set index_permissions in the index table.
-    schema.SetIsBackfilling(true);
+    // Start off the index table with major compactions disabled. We need this to retain the delete
+    // markers until the backfill process is completed.  No need to set index_permissions in the
+    // index table.
+    schema.SetRetainDeleteMarkers(true);
   }
 
   LOG(INFO) << "CreateTable with IndexInfo " << yb::ToString(index_info);

src/yb/tablet/tablet.cc

@@ -2006,7 +2006,7 @@ Status Tablet::MarkBackfillDone() {
                         << table_info->schema.ToString();
   const vector<DeletedColumn> empty_deleted_cols;
   Schema new_schema = Schema(table_info->schema);
-  new_schema.SetIsBackfilling(false);
+  new_schema.SetRetainDeleteMarkers(false);
   metadata_->SetSchema(
       new_schema, table_info->index_map, empty_deleted_cols, table_info->schema_version);
   return metadata_->Flush();

src/yb/tablet/tablet_retention_policy.cc

@@ -108,7 +108,7 @@ void TabletRetentionPolicy::UnregisterReaderTimestamp(HybridTime timestamp) {
 bool TabletRetentionPolicy::ShouldRetainDeleteMarkersInMajorCompaction() const {
   // If the index table is in the process of being backfilled, then we
   // want to retain delete markers until the backfill process is complete.
-  return metadata_.schema()->table_properties().IsBackfilling();
+  return metadata_.schema()->table_properties().retain_delete_markers();
 }
 
 HybridTime TabletRetentionPolicy::HistoryCutoffToPropagate(HybridTime last_write_ht) {