prevent overflow in index

Author: James Cor

server/tables/pgcatalog/pg_constraint.go

@@ -113,13 +113,13 @@ func (p PgConstraintHandler) PkSchema() sql.PrimaryKeySchema {
 // Indexes implements tables.IndexedTableHandler.
 func (p PgConstraintHandler) Indexes() ([]sql.Index, error) {
 	return []sql.Index{
-		pgCatalogInMemIndex{
-			name:        "pg_constraint_oid_index",
-			tblName:     "pg_constraint",
-			dbName:      "pg_catalog",
-			uniq:        true,
-			columnExprs: []sql.ColumnExpressionType{{Expression: "pg_constraint.oid", Type: pgtypes.Oid}},
-		},
+		//pgCatalogInMemIndex{
+		//	name:        "pg_constraint_oid_index",
+		//	tblName:     "pg_constraint",
+		//	dbName:      "pg_catalog",
+		//	uniq:        true,
+		//	columnExprs: []sql.ColumnExpressionType{{Expression: "pg_constraint.oid", Type: pgtypes.Oid}},
+		//},
 		pgCatalogInMemIndex{
 			name:    "pg_constraint_conrelid_contypid_conname_index",
 			tblName: "pg_constraint",
@@ -131,27 +131,27 @@ func (p PgConstraintHandler) Indexes() ([]sql.Index, error) {
 				{Expression: "pg_constraint.conname", Type: pgtypes.Name},
 			},
 		},
-		pgCatalogInMemIndex{
-			name:    "pg_constraint_conname_nsp_index",
-			tblName: "pg_constraint",
-			dbName:  "pg_catalog",
-			uniq:    false,
-			columnExprs: []sql.ColumnExpressionType{
-				{Expression: "pg_constraint.conname", Type: pgtypes.Name},
-				{Expression: "pg_constraint.connamespace", Type: pgtypes.Oid},
-			},
-		},
+		//pgCatalogInMemIndex{
+		//	name:    "pg_constraint_conname_nsp_index",
+		//	tblName: "pg_constraint",
+		//	dbName:  "pg_catalog",
+		//	uniq:    false,
+		//	columnExprs: []sql.ColumnExpressionType{
+		//		{Expression: "pg_constraint.conname", Type: pgtypes.Name},
+		//		{Expression: "pg_constraint.connamespace", Type: pgtypes.Oid},
+		//	},
+		//},
 		// pg_constraint_conparentid_index is skipped because we don't support partitions, but might be worth
 		// implementing if it makes any tool faster
-		pgCatalogInMemIndex{
-			name:    "pg_constraint_contypid_index",
-			tblName: "pg_constraint",
-			dbName:  "pg_catalog",
-			uniq:    false,
-			columnExprs: []sql.ColumnExpressionType{
-				{Expression: "pg_constraint.contypid", Type: pgtypes.Oid},
-			},
-		},
+		//pgCatalogInMemIndex{
+		//	name:    "pg_constraint_contypid_index",
+		//	tblName: "pg_constraint",
+		//	dbName:  "pg_catalog",
+		//	uniq:    false,
+		//	columnExprs: []sql.ColumnExpressionType{
+		//		{Expression: "pg_constraint.contypid", Type: pgtypes.Oid},
+		//	},
+		//},
 	}, nil
 }
 
@@ -274,15 +274,16 @@ func (p PgConstraintHandler) getIndexScanRange(rng sql.Range, index sql.Index) (
 		}
 
 		if hasUpperBound {
+			// TODO: does this make sense?
 			// our less-than upper bounds depend on how many fields were set
 			if typOidUpperSet {
 				if nameUpperSet {
 					nameUpper = fmt.Sprintf("%s%o", nameUpper, rune(0))
-				} else {
+				} else if typOidUpper < math.MaxUint32 { // prevent overflow
 					typOidUpper = typOidUpper + 1
 				}
 			} else {
-				if !relOidUpperSet {
+				if !relOidUpperSet && relOidUpper < math.MaxUint32 { // prevent overflow
 					relOidUpper = relOidUpper + 1
 				}
 			}