Reference table initial infra code change (#769)

* Reference table initial infra code change * Add test
pg-sharding · Sep 16, 2024 · 62c9895 · 62c9895
1 parent 006a961
commit 62c9895
Show file tree

Hide file tree

Showing 11 changed files with 477 additions and 399 deletions.
diff --git a/pkg/meta/meta.go b/pkg/meta/meta.go
@@ -272,6 +272,9 @@ func processAlterDistribution(ctx context.Context, astmt spqrparser.Statement, m
 		rels := []*distributions.DistributedRelation{}
 
 		for _, drel := range stmt.Relations {
+			if stmt.Distribution.Replicated && !drel.ReplicatedRelation {
+				return spqrerror.New(spqrerror.SPQR_NO_DISTRIBUTION, "non replicated relation should be attached to non replicated distribution")
+			}
 			rels = append(rels, distributions.DistributedRelationFromSQL(drel))
 		}
 

diff --git a/pkg/models/distributions/distribution.go b/pkg/models/distributions/distribution.go
@@ -12,8 +12,9 @@ type DistributionKeyEntry struct {
 }
 
 type DistributedRelation struct {
-	Name            string
-	DistributionKey []DistributionKeyEntry
+	Name               string
+	DistributionKey    []DistributionKeyEntry
+	ReplicatedRelation bool
 }
 
 // DistributedRelationFromDB creates a DistributedRelation object from a qdb.DistributedRelation object.
@@ -35,6 +36,8 @@ func DistributedRelationFromDB(rel *qdb.DistributedRelation) *DistributedRelatio
 		})
 	}
 
+	rdistr.ReplicatedRelation = rel.ReplicatedRelation
+
 	return rdistr
 }
 
@@ -58,6 +61,8 @@ func DistributedRelationToDB(rel *DistributedRelation) *qdb.DistributedRelation
 		})
 	}
 
+	rdistr.ReplicatedRelation = rel.ReplicatedRelation
+
 	return rdistr
 }
 
@@ -81,6 +86,8 @@ func DistributedRelatitonToProto(rel *DistributedRelation) *proto.DistributedRel
 		})
 	}
 
+	rdistr.ReplicatedRelation = rel.ReplicatedRelation
+
 	return rdistr
 }
 
@@ -103,6 +110,8 @@ func DistributedRelationFromProto(rel *proto.DistributedRelation) *DistributedRe
 		})
 	}
 
+	rdistr.ReplicatedRelation = rel.ReplicatedRelation
+
 	return rdistr
 }
 
@@ -125,6 +134,8 @@ func DistributedRelationFromSQL(rel *spqrparser.DistributedRelation) *Distribute
 		})
 	}
 
+	rdistr.ReplicatedRelation = rel.ReplicatedRelation
+
 	return rdistr
 }
 

diff --git a/pkg/protos/distribution.pb.go b/pkg/protos/distribution.pb.go
diff --git a/protos/distribution.proto b/protos/distribution.proto
@@ -12,6 +12,7 @@ message DistributionKeyEntry {
 message DistributedRelation {
   string name = 1;
   repeated DistributionKeyEntry distributionKey = 2;
+  bool ReplicatedRelation = 3;
 }
 
 message Distribution {

diff --git a/qdb/models.go b/qdb/models.go
@@ -82,8 +82,9 @@ type DistributionKeyEntry struct {
 }
 
 type DistributedRelation struct {
-	Name            string                 `json:"name"`
-	DistributionKey []DistributionKeyEntry `json:"column_names"`
+	Name               string                 `json:"name"`
+	DistributionKey    []DistributionKeyEntry `json:"column_names"`
+	ReplicatedRelation bool                   `json:"replicated_relation,omitempty"`
 }
 
 type Distribution struct {

diff --git a/yacc/console/ast.go b/yacc/console/ast.go
@@ -152,7 +152,8 @@ type ShardingRuleSelector struct {
 }
 
 type DistributionSelector struct {
-	ID string
+	ID         string
+	Replicated bool
 }
 
 type ShardSelector struct {
@@ -225,8 +226,9 @@ type DistributionKeyEntry struct {
 }
 
 type DistributedRelation struct {
-	Name            string
-	DistributionKey []DistributionKeyEntry
+	Name               string
+	DistributionKey    []DistributionKeyEntry
+	ReplicatedRelation bool
 }
 
 type AttachRelation struct {