diff --git a/src/common/backend/catalog/builtin_funcs.ini b/src/common/backend/catalog/builtin_funcs.ini
index 731bd872f..1e224889c 100755
--- a/src/common/backend/catalog/builtin_funcs.ini
+++ b/src/common/backend/catalog/builtin_funcs.ini
@@ -7195,7 +7195,7 @@
     ),
     AddFuncGroup(
         "pg_buffercache_pages", 1, 
-        AddBuiltinFunc(_0(4130), _1("pg_buffercache_pages"), _2(0), _3(false), _4(true), _5(pg_buffercache_pages), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(100), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('s'), _19(0), _20(0), _21(12, 23, 26, 21, 20, 26, 26, 23, 26, 16, 16, 21, 23), _22(12, 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o'), _23(12, "bufferid", "relfilenode", "bucketid", "storage_type", "reltablespace", "reldatabase", "relforknumber", "relblocknumber", "isdirty", "isvalid", "usage_count", "pinning_backends"), _24(NULL), _25("pg_buffercache_pages"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33("f"), _34('f'), _35(NULL),  _36(0), _37(false))
+        AddBuiltinFunc(_0(4130), _1("pg_buffercache_pages"), _2(0), _3(false), _4(true), _5(pg_buffercache_pages), _6(2249), _7(PG_CATALOG_NAMESPACE), _8(BOOTSTRAP_SUPERUSERID), _9(INTERNALlanguageId), _10(1), _11(100), _12(0), _13(0), _14(false), _15(false), _16(false), _17(false), _18('s'), _19(0), _20(0), _21(12, 23, 26, 23, 20, 26, 26, 23, 26, 16, 16, 21, 23), _22(12, 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o', 'o'), _23(12, "bufferid", "relfilenode", "bucketid", "storage_type", "reltablespace", "reldatabase", "relforknumber", "relblocknumber", "isdirty", "isvalid", "usage_count", "pinning_backends"), _24(NULL), _25("pg_buffercache_pages"), _26(NULL), _27(NULL), _28(NULL), _29(0), _30(false), _31(NULL), _32(false), _33("f"), _34('f'), _35(NULL),  _36(0), _37(false))
     ),
     AddFuncGroup(
         "pg_cancel_backend", 1, 
diff --git a/src/common/backend/utils/adt/pgstatfuncs.cpp b/src/common/backend/utils/adt/pgstatfuncs.cpp
index 058791d0d..b97494b41 100644
--- a/src/common/backend/utils/adt/pgstatfuncs.cpp
+++ b/src/common/backend/utils/adt/pgstatfuncs.cpp
@@ -8614,7 +8614,7 @@ Datum pg_buffercache_pages(PG_FUNCTION_ARGS)
         tupledesc = CreateTemplateTupleDesc(NUM_BUFFERCACHE_PAGES_ELEM, false, TAM_HEAP);
         TupleDescInitEntry(tupledesc, (AttrNumber)1, "bufferid", INT4OID, -1, 0);
         TupleDescInitEntry(tupledesc, (AttrNumber)2, "relfilenode", OIDOID, -1, 0);
-        TupleDescInitEntry(tupledesc, (AttrNumber)3, "bucketid", INT2OID, -1, 0);
+        TupleDescInitEntry(tupledesc, (AttrNumber)3, "bucketid", INT4OID, -1, 0);
         TupleDescInitEntry(tupledesc, (AttrNumber)4, "storage_type", INT8OID, -1, 0);
         TupleDescInitEntry(tupledesc, (AttrNumber)5, "reltablespace", OIDOID, -1, 0);
         TupleDescInitEntry(tupledesc, (AttrNumber)6, "reldatabase", OIDOID, -1, 0);
@@ -8729,7 +8729,7 @@ Datum pg_buffercache_pages(PG_FUNCTION_ARGS)
         } else {
             values[1] = ObjectIdGetDatum(fctx->record[i].relfilenode);
             nulls[1] = false;
-            values[2] = Int16GetDatum(fctx->record[i].bucketnode);
+            values[2] = Int32GetDatum(fctx->record[i].bucketnode);
             nulls[2] = false;
             values[3] = Int32GetDatum(fctx->record[i].storage_type);
             nulls[3] = false;
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index 195b4b045..26c871c9a 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -2653,7 +2653,7 @@ extern void sessionStatShmemInit(void);
 typedef struct {
     uint32 bufferid;
     Oid relfilenode;
-    int2 bucketnode;
+    int4 bucketnode;
     uint32 storage_type;
     Oid reltablespace;
     Oid reldatabase;