feat(bigtable): add GC policy to FamilyInfo.

bigtable/admin.go

@@ -312,7 +312,7 @@ type TableInfo struct {
 type FamilyInfo struct {
 	Name           string
 	GCPolicy       string
-	GCPolicyObject GCPolicy
+	TypedGCPolicy  TypedGCPolicy
 }
 
 func (ac *AdminClient) getTable(ctx context.Context, table string, view btapb.Table_View) (*btapb.Table, error) {
@@ -351,7 +351,7 @@ func (ac *AdminClient) TableInfo(ctx context.Context, table string) (*TableInfo,
 		ti.FamilyInfos = append(ti.FamilyInfos, FamilyInfo{
 			Name:           name,
 			GCPolicy:       GCRuleToString(fam.GcRule),
-			GCPolicyObject: GCRuleToPolicy(fam.GcRule),
+			TypedGCPolicy:  fromPolicyToTypedPolicy(gcRuleToPolicy(fam.GcRule)),
 		})
 	}
 	return ti, nil

bigtable/gc.go

@@ -25,21 +25,25 @@ import (
 	bttdpb "google.golang.org/genproto/googleapis/bigtable/admin/v2"
 )
 
+type PolicyType = int
+
 const (
-	PolicyType_None = iota
-	PolicyType_MaxAge
-	PolicyType_MaxVersion
-	PolicyType_Union
-	PolicyType_Intersection
+	PolicyTypeNone PolicyType = iota
+	PolicyTypeMaxAge
+	PolicyTypeMaxVersion
+	PolicyTypeUnion
+	PolicyTypeIntersection
 )
 
-type PolicyType = int
-
 // A GCPolicy represents a rule that determines which cells are eligible for garbage collection.
 type GCPolicy interface {
 	String() string
 	proto() *bttdpb.GcRule
-	PolicyType() PolicyType
+}
+
+type TypedGCPolicy struct {
+	GCPolicy
+	PolicyType PolicyType
 }
 
 // IntersectionPolicy returns a GC policy that only applies when all its sub-policies apply.
@@ -67,10 +71,6 @@ func (ip intersectionPolicy) proto() *bttdpb.GcRule {
 	}
 }
 
-func (intersectionPolicy) PolicyType() PolicyType {
-	return PolicyType_Intersection
-}
-
 // UnionPolicy returns a GC policy that applies when any of its sub-policies apply.
 func UnionPolicy(sub ...GCPolicy) GCPolicy { return unionPolicy{sub} }
 
@@ -96,10 +96,6 @@ func (up unionPolicy) proto() *bttdpb.GcRule {
 	}
 }
 
-func (unionPolicy) PolicyType() PolicyType {
-	return PolicyType_Union
-}
-
 // MaxVersionsPolicy returns a GC policy that applies to all versions of a cell
 // except for the most recent n.
 func MaxVersionsPolicy(n int) GCPolicy { return maxVersionsPolicy(n) }
@@ -112,10 +108,6 @@ func (mvp maxVersionsPolicy) proto() *bttdpb.GcRule {
 	return &bttdpb.GcRule{Rule: &bttdpb.GcRule_MaxNumVersions{MaxNumVersions: int32(mvp)}}
 }
 
-func (maxVersionsPolicy) PolicyType() PolicyType {
-	return PolicyType_MaxVersion
-}
-
 // MaxAgePolicy returns a GC policy that applies to all cells
 // older than the given age.
 func MaxAgePolicy(d time.Duration) GCPolicy { return maxAgePolicy(d) }
@@ -153,20 +145,12 @@ func (ma maxAgePolicy) proto() *bttdpb.GcRule {
 	}
 }
 
-func (maxAgePolicy) PolicyType() PolicyType {
-	return PolicyType_MaxAge
-}
-
 type noGCPolicy struct{}
 
 func (n noGCPolicy) String() string { return "" }
 
 func (n noGCPolicy) proto() *bttdpb.GcRule { return &bttdpb.GcRule{Rule: nil} }
 
-func (n noGCPolicy) PolicyType() PolicyType {
-	return PolicyType_None
-}
-
 // NoGcPolicy applies to all cells setting maxage and maxversions to nil implies no gc policies
 func NoGcPolicy() GCPolicy { return noGCPolicy{} }
 
@@ -189,15 +173,15 @@ func GCRuleToString(rule *bttdpb.GcRule) string {
 	}
 }
 
-func GCRuleToPolicy(rule *bttdpb.GcRule) GCPolicy {
+func gcRuleToPolicy(rule *bttdpb.GcRule) GCPolicy {
 	if rule == nil {
 		return NoGcPolicy()
 	}
 	switch r := rule.Rule.(type) {
 	case *bttdpb.GcRule_Intersection_:
-		return fromRuleToPolicy(r.Intersection.Rules, PolicyType_Intersection)
+		return compoundRuleToPolicy(r.Intersection.Rules, PolicyTypeIntersection)
 	case *bttdpb.GcRule_Union_:
-		return fromRuleToPolicy(r.Union.Rules, PolicyType_Union)
+		return compoundRuleToPolicy(r.Union.Rules, PolicyTypeUnion)
 	case *bttdpb.GcRule_MaxAge:
 		return MaxAgePolicy(time.Duration(r.MaxAge.Seconds) * time.Second)
 	case *bttdpb.GcRule_MaxNumVersions:
@@ -215,21 +199,36 @@ func joinRules(rules []*bttdpb.GcRule, sep string) string {
 	return "(" + strings.Join(chunks, sep) + ")"
 }
 
-func fromRuleToPolicy(rules []*bttdpb.GcRule, mode PolicyType) GCPolicy {
+func compoundRuleToPolicy(rules []*bttdpb.GcRule, mode PolicyType) GCPolicy {
 	sub := []GCPolicy{}
 	for _, r := range rules {
-		p := GCRuleToPolicy(r)
+		p := gcRuleToPolicy(r)
 		if p.String() != "" {
-			sub = append(sub, GCRuleToPolicy(r))
+			sub = append(sub, gcRuleToPolicy(r))
 		}
 	}
 
 	switch mode {
-	case PolicyType_Union:
+	case PolicyTypeUnion:
 		return unionPolicy{sub: sub}
-	case PolicyType_Intersection:
+	case PolicyTypeIntersection:
 		return intersectionPolicy{sub: sub}
 	default:
 		return NoGcPolicy()
 	}
 }
+
+func fromPolicyToTypedPolicy(gcPolicy GCPolicy) TypedGCPolicy {
+	switch gcPolicy.proto().Rule.(type) {
+	case *bttdpb.GcRule_Intersection_:
+		return TypedGCPolicy{GCPolicy: gcPolicy, PolicyType: PolicyTypeIntersection}
+	case *bttdpb.GcRule_Union_:
+		return TypedGCPolicy{GCPolicy: gcPolicy, PolicyType: PolicyTypeUnion}
+	case *bttdpb.GcRule_MaxAge:
+		return TypedGCPolicy{GCPolicy: gcPolicy, PolicyType: PolicyTypeMaxAge}
+	case *bttdpb.GcRule_MaxNumVersions:
+		return TypedGCPolicy{GCPolicy: gcPolicy, PolicyType: PolicyTypeMaxVersion}
+	default:
+		return TypedGCPolicy{GCPolicy: gcPolicy, PolicyType: PolicyTypeNone}
+	}
+}

bigtable/gc_test.go

@@ -61,7 +61,7 @@ func TestGCRuleToPolicy(t *testing.T) {
 	}
 
 	for _, test := range tc {
-		got := GCRuleToPolicy(test.proto)
+		got := gcRuleToPolicy(test.proto)
 		if got.String() != test.want {
 			t.Errorf("got gc rule %v, want: %v", got, test.want)
 		}