Update resgroup option names for latest versions (#15)

* Update resgroup option names for latest versions
* Update name in comment

The Greenplum upstream had renamed resgroup option names two
times in gpdb7. The latest names are not updated in cbcopy.

The commits to rename option names are:
greenplum-db/gpdb-archive@7a4c80d7e3dbab86c
greenplum-db/gpdb-archive@483adea86b50c1759

The affected name changes are:
cpu_rate_limit -> cpu_hard_quota_limit -> cpu_max_percent
cpu_soft_priority -> cpu_weight

Author: gfphoenix78

integration/metadata_globals_create_test.go

@@ -163,7 +163,7 @@ var _ = Describe("cbcopy integration create statement tests", func() {
 			} else { // GPDB7+
 				return
 				/* comment out, due to CBDB/PG14 - GP7/PG12 behavior diff
-				someGroup := builtin.ResourceGroupAtLeast7{ResourceGroup: builtin.ResourceGroup{Oid: 1, Name: "some_group", Concurrency: "15", Cpuset: "-1"}, CpuHardQuotaLimit: "10", CpuSoftPriority: "100"}
+				someGroup := builtin.ResourceGroupAtLeast7{ResourceGroup: builtin.ResourceGroup{Oid: 1, Name: "some_group", Concurrency: "15", Cpuset: "-1"}, CpuMaxPercent: "10", CpuWeight: "100"}
 				builtin.PrintCreateResourceGroupStatementsAtLeast7(backupfile, tocfile, []builtin.ResourceGroupAtLeast7{someGroup}, emptyMetadataMap)
 				testhelper.AssertQueryRuns(connectionPool, buffer.String())
 				defer testhelper.AssertQueryRuns(connectionPool, `DROP RESOURCE GROUP some_group`)
@@ -200,9 +200,9 @@ var _ = Describe("cbcopy integration create statement tests", func() {
 				return
 				/* comment out, due to CBDB/PG14 - GP7/PG12 behavior diff
 				expectedDefaults := builtin.ResourceGroupAtLeast7{ResourceGroup: builtin.ResourceGroup{Oid: 1, Name: "some_group", Concurrency: concurrencyDefault, Cpuset: cpuSetDefault},
-					CpuHardQuotaLimit: "10", CpuSoftPriority: "100"}
+					CpuMaxPercent: "10", CpuWeight: "100"}
 
-				testhelper.AssertQueryRuns(connectionPool, "CREATE RESOURCE GROUP some_group WITH (CPU_HARD_QUOTA_LIMIT=10, CPU_SOFT_PRIORITY=100);")
+				testhelper.AssertQueryRuns(connectionPool, "CREATE RESOURCE GROUP some_group WITH (CPU_MAX_PERCENT=10, CPU_WEIGHT=100);")
 				defer testhelper.AssertQueryRuns(connectionPool, `DROP RESOURCE GROUP some_group`)
 
 				resultResourceGroups := builtin.GetResourceGroups[builtin.ResourceGroupAtLeast7](connectionPool)
@@ -243,9 +243,9 @@ var _ = Describe("cbcopy integration create statement tests", func() {
 				return
 				/* comment out, due to CBDB/PG14 - GP7/PG12 behavior diff
 				expectedDefaults := builtin.ResourceGroupAtLeast7{ResourceGroup: builtin.ResourceGroup{Oid: 1, Name: "some_group", Concurrency: concurrencyDefault, Cpuset: cpuSetDefault},
-					CpuHardQuotaLimit: "10", CpuSoftPriority: "100"}
+					CpuMaxPercent: "10", CpuWeight: "100"}
 
-				testhelper.AssertQueryRuns(connectionPool, "CREATE RESOURCE GROUP some_group WITH (CPU_HARD_QUOTA_LIMIT=10, CPU_SOFT_PRIORITY=100);")
+				testhelper.AssertQueryRuns(connectionPool, "CREATE RESOURCE GROUP some_group WITH (CPU_MAX_PERCENT=10, CPU_WEIGHT=100);")
 				defer testhelper.AssertQueryRuns(connectionPool, `DROP RESOURCE GROUP some_group`)
 
 				resultResourceGroups := builtin.GetResourceGroups[builtin.ResourceGroupAtLeast7](connectionPool)
@@ -285,7 +285,7 @@ var _ = Describe("cbcopy integration create statement tests", func() {
 				return
 				/* comment out, due to CBDB/PG14 - GP7/PG12 behavior diff
 				defaultGroup := builtin.ResourceGroupAtLeast7{ResourceGroup: builtin.ResourceGroup{Oid: 1, Name: "default_group", Concurrency: "15", Cpuset: "-1"},
-					CpuHardQuotaLimit: "10", CpuSoftPriority: "100"}
+					CpuMaxPercent: "10", CpuWeight: "100"}
 				emptyMetadataMap := map[builtin.UniqueID]builtin.ObjectMetadata{}
 
 				builtin.PrintCreateResourceGroupStatementsAtLeast7(backupfile, tocfile, []builtin.ResourceGroupAtLeast7{defaultGroup}, emptyMetadataMap)

integration/metadata_globals_queries_test.go

@@ -179,13 +179,13 @@ var _ = Describe("cbcopy integration tests", func() {
 			} else { // GPDB7+
 				return
 				/* comment out, due to CBDB/PG14 - GP7/PG12 behavior diff
-				testhelper.AssertQueryRuns(connectionPool, `CREATE RESOURCE GROUP someGroup WITH (CPU_HARD_QUOTA_LIMIT=10, CPU_SOFT_PRIORITY=100, CONCURRENCY=15);`)
+				testhelper.AssertQueryRuns(connectionPool, `CREATE RESOURCE GROUP someGroup WITH (CPU_MAX_PERCENT=10, CPU_WEIGHT=100, CONCURRENCY=15);`)
 				defer testhelper.AssertQueryRuns(connectionPool, `DROP RESOURCE GROUP someGroup`)
 
 				results := builtin.GetResourceGroups[builtin.ResourceGroupAtLeast7](connectionPool)
 
 				someGroup := builtin.ResourceGroupAtLeast7{ResourceGroup: builtin.ResourceGroup{Oid: 1, Name: `somegroup`, Concurrency: "15", Cpuset: "-1"},
-					CpuHardQuotaLimit: "10", CpuSoftPriority: "100"}
+					CpuMaxPercent: "10", CpuWeight: "100"}
 
 				for _, resultGroup := range results {
 					if resultGroup.Name == `somegroup` {
@@ -236,13 +236,13 @@ var _ = Describe("cbcopy integration tests", func() {
 			} else {
 				return
 				/* comment out, due to CBDB/PG14 - GP7/PG12 behavior diff
-				testhelper.AssertQueryRuns(connectionPool, `CREATE RESOURCE GROUP someGroup WITH (CPU_HARD_QUOTA_LIMIT=10, CPU_SOFT_PRIORITY=100);`)
+				testhelper.AssertQueryRuns(connectionPool, `CREATE RESOURCE GROUP someGroup WITH (CPU_MAX_PERCENT=10, CPU_WEIGHT=100);`)
 				defer testhelper.AssertQueryRuns(connectionPool, `DROP RESOURCE GROUP someGroup`)
 
 				results := builtin.GetResourceGroups[builtin.ResourceGroupAtLeast7](connectionPool)
 
 				expectedDefaults := builtin.ResourceGroupAtLeast7{ResourceGroup: builtin.ResourceGroup{Oid: 1, Name: `somegroup`, Concurrency: concurrencyDefault, Cpuset: cpuSetDefault},
-					CpuHardQuotaLimit: "10", CpuSoftPriority: "100"}
+					CpuMaxPercent: "10", CpuWeight: "100"}
 
 				for _, resultGroup := range results {
 					if resultGroup.Name == `somegroup` {

meta/builtin/extract_helper.go

@@ -324,7 +324,7 @@ func backupResourceGroups(conn *dbconn.DBConn, metadataFile *utils.FileWithByteC
 	gplog.Verbose("Writing CREATE RESOURCE GROUP statements to metadata file")
 
 	// at resource group part, CBDB is still same as 3x/GP6.
-	if (conn.Version.IsGPDB() && conn.Version.Before("7")) || conn.Version.IsCBDB() {
+	if (conn.Version.IsGPDB() && conn.Version.Before("7")) {
 		resGroups := GetResourceGroups[ResourceGroupBefore7](conn)
 		objectCounts["Resource Groups"] = len(resGroups)
 		resGroupMetadata := GetCommentsForObjectType(conn, TYPE_RESOURCEGROUP)

meta/builtin/metadata_globals.go

@@ -115,18 +115,18 @@ func PrintResetResourceGroupStatements(metadataFile *utils.FileWithByteCount, to
 	}
 	defSettings := make([]DefSetting, 0)
 
-	if (gpdbVersion.IsGPDB() && gpdbVersion.Before("7")) || gpdbVersion.IsCBDB() {
+	if gpdbVersion.IsGPDB() && gpdbVersion.Before("7") {
 		defSettings = append(defSettings, DefSetting{"admin_group", "SET CPU_RATE_LIMIT 1"})
 		defSettings = append(defSettings, DefSetting{"admin_group", "SET MEMORY_LIMIT 1"})
 		defSettings = append(defSettings, DefSetting{"default_group", "SET CPU_RATE_LIMIT 1"})
 		defSettings = append(defSettings, DefSetting{"default_group", "SET MEMORY_LIMIT 1"})
 	} else { // GPDB7+
-		defSettings = append(defSettings, DefSetting{"admin_group", "SET CPU_HARD_QUOTA_LIMIT 1"})
-		defSettings = append(defSettings, DefSetting{"admin_group", "SET CPU_SOFT_PRIORITY 100"})
-		defSettings = append(defSettings, DefSetting{"default_group", "SET CPU_HARD_QUOTA_LIMIT 1"})
-		defSettings = append(defSettings, DefSetting{"default_group", "SET CPU_SOFT_PRIORITY 100"})
-		defSettings = append(defSettings, DefSetting{"system_group", "SET CPU_HARD_QUOTA_LIMIT 1"})
-		defSettings = append(defSettings, DefSetting{"system_group", "SET CPU_SOFT_PRIORITY 100"})
+		defSettings = append(defSettings, DefSetting{"admin_group", "SET CPU_MAX_PERCENT 1"})
+		defSettings = append(defSettings, DefSetting{"admin_group", "SET CPU_WEIGHT 100"})
+		defSettings = append(defSettings, DefSetting{"default_group", "SET CPU_MAX_PERCENT 1"})
+		defSettings = append(defSettings, DefSetting{"default_group", "SET CPU_WEIGHT 100"})
+		defSettings = append(defSettings, DefSetting{"system_group", "SET CPU_MAX_PERCENT 1"})
+		defSettings = append(defSettings, DefSetting{"system_group", "SET CPU_WEIGHT 100"})
 	}
 
 	for _, prepare := range defSettings {
@@ -147,7 +147,7 @@ func PrintCreateResourceGroupStatementsAtLeast7(metadataFile *utils.FileWithByte
 				setting string
 				value   string
 			}{
-				{"CPU_SOFT_PRIORITY", resGroup.CpuSoftPriority},
+				{"CPU_WEIGHT", resGroup.CpuWeight},
 				{"CONCURRENCY", resGroup.Concurrency},
 			}
 			for _, property := range resGroupList {
@@ -161,9 +161,9 @@ func PrintCreateResourceGroupStatementsAtLeast7(metadataFile *utils.FileWithByte
 			// TODO -- why do we handle these separately?
 			// TODO -- is this still necessary for 7?
 			start = metadataFile.ByteCount
-			if !strings.HasPrefix(resGroup.CpuHardQuotaLimit, "-") {
+			if !strings.HasPrefix(resGroup.CpuMaxPercent, "-") {
 				/* cpu rate mode */
-				metadataFile.MustPrintf("\n\nALTER RESOURCE GROUP %s SET CPU_HARD_QUOTA_LIMIT %s;", resGroup.Name, resGroup.CpuHardQuotaLimit)
+				metadataFile.MustPrintf("\n\nALTER RESOURCE GROUP %s SET CPU_MAX_PERCENT %s;", resGroup.Name, resGroup.CpuMaxPercent)
 			} else {
 				/* cpuset mode */
 				metadataFile.MustPrintf("\n\nALTER RESOURCE GROUP %s SET CPUSET '%s';", resGroup.Name, resGroup.Cpuset)
@@ -178,14 +178,14 @@ func PrintCreateResourceGroupStatementsAtLeast7(metadataFile *utils.FileWithByte
 			/* special handling for cpu properties */
 			// TODO -- why do we handle these separately?
 			// TODO -- is this still necessary for 7?
-			if !strings.HasPrefix(resGroup.CpuHardQuotaLimit, "-") {
+			if !strings.HasPrefix(resGroup.CpuMaxPercent, "-") {
 				/* cpu rate mode */
-				attributes = append(attributes, fmt.Sprintf("CPU_HARD_QUOTA_LIMIT=%s", resGroup.CpuHardQuotaLimit))
+				attributes = append(attributes, fmt.Sprintf("CPU_MAX_PERCENT=%s", resGroup.CpuMaxPercent))
 			} else if (gpdbVersion.IsGPDB() && gpdbVersion.AtLeast("5.9.0")) || gpdbVersion.IsCBDB() {
 				/* cpuset mode */
 				attributes = append(attributes, fmt.Sprintf("CPUSET='%s'", resGroup.Cpuset))
 			}
-			attributes = append(attributes, fmt.Sprintf("CPU_SOFT_PRIORITY=%s", resGroup.CpuSoftPriority))
+			attributes = append(attributes, fmt.Sprintf("CPU_WEIGHT=%s", resGroup.CpuWeight))
 			attributes = append(attributes, fmt.Sprintf("CONCURRENCY=%s", resGroup.Concurrency))
 			metadataFile.MustPrintf("\n\nCREATE RESOURCE GROUP %s WITH (%s);", resGroup.Name, strings.Join(attributes, ", "))
 

meta/builtin/metadata_globals_test.go

@@ -264,20 +264,20 @@ GRANT TEMPORARY,CONNECT ON DATABASE testdb TO testrole;`,
 		It("prints prepare resource groups", func() {
 			builtin.PrintResetResourceGroupStatements(backupfile, tocfile)
 			testutils.ExpectEntry(tocfile.GlobalEntries, 0, "", "", "admin_group", "RESOURCE GROUP")
-			if (connectionPool.Version.IsGPDB() && connectionPool.Version.Before("7")) || connectionPool.Version.IsCBDB() {
+			if (connectionPool.Version.IsGPDB() && connectionPool.Version.Before("7")) {
 				testutils.AssertBufferContents(tocfile.GlobalEntries, buffer,
 					`ALTER RESOURCE GROUP admin_group SET CPU_RATE_LIMIT 1;`,
 					`ALTER RESOURCE GROUP admin_group SET MEMORY_LIMIT 1;`,
 					`ALTER RESOURCE GROUP default_group SET CPU_RATE_LIMIT 1;`,
 					`ALTER RESOURCE GROUP default_group SET MEMORY_LIMIT 1;`)
 			} else { // GPDB7+
 				testutils.AssertBufferContents(tocfile.GlobalEntries, buffer,
-					`ALTER RESOURCE GROUP admin_group SET CPU_HARD_QUOTA_LIMIT 1;`,
-					`ALTER RESOURCE GROUP admin_group SET CPU_SOFT_PRIORITY 100;`,
-					`ALTER RESOURCE GROUP default_group SET CPU_HARD_QUOTA_LIMIT 1;`,
-					`ALTER RESOURCE GROUP default_group SET CPU_SOFT_PRIORITY 100;`,
-					`ALTER RESOURCE GROUP system_group SET CPU_HARD_QUOTA_LIMIT 1;`,
-					`ALTER RESOURCE GROUP system_group SET CPU_SOFT_PRIORITY 100;`)
+					`ALTER RESOURCE GROUP admin_group SET CPU_MAX_PERCENT 1;`,
+					`ALTER RESOURCE GROUP admin_group SET CPU_WEIGHT 100;`,
+					`ALTER RESOURCE GROUP default_group SET CPU_MAX_PERCENT 1;`,
+					`ALTER RESOURCE GROUP default_group SET CPU_WEIGHT 100;`,
+					`ALTER RESOURCE GROUP system_group SET CPU_MAX_PERCENT 1;`,
+					`ALTER RESOURCE GROUP system_group SET CPU_WEIGHT 100;`)
 
 			}
 		})

meta/builtin/queries_globals.go

@@ -231,15 +231,15 @@ type ResourceGroupBefore7 struct {
 }
 
 type ResourceGroupAtLeast7 struct {
-	ResourceGroup            // embedded common rg fields+methods
-	CpuHardQuotaLimit string `db:"cpu_hard_quota_limit"`
-	CpuSoftPriority   string `db:"cpu_soft_priority"`
+	ResourceGroup        // embedded common rg fields+methods
+	CpuMaxPercent string `db:"cpu_max_percent"`
+	CpuWeight     string `db:"cpu_weight"`
 }
 
 func GetResourceGroups[T ResourceGroupBefore7 | ResourceGroupAtLeast7](connectionPool *dbconn.DBConn) []T {
 	var query string
 
-	if (connectionPool.Version.IsGPDB() && connectionPool.Version.Before("7")) || connectionPool.Version.IsCBDB() {
+	if connectionPool.Version.IsGPDB() && connectionPool.Version.Before("7") {
 		before7SelectClause := ""
 		// This is when pg_dumpall was changed to use the actual values
 		if (connectionPool.Version.IsGPDB() && connectionPool.Version.AtLeast("5.2.0")) || connectionPool.Version.IsCBDB() {
@@ -296,8 +296,8 @@ func GetResourceGroups[T ResourceGroupBefore7 | ResourceGroupAtLeast7](connectio
 				g.oid       AS oid,
 				g.rsgname   AS name,
 				t1.value    AS concurrency,
-				t2.value    AS cpu_hard_quota_limit,
-				t3.value    AS cpu_soft_priority,
+				t2.value    AS cpu_max_percent,
+				t3.value    AS cpu_weight,
 				t4.value    AS cpuset
 			FROM pg_resgroup g
 				JOIN pg_resgroupcapability t1 ON g.oid = t1.resgroupid AND t1.reslimittype = 1