chore: cherry pick patches to release/v0.17.0 branch (#7024 )

* fix: print the output message of the error in admin fn macro (#6994) Signed-off-by: evenyag <realevenyag@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: make EXPIRE (keyword) parsing case-insensitive, when creating flow (#6997) fix: make EXPIRE keyword case-insensitive in CREATE FLOW parser Signed-off-by: Shyamnatesan <shyamnatesan21@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: promql range function has incorrect timestamps (#7006) * fix: promql range function has incorrect timestamps Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * simplify Signed-off-by: Ruihang Xia <waynestxia@gmail.com> --------- Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: incorrect timestamp resolution in information_schema.partitions table (#7004) * fix: incorrect timestamp resolution in information_schema.partitions table Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * use second for all fields in partitions table Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * update sqlness result Signed-off-by: Ruihang Xia <waynestxia@gmail.com> --------- Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: match promql column reference in case sensitive way (#7013) Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: group by expr not as column in step aggr (#7008) * fix: group by expr not as column Signed-off-by: discord9 <discord9@163.com> * test: dist analyzer date_bin Signed-off-by: discord9 <discord9@163.com> * ???fix wip Signed-off-by: discord9 <discord9@163.com> * fix: deduce using correct input fields Signed-off-by: discord9 <discord9@163.com> * refactor: clearer wrapper Signed-off-by: discord9 <discord9@163.com> * chore: update sqlness Signed-off-by: discord9 <discord9@163.com> * chore: per review Signed-off-by: discord9 <discord9@163.com> * chore: per review Signed-off-by: discord9 <discord9@163.com> * chore: rm todo Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com> * fix: skip placeholder when partition columns (#7020) Signed-off-by: discord9 <discord9@163.com> * chore: add function for getting started on metasrv (#7022) Signed-off-by: shuiyisong <xixing.sys@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: not step when aggr have order by/filter (#7015) * fix: not applied Signed-off-by: discord9 <discord9@163.com> * chore: per review Signed-off-by: discord9 <discord9@163.com> * test: confirm order by not push down Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com> * feat: supports expression in TQL params (#7014) * feat: supports expression in TQL params Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: by cr comments Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: comment Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: by cr comments Signed-off-by: Dennis Zhuang <killme2008@gmail.com> --------- Signed-off-by: Dennis Zhuang <killme2008@gmail.com> Signed-off-by: discord9 <discord9@163.com> * feat: update dashboard to v0.11.6 (#7026) Co-authored-by: ZonaHex <ZonaHex@users.noreply.github.com> Signed-off-by: discord9 <discord9@163.com> * fix: step aggr merge phase not order nor filter (#6998) * fix: not order Signed-off-by: discord9 <discord9@163.com> * test: redacted Signed-off-by: discord9 <discord9@163.com> * feat: fix up state wrapper Signed-off-by: discord9 <discord9@163.com> * df last_value state not as promised! Signed-off-by: discord9 <discord9@163.com> * fix?: could fix better Signed-off-by: discord9 <discord9@163.com> * test: unstable result Signed-off-by: discord9 <discord9@163.com> * fix: work around by fixing state Signed-off-by: discord9 <discord9@163.com> * chore: after rebase fix Signed-off-by: discord9 <discord9@163.com> * chore: finish some todo Signed-off-by: discord9 <discord9@163.com> * chore: per copilot Signed-off-by: discord9 <discord9@163.com> * refactor: not fix but just notify mismatch Signed-off-by: discord9 <discord9@163.com> * chore: warn -> debug state mismatch Signed-off-by: discord9 <discord9@163.com> * chore: refine error msg Signed-off-by: discord9 <discord9@163.com> * test: sqlness add last_value date_bin test Signed-off-by: discord9 <discord9@163.com> * ?: substrait order by decode failure Signed-off-by: discord9 <discord9@163.com> * unit test reproduce that Signed-off-by: discord9 <discord9@163.com> * feat: support state wrapper's order serde in substrait Signed-off-by: discord9 <discord9@163.com> * refactor: stuff Signed-off-by: discord9 <discord9@163.com> * test: standalone/distributed different exec Signed-off-by: discord9 <discord9@163.com> * fmt Signed-off-by: discord9 <discord9@163.com> * chore: per review Signed-off-by: discord9 <discord9@163.com> * refactor: closure Signed-off-by: discord9 <discord9@163.com> * test: first value order by Signed-off-by: discord9 <discord9@163.com> * refactor: per cr Signed-off-by: discord9 <discord9@163.com> * feat: ScanHint last_value last row selector Signed-off-by: discord9 <discord9@163.com> * docs: per cr Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com> * chore: bump version to 0.17.2 Signed-off-by: WenyXu <wenymedia@gmail.com> Signed-off-by: discord9 <discord9@163.com> * chore: not warning Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: evenyag <realevenyag@gmail.com> Signed-off-by: discord9 <discord9@163.com> Signed-off-by: Shyamnatesan <shyamnatesan21@gmail.com> Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: shuiyisong <xixing.sys@gmail.com> Signed-off-by: Dennis Zhuang <killme2008@gmail.com> Signed-off-by: WenyXu <wenymedia@gmail.com> Co-authored-by: Yingwen <realevenyag@gmail.com> Co-authored-by: shyam <43544082+Shyamnatesan@users.noreply.github.com> Co-authored-by: Ruihang Xia <waynestxia@gmail.com> Co-authored-by: discord9 <55937128+discord9@users.noreply.github.com> Co-authored-by: shuiyisong <113876041+shuiyisong@users.noreply.github.com> Co-authored-by: dennis zhuang <killme2008@gmail.com> Co-authored-by: ZonaHe <zonahe@qq.com> Co-authored-by: ZonaHex <ZonaHex@users.noreply.github.com> Co-authored-by: discord9 <discord9@163.com>
chore: bump version to 0.17.1
2025-12-24 23:19:57 +00:00 · 2025-09-28 16:21:06 +08:00 · 2025-09-17 16:42:28 +08:00 · 2025-09-17 16:42:28 +08:00 · 2025-09-17 16:42:28 +08:00 · 2025-09-17 16:42:28 +08:00
1573 changed files with 26832 additions and 79736 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -2,7 +2,7 @@
 linker = "aarch64-linux-gnu-gcc"

 [alias]
-sqlness = "run --bin sqlness-runner --target-dir target/sqlness --"
+sqlness = "run --bin sqlness-runner --"

 [unstable.git]
 shallow_index = true
--- a/.github/scripts/deploy-greptimedb.sh
+++ b/.github/scripts/deploy-greptimedb.sh
@@ -7,8 +7,6 @@ KUBERNETES_VERSION="${KUBERNETES_VERSION:-v1.32.0}"
 ENABLE_STANDALONE_MODE="${ENABLE_STANDALONE_MODE:-true}"
 DEFAULT_INSTALL_NAMESPACE=${DEFAULT_INSTALL_NAMESPACE:-default}
 GREPTIMEDB_IMAGE_TAG=${GREPTIMEDB_IMAGE_TAG:-latest}
-GREPTIMEDB_OPERATOR_IMAGE_TAG=${GREPTIMEDB_OPERATOR_IMAGE_TAG:-v0.5.1}
-GREPTIMEDB_INITIALIZER_IMAGE_TAG="${GREPTIMEDB_OPERATOR_IMAGE_TAG}"
 GREPTIME_CHART="https://greptimeteam.github.io/helm-charts/"
 ETCD_CHART="oci://registry-1.docker.io/bitnamicharts/etcd"
 ETCD_CHART_VERSION="${ETCD_CHART_VERSION:-12.0.8}"
@@ -60,7 +58,7 @@ function deploy_greptimedb_operator() {
  # Use the latest chart and image.
  helm upgrade --install greptimedb-operator greptime/greptimedb-operator \
    --create-namespace \
-    --set image.tag="$GREPTIMEDB_OPERATOR_IMAGE_TAG" \
+    --set image.tag=latest \
    -n "$DEFAULT_INSTALL_NAMESPACE"

  # Wait for greptimedb-operator to be ready.
@@ -80,7 +78,6 @@ function deploy_greptimedb_cluster() {
  helm upgrade --install "$cluster_name" greptime/greptimedb-cluster \
    --create-namespace \
    --set image.tag="$GREPTIMEDB_IMAGE_TAG" \
-    --set initializer.tag="$GREPTIMEDB_INITIALIZER_IMAGE_TAG" \
    --set meta.backendStorage.etcd.endpoints="etcd.$install_namespace:2379" \
    --set meta.backendStorage.etcd.storeKeyPrefix="$cluster_name" \
    -n "$install_namespace"
@@ -118,7 +115,6 @@ function deploy_greptimedb_cluster_with_s3_storage() {
  helm upgrade --install "$cluster_name" greptime/greptimedb-cluster -n "$install_namespace" \
    --create-namespace \
    --set image.tag="$GREPTIMEDB_IMAGE_TAG" \
-    --set initializer.tag="$GREPTIMEDB_INITIALIZER_IMAGE_TAG" \
    --set meta.backendStorage.etcd.endpoints="etcd.$install_namespace:2379" \
    --set meta.backendStorage.etcd.storeKeyPrefix="$cluster_name" \
    --set objectStorage.s3.bucket="$AWS_CI_TEST_BUCKET" \
--- a/.github/scripts/package-lock.json
+++ b/.github/scripts/package-lock.json
@@ -1,507 +0,0 @@
-{
-  "name": "greptimedb-github-scripts",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "greptimedb-github-scripts",
-      "version": "1.0.0",
-      "dependencies": {
-        "@octokit/rest": "^21.0.0",
-        "axios": "^1.7.0"
-      }
-    },
-    "node_modules/@octokit/auth-token": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-5.1.2.tgz",
-      "integrity": "sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/core": {
-      "version": "6.1.6",
-      "resolved": "https://registry.npmjs.org/@octokit/core/-/core-6.1.6.tgz",
-      "integrity": "sha512-kIU8SLQkYWGp3pVKiYzA5OSaNF5EE03P/R8zEmmrG6XwOg5oBjXyQVVIauQ0dgau4zYhpZEhJrvIYt6oM+zZZA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/auth-token": "^5.0.0",
-        "@octokit/graphql": "^8.2.2",
-        "@octokit/request": "^9.2.3",
-        "@octokit/request-error": "^6.1.8",
-        "@octokit/types": "^14.0.0",
-        "before-after-hook": "^3.0.2",
-        "universal-user-agent": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/endpoint": {
-      "version": "10.1.4",
-      "resolved": "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-10.1.4.tgz",
-      "integrity": "sha512-OlYOlZIsfEVZm5HCSR8aSg02T2lbUWOsCQoPKfTXJwDzcHQBrVBGdGXb89dv2Kw2ToZaRtudp8O3ZIYoaOjKlA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.0.0",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/graphql": {
-      "version": "8.2.2",
-      "resolved": "https://registry.npmjs.org/@octokit/graphql/-/graphql-8.2.2.tgz",
-      "integrity": "sha512-Yi8hcoqsrXGdt0yObxbebHXFOiUA+2v3n53epuOg1QUgOB6c4XzvisBNVXJSl8RYA5KrDuSL2yq9Qmqe5N0ryA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/request": "^9.2.3",
-        "@octokit/types": "^14.0.0",
-        "universal-user-agent": "^7.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/openapi-types": {
-      "version": "25.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-25.1.0.tgz",
-      "integrity": "sha512-idsIggNXUKkk0+BExUn1dQ92sfysJrje03Q0bv0e+KPLrvyqZF8MnBpFz8UNfYDwB3Ie7Z0TByjWfzxt7vseaA==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-paginate-rest": {
-      "version": "11.6.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.6.0.tgz",
-      "integrity": "sha512-n5KPteiF7pWKgBIBJSk8qzoZWcUkza2O6A0za97pMGVrGfPdltxrfmfF5GucHYvHGZD8BdaZmmHGz5cX/3gdpw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.10.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-paginate-rest/node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
-      }
-    },
-    "node_modules/@octokit/plugin-request-log": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-5.3.1.tgz",
-      "integrity": "sha512-n/lNeCtq+9ofhC15xzmJCNKP2BWTv8Ih2TTy+jatNCCq/gQP/V7rK3fjIfuz0pDWDALO/o/4QY4hyOF6TQQFUw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods": {
-      "version": "13.5.0",
-      "resolved": "https://registry.npmjs.org/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-13.5.0.tgz",
-      "integrity": "sha512-9Pas60Iv9ejO3WlAX3maE1+38c5nqbJXV5GrncEfkndIpZrJ/WPMRd2xYDcPPEt5yzpxcjw9fWNoPhsSGzqKqw==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^13.10.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      },
-      "peerDependencies": {
-        "@octokit/core": ">=6"
-      }
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/openapi-types": {
-      "version": "24.2.0",
-      "resolved": "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-24.2.0.tgz",
-      "integrity": "sha512-9sIH3nSUttelJSXUrmGzl7QUBFul0/mB8HRYl3fOlgHbIWG+WnYDXU3v/2zMtAvuzZ/ed00Ei6on975FhBfzrg==",
-      "license": "MIT"
-    },
-    "node_modules/@octokit/plugin-rest-endpoint-methods/node_modules/@octokit/types": {
-      "version": "13.10.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-13.10.0.tgz",
-      "integrity": "sha512-ifLaO34EbbPj0Xgro4G5lP5asESjwHracYJvVaPIyXMuiuXLlhic3S47cBdTb+jfODkTE5YtGCLt3Ay3+J97sA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^24.2.0"
-      }
-    },
-    "node_modules/@octokit/request": {
-      "version": "9.2.4",
-      "resolved": "https://registry.npmjs.org/@octokit/request/-/request-9.2.4.tgz",
-      "integrity": "sha512-q8ybdytBmxa6KogWlNa818r0k1wlqzNC+yNkcQDECHvQo8Vmstrg18JwqJHdJdUiHD2sjlwBgSm9kHkOKe2iyA==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/endpoint": "^10.1.4",
-        "@octokit/request-error": "^6.1.8",
-        "@octokit/types": "^14.0.0",
-        "fast-content-type-parse": "^2.0.0",
-        "universal-user-agent": "^7.0.2"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/request-error": {
-      "version": "6.1.8",
-      "resolved": "https://registry.npmjs.org/@octokit/request-error/-/request-error-6.1.8.tgz",
-      "integrity": "sha512-WEi/R0Jmq+IJKydWlKDmryPcmdYSVjL3ekaiEL1L9eo1sUnqMJ+grqmC9cjk7CA7+b2/T397tO5d8YLOH3qYpQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/types": "^14.0.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/rest": {
-      "version": "21.1.1",
-      "resolved": "https://registry.npmjs.org/@octokit/rest/-/rest-21.1.1.tgz",
-      "integrity": "sha512-sTQV7va0IUVZcntzy1q3QqPm/r8rWtDCqpRAmb8eXXnKkjoQEtFe3Nt5GTVsHft+R6jJoHeSiVLcgcvhtue/rg==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/core": "^6.1.4",
-        "@octokit/plugin-paginate-rest": "^11.4.2",
-        "@octokit/plugin-request-log": "^5.3.1",
-        "@octokit/plugin-rest-endpoint-methods": "^13.3.0"
-      },
-      "engines": {
-        "node": ">= 18"
-      }
-    },
-    "node_modules/@octokit/types": {
-      "version": "14.1.0",
-      "resolved": "https://registry.npmjs.org/@octokit/types/-/types-14.1.0.tgz",
-      "integrity": "sha512-1y6DgTy8Jomcpu33N+p5w58l6xyt55Ar2I91RPiIA0xCJBXyUAhXCcmZaDWSANiha7R9a6qJJ2CRomGPZ6f46g==",
-      "license": "MIT",
-      "dependencies": {
-        "@octokit/openapi-types": "^25.1.0"
-      }
-    },
-    "node_modules/asynckit": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
-      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
-      "license": "MIT"
-    },
-    "node_modules/axios": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
-      "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
-      "license": "MIT",
-      "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.4",
-        "proxy-from-env": "^1.1.0"
-      }
-    },
-    "node_modules/before-after-hook": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-3.0.2.tgz",
-      "integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==",
-      "license": "Apache-2.0"
-    },
-    "node_modules/call-bind-apply-helpers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
-      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
-      "license": "MIT",
-      "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "license": "MIT",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/fast-content-type-parse": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz",
-      "integrity": "sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ],
-      "license": "MIT"
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.11",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz",
-      "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
-      "engines": {
-        "node": ">=4.0"
-      },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/form-data": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
-      "license": "MIT",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "hasown": "^2.0.2",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "license": "MIT",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "license": "MIT",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "license": "MIT",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "license": "MIT",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "license": "MIT",
-      "dependencies": {
-        "mime-db": "1.52.0"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/proxy-from-env": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
-    },
-    "node_modules/universal-user-agent": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-7.0.3.tgz",
-      "integrity": "sha512-TmnEAEAsBJVZM/AADELsK76llnwcf9vMKuPz8JflO1frO8Lchitr0fNaN9d+Ap0BjKtqWqd/J17qeDnXh8CL2A==",
-      "license": "ISC"
-    }
-  }
-}
--- a/.github/scripts/package.json
+++ b/.github/scripts/package.json
@@ -1,10 +0,0 @@
-{
-  "name": "greptimedb-github-scripts",
-  "version": "1.0.0",
-  "type": "module",
-  "description": "GitHub automation scripts for GreptimeDB",
-  "dependencies": {
-    "@octokit/rest": "^21.0.0",
-    "axios": "^1.7.0"
-  }
-}
--- a/.github/scripts/pr-review-reminder.js
+++ b/.github/scripts/pr-review-reminder.js
@@ -1,152 +0,0 @@
-// Daily PR Review Reminder Script
-// Fetches open PRs from GreptimeDB repository and sends Slack notifications
-// to PR owners and assigned reviewers to keep review process moving.
-
-(async () => {
-  const { Octokit } = await import("@octokit/rest");
-  const { default: axios } = await import('axios');
-
-  // Configuration
-  const GITHUB_TOKEN = process.env.GITHUB_TOKEN;
-  const SLACK_WEBHOOK_URL = process.env.SLACK_PR_REVIEW_WEBHOOK_URL;
-  const REPO_OWNER = "GreptimeTeam";
-  const REPO_NAME = "greptimedb";
-  const GITHUB_TO_SLACK = JSON.parse(process.env.GITHUBID_SLACKID_MAPPING || '{}');
-
-  // Debug: Print environment variable status
-  console.log("=== Environment Variables Debug ===");
-  console.log(`GITHUB_TOKEN: ${GITHUB_TOKEN ? 'Set ✓' : 'NOT SET ✗'}`);
-  console.log(`SLACK_PR_REVIEW_WEBHOOK_URL: ${SLACK_WEBHOOK_URL ? 'Set ✓' : 'NOT SET ✗'}`);
-  console.log(`GITHUBID_SLACKID_MAPPING: ${process.env.GITHUBID_SLACKID_MAPPING ? `Set ✓ (${Object.keys(GITHUB_TO_SLACK).length} mappings)` : 'NOT SET ✗'}`);
-  console.log("===================================\n");
-
-  const octokit = new Octokit({
-    auth: GITHUB_TOKEN
-  });
-
-  // Fetch all open PRs from the repository
-  async function fetchOpenPRs() {
-    try {
-      const prs = await octokit.pulls.list({
-        owner: REPO_OWNER,
-        repo: REPO_NAME,
-        state: "open",
-        per_page: 100,
-        sort: "created",
-        direction: "asc"
-      });
-      return prs.data.filter((pr) => !pr.draft);
-    } catch (error) {
-      console.error("Error fetching PRs:", error);
-      return [];
-    }
-  }
-
-  // Convert GitHub username to Slack mention or fallback to GitHub username
-  function toSlackMention(githubUser) {
-    const slackUserId = GITHUB_TO_SLACK[githubUser];
-    return slackUserId ? `<@${slackUserId}>` : `@${githubUser}`;
-  }
-
-  // Calculate days since PR was opened
-  function getDaysOpen(createdAt) {
-    const created = new Date(createdAt);
-    const now = new Date();
-    const diffMs = now - created;
-    const days = Math.floor(diffMs / (1000 * 60 * 60 * 24));
-    return days;
-  }
-
-  // Build Slack notification message from PR list
-  function buildSlackMessage(prs) {
-    if (prs.length === 0) {
-      return "*🎉 Great job! No pending PRs for review.*";
-    }
-
-    // Separate PRs by age threshold (14 days)
-    const criticalPRs = [];
-    const recentPRs = [];
-
-    prs.forEach(pr => {
-      const daysOpen = getDaysOpen(pr.created_at);
-      if (daysOpen >= 14) {
-        criticalPRs.push(pr);
-      } else {
-        recentPRs.push(pr);
-      }
-    });
-
-    const lines = [
-      `*🔍 Daily PR Review Reminder 🔍*`,
-      `Found *${criticalPRs.length}* critical PR(s) (14+ days old)\n`
-    ];
-
-    // Show critical PRs (14+ days) in detail
-    if (criticalPRs.length > 0) {
-      criticalPRs.forEach((pr, index) => {
-        const owner = toSlackMention(pr.user.login);
-        const reviewers = pr.requested_reviewers || [];
-        const reviewerMentions = reviewers.map(r => toSlackMention(r.login)).join(", ");
-        const daysOpen = getDaysOpen(pr.created_at);
-
-        const prInfo = `${index + 1}. <${pr.html_url}|#${pr.number}: ${pr.title}>`;
-        const ageInfo = `   🔴 Opened *${daysOpen}* day(s) ago`;
-        const ownerInfo = `   👤 Owner: ${owner}`;
-        const reviewerInfo = reviewers.length > 0
-          ? `   👁️ Reviewers: ${reviewerMentions}`
-          : `   👁️ Reviewers: _Not assigned yet_`;
-
-        lines.push(prInfo);
-        lines.push(ageInfo);
-        lines.push(ownerInfo);
-        lines.push(reviewerInfo);
-        lines.push(""); // Empty line between PRs
-      });
-    }
-
-    lines.push("_Let's keep the code review process moving! 🚀_");
-
-    return lines.join("\n");
-  }
-
-  // Send notification to Slack webhook
-  async function sendSlackNotification(message) {
-    if (!SLACK_WEBHOOK_URL) {
-      console.log("⚠️  SLACK_PR_REVIEW_WEBHOOK_URL not configured. Message preview:");
-      console.log("=".repeat(60));
-      console.log(message);
-      console.log("=".repeat(60));
-      return;
-    }
-
-    try {
-      const response = await axios.post(SLACK_WEBHOOK_URL, {
-        text: message
-      });
-
-      if (response.status !== 200) {
-        throw new Error(`Slack API returned status ${response.status}`);
-      }
-      console.log("Slack notification sent successfully.");
-    } catch (error) {
-      console.error("Error sending Slack notification:", error);
-      throw error;
-    }
-  }
-
-  // Main execution flow
-  async function run() {
-    console.log(`Fetching open PRs from ${REPO_OWNER}/${REPO_NAME}...`);
-    const prs = await fetchOpenPRs();
-    console.log(`Found ${prs.length} open PR(s).`);
-
-    const message = buildSlackMessage(prs);
-    console.log("Sending Slack notification...");
-    await sendSlackNotification(message);
-  }
-
-  run().catch(error => {
-    console.error("Script execution failed:", error);
-    process.exit(1);
-  });
-})();
--- a/.github/workflows/develop.yml
+++ b/.github/workflows/develop.yml
@@ -613,9 +613,6 @@ jobs:
          - name: "MySQL Kvbackend"
            opts: "--setup-mysql"
            kafka: false
-          - name: "Flat format"
-            opts: "--enable-flat-format"
-            kafka: false
    timeout-minutes: 60
    steps:
      - uses: actions/checkout@v4
@@ -635,7 +632,7 @@ jobs:
      - name: Unzip binaries
        run: tar -xvf ./bins.tar.gz
      - name: Run sqlness
-        run: RUST_BACKTRACE=1 ./bins/sqlness-runner bare ${{ matrix.mode.opts }} -c ./tests/cases --bins-dir ./bins --preserve-state
+        run: RUST_BACKTRACE=1 ./bins/sqlness-runner ${{ matrix.mode.opts }} -c ./tests/cases --bins-dir ./bins --preserve-state
      - name: Upload sqlness logs
        if: failure()
        uses: actions/upload-artifact@v4
@@ -811,7 +808,7 @@ jobs:
      - name: Setup external services
        working-directory: tests-integration/fixtures
        run: ../../.github/scripts/pull-test-deps-images.sh && docker compose up -d --wait
-
+        
      - name: Run nextest cases
        run: cargo llvm-cov nextest --workspace --lcov --output-path lcov.info -F dashboard -F pg_kvbackend -F mysql_kvbackend
        env:
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -92,6 +92,5 @@ jobs:
        mode:
          - name: "Basic"
          - name: "Remote WAL"
-          - name: "Flat format"
    steps:
      - run: 'echo "No action required"'
--- a/.github/workflows/pr-review-reminder.yml
+++ b/.github/workflows/pr-review-reminder.yml
@@ -1,36 +0,0 @@
-name: PR Review Reminder
-
-on:
-  schedule:
-    # Run at 9:00 AM UTC+8 (01:00 AM UTC) on Monday, Wednesday, Friday
-    - cron: '0 1 * * 1,3,5'
-  workflow_dispatch:
-
-jobs:
-  pr-review-reminder:
-    name: Send PR Review Reminders
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: read
-    if: ${{ github.repository == 'GreptimeTeam/greptimedb' }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-
-      - name: Install dependencies
-        working-directory: .github/scripts
-        run: npm ci
-
-      - name: Run PR review reminder
-        working-directory: .github/scripts
-        run: node pr-review-reminder.js
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SLACK_PR_REVIEW_WEBHOOK_URL: ${{ vars.SLACK_PR_REVIEW_WEBHOOK_URL }}
-          GITHUBID_SLACKID_MAPPING: ${{ vars.GITHUBID_SLACKID_MAPPING }}
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -61,7 +61,6 @@ members = [
    "src/promql",
    "src/puffin",
    "src/query",
-    "src/standalone",
    "src/servers",
    "src/session",
    "src/sql",
@@ -74,8 +73,8 @@ members = [
 resolver = "2"

 [workspace.package]
-version = "1.0.0-beta.1"
-edition = "2024"
+version = "0.17.2"
+edition = "2021"
 license = "Apache-2.0"

 [workspace.lints]
@@ -99,12 +98,12 @@ rust.unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
 # See for more detaiils: https://github.com/rust-lang/cargo/issues/11329
 ahash = { version = "0.8", features = ["compile-time-rng"] }
 aquamarine = "0.6"
-arrow = { version = "56.2", features = ["prettyprint"] }
-arrow-array = { version = "56.2", default-features = false, features = ["chrono-tz"] }
-arrow-buffer = "56.2"
-arrow-flight = "56.2"
-arrow-ipc = { version = "56.2", default-features = false, features = ["lz4", "zstd"] }
-arrow-schema = { version = "56.2", features = ["serde"] }
+arrow = { version = "56.0", features = ["prettyprint"] }
+arrow-array = { version = "56.0", default-features = false, features = ["chrono-tz"] }
+arrow-buffer = "56.0"
+arrow-flight = "56.0"
+arrow-ipc = { version = "56.0", default-features = false, features = ["lz4", "zstd"] }
+arrow-schema = { version = "56.0", features = ["serde"] }
 async-stream = "0.3"
 async-trait = "0.1"
 # Remember to update axum-extra, axum-macros when updating axum
@@ -118,24 +117,22 @@ bitflags = "2.4.1"
 bytemuck = "1.12"
 bytes = { version = "1.7", features = ["serde"] }
 chrono = { version = "0.4", features = ["serde"] }
-chrono-tz = { version = "0.10.1", features = ["case-insensitive"] }
+chrono-tz = "0.10.1"
 clap = { version = "4.4", features = ["derive"] }
 config = "0.13.0"
-const_format = "0.2"
 crossbeam-utils = "0.8"
 dashmap = "6.1"
-datafusion = "50"
-datafusion-common = "50"
-datafusion-expr = "50"
-datafusion-functions = "50"
-datafusion-functions-aggregate-common = "50"
-datafusion-optimizer = "50"
-datafusion-orc = "0.5"
-datafusion-pg-catalog = "0.12.1"
-datafusion-physical-expr = "50"
-datafusion-physical-plan = "50"
-datafusion-sql = "50"
-datafusion-substrait = "50"
+datafusion = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
+datafusion-common = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
+datafusion-expr = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
+datafusion-functions = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
+datafusion-functions-aggregate-common = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
+datafusion-optimizer = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
+datafusion-orc = { git = "https://github.com/GreptimeTeam/datafusion-orc", rev = "a0a5f902158f153119316eaeec868cff3fc8a99d" }
+datafusion-physical-expr = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
+datafusion-physical-plan = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
+datafusion-sql = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
+datafusion-substrait = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "7d5214512740b4dfb742b6b3d91ed9affcc2c9d0" }
 deadpool = "0.12"
 deadpool-postgres = "0.14"
 derive_builder = "0.20"
@@ -148,7 +145,7 @@ etcd-client = { git = "https://github.com/GreptimeTeam/etcd-client", rev = "f62d
 fst = "0.4.7"
 futures = "0.3"
 futures-util = "0.3"
-greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "14b9dc40bdc8288742b0cefc7bb024303b7429ef" }
+greptime-proto = { git = "https://github.com/GreptimeTeam/greptime-proto.git", rev = "66eb089afa6baaa3ddfafabd0a4abbe317d012c3" }
 hex = "0.4"
 http = "1"
 humantime = "2.1"
@@ -177,11 +174,8 @@ opentelemetry-proto = { version = "0.30", features = [
    "logs",
 ] }
 ordered-float = { version = "4.3", features = ["serde"] }
-otel-arrow-rust = { git = "https://github.com/GreptimeTeam/otel-arrow", rev = "2d64b7c0fa95642028a8205b36fe9ea0b023ec59", features = [
-    "server",
-] }
 parking_lot = "0.12"
-parquet = { version = "56.2", default-features = false, features = ["arrow", "async", "object_store"] }
+parquet = { version = "56.0", default-features = false, features = ["arrow", "async", "object_store"] }
 paste = "1.0"
 pin-project = "1.0"
 pretty_assertions = "1.4.0"
@@ -192,7 +186,7 @@ prost-types = "0.13"
 raft-engine = { version = "0.4.1", default-features = false }
 rand = "0.9"
 ratelimit = "0.10"
-regex = "1.12"
+regex = "1.8"
 regex-automata = "0.4"
 reqwest = { version = "0.12", default-features = false, features = [
    "json",
@@ -208,7 +202,6 @@ rstest_reuse = "0.7"
 rust_decimal = "1.33"
 rustc-hash = "2.0"
 # It is worth noting that we should try to avoid using aws-lc-rs until it can be compiled on various platforms.
-hostname = "0.4.0"
 rustls = { version = "0.23.25", default-features = false }
 sea-query = "0.32"
 serde = { version = "1.0", features = ["derive"] }
@@ -218,8 +211,16 @@ simd-json = "0.15"
 similar-asserts = "1.6.0"
 smallvec = { version = "1", features = ["serde"] }
 snafu = "0.8"
-sqlparser = { version = "0.58.0", default-features = false, features = ["std", "visitor", "serde"] }
-sqlx = { version = "0.8", default-features = false, features = ["any", "macros", "json", "runtime-tokio-rustls"] }
+sqlparser = { git = "https://github.com/GreptimeTeam/sqlparser-rs.git", rev = "39e4fc94c3c741981f77e9d63b5ce8c02e0a27ea", features = [
+    "visitor",
+    "serde",
+] } # branch = "v0.55.x"
+sqlx = { version = "0.8", features = [
+    "runtime-tokio-rustls",
+    "mysql",
+    "postgres",
+    "chrono",
+] }
 strum = { version = "0.27", features = ["derive"] }
 sysinfo = "0.33"
 tempfile = "3"
@@ -274,7 +275,6 @@ common-recordbatch = { path = "src/common/recordbatch" }
 common-runtime = { path = "src/common/runtime" }
 common-session = { path = "src/common/session" }
 common-sql = { path = "src/common/sql" }
-common-stat = { path = "src/common/stat" }
 common-telemetry = { path = "src/common/telemetry" }
 common-test-util = { path = "src/common/test-util" }
 common-time = { path = "src/common/time" }
@@ -296,6 +296,9 @@ mito-codec = { path = "src/mito-codec" }
 mito2 = { path = "src/mito2" }
 object-store = { path = "src/object-store" }
 operator = { path = "src/operator" }
+otel-arrow-rust = { git = "https://github.com/GreptimeTeam/otel-arrow", rev = "2d64b7c0fa95642028a8205b36fe9ea0b023ec59", features = [
+    "server",
+] }
 partition = { path = "src/partition" }
 pipeline = { path = "src/pipeline" }
 plugins = { path = "src/plugins" }
@@ -305,7 +308,7 @@ query = { path = "src/query" }
 servers = { path = "src/servers" }
 session = { path = "src/session" }
 sql = { path = "src/sql" }
-standalone = { path = "src/standalone" }
+stat = { path = "src/common/stat" }
 store-api = { path = "src/store-api" }
 substrait = { path = "src/common/substrait" }
 table = { path = "src/table" }
@@ -314,21 +317,6 @@ table = { path = "src/table" }
 git = "https://github.com/GreptimeTeam/greptime-meter.git"
 rev = "5618e779cf2bb4755b499c630fba4c35e91898cb"

-[patch.crates-io]
-datafusion = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-common = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-expr = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-functions = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-functions-aggregate-common = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-optimizer = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-physical-expr = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-physical-expr-common = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-physical-plan = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-datasource = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-sql = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-datafusion-substrait = { git = "https://github.com/GreptimeTeam/datafusion.git", rev = "fd4b2abcf3c3e43e94951bda452c9fd35243aab0" }
-sqlparser = { git = "https://github.com/GreptimeTeam/sqlparser-rs.git", rev = "4b519a5caa95472cc3988f5556813a583dd35af1" }                           # branch = "v0.58.x"
-
 [profile.release]
 debug = 1

--- a/4
+++ b/4
@@ -8,7 +8,7 @@ CARGO_BUILD_OPTS := --locked
 IMAGE_REGISTRY ?= docker.io
 IMAGE_NAMESPACE ?= greptime
 IMAGE_TAG ?= latest
-DEV_BUILDER_IMAGE_TAG ?= 2025-10-01-8fe17d43-20251011080129
+DEV_BUILDER_IMAGE_TAG ?= 2025-05-19-f55023f3-20250829091211
 BUILDX_MULTI_PLATFORM_BUILD ?= false
 BUILDX_BUILDER_NAME ?= gtbuilder
 BASE_IMAGE ?= ubuntu
@@ -169,7 +169,7 @@ nextest: ## Install nextest tools.

 .PHONY: sqlness-test
 sqlness-test: ## Run sqlness test.
-	cargo sqlness bare ${SQLNESS_OPTS}
+	cargo sqlness ${SQLNESS_OPTS}

 RUNS ?= 1
 FUZZ_TARGET ?= fuzz_alter_table
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@

 <div align="center">
 <h3 align="center">
+  <a href="https://greptime.com/product/cloud">GreptimeCloud</a> |
  <a href="https://docs.greptime.com/">User Guide</a> |
  <a href="https://greptimedb.rs/">API Docs</a> |
  <a href="https://github.com/GreptimeTeam/greptimedb/issues/5446">Roadmap 2025</a>
@@ -104,6 +105,16 @@ Read [more benchmark reports](https://docs.greptime.com/user-guide/concepts/feat

 ## Try GreptimeDB

+### 1. [Live Demo](https://greptime.com/playground)
+
+Experience GreptimeDB directly in your browser.
+
+### 2. [GreptimeCloud](https://console.greptime.cloud/)
+
+Start instantly with a free cluster.
+
+### 3. Docker (Local Quickstart)
+
 ```shell
 docker pull greptime/greptimedb
 ```
--- a/config/config.md
+++ b/config/config.md
@@ -13,10 +13,9 @@
 | Key | Type | Default | Descriptions |
 | --- | -----| ------- | ----------- |
 | `default_timezone` | String | Unset | The default timezone of the server. |
-| `default_column_prefix` | String | Unset | The default column prefix for auto-created time index and value columns. |
 | `init_regions_in_background` | Bool | `false` | Initialize all regions in the background during the startup.<br/>By default, it provides services after all regions have been initialized. |
 | `init_regions_parallelism` | Integer | `16` | Parallelism of initializing regions. |
-| `max_concurrent_queries` | Integer | `0` | The maximum current queries allowed to be executed. Zero means unlimited.<br/>NOTE: This setting affects scan_memory_limit's privileged tier allocation.<br/>When set, 70% of queries get privileged memory access (full scan_memory_limit).<br/>The remaining 30% get standard tier access (70% of scan_memory_limit). |
+| `max_concurrent_queries` | Integer | `0` | The maximum current queries allowed to be executed. Zero means unlimited. |
 | `enable_telemetry` | Bool | `true` | Enable telemetry to collect anonymous usage data. Enabled by default. |
 | `max_in_flight_write_bytes` | String | Unset | The maximum in-flight write bytes. |
 | `runtime` | -- | -- | The runtime options. |
@@ -26,15 +25,12 @@
 | `http.addr` | String | `127.0.0.1:4000` | The address to bind the HTTP server. |
 | `http.timeout` | String | `0s` | HTTP request timeout. Set to 0 to disable timeout. |
 | `http.body_limit` | String | `64MB` | HTTP request body limit.<br/>The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.<br/>Set to 0 to disable limit. |
-| `http.max_total_body_memory` | String | Unset | Maximum total memory for all concurrent HTTP request bodies.<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
 | `http.enable_cors` | Bool | `true` | HTTP CORS support, it's turned on by default<br/>This allows browser to access http APIs without CORS restrictions |
 | `http.cors_allowed_origins` | Array | Unset | Customize allowed origins for HTTP CORS. |
 | `http.prom_validation_mode` | String | `strict` | Whether to enable validation for Prometheus remote write requests.<br/>Available options:<br/>- strict: deny invalid UTF-8 strings (default).<br/>- lossy: allow invalid UTF-8 strings, replace invalid characters with REPLACEMENT_CHARACTER(U+FFFD).<br/>- unchecked: do not valid strings. |
 | `grpc` | -- | -- | The gRPC server options. |
 | `grpc.bind_addr` | String | `127.0.0.1:4001` | The address to bind the gRPC server. |
 | `grpc.runtime_size` | Integer | `8` | The number of server worker threads. |
-| `grpc.max_total_message_memory` | String | Unset | Maximum total memory for all concurrent gRPC request messages.<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
-| `grpc.max_connection_age` | String | Unset | The maximum connection age for gRPC connection.<br/>The value can be a human-readable time string. For example: `10m` for ten minutes or `1h` for one hour.<br/>Refer to https://grpc.io/docs/guides/keepalive/ for more details. |
 | `grpc.tls` | -- | -- | gRPC server TLS options, see `mysql.tls` section. |
 | `grpc.tls.mode` | String | `disable` | TLS mode. |
 | `grpc.tls.cert_path` | String | Unset | Certificate file path. |
@@ -104,11 +100,9 @@
 | `flow.num_workers` | Integer | `0` | The number of flow worker in flownode.<br/>Not setting(or set to 0) this value will use the number of CPU cores divided by 2. |
 | `query` | -- | -- | The query engine options. |
 | `query.parallelism` | Integer | `0` | Parallelism of the query engine.<br/>Default to 0, which means the number of CPU cores. |
-| `query.memory_pool_size` | String | `50%` | Memory pool size for query execution operators (aggregation, sorting, join).<br/>Supports absolute size (e.g., "2GB", "4GB") or percentage of system memory (e.g., "20%").<br/>Setting it to 0 disables the limit (unbounded, default behavior).<br/>When this limit is reached, queries will fail with ResourceExhausted error.<br/>NOTE: This does NOT limit memory used by table scans. |
 | `storage` | -- | -- | The data storage options. |
 | `storage.data_home` | String | `./greptimedb_data` | The working home directory. |
 | `storage.type` | String | `File` | The storage type used to store the data.<br/>- `File`: the data is stored in the local file system.<br/>- `S3`: the data is stored in the S3 object storage.<br/>- `Gcs`: the data is stored in the Google Cloud Storage.<br/>- `Azblob`: the data is stored in the Azure Blob Storage.<br/>- `Oss`: the data is stored in the Aliyun OSS. |
-| `storage.enable_read_cache` | Bool | `true` | Whether to enable read cache. If not set, the read cache will be enabled by default when using object storage. |
 | `storage.cache_path` | String | Unset | Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.<br/>A local file directory, defaults to `{data_home}`. An empty string means disabling. |
 | `storage.cache_capacity` | String | Unset | The local file cache capacity in bytes. If your disk space is sufficient, it is recommended to set it larger. |
 | `storage.bucket` | String | Unset | The S3 bucket name.<br/>**It's only used when the storage type is `S3`, `Oss` and `Gcs`**. |
@@ -152,15 +146,11 @@
 | `region_engine.mito.write_cache_path` | String | `""` | File system path for write cache, defaults to `{data_home}`. |
 | `region_engine.mito.write_cache_size` | String | `5GiB` | Capacity for write cache. If your disk space is sufficient, it is recommended to set it larger. |
 | `region_engine.mito.write_cache_ttl` | String | Unset | TTL for write cache. |
-| `region_engine.mito.preload_index_cache` | Bool | `true` | Preload index (puffin) files into cache on region open (default: true).<br/>When enabled, index files are loaded into the write cache during region initialization,<br/>which can improve query performance at the cost of longer startup times. |
-| `region_engine.mito.index_cache_percent` | Integer | `20` | Percentage of write cache capacity allocated for index (puffin) files (default: 20).<br/>The remaining capacity is used for data (parquet) files.<br/>Must be between 0 and 100 (exclusive). For example, with a 5GiB write cache and 20% allocation,<br/>1GiB is reserved for index files and 4GiB for data files. |
 | `region_engine.mito.sst_write_buffer_size` | String | `8MB` | Buffer size for SST writing. |
 | `region_engine.mito.parallel_scan_channel_size` | Integer | `32` | Capacity of the channel to send data from parallel scan tasks to the main task. |
 | `region_engine.mito.max_concurrent_scan_files` | Integer | `384` | Maximum number of SST files to scan concurrently. |
 | `region_engine.mito.allow_stale_entries` | Bool | `false` | Whether to allow stale WAL entries read during replay. |
-| `region_engine.mito.scan_memory_limit` | String | `50%` | Memory limit for table scans across all queries.<br/>Supports absolute size (e.g., "2GB") or percentage of system memory (e.g., "20%").<br/>Setting it to 0 disables the limit.<br/>NOTE: Works with max_concurrent_queries for tiered memory allocation.<br/>- If max_concurrent_queries is set: 70% of queries get full access, 30% get 70% access.<br/>- If max_concurrent_queries is 0 (unlimited): first 20 queries get full access, rest get 70% access. |
 | `region_engine.mito.min_compaction_interval` | String | `0m` | Minimum time interval between two compactions.<br/>To align with the old behavior, the default value is 0 (no restrictions). |
-| `region_engine.mito.default_experimental_flat_format` | Bool | `false` | Whether to enable experimental flat format as the default format. |
 | `region_engine.mito.index` | -- | -- | The options for index in Mito engine. |
 | `region_engine.mito.index.aux_path` | String | `""` | Auxiliary directory path for the index in filesystem, used to store intermediate files for<br/>creating the index and staging files for searching the index, defaults to `{data_home}/index_intermediate`.<br/>The default name for this directory is `index_intermediate` for backward compatibility.<br/><br/>This path contains two subdirectories:<br/>- `__intm`: for storing intermediate files used during creating index.<br/>- `staging`: for storing staging files used during searching index. |
 | `region_engine.mito.index.staging_size` | String | `2GB` | The max capacity of the staging directory. |
@@ -192,7 +182,7 @@
 | `region_engine.mito.memtable.fork_dictionary_bytes` | String | `1GiB` | Max dictionary bytes.<br/>Only available for `partition_tree` memtable. |
 | `region_engine.file` | -- | -- | Enable the file engine. |
 | `region_engine.metric` | -- | -- | Metric engine options. |
-| `region_engine.metric.sparse_primary_key_encoding` | Bool | `true` | Whether to use sparse primary key encoding. |
+| `region_engine.metric.experimental_sparse_primary_key_encoding` | Bool | `false` | Whether to enable the experimental sparse primary key encoding. |
 | `logging` | -- | -- | The logging options. |
 | `logging.dir` | String | `./greptimedb_data/logs` | The directory to store the log files. If set to empty, logs will not be written to files. |
 | `logging.level` | String | Unset | The log level. Can be `info`/`debug`/`warn`/`error`. |
@@ -231,7 +221,6 @@
 | Key | Type | Default | Descriptions |
 | --- | -----| ------- | ----------- |
 | `default_timezone` | String | Unset | The default timezone of the server. |
-| `default_column_prefix` | String | Unset | The default column prefix for auto-created time index and value columns. |
 | `max_in_flight_write_bytes` | String | Unset | The maximum in-flight write bytes. |
 | `runtime` | -- | -- | The runtime options. |
 | `runtime.global_rt_size` | Integer | `8` | The number of threads to execute the runtime for global read operations. |
@@ -243,7 +232,6 @@
 | `http.addr` | String | `127.0.0.1:4000` | The address to bind the HTTP server. |
 | `http.timeout` | String | `0s` | HTTP request timeout. Set to 0 to disable timeout. |
 | `http.body_limit` | String | `64MB` | HTTP request body limit.<br/>The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.<br/>Set to 0 to disable limit. |
-| `http.max_total_body_memory` | String | Unset | Maximum total memory for all concurrent HTTP request bodies.<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
 | `http.enable_cors` | Bool | `true` | HTTP CORS support, it's turned on by default<br/>This allows browser to access http APIs without CORS restrictions |
 | `http.cors_allowed_origins` | Array | Unset | Customize allowed origins for HTTP CORS. |
 | `http.prom_validation_mode` | String | `strict` | Whether to enable validation for Prometheus remote write requests.<br/>Available options:<br/>- strict: deny invalid UTF-8 strings (default).<br/>- lossy: allow invalid UTF-8 strings, replace invalid characters with REPLACEMENT_CHARACTER(U+FFFD).<br/>- unchecked: do not valid strings. |
@@ -251,9 +239,7 @@
 | `grpc.bind_addr` | String | `127.0.0.1:4001` | The address to bind the gRPC server. |
 | `grpc.server_addr` | String | `127.0.0.1:4001` | The address advertised to the metasrv, and used for connections from outside the host.<br/>If left empty or unset, the server will automatically use the IP address of the first network interface<br/>on the host, with the same port number as the one specified in `grpc.bind_addr`. |
 | `grpc.runtime_size` | Integer | `8` | The number of server worker threads. |
-| `grpc.max_total_message_memory` | String | Unset | Maximum total memory for all concurrent gRPC request messages.<br/>Set to 0 to disable the limit. Default: "0" (unlimited) |
 | `grpc.flight_compression` | String | `arrow_ipc` | Compression mode for frontend side Arrow IPC service. Available options:<br/>- `none`: disable all compression<br/>- `transport`: only enable gRPC transport compression (zstd)<br/>- `arrow_ipc`: only enable Arrow IPC compression (lz4)<br/>- `all`: enable all compression.<br/>Default to `none` |
-| `grpc.max_connection_age` | String | Unset | The maximum connection age for gRPC connection.<br/>The value can be a human-readable time string. For example: `10m` for ten minutes or `1h` for one hour.<br/>Refer to https://grpc.io/docs/guides/keepalive/ for more details. |
 | `grpc.tls` | -- | -- | gRPC server TLS options, see `mysql.tls` section. |
 | `grpc.tls.mode` | String | `disable` | TLS mode. |
 | `grpc.tls.cert_path` | String | Unset | Certificate file path. |
@@ -312,7 +298,6 @@
 | `query` | -- | -- | The query engine options. |
 | `query.parallelism` | Integer | `0` | Parallelism of the query engine.<br/>Default to 0, which means the number of CPU cores. |
 | `query.allow_query_fallback` | Bool | `false` | Whether to allow query fallback when push down optimize fails.<br/>Default to false, meaning when push down optimize failed, return error msg |
-| `query.memory_pool_size` | String | `50%` | Memory pool size for query execution operators (aggregation, sorting, join).<br/>Supports absolute size (e.g., "4GB", "8GB") or percentage of system memory (e.g., "30%").<br/>Setting it to 0 disables the limit (unbounded, default behavior).<br/>When this limit is reached, queries will fail with ResourceExhausted error.<br/>NOTE: This does NOT limit memory used by table scans (only applies to datanodes). |
 | `datanode` | -- | -- | Datanode options. |
 | `datanode.client` | -- | -- | Datanode client options. |
 | `datanode.client.connect_timeout` | String | `10s` | -- |
@@ -392,9 +377,10 @@
 | `procedure.max_metadata_value_size` | String | `1500KiB` | Auto split large value<br/>GreptimeDB procedure uses etcd as the default metadata storage backend.<br/>The etcd the maximum size of any request is 1.5 MiB<br/>1500KiB = 1536KiB (1.5MiB) - 36KiB (reserved size of key)<br/>Comments out the `max_metadata_value_size`, for don't split large value (no limit). |
 | `procedure.max_running_procedures` | Integer | `128` | Max running procedures.<br/>The maximum number of procedures that can be running at the same time.<br/>If the number of running procedures exceeds this limit, the procedure will be rejected. |
 | `failure_detector` | -- | -- | -- |
-| `failure_detector.threshold` | Float | `8.0` | Maximum acceptable φ before the peer is treated as failed.<br/>Lower values react faster but yield more false positives. |
-| `failure_detector.min_std_deviation` | String | `100ms` | The minimum standard deviation of the heartbeat intervals.<br/>So tiny variations don’t make φ explode. Prevents hypersensitivity when heartbeat intervals barely vary. |
-| `failure_detector.acceptable_heartbeat_pause` | String | `10000ms` | The acceptable pause duration between heartbeats.<br/>Additional extra grace period to the learned mean interval before φ rises, absorbing temporary network hiccups or GC pauses. |
+| `failure_detector.threshold` | Float | `8.0` | The threshold value used by the failure detector to determine failure conditions. |
+| `failure_detector.min_std_deviation` | String | `100ms` | The minimum standard deviation of the heartbeat intervals, used to calculate acceptable variations. |
+| `failure_detector.acceptable_heartbeat_pause` | String | `10000ms` | The acceptable pause duration between heartbeats, used to determine if a heartbeat interval is acceptable. |
+| `failure_detector.first_heartbeat_estimate` | String | `1000ms` | The initial estimate of the heartbeat interval used by the failure detector. |
 | `datanode` | -- | -- | Datanode options. |
 | `datanode.client` | -- | -- | Datanode client options. |
 | `datanode.client.timeout` | String | `10s` | Operation timeout. |
@@ -447,11 +433,10 @@
 | Key | Type | Default | Descriptions |
 | --- | -----| ------- | ----------- |
 | `node_id` | Integer | Unset | The datanode identifier and should be unique in the cluster. |
-| `default_column_prefix` | String | Unset | The default column prefix for auto-created time index and value columns. |
 | `require_lease_before_startup` | Bool | `false` | Start services after regions have obtained leases.<br/>It will block the datanode start if it can't receive leases in the heartbeat from metasrv. |
 | `init_regions_in_background` | Bool | `false` | Initialize all regions in the background during the startup.<br/>By default, it provides services after all regions have been initialized. |
 | `init_regions_parallelism` | Integer | `16` | Parallelism of initializing regions. |
-| `max_concurrent_queries` | Integer | `0` | The maximum current queries allowed to be executed. Zero means unlimited.<br/>NOTE: This setting affects scan_memory_limit's privileged tier allocation.<br/>When set, 70% of queries get privileged memory access (full scan_memory_limit).<br/>The remaining 30% get standard tier access (70% of scan_memory_limit). |
+| `max_concurrent_queries` | Integer | `0` | The maximum current queries allowed to be executed. Zero means unlimited. |
 | `enable_telemetry` | Bool | `true` | Enable telemetry to collect anonymous usage data. Enabled by default. |
 | `http` | -- | -- | The HTTP server options. |
 | `http.addr` | String | `127.0.0.1:4000` | The address to bind the HTTP server. |
@@ -486,7 +471,7 @@
 | `meta_client.metadata_cache_ttl` | String | `10m` | TTL of the metadata cache. |
 | `meta_client.metadata_cache_tti` | String | `5m` | -- |
 | `wal` | -- | -- | The WAL options. |
-| `wal.provider` | String | `raft_engine` | The provider of the WAL.<br/>- `raft_engine`: the wal is stored in the local file system by raft-engine.<br/>- `kafka`: it's remote wal that data is stored in Kafka.<br/>- `noop`: it's a no-op WAL provider that does not store any WAL data.<br/>**Notes: any unflushed data will be lost when the datanode is shutdown.** |
+| `wal.provider` | String | `raft_engine` | The provider of the WAL.<br/>- `raft_engine`: the wal is stored in the local file system by raft-engine.<br/>- `kafka`: it's remote wal that data is stored in Kafka. |
 | `wal.dir` | String | Unset | The directory to store the WAL files.<br/>**It's only used when the provider is `raft_engine`**. |
 | `wal.file_size` | String | `128MB` | The size of the WAL segment file.<br/>**It's only used when the provider is `raft_engine`**. |
 | `wal.purge_threshold` | String | `1GB` | The threshold of the WAL size to trigger a purge.<br/>**It's only used when the provider is `raft_engine`**. |
@@ -505,12 +490,10 @@
 | `wal.overwrite_entry_start_id` | Bool | `false` | Ignore missing entries during read WAL.<br/>**It's only used when the provider is `kafka`**.<br/><br/>This option ensures that when Kafka messages are deleted, the system<br/>can still successfully replay memtable data without throwing an<br/>out-of-range error.<br/>However, enabling this option might lead to unexpected data loss,<br/>as the system will skip over missing entries instead of treating<br/>them as critical errors. |
 | `query` | -- | -- | The query engine options. |
 | `query.parallelism` | Integer | `0` | Parallelism of the query engine.<br/>Default to 0, which means the number of CPU cores. |
-| `query.memory_pool_size` | String | `50%` | Memory pool size for query execution operators (aggregation, sorting, join).<br/>Supports absolute size (e.g., "2GB", "4GB") or percentage of system memory (e.g., "20%").<br/>Setting it to 0 disables the limit (unbounded, default behavior).<br/>When this limit is reached, queries will fail with ResourceExhausted error.<br/>NOTE: This does NOT limit memory used by table scans. |
 | `storage` | -- | -- | The data storage options. |
 | `storage.data_home` | String | `./greptimedb_data` | The working home directory. |
 | `storage.type` | String | `File` | The storage type used to store the data.<br/>- `File`: the data is stored in the local file system.<br/>- `S3`: the data is stored in the S3 object storage.<br/>- `Gcs`: the data is stored in the Google Cloud Storage.<br/>- `Azblob`: the data is stored in the Azure Blob Storage.<br/>- `Oss`: the data is stored in the Aliyun OSS. |
 | `storage.cache_path` | String | Unset | Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.<br/>A local file directory, defaults to `{data_home}`. An empty string means disabling. |
-| `storage.enable_read_cache` | Bool | `true` | Whether to enable read cache. If not set, the read cache will be enabled by default when using object storage. |
 | `storage.cache_capacity` | String | Unset | The local file cache capacity in bytes. If your disk space is sufficient, it is recommended to set it larger. |
 | `storage.bucket` | String | Unset | The S3 bucket name.<br/>**It's only used when the storage type is `S3`, `Oss` and `Gcs`**. |
 | `storage.root` | String | Unset | The S3 data will be stored in the specified prefix, for example, `s3://${bucket}/${root}`.<br/>**It's only used when the storage type is `S3`, `Oss` and `Azblob`**. |
@@ -555,15 +538,11 @@
 | `region_engine.mito.write_cache_path` | String | `""` | File system path for write cache, defaults to `{data_home}`. |
 | `region_engine.mito.write_cache_size` | String | `5GiB` | Capacity for write cache. If your disk space is sufficient, it is recommended to set it larger. |
 | `region_engine.mito.write_cache_ttl` | String | Unset | TTL for write cache. |
-| `region_engine.mito.preload_index_cache` | Bool | `true` | Preload index (puffin) files into cache on region open (default: true).<br/>When enabled, index files are loaded into the write cache during region initialization,<br/>which can improve query performance at the cost of longer startup times. |
-| `region_engine.mito.index_cache_percent` | Integer | `20` | Percentage of write cache capacity allocated for index (puffin) files (default: 20).<br/>The remaining capacity is used for data (parquet) files.<br/>Must be between 0 and 100 (exclusive). For example, with a 5GiB write cache and 20% allocation,<br/>1GiB is reserved for index files and 4GiB for data files. |
 | `region_engine.mito.sst_write_buffer_size` | String | `8MB` | Buffer size for SST writing. |
 | `region_engine.mito.parallel_scan_channel_size` | Integer | `32` | Capacity of the channel to send data from parallel scan tasks to the main task. |
 | `region_engine.mito.max_concurrent_scan_files` | Integer | `384` | Maximum number of SST files to scan concurrently. |
 | `region_engine.mito.allow_stale_entries` | Bool | `false` | Whether to allow stale WAL entries read during replay. |
-| `region_engine.mito.scan_memory_limit` | String | `50%` | Memory limit for table scans across all queries.<br/>Supports absolute size (e.g., "2GB") or percentage of system memory (e.g., "20%").<br/>Setting it to 0 disables the limit.<br/>NOTE: Works with max_concurrent_queries for tiered memory allocation.<br/>- If max_concurrent_queries is set: 70% of queries get full access, 30% get 70% access.<br/>- If max_concurrent_queries is 0 (unlimited): first 20 queries get full access, rest get 70% access. |
 | `region_engine.mito.min_compaction_interval` | String | `0m` | Minimum time interval between two compactions.<br/>To align with the old behavior, the default value is 0 (no restrictions). |
-| `region_engine.mito.default_experimental_flat_format` | Bool | `false` | Whether to enable experimental flat format as the default format. |
 | `region_engine.mito.index` | -- | -- | The options for index in Mito engine. |
 | `region_engine.mito.index.aux_path` | String | `""` | Auxiliary directory path for the index in filesystem, used to store intermediate files for<br/>creating the index and staging files for searching the index, defaults to `{data_home}/index_intermediate`.<br/>The default name for this directory is `index_intermediate` for backward compatibility.<br/><br/>This path contains two subdirectories:<br/>- `__intm`: for storing intermediate files used during creating index.<br/>- `staging`: for storing staging files used during searching index. |
 | `region_engine.mito.index.staging_size` | String | `2GB` | The max capacity of the staging directory. |
@@ -595,7 +574,7 @@
 | `region_engine.mito.memtable.fork_dictionary_bytes` | String | `1GiB` | Max dictionary bytes.<br/>Only available for `partition_tree` memtable. |
 | `region_engine.file` | -- | -- | Enable the file engine. |
 | `region_engine.metric` | -- | -- | Metric engine options. |
-| `region_engine.metric.sparse_primary_key_encoding` | Bool | `true` | Whether to use sparse primary key encoding. |
+| `region_engine.metric.experimental_sparse_primary_key_encoding` | Bool | `false` | Whether to enable the experimental sparse primary key encoding. |
 | `logging` | -- | -- | The logging options. |
 | `logging.dir` | String | `./greptimedb_data/logs` | The directory to store the log files. If set to empty, logs will not be written to files. |
 | `logging.level` | String | Unset | The log level. Can be `info`/`debug`/`warn`/`error`. |
@@ -682,6 +661,5 @@
 | `tracing.tokio_console_addr` | String | Unset | The tokio console address. |
 | `query` | -- | -- | -- |
 | `query.parallelism` | Integer | `1` | Parallelism of the query engine for query sent by flownode.<br/>Default to 1, so it won't use too much cpu or memory |
-| `query.memory_pool_size` | String | `50%` | Memory pool size for query execution operators (aggregation, sorting, join).<br/>Supports absolute size (e.g., "1GB", "2GB") or percentage of system memory (e.g., "20%").<br/>Setting it to 0 disables the limit (unbounded, default behavior).<br/>When this limit is reached, queries will fail with ResourceExhausted error.<br/>NOTE: This does NOT limit memory used by table scans. |
 | `memory` | -- | -- | The memory options. |
 | `memory.enable_heap_profiling` | Bool | `true` | Whether to enable heap profiling activation during startup.<br/>When enabled, heap profiling will be activated if the `MALLOC_CONF` environment variable<br/>is set to "prof:true,prof_active:false". The official image adds this env variable.<br/>Default is true. |
--- a/config/datanode.example.toml
+++ b/config/datanode.example.toml
@@ -2,10 +2,6 @@
 ## @toml2docs:none-default
 node_id = 42

-## The default column prefix for auto-created time index and value columns.
-## @toml2docs:none-default
-default_column_prefix = "greptime"
-
 ## Start services after regions have obtained leases.
 ## It will block the datanode start if it can't receive leases in the heartbeat from metasrv.
 require_lease_before_startup = false
@@ -18,9 +14,6 @@ init_regions_in_background = false
 init_regions_parallelism = 16

 ## The maximum current queries allowed to be executed. Zero means unlimited.
-## NOTE: This setting affects scan_memory_limit's privileged tier allocation.
-## When set, 70% of queries get privileged memory access (full scan_memory_limit).
-## The remaining 30% get standard tier access (70% of scan_memory_limit).
 max_concurrent_queries = 0

 ## Enable telemetry to collect anonymous usage data. Enabled by default.
@@ -125,7 +118,6 @@ metadata_cache_tti = "5m"
 ## The provider of the WAL.
 ## - `raft_engine`: the wal is stored in the local file system by raft-engine.
 ## - `kafka`: it's remote wal that data is stored in Kafka.
-## - `noop`: it's a no-op WAL provider that does not store any WAL data.<br/>**Notes: any unflushed data will be lost when the datanode is shutdown.**
 provider = "raft_engine"

 ## The directory to store the WAL files.
@@ -264,13 +256,6 @@ overwrite_entry_start_id = false
 ## Default to 0, which means the number of CPU cores.
 parallelism = 0

-## Memory pool size for query execution operators (aggregation, sorting, join).
-## Supports absolute size (e.g., "2GB", "4GB") or percentage of system memory (e.g., "20%").
-## Setting it to 0 disables the limit (unbounded, default behavior).
-## When this limit is reached, queries will fail with ResourceExhausted error.
-## NOTE: This does NOT limit memory used by table scans.
-memory_pool_size = "50%"
-
 ## The data storage options.
 [storage]
 ## The working home directory.
@@ -289,9 +274,6 @@ type = "File"
 ## @toml2docs:none-default
 #+ cache_path = ""

-## Whether to enable read cache. If not set, the read cache will be enabled by default when using object storage.
-#+ enable_read_cache = true
-
 ## The local file cache capacity in bytes. If your disk space is sufficient, it is recommended to set it larger.
 ## @toml2docs:none-default
 cache_capacity = "5GiB"
@@ -499,17 +481,6 @@ write_cache_size = "5GiB"
 ## @toml2docs:none-default
 write_cache_ttl = "8h"

-## Preload index (puffin) files into cache on region open (default: true).
-## When enabled, index files are loaded into the write cache during region initialization,
-## which can improve query performance at the cost of longer startup times.
-preload_index_cache = true
-
-## Percentage of write cache capacity allocated for index (puffin) files (default: 20).
-## The remaining capacity is used for data (parquet) files.
-## Must be between 0 and 100 (exclusive). For example, with a 5GiB write cache and 20% allocation,
-## 1GiB is reserved for index files and 4GiB for data files.
-index_cache_percent = 20
-
 ## Buffer size for SST writing.
 sst_write_buffer_size = "8MB"

@@ -522,21 +493,10 @@ max_concurrent_scan_files = 384
 ## Whether to allow stale WAL entries read during replay.
 allow_stale_entries = false

-## Memory limit for table scans across all queries.
-## Supports absolute size (e.g., "2GB") or percentage of system memory (e.g., "20%").
-## Setting it to 0 disables the limit.
-## NOTE: Works with max_concurrent_queries for tiered memory allocation.
-## - If max_concurrent_queries is set: 70% of queries get full access, 30% get 70% access.
-## - If max_concurrent_queries is 0 (unlimited): first 20 queries get full access, rest get 70% access.
-scan_memory_limit = "50%"
-
 ## Minimum time interval between two compactions.
 ## To align with the old behavior, the default value is 0 (no restrictions).
 min_compaction_interval = "0m"

-## Whether to enable experimental flat format as the default format.
-default_experimental_flat_format = false
-
 ## The options for index in Mito engine.
 [region_engine.mito.index]

@@ -669,8 +629,8 @@ fork_dictionary_bytes = "1GiB"
 [[region_engine]]
 ## Metric engine options.
 [region_engine.metric]
-## Whether to use sparse primary key encoding.
-sparse_primary_key_encoding = true
+## Whether to enable the experimental sparse primary key encoding.
+experimental_sparse_primary_key_encoding = false

 ## The logging options.
 [logging]
--- a/config/flownode.example.toml
+++ b/config/flownode.example.toml
@@ -158,13 +158,6 @@ default_ratio = 1.0
 ## Default to 1, so it won't use too much cpu or memory
 parallelism = 1

-## Memory pool size for query execution operators (aggregation, sorting, join).
-## Supports absolute size (e.g., "1GB", "2GB") or percentage of system memory (e.g., "20%").
-## Setting it to 0 disables the limit (unbounded, default behavior).
-## When this limit is reached, queries will fail with ResourceExhausted error.
-## NOTE: This does NOT limit memory used by table scans.
-memory_pool_size = "50%"
-
 ## The memory options.
 [memory]
 ## Whether to enable heap profiling activation during startup.
--- a/config/frontend.example.toml
+++ b/config/frontend.example.toml
@@ -2,10 +2,6 @@
 ## @toml2docs:none-default
 default_timezone = "UTC"

-## The default column prefix for auto-created time index and value columns.
-## @toml2docs:none-default
-default_column_prefix = "greptime"
-
 ## The maximum in-flight write bytes.
 ## @toml2docs:none-default
 #+ max_in_flight_write_bytes = "500MB"
@@ -35,10 +31,6 @@ timeout = "0s"
 ## The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.
 ## Set to 0 to disable limit.
 body_limit = "64MB"
-## Maximum total memory for all concurrent HTTP request bodies.
-## Set to 0 to disable the limit. Default: "0" (unlimited)
-## @toml2docs:none-default
-#+ max_total_body_memory = "1GB"
 ## HTTP CORS support, it's turned on by default
 ## This allows browser to access http APIs without CORS restrictions
 enable_cors = true
@@ -62,10 +54,6 @@ bind_addr = "127.0.0.1:4001"
 server_addr = "127.0.0.1:4001"
 ## The number of server worker threads.
 runtime_size = 8
-## Maximum total memory for all concurrent gRPC request messages.
-## Set to 0 to disable the limit. Default: "0" (unlimited)
-## @toml2docs:none-default
-#+ max_total_message_memory = "1GB"
 ## Compression mode for frontend side Arrow IPC service. Available options:
 ## - `none`: disable all compression
 ## - `transport`: only enable gRPC transport compression (zstd)
@@ -73,11 +61,6 @@ runtime_size = 8
 ## - `all`: enable all compression.
 ## Default to `none`
 flight_compression = "arrow_ipc"
-## The maximum connection age for gRPC connection.
-## The value can be a human-readable time string. For example: `10m` for ten minutes or `1h` for one hour.
-## Refer to https://grpc.io/docs/guides/keepalive/ for more details.
-## @toml2docs:none-default
-#+ max_connection_age = "10m"

 ## gRPC server TLS options, see `mysql.tls` section.
 [grpc.tls]
@@ -256,13 +239,6 @@ parallelism = 0
 ## Default to false, meaning when push down optimize failed, return error msg
 allow_query_fallback = false

-## Memory pool size for query execution operators (aggregation, sorting, join).
-## Supports absolute size (e.g., "4GB", "8GB") or percentage of system memory (e.g., "30%").
-## Setting it to 0 disables the limit (unbounded, default behavior).
-## When this limit is reached, queries will fail with ResourceExhausted error.
-## NOTE: This does NOT limit memory used by table scans (only applies to datanodes).
-memory_pool_size = "50%"
-
 ## Datanode options.
 [datanode]
 ## Datanode client options.
--- a/config/metasrv.example.toml
+++ b/config/metasrv.example.toml
@@ -149,18 +149,20 @@ max_metadata_value_size = "1500KiB"
 max_running_procedures = 128

 # Failure detectors options.
-# GreptimeDB uses the Phi Accrual Failure Detector algorithm to detect datanode failures.
 [failure_detector]
-## Maximum acceptable φ before the peer is treated as failed.
-## Lower values react faster but yield more false positives.
+
+## The threshold value used by the failure detector to determine failure conditions.
 threshold = 8.0
-## The minimum standard deviation of the heartbeat intervals.
-## So tiny variations don’t make φ explode. Prevents hypersensitivity when heartbeat intervals barely vary.
+
+## The minimum standard deviation of the heartbeat intervals, used to calculate acceptable variations.
 min_std_deviation = "100ms"
-## The acceptable pause duration between heartbeats.
-## Additional extra grace period to the learned mean interval before φ rises, absorbing temporary network hiccups or GC pauses.
+
+## The acceptable pause duration between heartbeats, used to determine if a heartbeat interval is acceptable.
 acceptable_heartbeat_pause = "10000ms"

+## The initial estimate of the heartbeat interval used by the failure detector.
+first_heartbeat_estimate = "1000ms"
+
 ## Datanode options.
 [datanode]

--- a/config/standalone.example.toml
+++ b/config/standalone.example.toml
@@ -2,10 +2,6 @@
 ## @toml2docs:none-default
 default_timezone = "UTC"

-## The default column prefix for auto-created time index and value columns.
-## @toml2docs:none-default
-default_column_prefix = "greptime"
-
 ## Initialize all regions in the background during the startup.
 ## By default, it provides services after all regions have been initialized.
 init_regions_in_background = false
@@ -14,9 +10,6 @@ init_regions_in_background = false
 init_regions_parallelism = 16

 ## The maximum current queries allowed to be executed. Zero means unlimited.
-## NOTE: This setting affects scan_memory_limit's privileged tier allocation.
-## When set, 70% of queries get privileged memory access (full scan_memory_limit).
-## The remaining 30% get standard tier access (70% of scan_memory_limit).
 max_concurrent_queries = 0

 ## Enable telemetry to collect anonymous usage data. Enabled by default.
@@ -43,10 +36,6 @@ timeout = "0s"
 ## The following units are supported: `B`, `KB`, `KiB`, `MB`, `MiB`, `GB`, `GiB`, `TB`, `TiB`, `PB`, `PiB`.
 ## Set to 0 to disable limit.
 body_limit = "64MB"
-## Maximum total memory for all concurrent HTTP request bodies.
-## Set to 0 to disable the limit. Default: "0" (unlimited)
-## @toml2docs:none-default
-#+ max_total_body_memory = "1GB"
 ## HTTP CORS support, it's turned on by default
 ## This allows browser to access http APIs without CORS restrictions
 enable_cors = true
@@ -67,15 +56,6 @@ prom_validation_mode = "strict"
 bind_addr = "127.0.0.1:4001"
 ## The number of server worker threads.
 runtime_size = 8
-## Maximum total memory for all concurrent gRPC request messages.
-## Set to 0 to disable the limit. Default: "0" (unlimited)
-## @toml2docs:none-default
-#+ max_total_message_memory = "1GB"
-## The maximum connection age for gRPC connection.
-## The value can be a human-readable time string. For example: `10m` for ten minutes or `1h` for one hour.
-## Refer to https://grpc.io/docs/guides/keepalive/ for more details.
-## @toml2docs:none-default
-#+ max_connection_age = "10m"

 ## gRPC server TLS options, see `mysql.tls` section.
 [grpc.tls]
@@ -368,13 +348,6 @@ max_running_procedures = 128
 ## Default to 0, which means the number of CPU cores.
 parallelism = 0

-## Memory pool size for query execution operators (aggregation, sorting, join).
-## Supports absolute size (e.g., "2GB", "4GB") or percentage of system memory (e.g., "20%").
-## Setting it to 0 disables the limit (unbounded, default behavior).
-## When this limit is reached, queries will fail with ResourceExhausted error.
-## NOTE: This does NOT limit memory used by table scans.
-memory_pool_size = "50%"
-
 ## The data storage options.
 [storage]
 ## The working home directory.
@@ -388,9 +361,6 @@ data_home = "./greptimedb_data"
 ## - `Oss`: the data is stored in the Aliyun OSS.
 type = "File"

-## Whether to enable read cache. If not set, the read cache will be enabled by default when using object storage.
-#+ enable_read_cache = true
-
 ## Read cache configuration for object storage such as 'S3' etc, it's configured by default when using object storage. It is recommended to configure it when using object storage for better performance.
 ## A local file directory, defaults to `{data_home}`. An empty string means disabling.
 ## @toml2docs:none-default
@@ -590,17 +560,6 @@ write_cache_size = "5GiB"
 ## @toml2docs:none-default
 write_cache_ttl = "8h"

-## Preload index (puffin) files into cache on region open (default: true).
-## When enabled, index files are loaded into the write cache during region initialization,
-## which can improve query performance at the cost of longer startup times.
-preload_index_cache = true
-
-## Percentage of write cache capacity allocated for index (puffin) files (default: 20).
-## The remaining capacity is used for data (parquet) files.
-## Must be between 0 and 100 (exclusive). For example, with a 5GiB write cache and 20% allocation,
-## 1GiB is reserved for index files and 4GiB for data files.
-index_cache_percent = 20
-
 ## Buffer size for SST writing.
 sst_write_buffer_size = "8MB"

@@ -613,21 +572,10 @@ max_concurrent_scan_files = 384
 ## Whether to allow stale WAL entries read during replay.
 allow_stale_entries = false

-## Memory limit for table scans across all queries.
-## Supports absolute size (e.g., "2GB") or percentage of system memory (e.g., "20%").
-## Setting it to 0 disables the limit.
-## NOTE: Works with max_concurrent_queries for tiered memory allocation.
-## - If max_concurrent_queries is set: 70% of queries get full access, 30% get 70% access.
-## - If max_concurrent_queries is 0 (unlimited): first 20 queries get full access, rest get 70% access.
-scan_memory_limit = "50%"
-
 ## Minimum time interval between two compactions.
 ## To align with the old behavior, the default value is 0 (no restrictions).
 min_compaction_interval = "0m"

-## Whether to enable experimental flat format as the default format.
-default_experimental_flat_format = false
-
 ## The options for index in Mito engine.
 [region_engine.mito.index]

@@ -760,8 +708,8 @@ fork_dictionary_bytes = "1GiB"
 [[region_engine]]
 ## Metric engine options.
 [region_engine.metric]
-## Whether to use sparse primary key encoding.
-sparse_primary_key_encoding = true
+## Whether to enable the experimental sparse primary key encoding.
+experimental_sparse_primary_key_encoding = false

 ## The logging options.
 [logging]
--- a/docs/how-to/how-to-profile-memory.md
+++ b/docs/how-to/how-to-profile-memory.md
@@ -30,7 +30,22 @@ curl https://raw.githubusercontent.com/brendangregg/FlameGraph/master/flamegraph

 ## Profiling

-### Enable memory profiling for greptimedb binary
+### Configuration
+
+You can control heap profiling activation through configuration. Add the following to your configuration file:
+
+```toml
+[memory]
+# Whether to enable heap profiling activation during startup.
+# When enabled, heap profiling will be activated if the `MALLOC_CONF` environment variable
+# is set to "prof:true,prof_active:false". The official image adds this env variable.
+# Default is true.
+enable_heap_profiling = true
+```
+
+By default, if you set `MALLOC_CONF=prof:true,prof_active:false`, the database will enable profiling during startup. You can disable this behavior by setting `enable_heap_profiling = false` in the configuration.
+
+### Starting with environment variables

 Start GreptimeDB instance with environment variables:

@@ -42,22 +57,6 @@ MALLOC_CONF=prof:true ./target/debug/greptime standalone start
 _RJEM_MALLOC_CONF=prof:true ./target/debug/greptime standalone start
 ```

-### Memory profiling for greptimedb docker image
-
-We have memory profiling enabled and activated by default in our official docker
-image.
-
-This behavior is controlled by configuration `enable_heap_profiling`:
-
-```toml
-[memory]
-# Whether to enable heap profiling activation during startup.
-# Default is true.
-enable_heap_profiling = true
-```
-
-To disable memory profiling, set `enable_heap_profiling` to `false`.
-
 ### Memory profiling control

 You can control heap profiling activation using the new HTTP APIs:
@@ -71,15 +70,6 @@ curl -X POST localhost:4000/debug/prof/mem/activate

 # Deactivate heap profiling
 curl -X POST localhost:4000/debug/prof/mem/deactivate
-
-# Activate gdump feature that dumps memory profiling data every time virtual memory usage exceeds previous maximum value.
-curl -X POST localhost:4000/debug/prof/mem/gdump -d 'activate=true'
-
-# Deactivate gdump.
-curl -X POST localhost:4000/debug/prof/mem/gdump -d 'activate=false'
-
-# Retrieve current gdump status.
-curl -X GET localhost:4000/debug/prof/mem/gdump
 ```

 ### Dump memory profiling data
--- a/docs/rfcs/2025-09-08-laminar-flow.md
+++ b/docs/rfcs/2025-09-08-laminar-flow.md
@@ -1,463 +0,0 @@
---
-Feature Name: "laminar-flow"
-Tracking Issue: https://github.com/GreptimeTeam/greptimedb/issues/TBD
-Date: 2025-09-08
-Author: "discord9 <discord9@163.com>"
---
-
-# laminar Flow
-
-## Summary
-
-This RFC proposes a redesign of the flow architecture where flownode becomes a lightweight in-memory state management node with an embedded frontend for direct computation. This approach optimizes resource utilization and improves scalability by eliminating network hops while maintaining clear separation between coordination and computation tasks.
-
-## Motivation
-
-The current flow architecture has several limitations:
-
-1. **Resource Inefficiency**: Flownodes perform both state management and computation, leading to resource duplication and inefficient utilization.
-2. **Scalability Constraints**: Computation resources are tied to flownode instances, limiting horizontal scaling capabilities.
-3. **State Management Complexity**: Mixing computation with state management makes the system harder to maintain and debug.
-4. **Network Overhead**: Additional network hops between flownode and separate frontend nodes add latency.
-
-The laminar Flow architecture addresses these issues by:
- Consolidating computation within flownode through embedded frontend
- Eliminating network overhead by removing separate frontend node communication
- Simplifying state management by focusing flownode on its core responsibility
- Improving system scalability and maintainability
-
-## Details
-
-### Architecture Overview
-
-The laminar Flow architecture transforms flownode into a lightweight coordinator that maintains flow state with an embedded frontend for computation. The key components involved are:
-
-1. **Flownode**: Maintains in-memory state, coordinates computation, and includes an embedded frontend for query execution
-2. **Embedded Frontend**: Executes **incremental** computations within the flownode
-3. **Datanode**: Stores final results and source data
-
-```mermaid
-graph TB
-    subgraph "laminar Flow Architecture"
-        subgraph Flownode["Flownode (State Manager + Embedded Frontend)"]
-            StateMap["Flow State Map<br/>Map<Timestamp, (Map<Key, Value>, Sequence)>"]
-            Coordinator["Computation Coordinator"]
-            subgraph EmbeddedFrontend["Embedded Frontend"]
-                QueryEngine["Query Engine"]
-                AggrState["__aggr_state Executor"]
-            end
-        end
-        
-        subgraph Datanode["Datanode"]
-            Storage["Data Storage"]
-            Results["Result Tables"]
-        end
-    end
-    
-    Coordinator -->|Internal Query| EmbeddedFrontend
-    EmbeddedFrontend -->|Incremental States| Coordinator
-    Flownode -->|Incremental Results| Datanode
-    EmbeddedFrontend -.->|Read Data| Datanode
-```
-
-### Core Components
-
-#### 1. Flow State Management
-
-Flownode maintains a state map for each flow:
-
-```rust
-type FlowState = Map<Timestamp, (Map<Key, Value>, Sequence)>;
-```
-
-Where:
- **Timestamp**: Time window identifier for aggregation groups
- **Key**: Aggregation group expressions (`group_exprs`)
- **Value**: Aggregation expressions results (`aggr_exprs`)
- **Sequence**: Computation progress marker for incremental updates
-
-#### 2. Incremental Computation Process
-
-The computation process follows these steps:
-
-1. **Trigger Evaluation**: Flownode determines when to trigger computation based on:
-   - Time intervals (periodic updates)
-   - Data volume thresholds
-   - Sequence progress requirements
-
-2. **Query Execution**: Flownode executes `__aggr_state` queries using its embedded frontend with:
-   - Time window filters
-   - Sequence range constraints
-
-3. **State Update**: Flownode receives partial state results and updates its internal state:
-   - Merges new values with existing aggregation state
-   - Updates sequence markers to track progress
-   - Identifies changed time windows for result computation
-
-4. **Result Materialization**: Flownode computes final results using `__aggr_merge` operations:
-   - Processes only updated time windows(and time series) for efficiency
-   - Writes results back to datanode directly through its embedded frontend
-
-### Detailed Workflow
-
-#### Incremental State Query
-
-```sql
-- Example incremental state query executed by embedded frontend
-SELECT
-    __aggr_state(avg(value)) as state,
-    time_window,
-    group_key
-FROM source_table
-WHERE
-    timestamp >= :window_start
-    AND timestamp < :window_end
-    AND __sequence >= :last_sequence
-    AND __sequence < :current_sequence
-    -- sequence range is actually written in grpc header, but shown here for clarity
-GROUP BY time_window, group_key;
-```
-
-#### State Merge Process
-
-```mermaid
-sequenceDiagram
-    participant F as Flownode (Coordinator)
-    participant EF as Embedded Frontend (Lightweight)
-    participant DN as Datanode (Heavy Computation)
-    
-    F->>F: Evaluate trigger conditions
-    F->>EF: Execute __aggr_state query with sequence range
-    EF->>DN: Send query to datanode (Heavy scan & aggregation)
-    DN->>DN: Scan data and compute partial aggregation state (Heavy CPU/I/O)
-    DN->>EF: Return aggregated state results
-    EF->>F: Forward state results (Lightweight merge)
-    F->>F: Merge with existing state
-    F->>F: Update sequence markers (Lightweight)
-    F->>EF: Compute incremental results with __aggr_merge
-    EF->>DN: Write incremental results to datanode
-```
-
-### Refill Implementation and State Management
-
-#### Refill Process
-
-Refill is implemented as a straightforward `__aggr_state` query with time and sequence constraints:
-
-```sql
-- Refill query for flow state recovery
-SELECT 
-    __aggr_state(aggregation_functions) as state,
-    time_window,
-    group_keys
-FROM source_table 
-WHERE 
-    timestamp >= :refill_start_time 
-    AND timestamp < :refill_end_time
-    AND __sequence >= :start_sequence 
-    AND __sequence < :end_sequence
-    -- sequence range is actually written in grpc header, but shown here for clarity
-GROUP BY time_window, group_keys;
-```
-
-#### State Recovery Strategy
-
-1. **Recent Data (Stream Mode)**: For recent time windows, flownode refills state using incremental queries
-2. **Historical Data (Batch Mode)**: For older time windows, flownode triggers batch computation directly and no need to refill state
-3. **Hybrid Approach**: Combines stream and batch processing based on data age and availability
-
-#### Mirror Write Optimization
-
-Mirror writes are simplified to only transmit timestamps to flownode:
-
-```rust
-struct MirrorWrite {
-    timestamps: Vec<Timestamp>,
-    // Removed: actual data payload
-}
-```
-
-This optimization:
- Eliminates network overhead by using embedded frontend
- Enables flownode to track pending time windows efficiently
- Allows flownode to decide processing mode (stream vs batch) based on timestamp age
-
-Another optimization could be just send dirty time windows range for each flow to flownode directly, no need to send timestamps one by one.
-
-### Query Optimization Strategies
-
-#### Sequence-Based Incremental Processing
-
-The core optimization relies on sequence-constrained queries:
-
-```sql
-- Optimized incremental query
-SELECT __aggr_state(expr) 
-FROM table 
-WHERE time_range AND sequence_range
-```
-
-Benefits:
- **Reduced Scan Volume**: Only processes data since last computation
- **Efficient Resource Usage**: Minimizes CPU and I/O overhead
- **Predictable Performance**: Query cost scales with incremental data size
-
-#### Time Window Partitioning
-
-```mermaid
-graph LR
-    subgraph "Time Windows"
-        W1["Window 1<br/>09:00-09:05"]
-        W2["Window 2<br/>09:05-09:10"]
-        W3["Window 3<br/>09:10-09:15"]
-    end
-    
-    subgraph "Processing Strategy"
-        W1 --> Batch["Batch Mode<br/>(Old Data)"]
-        W2 --> Stream["Stream Mode<br/>(Recent Data)"]
-        W3 --> Stream2["Stream Mode<br/>(Current Data)"]
-    end
-```
-
-### Performance Characteristics
-
-#### Memory Usage
-
- **Flownode**: O(active_time_windows × group_cardinality) for state storage
- **Embedded Frontend**: O(query_batch_size) for temporary computation
- **Overall**: Significantly reduced compared to current architecture
-
-#### Computation Distribution
-
- **Direct Processing**: Queries processed directly within flownode's embedded frontend
- **Fault Tolerance**: Simplified error handling with fewer distributed components
- **Scalability**: Computation capacity scales with flownode instances
-
-#### Network Optimization
-
- **Reduced Payload**: Mirror writes only contain timestamps
- **Efficient Queries**: Sequence constraints minimize data transfer
- **Result Caching**: State results cached in flownode memory
-
-### Sequential Read Implementation for Incremental Queries
-
-#### Sequence Management
-
-Flow maintains two critical sequences to track incremental query progress for each region:
-
- **`memtable_last_seq`**: Tracks the latest sequence number read from the memtable
- **`sst_last_seq`**: Tracks the latest sequence number read from SST files
-
-These sequences enable precise incremental data processing by defining the exact range of data to query in subsequent iterations.
-
-#### Query Protocol
-
-When executing incremental queries, flownode provides both sequence parameters to datanode:
-
-```rust
-struct GrpcHeader {
-    ...
-    // Sequence tracking for incremental reads
-    memtable_last_seq: HashMap<RegionId, SequenceNumber>,
-    sst_last_seqs: HashMap<RegionId, SequenceNumber>,
-}
-```
-
-The datanode processes these parameters to return only the data within the specified sequence ranges, ensuring efficient incremental processing.
-
-#### Sequence Invalidation and Refill Mechanism
-
-A critical challenge occurs when data referenced by `memtable_last_seq` gets flushed from memory to disk. Since SST files only maintain a single maximum sequence number for the entire file (rather than per-record sequence tracking), precise incremental queries become impossible for the affected time ranges.
-
-**Detection of Invalidation:**
-```rust
-// When memtable_last_seq data has been flushed to SST
-if memtable_last_seq_flushed_to_disk {
-    // Incremental query is no longer feasible
-    // Need to trigger refill for affected time ranges
-}
-```
-
-**Refill Process:**
-1. **Identify Affected Time Range**: Query the time range corresponding to the flushed `memtable_last_seq` data
-2. **Full Recomputation**: Execute a complete aggregation query for the affected time windows
-3. **State Replacement**: Replace the existing flow state for these time ranges with newly computed values
-4. **Sequence Update**: Update `memtable_last_seq` to the current latest sequence, while `sst_last_seq` continues normal incremental updates
-
-```sql
-- Refill query when memtable data has been flushed
-SELECT
-    __aggr_state(aggregation_functions) as state,
-    time_window,
-    group_keys
-FROM source_table
-WHERE
-    timestamp >= :affected_time_start
-    AND timestamp < :affected_time_end
-    -- Full scan required since sequence precision is lost in SST
-GROUP BY time_window, group_keys;
-```
-
-#### Datanode Implementation Requirements
-
-Datanode must implement enhanced query processing capabilities to support sequence-based incremental reads:
-
-**Input Processing:**
- Accept `memtable_last_seq` and `sst_last_seq` parameters in query requests
- Filter data based on sequence ranges across both memtable and SST storage layers
-
-**Output Enhancement:**
-```rust
-struct OutputMeta {
-    pub plan: Option<Arc<dyn ExecutionPlan>>,
-    pub cost: OutputCost,
-    pub sequence_info: HashMap<RegionId, SequenceInfo>, // New field for sequence tracking per regions involved in the query
-}
-
-struct SequenceInfo {
-    // Sequence tracking for next iteration
-    max_memtable_seq: SequenceNumber,  // Highest sequence from memtable in this result
-    max_sst_seq: SequenceNumber,       // Highest sequence from SST in this result
-}
-```
-
-**Sequence Tracking Logic:**
-datanode already impl `max_sst_seq` in leader range read, can reuse similar logic for `max_memtable_seq`.
-
-#### Sequence Update Strategy
-
-**Normal Incremental Updates:**
- Update both `memtable_last_seq` and `sst_last_seq` after successful query execution
- Use returned `max_memtable_seq` and `max_sst_seq` values for next iteration
-
-**Refill Scenario:**
- Reset `memtable_last_seq` to current maximum after refill completion
- Continue normal `sst_last_seq` updates based on successful query responses
- Maintain separate tracking to detect future flush events
-
-#### Performance Considerations
-
-**Sequence Range Optimization:**
- Minimize sequence range spans to reduce scan overhead
- Batch multiple small incremental updates when beneficial
- Balance between query frequency and processing efficiency
-
-**Memory Management:**
- Monitor memtable flush frequency to predict refill requirements
- Implement adaptive query scheduling based on flush patterns
- Optimize state storage to handle frequent updates efficiently
-
-This sequential read implementation ensures reliable incremental processing while gracefully handling the complexities of storage architecture, maintaining both correctness and performance in the face of background compaction and flush operations.
-
-## Implementation Plan
-
-### Phase 1: Core Infrastructure
-
-1. **State Management**: Implement in-memory state map in flownode
-2. **Query Interface**: Integrate `__aggr_state` query interface in embedded frontend(Already done in previous query pushdown optimizer work)
-3. **Basic Coordination**: Implement query dispatch and result collection
-4. **Sequence Tracking**: Implement sequence-based incremental processing(Can use similar interface which leader range read use)
-
-After phase 1, the system should support basic flow operations with incremental updates.
-
-### Phase 2: Optimization Features
-
-1. **Refill Logic**: Develop state recovery mechanisms
-2. **Mirror Write Optimization**: Simplify mirror write protocol
-
-### Phase 3: Advanced Features
-
-1. **Load Balancing**: Implement intelligent resource allocation for partitioned flow(Flow distributed executed on multiple flownodes)
-2. **Fault Tolerance**: Add retry mechanisms and error handling
-3. **Performance Tuning**: Optimize query batching and state management
-
-## Drawbacks
-
-### Reduced Network Communication
-
- **Eliminated Hops**: Direct communication between flownode and datanode through embedded frontend
- **Reduced Latency**: No separate frontend node communication overhead
- **Simplified Network Topology**: Fewer network dependencies and failure points
-
-### Complexity in Error Handling
-
- **Distributed Failures**: Need to handle failures across multiple components
- **State Consistency**: Ensuring state consistency during partial failures
- **Recovery Complexity**: More complex recovery procedures
-
-### Datanode Resource Requirements
-
- **Computation Load**: Datanode handles the heavy computational workload for flow queries
- **Query Interference**: Flow queries may impact regular query performance on datanode
- **Resource Contention**: Need careful resource management and isolation on datanode
-
-## Alternatives
-
-### Alternative 1: Enhanced Current Architecture
-
-Keep computation in flownode but optimize through:
- Better resource management
- Improved query optimization
- Enhanced state persistence
-
-**Pros:**
- Simpler architecture
- Fewer network hops
- Easier debugging
-
-**Cons:**
- Limited scalability
- Resource inefficiency
- Harder to optimize computation distribution
-
-### Alternative 2: Embedded Computation
-
-Embed lightweight computation engines within flownode:
-
-**Pros:**
- Reduced network communication
- Better performance for simple queries
- Simpler deployment
-
-**Cons:**
- Limited scalability
- Resource constraints
- Harder to leverage existing frontend optimizations
-
-## Future Work
-
-### Advanced Query Optimization
-
- **Parallel Processing**: Enable parallel execution of flow queries
- **Query Caching**: Cache frequently executed query patterns
-
-### Enhanced State Management
-
- **State Compression**: Implement efficient state serialization
- **Distributed State**: Support state distribution across multiple flownodes
- **State Persistence**: Add optional state persistence for durability
-
-### Monitoring and Observability
-
- **Performance Metrics**: Track query execution times and resource usage
- **State Visualization**: Provide tools for state inspection and debugging
- **Health Monitoring**: Monitor system health and performance characteristics
-
-### Integration Improvements
-
- **Embedded Frontend Optimization**: Optimize embedded frontend query planning and execution
- **Datanode Optimization**: Optimize result writing from flownode
- **Metasrv Coordination**: Enhanced metadata management and coordination
-
-## Conclusion
-
-The laminar Flow architecture represents a significant improvement over the current flow system by separating state management from computation execution. This design enables better resource utilization, improved scalability, and simplified maintenance while maintaining the core functionality of continuous aggregation.
-
-The key benefits include:
-
-1. **Improved Scalability**: Computation can scale independently of state management
-2. **Better Resource Utilization**: Eliminates network overhead and leverages embedded frontend infrastructure
-3. **Simplified Architecture**: Clear separation of concerns between components
-4. **Enhanced Performance**: Sequence-based incremental processing reduces computational overhead
-
-While the architecture introduces some complexity in terms of distributed coordination and error handling, the benefits significantly outweigh the drawbacks, making it a compelling evolution of the flow system.
--- a/flake.lock
+++ b/flake.lock
@@ -8,11 +8,11 @@
        "rust-analyzer-src": "rust-analyzer-src"
      },
      "locked": {
-        "lastModified": 1760078406,
-        "narHash": "sha256-JeJK0ZA845PtkCHkfo4KjeI1mYrsr2s3cxBYKhF4BoE=",
+        "lastModified": 1745735608,
+        "narHash": "sha256-L0jzm815XBFfF2wCFmR+M1CF+beIEFj6SxlqVKF59Ec=",
        "owner": "nix-community",
        "repo": "fenix",
-        "rev": "351277c60d104944122ee389cdf581c5ce2c6732",
+        "rev": "c39a78eba6ed2a022cc3218db90d485077101496",
        "type": "github"
      },
      "original": {
@@ -41,11 +41,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1759994382,
-        "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=",
+        "lastModified": 1748162331,
+        "narHash": "sha256-rqc2RKYTxP3tbjA+PB3VMRQNnjesrT0pEofXQTrMsS8=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7",
+        "rev": "7c43f080a7f28b2774f3b3f43234ca11661bf334",
        "type": "github"
      },
      "original": {
@@ -65,11 +65,11 @@
    "rust-analyzer-src": {
      "flake": false,
      "locked": {
-        "lastModified": 1760014945,
-        "narHash": "sha256-ySdl7F9+oeWNHVrg3QL/brazqmJvYFEdpGnF3pyoDH8=",
+        "lastModified": 1745694049,
+        "narHash": "sha256-fxvRYH/tS7hGQeg9zCVh5RBcSWT+JGJet7RA8Ss+rC0=",
        "owner": "rust-lang",
        "repo": "rust-analyzer",
-        "rev": "90d2e1ce4dfe7dc49250a8b88a0f08ffdb9cb23f",
+        "rev": "d8887c0758bbd2d5f752d5bd405d4491e90e7ed6",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -19,7 +19,7 @@
        lib = nixpkgs.lib;
        rustToolchain = fenix.packages.${system}.fromToolchainName {
          name = (lib.importTOML ./rust-toolchain.toml).toolchain.channel;
-          sha256 = "sha256-GCGEXGZeJySLND0KU5TdtTrqFV76TF3UdvAHSUegSsk=";
+          sha256 = "sha256-tJJr8oqX3YD+ohhPK7jlt/7kvKBnBqJVjYtoFr520d4=";
        };
      in
      {
--- a/grafana/dashboards/metrics/cluster/dashboard.json
+++ b/grafana/dashboards/metrics/cluster/dashboard.json
@@ -1411,7 +1411,7 @@
                "uid": "${metrics}"
              },
              "editorMode": "code",
-              "expr": "max(greptime_memory_limit_in_bytes{instance=~\"$datanode\"})",
+              "expr": "max(greptime_memory_limit_in_bytes{app=\"greptime-datanode\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1528,7 +1528,7 @@
              },
              "editorMode": "code",
              "exemplar": false,
-              "expr": "max(greptime_cpu_limit_in_millicores{instance=~\"$datanode\"})",
+              "expr": "max(greptime_cpu_limit_in_millicores{app=\"greptime-datanode\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1643,7 +1643,7 @@
                "uid": "${metrics}"
              },
              "editorMode": "code",
-              "expr": "max(greptime_memory_limit_in_bytes{instance=~\"$frontend\"})",
+              "expr": "max(greptime_memory_limit_in_bytes{app=\"greptime-frontend\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1760,7 +1760,7 @@
              },
              "editorMode": "code",
              "exemplar": false,
-              "expr": "max(greptime_cpu_limit_in_millicores{instance=~\"$frontend\"})",
+              "expr": "max(greptime_cpu_limit_in_millicores{app=\"greptime-frontend\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1875,7 +1875,7 @@
                "uid": "${metrics}"
              },
              "editorMode": "code",
-              "expr": "max(greptime_memory_limit_in_bytes{instance=~\"$metasrv\"})",
+              "expr": "max(greptime_memory_limit_in_bytes{app=\"greptime-metasrv\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1992,7 +1992,7 @@
              },
              "editorMode": "code",
              "exemplar": false,
-              "expr": "max(greptime_cpu_limit_in_millicores{instance=~\"$metasrv\"})",
+              "expr": "max(greptime_cpu_limit_in_millicores{app=\"greptime-metasrv\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -2107,7 +2107,7 @@
                "uid": "${metrics}"
              },
              "editorMode": "code",
-              "expr": "max(greptime_memory_limit_in_bytes{instance=~\"$flownode\"})",
+              "expr": "max(greptime_memory_limit_in_bytes{app=\"greptime-flownode\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -2224,7 +2224,7 @@
              },
              "editorMode": "code",
              "exemplar": false,
-              "expr": "max(greptime_cpu_limit_in_millicores{instance=~\"$flownode\"})",
+              "expr": "max(greptime_cpu_limit_in_millicores{app=\"greptime-flownode\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
--- a/grafana/dashboards/metrics/cluster/dashboard.md
+++ b/grafana/dashboards/metrics/cluster/dashboard.md
@@ -21,14 +21,14 @@
 # Resources
 | Title | Query | Type | Description | Datasource | Unit | Legend Format |
 | --- | --- | --- | --- | --- | --- | --- |
-| Datanode Memory per Instance | `sum(process_resident_memory_bytes{instance=~"$datanode"}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{instance=~"$datanode"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{instance}}]-[{{ pod }}]` |
-| Datanode CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{instance=~"$datanode"}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{instance=~"$datanode"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
-| Frontend Memory per Instance | `sum(process_resident_memory_bytes{instance=~"$frontend"}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{instance=~"$frontend"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]` |
-| Frontend CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{instance=~"$frontend"}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{instance=~"$frontend"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]-cpu` |
-| Metasrv Memory per Instance | `sum(process_resident_memory_bytes{instance=~"$metasrv"}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{instance=~"$metasrv"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]-resident` |
-| Metasrv CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{instance=~"$metasrv"}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{instance=~"$metasrv"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
-| Flownode Memory per Instance | `sum(process_resident_memory_bytes{instance=~"$flownode"}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{instance=~"$flownode"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]` |
-| Flownode CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{instance=~"$flownode"}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{instance=~"$flownode"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
+| Datanode Memory per Instance | `sum(process_resident_memory_bytes{instance=~"$datanode"}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{app="greptime-datanode"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{instance}}]-[{{ pod }}]` |
+| Datanode CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{instance=~"$datanode"}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{app="greptime-datanode"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
+| Frontend Memory per Instance | `sum(process_resident_memory_bytes{instance=~"$frontend"}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{app="greptime-frontend"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]` |
+| Frontend CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{instance=~"$frontend"}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{app="greptime-frontend"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]-cpu` |
+| Metasrv Memory per Instance | `sum(process_resident_memory_bytes{instance=~"$metasrv"}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{app="greptime-metasrv"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]-resident` |
+| Metasrv CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{instance=~"$metasrv"}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{app="greptime-metasrv"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
+| Flownode Memory per Instance | `sum(process_resident_memory_bytes{instance=~"$flownode"}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{app="greptime-flownode"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]` |
+| Flownode CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{instance=~"$flownode"}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{app="greptime-flownode"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
 # Frontend Requests
 | Title | Query | Type | Description | Datasource | Unit | Legend Format |
 | --- | --- | --- | --- | --- | --- | --- |
--- a/grafana/dashboards/metrics/cluster/dashboard.yaml
+++ b/grafana/dashboards/metrics/cluster/dashboard.yaml
@@ -187,7 +187,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{instance}}]-[{{ pod }}]'
-            - expr: max(greptime_memory_limit_in_bytes{instance=~"$datanode"})
+            - expr: max(greptime_memory_limit_in_bytes{app="greptime-datanode"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -202,7 +202,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_cpu_limit_in_millicores{instance=~"$datanode"})
+            - expr: max(greptime_cpu_limit_in_millicores{app="greptime-datanode"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -217,7 +217,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_memory_limit_in_bytes{instance=~"$frontend"})
+            - expr: max(greptime_memory_limit_in_bytes{app="greptime-frontend"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -232,7 +232,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]-cpu'
-            - expr: max(greptime_cpu_limit_in_millicores{instance=~"$frontend"})
+            - expr: max(greptime_cpu_limit_in_millicores{app="greptime-frontend"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -247,7 +247,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]-resident'
-            - expr: max(greptime_memory_limit_in_bytes{instance=~"$metasrv"})
+            - expr: max(greptime_memory_limit_in_bytes{app="greptime-metasrv"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -262,7 +262,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_cpu_limit_in_millicores{instance=~"$metasrv"})
+            - expr: max(greptime_cpu_limit_in_millicores{app="greptime-metasrv"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -277,7 +277,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_memory_limit_in_bytes{instance=~"$flownode"})
+            - expr: max(greptime_memory_limit_in_bytes{app="greptime-flownode"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -292,7 +292,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_cpu_limit_in_millicores{instance=~"$flownode"})
+            - expr: max(greptime_cpu_limit_in_millicores{app="greptime-flownode"})
              datasource:
                type: prometheus
                uid: ${metrics}
--- a/grafana/dashboards/metrics/standalone/dashboard.json
+++ b/grafana/dashboards/metrics/standalone/dashboard.json
@@ -1411,7 +1411,7 @@
                "uid": "${metrics}"
              },
              "editorMode": "code",
-              "expr": "max(greptime_memory_limit_in_bytes{})",
+              "expr": "max(greptime_memory_limit_in_bytes{app=\"greptime-datanode\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1528,7 +1528,7 @@
              },
              "editorMode": "code",
              "exemplar": false,
-              "expr": "max(greptime_cpu_limit_in_millicores{})",
+              "expr": "max(greptime_cpu_limit_in_millicores{app=\"greptime-datanode\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1643,7 +1643,7 @@
                "uid": "${metrics}"
              },
              "editorMode": "code",
-              "expr": "max(greptime_memory_limit_in_bytes{})",
+              "expr": "max(greptime_memory_limit_in_bytes{app=\"greptime-frontend\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1760,7 +1760,7 @@
              },
              "editorMode": "code",
              "exemplar": false,
-              "expr": "max(greptime_cpu_limit_in_millicores{})",
+              "expr": "max(greptime_cpu_limit_in_millicores{app=\"greptime-frontend\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1875,7 +1875,7 @@
                "uid": "${metrics}"
              },
              "editorMode": "code",
-              "expr": "max(greptime_memory_limit_in_bytes{})",
+              "expr": "max(greptime_memory_limit_in_bytes{app=\"greptime-metasrv\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -1992,7 +1992,7 @@
              },
              "editorMode": "code",
              "exemplar": false,
-              "expr": "max(greptime_cpu_limit_in_millicores{})",
+              "expr": "max(greptime_cpu_limit_in_millicores{app=\"greptime-metasrv\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -2107,7 +2107,7 @@
                "uid": "${metrics}"
              },
              "editorMode": "code",
-              "expr": "max(greptime_memory_limit_in_bytes{})",
+              "expr": "max(greptime_memory_limit_in_bytes{app=\"greptime-flownode\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
@@ -2224,7 +2224,7 @@
              },
              "editorMode": "code",
              "exemplar": false,
-              "expr": "max(greptime_cpu_limit_in_millicores{})",
+              "expr": "max(greptime_cpu_limit_in_millicores{app=\"greptime-flownode\"})",
              "hide": false,
              "instant": false,
              "legendFormat": "limit",
--- a/grafana/dashboards/metrics/standalone/dashboard.md
+++ b/grafana/dashboards/metrics/standalone/dashboard.md
@@ -21,14 +21,14 @@
 # Resources
 | Title | Query | Type | Description | Datasource | Unit | Legend Format |
 | --- | --- | --- | --- | --- | --- | --- |
-| Datanode Memory per Instance | `sum(process_resident_memory_bytes{}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{instance}}]-[{{ pod }}]` |
-| Datanode CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
-| Frontend Memory per Instance | `sum(process_resident_memory_bytes{}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]` |
-| Frontend CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]-cpu` |
-| Metasrv Memory per Instance | `sum(process_resident_memory_bytes{}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]-resident` |
-| Metasrv CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
-| Flownode Memory per Instance | `sum(process_resident_memory_bytes{}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]` |
-| Flownode CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
+| Datanode Memory per Instance | `sum(process_resident_memory_bytes{}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{app="greptime-datanode"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{instance}}]-[{{ pod }}]` |
+| Datanode CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{app="greptime-datanode"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
+| Frontend Memory per Instance | `sum(process_resident_memory_bytes{}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{app="greptime-frontend"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]` |
+| Frontend CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{app="greptime-frontend"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]-cpu` |
+| Metasrv Memory per Instance | `sum(process_resident_memory_bytes{}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{app="greptime-metasrv"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]-resident` |
+| Metasrv CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{app="greptime-metasrv"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
+| Flownode Memory per Instance | `sum(process_resident_memory_bytes{}) by (instance, pod)`<br/>`max(greptime_memory_limit_in_bytes{app="greptime-flownode"})` | `timeseries` | Current memory usage by instance | `prometheus` | `bytes` | `[{{ instance }}]-[{{ pod }}]` |
+| Flownode CPU Usage per Instance | `sum(rate(process_cpu_seconds_total{}[$__rate_interval]) * 1000) by (instance, pod)`<br/>`max(greptime_cpu_limit_in_millicores{app="greptime-flownode"})` | `timeseries` | Current cpu usage by instance | `prometheus` | `none` | `[{{ instance }}]-[{{ pod }}]` |
 # Frontend Requests
 | Title | Query | Type | Description | Datasource | Unit | Legend Format |
 | --- | --- | --- | --- | --- | --- | --- |
--- a/grafana/dashboards/metrics/standalone/dashboard.yaml
+++ b/grafana/dashboards/metrics/standalone/dashboard.yaml
@@ -187,7 +187,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{instance}}]-[{{ pod }}]'
-            - expr: max(greptime_memory_limit_in_bytes{})
+            - expr: max(greptime_memory_limit_in_bytes{app="greptime-datanode"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -202,7 +202,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_cpu_limit_in_millicores{})
+            - expr: max(greptime_cpu_limit_in_millicores{app="greptime-datanode"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -217,7 +217,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_memory_limit_in_bytes{})
+            - expr: max(greptime_memory_limit_in_bytes{app="greptime-frontend"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -232,7 +232,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]-cpu'
-            - expr: max(greptime_cpu_limit_in_millicores{})
+            - expr: max(greptime_cpu_limit_in_millicores{app="greptime-frontend"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -247,7 +247,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]-resident'
-            - expr: max(greptime_memory_limit_in_bytes{})
+            - expr: max(greptime_memory_limit_in_bytes{app="greptime-metasrv"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -262,7 +262,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_cpu_limit_in_millicores{})
+            - expr: max(greptime_cpu_limit_in_millicores{app="greptime-metasrv"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -277,7 +277,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_memory_limit_in_bytes{})
+            - expr: max(greptime_memory_limit_in_bytes{app="greptime-flownode"})
              datasource:
                type: prometheus
                uid: ${metrics}
@@ -292,7 +292,7 @@ groups:
                type: prometheus
                uid: ${metrics}
              legendFormat: '[{{ instance }}]-[{{ pod }}]'
-            - expr: max(greptime_cpu_limit_in_millicores{})
+            - expr: max(greptime_cpu_limit_in_millicores{app="greptime-flownode"})
              datasource:
                type: prometheus
                uid: ${metrics}
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2025-10-01"
+channel = "nightly-2025-05-19"
--- a/scripts/generate_certs.sh
+++ b/scripts/generate_certs.sh
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-CERT_DIR="${1:-$(dirname "$0")/../tests-integration/fixtures/certs}"
-DAYS="${2:-365}"
-
-mkdir -p "${CERT_DIR}"
-cd "${CERT_DIR}"
-
-echo "Generating CA certificate..."
-openssl req -new -x509 -days "${DAYS}" -nodes -text \
-  -out root.crt -keyout root.key \
-  -subj "/CN=GreptimeDBRootCA"
-
-
-echo "Generating server certificate..."
-openssl req -new -nodes -text \
-  -out server.csr -keyout server.key \
-  -subj "/CN=greptime"
-
-openssl x509 -req -in server.csr -text -days "${DAYS}" \
-  -CA root.crt -CAkey root.key -CAcreateserial \
-  -out server.crt \
-  -extensions v3_req -extfile <(printf "[v3_req]\nsubjectAltName=DNS:localhost,IP:127.0.0.1")
-
-echo "Generating client certificate..."
-# Make sure the client certificate is for the greptimedb user
-openssl req -new -nodes -text \
-  -out client.csr -keyout client.key \
-  -subj "/CN=greptimedb"
-
-openssl x509 -req -in client.csr -CA root.crt -CAkey root.key -CAcreateserial \
-out client.crt -days 365 -extensions v3_req -extfile <(printf "[v3_req]\nsubjectAltName=DNS:localhost")
-
-rm -f *.csr
-
-echo "TLS certificates generated successfully in ${CERT_DIR}"
-
-chmod 644 root.key
-chmod 644 client.key
-chmod 644 server.key
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -8,7 +8,6 @@ license.workspace = true
 workspace = true

 [dependencies]
-arrow-schema.workspace = true
 common-base.workspace = true
 common-decimal.workspace = true
 common-error.workspace = true
--- a/src/api/src/error.rs
+++ b/src/api/src/error.rs
@@ -19,8 +19,8 @@ use common_error::status_code::StatusCode;
 use common_macro::stack_trace_debug;
 use common_time::timestamp::TimeUnit;
 use datatypes::prelude::ConcreteDataType;
-use snafu::Location;
 use snafu::prelude::*;
+use snafu::Location;

 pub type Result<T> = std::result::Result<T, Error>;

--- a/src/api/src/helper.rs
+++ b/src/api/src/helper.rs
--- a/src/api/src/lib.rs
+++ b/src/api/src/lib.rs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+#![feature(let_chains)]
+
 pub mod error;
 pub mod helper;

--- a/src/api/src/v1/column_def.rs
+++ b/src/api/src/v1/column_def.rs
@@ -14,11 +14,10 @@

 use std::collections::HashMap;

-use arrow_schema::extension::{EXTENSION_TYPE_METADATA_KEY, EXTENSION_TYPE_NAME_KEY};
 use datatypes::schema::{
-    COMMENT_KEY, ColumnDefaultConstraint, ColumnSchema, FULLTEXT_KEY, FulltextAnalyzer,
-    FulltextBackend, FulltextOptions, INVERTED_INDEX_KEY, SKIPPING_INDEX_KEY, SkippingIndexOptions,
-    SkippingIndexType,
+    ColumnDefaultConstraint, ColumnSchema, FulltextAnalyzer, FulltextBackend, FulltextOptions,
+    SkippingIndexOptions, SkippingIndexType, COMMENT_KEY, FULLTEXT_KEY, INVERTED_INDEX_KEY,
+    SKIPPING_INDEX_KEY,
 };
 use greptime_proto::v1::{
    Analyzer, FulltextBackend as PbFulltextBackend, SkippingIndexType as PbSkippingIndexType,
@@ -38,10 +37,8 @@ const SKIPPING_INDEX_GRPC_KEY: &str = "skipping_index";

 /// Tries to construct a `ColumnSchema` from the given  `ColumnDef`.
 pub fn try_as_column_schema(column_def: &ColumnDef) -> Result<ColumnSchema> {
-    let data_type = ColumnDataTypeWrapper::try_new(
-        column_def.data_type,
-        column_def.datatype_extension.clone(),
-    )?;
+    let data_type =
+        ColumnDataTypeWrapper::try_new(column_def.data_type, column_def.datatype_extension)?;

    let constraint = if column_def.default_constraint.is_empty() {
        None
@@ -69,15 +66,6 @@ pub fn try_as_column_schema(column_def: &ColumnDef) -> Result<ColumnSchema> {
        if let Some(skipping_index) = options.options.get(SKIPPING_INDEX_GRPC_KEY) {
            metadata.insert(SKIPPING_INDEX_KEY.to_string(), skipping_index.to_owned());
        }
-        if let Some(extension_name) = options.options.get(EXTENSION_TYPE_NAME_KEY) {
-            metadata.insert(EXTENSION_TYPE_NAME_KEY.to_string(), extension_name.clone());
-        }
-        if let Some(extension_metadata) = options.options.get(EXTENSION_TYPE_METADATA_KEY) {
-            metadata.insert(
-                EXTENSION_TYPE_METADATA_KEY.to_string(),
-                extension_metadata.clone(),
-            );
-        }
    }

    ColumnSchema::new(&column_def.name, data_type.into(), column_def.is_nullable)
@@ -149,17 +137,6 @@ pub fn options_from_column_schema(column_schema: &ColumnSchema) -> Option<Column
            .options
            .insert(SKIPPING_INDEX_GRPC_KEY.to_string(), skipping_index.clone());
    }
-    if let Some(extension_name) = column_schema.metadata().get(EXTENSION_TYPE_NAME_KEY) {
-        options
-            .options
-            .insert(EXTENSION_TYPE_NAME_KEY.to_string(), extension_name.clone());
-    }
-    if let Some(extension_metadata) = column_schema.metadata().get(EXTENSION_TYPE_METADATA_KEY) {
-        options.options.insert(
-            EXTENSION_TYPE_METADATA_KEY.to_string(),
-            extension_metadata.clone(),
-        );
-    }

    (!options.options.is_empty()).then_some(options)
 }
--- a/src/auth/src/common.rs
+++ b/src/auth/src/common.rs
@@ -17,13 +17,13 @@ use std::sync::Arc;
 use common_base::secrets::SecretString;
 use digest::Digest;
 use sha1::Sha1;
-use snafu::{OptionExt, ensure};
+use snafu::{ensure, OptionExt};

 use crate::error::{IllegalParamSnafu, InvalidConfigSnafu, Result, UserPasswordMismatchSnafu};
 use crate::user_info::DefaultUserInfo;
-use crate::user_provider::static_user_provider::{STATIC_USER_PROVIDER, StaticUserProvider};
+use crate::user_provider::static_user_provider::{StaticUserProvider, STATIC_USER_PROVIDER};
 use crate::user_provider::watch_file_user_provider::{
-    WATCH_FILE_USER_PROVIDER, WatchFileUserProvider,
+    WatchFileUserProvider, WATCH_FILE_USER_PROVIDER,
 };
 use crate::{UserInfoRef, UserProviderRef};

@@ -35,7 +35,7 @@ pub fn userinfo_by_name(username: Option<String>) -> UserInfoRef {
    DefaultUserInfo::with_name(username.unwrap_or_else(|| DEFAULT_USERNAME.to_string()))
 }

-pub fn user_provider_from_option(opt: &str) -> Result<UserProviderRef> {
+pub fn user_provider_from_option(opt: &String) -> Result<UserProviderRef> {
    let (name, content) = opt.split_once(':').with_context(|| InvalidConfigSnafu {
        value: opt.to_string(),
        msg: "UserProviderOption must be in format `<option>:<value>`",
@@ -57,7 +57,7 @@ pub fn user_provider_from_option(opt: &str) -> Result<UserProviderRef> {
    }
 }

-pub fn static_user_provider_from_option(opt: &str) -> Result<StaticUserProvider> {
+pub fn static_user_provider_from_option(opt: &String) -> Result<StaticUserProvider> {
    let (name, content) = opt.split_once(':').with_context(|| InvalidConfigSnafu {
        value: opt.to_string(),
        msg: "UserProviderOption must be in format `<option>:<value>`",
--- a/src/auth/src/lib.rs
+++ b/src/auth/src/lib.rs
@@ -22,13 +22,13 @@ mod user_provider;
 pub mod tests;

 pub use common::{
-    HashedPassword, Identity, Password, auth_mysql, static_user_provider_from_option,
-    user_provider_from_option, userinfo_by_name,
+    auth_mysql, static_user_provider_from_option, user_provider_from_option, userinfo_by_name,
+    HashedPassword, Identity, Password,
 };
-pub use permission::{DefaultPermissionChecker, PermissionChecker, PermissionReq, PermissionResp};
+pub use permission::{PermissionChecker, PermissionReq, PermissionResp};
 pub use user_info::UserInfo;
-pub use user_provider::UserProvider;
 pub use user_provider::static_user_provider::StaticUserProvider;
+pub use user_provider::UserProvider;

 /// pub type alias
 pub type UserInfoRef = std::sync::Arc<dyn UserInfo>;
--- a/src/auth/src/permission.rs
+++ b/src/auth/src/permission.rs
@@ -13,15 +13,12 @@
 // limitations under the License.

 use std::fmt::Debug;
-use std::sync::Arc;

 use api::v1::greptime_request::Request;
-use common_telemetry::debug;
 use sql::statements::statement::Statement;

 use crate::error::{PermissionDeniedSnafu, Result};
-use crate::user_info::DefaultUserInfo;
-use crate::{PermissionCheckerRef, UserInfo, UserInfoRef};
+use crate::{PermissionCheckerRef, UserInfoRef};

 #[derive(Debug, Clone)]
 pub enum PermissionReq<'a> {
@@ -38,32 +35,6 @@ pub enum PermissionReq<'a> {
    BulkInsert,
 }

-impl<'a> PermissionReq<'a> {
-    /// Returns true if the permission request is for read operations.
-    pub fn is_readonly(&self) -> bool {
-        match self {
-            PermissionReq::GrpcRequest(Request::Query(_))
-            | PermissionReq::PromQuery
-            | PermissionReq::LogQuery
-            | PermissionReq::PromStoreRead => true,
-            PermissionReq::SqlStatement(stmt) => stmt.is_readonly(),
-
-            PermissionReq::GrpcRequest(_)
-            | PermissionReq::Opentsdb
-            | PermissionReq::LineProtocol
-            | PermissionReq::PromStoreWrite
-            | PermissionReq::Otlp
-            | PermissionReq::LogWrite
-            | PermissionReq::BulkInsert => false,
-        }
-    }
-
-    /// Returns true if the permission request is for write operations.
-    pub fn is_write(&self) -> bool {
-        !self.is_readonly()
-    }
-}
-
 #[derive(Debug)]
 pub enum PermissionResp {
    Allow,
@@ -94,106 +65,3 @@ impl PermissionChecker for Option<&PermissionCheckerRef> {
        }
    }
 }
-
-/// The default permission checker implementation.
-/// It checks the permission mode of [DefaultUserInfo].
-pub struct DefaultPermissionChecker;
-
-impl DefaultPermissionChecker {
-    /// Returns a new [PermissionCheckerRef] instance.
-    pub fn arc() -> PermissionCheckerRef {
-        Arc::new(DefaultPermissionChecker)
-    }
-}
-
-impl PermissionChecker for DefaultPermissionChecker {
-    fn check_permission(
-        &self,
-        user_info: UserInfoRef,
-        req: PermissionReq,
-    ) -> Result<PermissionResp> {
-        if let Some(default_user) = user_info.as_any().downcast_ref::<DefaultUserInfo>() {
-            let permission_mode = default_user.permission_mode();
-
-            if req.is_readonly() && !permission_mode.can_read() {
-                debug!(
-                    "Permission denied: read operation not allowed, user = {}, permission = {}",
-                    default_user.username(),
-                    permission_mode.as_str()
-                );
-                return Ok(PermissionResp::Reject);
-            }
-
-            if req.is_write() && !permission_mode.can_write() {
-                debug!(
-                    "Permission denied: write operation not allowed, user = {}, permission = {}",
-                    default_user.username(),
-                    permission_mode.as_str()
-                );
-                return Ok(PermissionResp::Reject);
-            }
-        }
-
-        // default allow all
-        Ok(PermissionResp::Allow)
-    }
-}
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::user_info::PermissionMode;
-
-    #[test]
-    fn test_default_permission_checker_allow_all_operations() {
-        let checker = DefaultPermissionChecker;
-        let user_info =
-            DefaultUserInfo::with_name_and_permission("test_user", PermissionMode::ReadWrite);
-
-        let read_req = PermissionReq::PromQuery;
-        let write_req = PermissionReq::PromStoreWrite;
-
-        let read_result = checker
-            .check_permission(user_info.clone(), read_req)
-            .unwrap();
-        let write_result = checker.check_permission(user_info, write_req).unwrap();
-
-        assert!(matches!(read_result, PermissionResp::Allow));
-        assert!(matches!(write_result, PermissionResp::Allow));
-    }
-
-    #[test]
-    fn test_default_permission_checker_readonly_user() {
-        let checker = DefaultPermissionChecker;
-        let user_info =
-            DefaultUserInfo::with_name_and_permission("readonly_user", PermissionMode::ReadOnly);
-
-        let read_req = PermissionReq::PromQuery;
-        let write_req = PermissionReq::PromStoreWrite;
-
-        let read_result = checker
-            .check_permission(user_info.clone(), read_req)
-            .unwrap();
-        let write_result = checker.check_permission(user_info, write_req).unwrap();
-
-        assert!(matches!(read_result, PermissionResp::Allow));
-        assert!(matches!(write_result, PermissionResp::Reject));
-    }
-
-    #[test]
-    fn test_default_permission_checker_writeonly_user() {
-        let checker = DefaultPermissionChecker;
-        let user_info =
-            DefaultUserInfo::with_name_and_permission("writeonly_user", PermissionMode::WriteOnly);
-
-        let read_req = PermissionReq::LogQuery;
-        let write_req = PermissionReq::LogWrite;
-
-        let read_result = checker
-            .check_permission(user_info.clone(), read_req)
-            .unwrap();
-        let write_result = checker.check_permission(user_info, write_req).unwrap();
-
-        assert!(matches!(read_result, PermissionResp::Reject));
-        assert!(matches!(write_result, PermissionResp::Allow));
-    }
-}
--- a/src/auth/src/tests.rs
+++ b/src/auth/src/tests.rs
@@ -21,7 +21,7 @@ use crate::error::{
    UserPasswordMismatchSnafu,
 };
 use crate::user_info::DefaultUserInfo;
-use crate::{Identity, Password, UserInfoRef, UserProvider, auth_mysql};
+use crate::{auth_mysql, Identity, Password, UserInfoRef, UserProvider};

 pub struct DatabaseAuthInfo<'a> {
    pub catalog: &'a str,
--- a/src/auth/src/user_info.rs
+++ b/src/auth/src/user_info.rs
@@ -23,86 +23,17 @@ pub trait UserInfo: Debug + Sync + Send {
    fn username(&self) -> &str;
 }

-/// The user permission mode
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default)]
-pub enum PermissionMode {
-    #[default]
-    ReadWrite,
-    ReadOnly,
-    WriteOnly,
-}
-
-impl PermissionMode {
-    /// Parse permission mode from string.
-    /// Supported values are:
-    /// - "rw", "readwrite", "read_write" => ReadWrite
-    /// - "ro", "readonly", "read_only" => ReadOnly
-    /// - "wo", "writeonly", "write_only" => WriteOnly
-    ///     Returns None if the input string is not a valid permission mode.
-    pub fn from_str(s: &str) -> Self {
-        match s.to_lowercase().as_str() {
-            "readwrite" | "read_write" | "rw" => PermissionMode::ReadWrite,
-            "readonly" | "read_only" | "ro" => PermissionMode::ReadOnly,
-            "writeonly" | "write_only" | "wo" => PermissionMode::WriteOnly,
-            _ => PermissionMode::ReadWrite,
-        }
-    }
-
-    /// Convert permission mode to string.
-    /// - ReadWrite => "rw"
-    /// - ReadOnly => "ro"
-    /// - WriteOnly => "wo"
-    ///     The returned string is a static string slice.
-    pub fn as_str(&self) -> &'static str {
-        match self {
-            PermissionMode::ReadWrite => "rw",
-            PermissionMode::ReadOnly => "ro",
-            PermissionMode::WriteOnly => "wo",
-        }
-    }
-
-    /// Returns true if the permission mode allows read operations.
-    pub fn can_read(&self) -> bool {
-        matches!(self, PermissionMode::ReadWrite | PermissionMode::ReadOnly)
-    }
-
-    /// Returns true if the permission mode allows write operations.
-    pub fn can_write(&self) -> bool {
-        matches!(self, PermissionMode::ReadWrite | PermissionMode::WriteOnly)
-    }
-}
-
-impl std::fmt::Display for PermissionMode {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "{}", self.as_str())
-    }
-}
-
 #[derive(Debug)]
 pub(crate) struct DefaultUserInfo {
    username: String,
-    permission_mode: PermissionMode,
 }

 impl DefaultUserInfo {
    pub(crate) fn with_name(username: impl Into<String>) -> UserInfoRef {
-        Self::with_name_and_permission(username, PermissionMode::default())
-    }
-
-    /// Create a UserInfo with specified permission mode.
-    pub(crate) fn with_name_and_permission(
-        username: impl Into<String>,
-        permission_mode: PermissionMode,
-    ) -> UserInfoRef {
        Arc::new(Self {
            username: username.into(),
-            permission_mode,
        })
    }
-
-    pub(crate) fn permission_mode(&self) -> &PermissionMode {
-        &self.permission_mode
-    }
 }

 impl UserInfo for DefaultUserInfo {
@@ -114,120 +45,3 @@ impl UserInfo for DefaultUserInfo {
        self.username.as_str()
    }
 }
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_permission_mode_from_str() {
-        // Test ReadWrite variants
-        assert_eq!(
-            PermissionMode::from_str("readwrite"),
-            PermissionMode::ReadWrite
-        );
-        assert_eq!(
-            PermissionMode::from_str("read_write"),
-            PermissionMode::ReadWrite
-        );
-        assert_eq!(PermissionMode::from_str("rw"), PermissionMode::ReadWrite);
-        assert_eq!(
-            PermissionMode::from_str("ReadWrite"),
-            PermissionMode::ReadWrite
-        );
-        assert_eq!(PermissionMode::from_str("RW"), PermissionMode::ReadWrite);
-
-        // Test ReadOnly variants
-        assert_eq!(
-            PermissionMode::from_str("readonly"),
-            PermissionMode::ReadOnly
-        );
-        assert_eq!(
-            PermissionMode::from_str("read_only"),
-            PermissionMode::ReadOnly
-        );
-        assert_eq!(PermissionMode::from_str("ro"), PermissionMode::ReadOnly);
-        assert_eq!(
-            PermissionMode::from_str("ReadOnly"),
-            PermissionMode::ReadOnly
-        );
-        assert_eq!(PermissionMode::from_str("RO"), PermissionMode::ReadOnly);
-
-        // Test WriteOnly variants
-        assert_eq!(
-            PermissionMode::from_str("writeonly"),
-            PermissionMode::WriteOnly
-        );
-        assert_eq!(
-            PermissionMode::from_str("write_only"),
-            PermissionMode::WriteOnly
-        );
-        assert_eq!(PermissionMode::from_str("wo"), PermissionMode::WriteOnly);
-        assert_eq!(
-            PermissionMode::from_str("WriteOnly"),
-            PermissionMode::WriteOnly
-        );
-        assert_eq!(PermissionMode::from_str("WO"), PermissionMode::WriteOnly);
-
-        // Test invalid inputs default to ReadWrite
-        assert_eq!(
-            PermissionMode::from_str("invalid"),
-            PermissionMode::ReadWrite
-        );
-        assert_eq!(PermissionMode::from_str(""), PermissionMode::ReadWrite);
-        assert_eq!(PermissionMode::from_str("xyz"), PermissionMode::ReadWrite);
-    }
-
-    #[test]
-    fn test_permission_mode_as_str() {
-        assert_eq!(PermissionMode::ReadWrite.as_str(), "rw");
-        assert_eq!(PermissionMode::ReadOnly.as_str(), "ro");
-        assert_eq!(PermissionMode::WriteOnly.as_str(), "wo");
-    }
-
-    #[test]
-    fn test_permission_mode_default() {
-        assert_eq!(PermissionMode::default(), PermissionMode::ReadWrite);
-    }
-
-    #[test]
-    fn test_permission_mode_round_trip() {
-        let modes = [
-            PermissionMode::ReadWrite,
-            PermissionMode::ReadOnly,
-            PermissionMode::WriteOnly,
-        ];
-
-        for mode in modes {
-            let str_repr = mode.as_str();
-            let parsed = PermissionMode::from_str(str_repr);
-            assert_eq!(mode, parsed);
-        }
-    }
-
-    #[test]
-    fn test_default_user_info_with_name() {
-        let user_info = DefaultUserInfo::with_name("test_user");
-        assert_eq!(user_info.username(), "test_user");
-    }
-
-    #[test]
-    fn test_default_user_info_with_name_and_permission() {
-        let user_info =
-            DefaultUserInfo::with_name_and_permission("test_user", PermissionMode::ReadOnly);
-        assert_eq!(user_info.username(), "test_user");
-
-        // Cast to DefaultUserInfo to access permission_mode
-        let default_user = user_info
-            .as_any()
-            .downcast_ref::<DefaultUserInfo>()
-            .unwrap();
-        assert_eq!(default_user.permission_mode, PermissionMode::ReadOnly);
-    }
-
-    #[test]
-    fn test_user_info_as_any() {
-        let user_info = DefaultUserInfo::with_name("test_user");
-        let any_ref = user_info.as_any();
-        assert!(any_ref.downcast_ref::<DefaultUserInfo>().is_some());
-    }
-}
--- a/src/auth/src/user_provider.rs
+++ b/src/auth/src/user_provider.rs
@@ -22,15 +22,15 @@ use std::io::BufRead;
 use std::path::Path;

 use common_base::secrets::ExposeSecret;
-use snafu::{OptionExt, ResultExt, ensure};
+use snafu::{ensure, OptionExt, ResultExt};

 use crate::common::{Identity, Password};
 use crate::error::{
    IllegalParamSnafu, InvalidConfigSnafu, IoSnafu, Result, UnsupportedPasswordTypeSnafu,
    UserNotFoundSnafu, UserPasswordMismatchSnafu,
 };
-use crate::user_info::{DefaultUserInfo, PermissionMode};
-use crate::{UserInfoRef, auth_mysql};
+use crate::user_info::DefaultUserInfo;
+use crate::{auth_mysql, UserInfoRef};

 #[async_trait::async_trait]
 pub trait UserProvider: Send + Sync {
@@ -64,19 +64,11 @@ pub trait UserProvider: Send + Sync {
    }
 }

-/// Type alias for user info map
-/// Key is username, value is (password, permission_mode)
-pub type UserInfoMap = HashMap<String, (Vec<u8>, PermissionMode)>;
-
-fn load_credential_from_file(filepath: &str) -> Result<UserInfoMap> {
+fn load_credential_from_file(filepath: &str) -> Result<Option<HashMap<String, Vec<u8>>>> {
    // check valid path
    let path = Path::new(filepath);
    if !path.exists() {
-        return InvalidConfigSnafu {
-            value: filepath.to_string(),
-            msg: "UserProvider file must exist",
-        }
-        .fail();
+        return Ok(None);
    }

    ensure!(
@@ -91,19 +83,13 @@ fn load_credential_from_file(filepath: &str) -> Result<UserInfoMap> {
        .lines()
        .map_while(std::result::Result::ok)
        .filter_map(|line| {
-            // The line format is:
-            // - `username=password` - Basic user with default permissions
-            // - `username:permission_mode=password` - User with specific permission mode
-            // - Lines starting with '#' are treated as comments and ignored
-            // - Empty lines are ignored
-            let line = line.trim();
-            if line.is_empty() || line.starts_with('#') {
-                return None;
+            if let Some((k, v)) = line.split_once('=') {
+                Some((k.to_string(), v.as_bytes().to_vec()))
+            } else {
+                None
            }
-
-            parse_credential_line(line)
        })
-        .collect::<HashMap<String, _>>();
+        .collect::<HashMap<String, Vec<u8>>>();

    ensure!(
        !credential.is_empty(),
@@ -113,31 +99,11 @@ fn load_credential_from_file(filepath: &str) -> Result<UserInfoMap> {
        }
    );

-    Ok(credential)
-}
-
-/// Parse a line of credential in the format of `username=password` or `username:permission_mode=password`
-pub(crate) fn parse_credential_line(line: &str) -> Option<(String, (Vec<u8>, PermissionMode))> {
-    let parts = line.split('=').collect::<Vec<&str>>();
-    if parts.len() != 2 {
-        return None;
-    }
-
-    let (username_part, password) = (parts[0], parts[1]);
-    let (username, permission_mode) = if let Some((user, perm)) = username_part.split_once(':') {
-        (user, PermissionMode::from_str(perm))
-    } else {
-        (username_part, PermissionMode::default())
-    };
-
-    Some((
-        username.to_string(),
-        (password.as_bytes().to_vec(), permission_mode),
-    ))
+    Ok(Some(credential))
 }

 fn authenticate_with_credential(
-    users: &UserInfoMap,
+    users: &HashMap<String, Vec<u8>>,
    input_id: Identity<'_>,
    input_pwd: Password<'_>,
 ) -> Result<UserInfoRef> {
@@ -149,7 +115,7 @@ fn authenticate_with_credential(
                    msg: "blank username"
                }
            );
-            let (save_pwd, permission_mode) = users.get(username).context(UserNotFoundSnafu {
+            let save_pwd = users.get(username).context(UserNotFoundSnafu {
                username: username.to_string(),
            })?;

@@ -162,10 +128,7 @@ fn authenticate_with_credential(
                        }
                    );
                    if save_pwd == pwd.expose_secret().as_bytes() {
-                        Ok(DefaultUserInfo::with_name_and_permission(
-                            username,
-                            *permission_mode,
-                        ))
+                        Ok(DefaultUserInfo::with_name(username))
                    } else {
                        UserPasswordMismatchSnafu {
                            username: username.to_string(),
@@ -174,9 +137,8 @@ fn authenticate_with_credential(
                    }
                }
                Password::MysqlNativePassword(auth_data, salt) => {
-                    auth_mysql(auth_data, salt, username, save_pwd).map(|_| {
-                        DefaultUserInfo::with_name_and_permission(username, *permission_mode)
-                    })
+                    auth_mysql(auth_data, salt, username, save_pwd)
+                        .map(|_| DefaultUserInfo::with_name(username))
                }
                Password::PgMD5(_, _) => UnsupportedPasswordTypeSnafu {
                    password_type: "pg_md5",
@@ -186,108 +148,3 @@ fn authenticate_with_credential(
        }
    }
 }
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse_credential_line() {
-        // Basic username=password format
-        let result = parse_credential_line("admin=password123");
-        assert_eq!(
-            result,
-            Some((
-                "admin".to_string(),
-                ("password123".as_bytes().to_vec(), PermissionMode::default())
-            ))
-        );
-
-        // Username with permission mode
-        let result = parse_credential_line("user:ReadOnly=secret");
-        assert_eq!(
-            result,
-            Some((
-                "user".to_string(),
-                ("secret".as_bytes().to_vec(), PermissionMode::ReadOnly)
-            ))
-        );
-        let result = parse_credential_line("user:ro=secret");
-        assert_eq!(
-            result,
-            Some((
-                "user".to_string(),
-                ("secret".as_bytes().to_vec(), PermissionMode::ReadOnly)
-            ))
-        );
-        // Username with WriteOnly permission mode
-        let result = parse_credential_line("writer:WriteOnly=mypass");
-        assert_eq!(
-            result,
-            Some((
-                "writer".to_string(),
-                ("mypass".as_bytes().to_vec(), PermissionMode::WriteOnly)
-            ))
-        );
-
-        // Username with 'wo' as WriteOnly permission shorthand
-        let result = parse_credential_line("writer:wo=mypass");
-        assert_eq!(
-            result,
-            Some((
-                "writer".to_string(),
-                ("mypass".as_bytes().to_vec(), PermissionMode::WriteOnly)
-            ))
-        );
-
-        // Username with complex password containing special characters
-        let result = parse_credential_line("admin:rw=p@ssw0rd!123");
-        assert_eq!(
-            result,
-            Some((
-                "admin".to_string(),
-                (
-                    "p@ssw0rd!123".as_bytes().to_vec(),
-                    PermissionMode::ReadWrite
-                )
-            ))
-        );
-
-        // Username with spaces should be preserved
-        let result = parse_credential_line("user name:WriteOnly=password");
-        assert_eq!(
-            result,
-            Some((
-                "user name".to_string(),
-                ("password".as_bytes().to_vec(), PermissionMode::WriteOnly)
-            ))
-        );
-
-        // Invalid format - no equals sign
-        let result = parse_credential_line("invalid_line");
-        assert_eq!(result, None);
-
-        // Invalid format - multiple equals signs
-        let result = parse_credential_line("user=pass=word");
-        assert_eq!(result, None);
-
-        // Empty password
-        let result = parse_credential_line("user=");
-        assert_eq!(
-            result,
-            Some((
-                "user".to_string(),
-                ("".as_bytes().to_vec(), PermissionMode::default())
-            ))
-        );
-
-        // Empty username
-        let result = parse_credential_line("=password");
-        assert_eq!(
-            result,
-            Some((
-                "".to_string(),
-                ("password".as_bytes().to_vec(), PermissionMode::default())
-            ))
-        );
-    }
-}
--- a/src/auth/src/user_provider/static_user_provider.rs
+++ b/src/auth/src/user_provider/static_user_provider.rs
@@ -12,19 +12,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+use std::collections::HashMap;
+
 use async_trait::async_trait;
 use snafu::{OptionExt, ResultExt};

 use crate::error::{FromUtf8Snafu, InvalidConfigSnafu, Result};
-use crate::user_provider::{
-    UserInfoMap, authenticate_with_credential, load_credential_from_file, parse_credential_line,
-};
+use crate::user_provider::{authenticate_with_credential, load_credential_from_file};
 use crate::{Identity, Password, UserInfoRef, UserProvider};

 pub(crate) const STATIC_USER_PROVIDER: &str = "static_user_provider";

 pub struct StaticUserProvider {
-    users: UserInfoMap,
+    users: HashMap<String, Vec<u8>>,
 }

 impl StaticUserProvider {
@@ -35,18 +35,23 @@ impl StaticUserProvider {
        })?;
        match mode {
            "file" => {
-                let users = load_credential_from_file(content)?;
+                let users = load_credential_from_file(content)?
+                    .context(InvalidConfigSnafu {
+                        value: content.to_string(),
+                        msg: "StaticFileUserProvider must be a valid file path",
+                    })?;
                Ok(StaticUserProvider { users })
            }
            "cmd" => content
                .split(',')
                .map(|kv| {
-                   parse_credential_line(kv).context(InvalidConfigSnafu {
+                    let (k, v) = kv.split_once('=').context(InvalidConfigSnafu {
                        value: kv.to_string(),
                        msg: "StaticUserProviderOption cmd values must be in format `user=pwd[,user=pwd]`",
-                    })
+                    })?;
+                    Ok((k.to_string(), v.as_bytes().to_vec()))
                })
-                .collect::<Result<UserInfoMap>>()
+                .collect::<Result<HashMap<String, Vec<u8>>>>()
                .map(|users| StaticUserProvider { users }),
            _ => InvalidConfigSnafu {
                value: mode.to_string(),
@@ -64,7 +69,7 @@ impl StaticUserProvider {
            msg: "Expect at least one pair of username and password",
        })?;
        let username = kv.0;
-        let pwd = String::from_utf8(kv.1.0.clone()).context(FromUtf8Snafu)?;
+        let pwd = String::from_utf8(kv.1.clone()).context(FromUtf8Snafu)?;
        Ok((username.clone(), pwd))
    }
 }
@@ -97,10 +102,10 @@ pub mod test {

    use common_test_util::temp_dir::create_temp_dir;

-    use crate::UserProvider;
    use crate::user_info::DefaultUserInfo;
    use crate::user_provider::static_user_provider::StaticUserProvider;
    use crate::user_provider::{Identity, Password};
+    use crate::UserProvider;

    async fn test_authenticate(provider: &dyn UserProvider, username: &str, password: &str) {
        let re = provider
@@ -138,13 +143,12 @@ pub mod test {
            let file = File::create(&file_path);
            let file = file.unwrap();
            let mut lw = LineWriter::new(file);
-            assert!(
-                lw.write_all(
+            assert!(lw
+                .write_all(
                    b"root=123456
 admin=654321",
                )
-                .is_ok()
-            );
+                .is_ok());
            lw.flush().unwrap();
        }

--- a/src/auth/src/user_provider/watch_file_user_provider.rs
+++ b/src/auth/src/user_provider/watch_file_user_provider.rs
@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+use std::collections::HashMap;
 use std::path::Path;
 use std::sync::mpsc::channel;
 use std::sync::{Arc, Mutex};
@@ -19,20 +20,20 @@ use std::sync::{Arc, Mutex};
 use async_trait::async_trait;
 use common_telemetry::{info, warn};
 use notify::{EventKind, RecursiveMode, Watcher};
-use snafu::{ResultExt, ensure};
+use snafu::{ensure, ResultExt};

 use crate::error::{FileWatchSnafu, InvalidConfigSnafu, Result};
-use crate::user_provider::{UserInfoMap, authenticate_with_credential, load_credential_from_file};
+use crate::user_info::DefaultUserInfo;
+use crate::user_provider::{authenticate_with_credential, load_credential_from_file};
 use crate::{Identity, Password, UserInfoRef, UserProvider};

 pub(crate) const WATCH_FILE_USER_PROVIDER: &str = "watch_file_user_provider";

-type WatchedCredentialRef = Arc<Mutex<UserInfoMap>>;
+type WatchedCredentialRef = Arc<Mutex<Option<HashMap<String, Vec<u8>>>>>;

 /// A user provider that reads user credential from a file and watches the file for changes.
 ///
-/// Both empty file and non-existent file are invalid and will cause initialization to fail.
-#[derive(Debug)]
+/// Empty file is invalid; but file not exist means every user can be authenticated.
 pub(crate) struct WatchFileUserProvider {
    users: WatchedCredentialRef,
 }
@@ -107,7 +108,16 @@ impl UserProvider for WatchFileUserProvider {

    async fn authenticate(&self, id: Identity<'_>, password: Password<'_>) -> Result<UserInfoRef> {
        let users = self.users.lock().expect("users credential must be valid");
-        authenticate_with_credential(&users, id, password)
+        if let Some(users) = users.as_ref() {
+            authenticate_with_credential(users, id, password)
+        } else {
+            match id {
+                Identity::UserId(id, _) => {
+                    warn!(id, "User provider file not exist, allow all users");
+                    Ok(DefaultUserInfo::with_name(id))
+                }
+            }
+        }
    }

    async fn authorize(&self, _: &str, _: &str, _: &UserInfoRef) -> Result<()> {
@@ -123,9 +133,9 @@ pub mod test {
    use common_test_util::temp_dir::create_temp_dir;
    use tokio::time::sleep;

-    use crate::UserProvider;
    use crate::user_provider::watch_file_user_provider::WatchFileUserProvider;
    use crate::user_provider::{Identity, Password};
+    use crate::UserProvider;

    async fn test_authenticate(
        provider: &dyn UserProvider,
@@ -168,21 +178,6 @@ pub mod test {
        }
    }

-    #[tokio::test]
-    async fn test_file_provider_initialization_with_missing_file() {
-        common_telemetry::init_default_ut_logging();
-
-        let dir = create_temp_dir("test_missing_file");
-        let file_path = format!("{}/non_existent_file", dir.path().to_str().unwrap());
-
-        // Try to create provider with non-existent file should fail
-        let result = WatchFileUserProvider::new(file_path.as_str());
-        assert!(result.is_err());
-
-        let error = result.unwrap_err();
-        assert!(error.to_string().contains("UserProvider file must exist"));
-    }
-
    #[tokio::test]
    async fn test_file_provider() {
        common_telemetry::init_default_ut_logging();
@@ -207,10 +202,9 @@ pub mod test {

        // remove the tmp file
        assert!(std::fs::remove_file(&file_path).is_ok());
-        // When file is deleted during runtime, keep the last known good credentials
+        test_authenticate(&provider, "root", "123456", true, Some(timeout)).await;
        test_authenticate(&provider, "root", "654321", true, Some(timeout)).await;
-        test_authenticate(&provider, "root", "123456", false, Some(timeout)).await;
-        test_authenticate(&provider, "admin", "654321", false, Some(timeout)).await;
+        test_authenticate(&provider, "admin", "654321", true, Some(timeout)).await;

        // recreate the tmp file
        assert!(std::fs::write(&file_path, "root=123456\n").is_ok());
--- a/src/cache/src/lib.rs
+++ b/src/cache/src/lib.rs
@@ -19,9 +19,9 @@ use std::time::Duration;

 use catalog::kvbackend::new_table_cache;
 use common_meta::cache::{
-    CacheRegistry, CacheRegistryBuilder, LayeredCacheRegistryBuilder, new_schema_cache,
-    new_table_flownode_set_cache, new_table_info_cache, new_table_name_cache,
-    new_table_route_cache, new_table_schema_cache, new_view_info_cache,
+    new_schema_cache, new_table_flownode_set_cache, new_table_info_cache, new_table_name_cache,
+    new_table_route_cache, new_table_schema_cache, new_view_info_cache, CacheRegistry,
+    CacheRegistryBuilder, LayeredCacheRegistryBuilder,
 };
 use common_meta::kv_backend::KvBackendRef;
 use moka::future::CacheBuilder;
--- a/src/catalog/Cargo.toml
+++ b/src/catalog/Cargo.toml
@@ -32,10 +32,8 @@ common-runtime.workspace = true
 common-telemetry.workspace = true
 common-time.workspace = true
 common-version.workspace = true
-common-workload.workspace = true
 dashmap.workspace = true
 datafusion.workspace = true
-datafusion-pg-catalog.workspace = true
 datatypes.workspace = true
 futures.workspace = true
 futures-util.workspace = true
@@ -49,7 +47,7 @@ paste.workspace = true
 prometheus.workspace = true
 promql-parser.workspace = true
 rand.workspace = true
-serde.workspace = true
+rustc-hash.workspace = true
 serde_json.workspace = true
 session.workspace = true
 snafu.workspace = true
--- a/src/catalog/src/error.rs
+++ b/src/catalog/src/error.rs
@@ -297,20 +297,6 @@ pub enum Error {
        #[snafu(implicit)]
        location: Location,
    },
-
-    #[snafu(display("Failed to handle query"))]
-    HandleQuery {
-        source: common_meta::error::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
-
-    #[snafu(display("Failed to project schema"))]
-    ProjectSchema {
-        source: datatypes::error::Error,
-        #[snafu(implicit)]
-        location: Location,
-    },
 }

 impl Error {
@@ -383,8 +369,6 @@ impl ErrorExt for Error {
            Error::FrontendNotFound { .. } | Error::MetaClientMissing { .. } => {
                StatusCode::Unexpected
            }
-            Error::HandleQuery { source, .. } => source.status_code(),
-            Error::ProjectSchema { source, .. } => source.status_code(),
        }
    }

--- a/src/catalog/src/information_extension.rs
+++ b/src/catalog/src/information_extension.rs
@@ -14,34 +14,25 @@

 use api::v1::meta::ProcedureStatus;
 use common_error::ext::BoxedError;
-use common_meta::cluster::{ClusterInfo, NodeInfo, Role};
+use common_meta::cluster::{ClusterInfo, NodeInfo};
 use common_meta::datanode::RegionStat;
 use common_meta::key::flow::flow_state::FlowStat;
-use common_meta::node_manager::DatanodeManagerRef;
 use common_meta::procedure_executor::{ExecutorContext, ProcedureExecutor};
 use common_meta::rpc::procedure;
 use common_procedure::{ProcedureInfo, ProcedureState};
-use common_query::request::QueryRequest;
-use common_recordbatch::SendableRecordBatchStream;
-use common_recordbatch::util::ChainedRecordBatchStream;
 use meta_client::MetaClientRef;
 use snafu::ResultExt;
-use store_api::storage::RegionId;

 use crate::error;
-use crate::information_schema::{DatanodeInspectRequest, InformationExtension};
+use crate::information_schema::InformationExtension;

 pub struct DistributedInformationExtension {
    meta_client: MetaClientRef,
-    datanode_manager: DatanodeManagerRef,
 }

 impl DistributedInformationExtension {
-    pub fn new(meta_client: MetaClientRef, datanode_manager: DatanodeManagerRef) -> Self {
-        Self {
-            meta_client,
-            datanode_manager,
-        }
+    pub fn new(meta_client: MetaClientRef) -> Self {
+        Self { meta_client }
    }
 }

@@ -107,39 +98,4 @@ impl InformationExtension for DistributedInformationExtension {
            .map_err(BoxedError::new)
            .context(crate::error::ListFlowStatsSnafu)
    }
-
-    async fn inspect_datanode(
-        &self,
-        request: DatanodeInspectRequest,
-    ) -> std::result::Result<SendableRecordBatchStream, Self::Error> {
-        // Aggregate results from all datanodes
-        let nodes = self
-            .meta_client
-            .list_nodes(Some(Role::Datanode))
-            .await
-            .map_err(BoxedError::new)
-            .context(crate::error::ListNodesSnafu)?;
-
-        let plan = request
-            .build_plan()
-            .context(crate::error::DatafusionSnafu)?;
-
-        let mut streams = Vec::with_capacity(nodes.len());
-        for node in nodes {
-            let client = self.datanode_manager.datanode(&node.peer).await;
-            let stream = client
-                .handle_query(QueryRequest {
-                    plan: plan.clone(),
-                    region_id: RegionId::default(),
-                    header: None,
-                })
-                .await
-                .context(crate::error::HandleQuerySnafu)?;
-            streams.push(stream);
-        }
-
-        let chained =
-            ChainedRecordBatchStream::new(streams).context(crate::error::CreateRecordBatchSnafu)?;
-        Ok(Box::pin(chained))
-    }
 }
--- a/src/catalog/src/kvbackend.rs
+++ b/src/catalog/src/kvbackend.rs
@@ -21,4 +21,4 @@ mod table_cache;

 pub use builder::KvBackendCatalogManagerBuilder;
 pub use manager::KvBackendCatalogManager;
-pub use table_cache::{TableCache, TableCacheRef, new_table_cache};
+pub use table_cache::{new_table_cache, TableCache, TableCacheRef};
--- a/src/catalog/src/kvbackend/builder.rs
+++ b/src/catalog/src/kvbackend/builder.rs
@@ -16,8 +16,8 @@ use std::sync::Arc;

 use common_catalog::consts::DEFAULT_CATALOG_NAME;
 use common_meta::cache::LayeredCacheRegistryRef;
-use common_meta::key::TableMetadataManager;
 use common_meta::key::flow::FlowMetadataManager;
+use common_meta::key::TableMetadataManager;
 use common_meta::kv_backend::KvBackendRef;
 use common_procedure::ProcedureManagerRef;
 use moka::sync::Cache;
@@ -26,10 +26,9 @@ use partition::manager::PartitionRuleManager;
 #[cfg(feature = "enterprise")]
 use crate::information_schema::InformationSchemaTableFactoryRef;
 use crate::information_schema::{InformationExtensionRef, InformationSchemaProvider};
+use crate::kvbackend::manager::{SystemCatalog, CATALOG_CACHE_MAX_CAPACITY};
 use crate::kvbackend::KvBackendCatalogManager;
-use crate::kvbackend::manager::{CATALOG_CACHE_MAX_CAPACITY, SystemCatalog};
 use crate::process_manager::ProcessManagerRef;
-use crate::system_schema::numbers_table_provider::NumbersTableProvider;
 use crate::system_schema::pg_catalog::PGCatalogProvider;

 pub struct KvBackendCatalogManagerBuilder {
@@ -120,7 +119,6 @@ impl KvBackendCatalogManagerBuilder {
                    DEFAULT_CATALOG_NAME.to_string(),
                    me.clone(),
                )),
-                numbers_table_provider: NumbersTableProvider,
                backend,
                process_manager,
                #[cfg(feature = "enterprise")]
--- a/src/catalog/src/kvbackend/client.rs
+++ b/src/catalog/src/kvbackend/client.rs
@@ -24,12 +24,12 @@ use common_meta::error::Error::CacheNotGet;
 use common_meta::error::{CacheNotGetSnafu, Error, ExternalSnafu, GetKvCacheSnafu, Result};
 use common_meta::kv_backend::txn::{Txn, TxnResponse};
 use common_meta::kv_backend::{KvBackend, KvBackendRef, TxnService};
-use common_meta::rpc::KeyValue;
 use common_meta::rpc::store::{
    BatchDeleteRequest, BatchDeleteResponse, BatchGetRequest, BatchGetResponse, BatchPutRequest,
    BatchPutResponse, CompareAndPutRequest, CompareAndPutResponse, DeleteRangeRequest,
    DeleteRangeResponse, PutRequest, PutResponse, RangeRequest, RangeResponse,
 };
+use common_meta::rpc::KeyValue;
 use common_telemetry::debug;
 use meta_client::client::MetaClient;
 use moka::future::{Cache, CacheBuilder};
@@ -461,17 +461,17 @@ impl KvBackend for MetaKvBackend {
 #[cfg(test)]
 mod tests {
    use std::any::Any;
-    use std::sync::Arc;
    use std::sync::atomic::{AtomicU32, Ordering};
+    use std::sync::Arc;

    use async_trait::async_trait;
    use common_meta::kv_backend::{KvBackend, TxnService};
-    use common_meta::rpc::KeyValue;
    use common_meta::rpc::store::{
        BatchDeleteRequest, BatchDeleteResponse, BatchGetRequest, BatchGetResponse,
        BatchPutRequest, BatchPutResponse, DeleteRangeRequest, DeleteRangeResponse, PutRequest,
        PutResponse, RangeRequest, RangeResponse,
    };
+    use common_meta::rpc::KeyValue;
    use dashmap::DashMap;

    use super::CachedKvBackend;
--- a/src/catalog/src/kvbackend/manager.rs
+++ b/src/catalog/src/kvbackend/manager.rs
@@ -18,19 +18,20 @@ use std::sync::{Arc, Weak};

 use async_stream::try_stream;
 use common_catalog::consts::{
-    DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, INFORMATION_SCHEMA_NAME, PG_CATALOG_NAME,
+    DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, INFORMATION_SCHEMA_NAME, NUMBERS_TABLE_ID,
+    PG_CATALOG_NAME,
 };
 use common_error::ext::BoxedError;
 use common_meta::cache::{
    LayeredCacheRegistryRef, TableInfoCacheRef, TableNameCacheRef, TableRoute, TableRouteCacheRef,
    ViewInfoCacheRef,
 };
-use common_meta::key::TableMetadataManagerRef;
 use common_meta::key::catalog_name::CatalogNameKey;
 use common_meta::key::flow::FlowMetadataManager;
 use common_meta::key::schema_name::SchemaNameKey;
 use common_meta::key::table_info::{TableInfoManager, TableInfoValue};
 use common_meta::key::table_name::TableNameKey;
+use common_meta::key::TableMetadataManagerRef;
 use common_meta::kv_backend::KvBackendRef;
 use common_procedure::ProcedureManagerRef;
 use futures_util::stream::BoxStream;
@@ -40,15 +41,15 @@ use partition::manager::PartitionRuleManagerRef;
 use session::context::{Channel, QueryContext};
 use snafu::prelude::*;
 use store_api::metric_engine_consts::METRIC_ENGINE_NAME;
-use table::TableRef;
 use table::dist_table::DistTable;
 use table::metadata::{TableId, TableInfoRef};
+use table::table::numbers::{NumbersTable, NUMBERS_TABLE_NAME};
 use table::table::PartitionRules;
 use table::table_name::TableName;
+use table::TableRef;
 use tokio::sync::Semaphore;
 use tokio_stream::wrappers::ReceiverStream;

-use crate::CatalogManager;
 use crate::error::{
    CacheNotFoundSnafu, GetTableCacheSnafu, InvalidTableInfoInCatalogSnafu, ListCatalogsSnafu,
    ListSchemasSnafu, ListTablesSnafu, Result, TableMetadataManagerSnafu,
@@ -58,9 +59,9 @@ use crate::information_schema::InformationSchemaTableFactoryRef;
 use crate::information_schema::{InformationExtensionRef, InformationSchemaProvider};
 use crate::kvbackend::TableCacheRef;
 use crate::process_manager::ProcessManagerRef;
-use crate::system_schema::SystemSchemaProvider;
-use crate::system_schema::numbers_table_provider::NumbersTableProvider;
 use crate::system_schema::pg_catalog::PGCatalogProvider;
+use crate::system_schema::SystemSchemaProvider;
+use crate::CatalogManager;

 /// Access all existing catalog, schema and tables.
 ///
@@ -554,7 +555,6 @@ pub(super) struct SystemCatalog {
    // system_schema_provider for default catalog
    pub(super) information_schema_provider: Arc<InformationSchemaProvider>,
    pub(super) pg_catalog_provider: Arc<PGCatalogProvider>,
-    pub(super) numbers_table_provider: NumbersTableProvider,
    pub(super) backend: KvBackendRef,
    pub(super) process_manager: Option<ProcessManagerRef>,
    #[cfg(feature = "enterprise")]
@@ -584,7 +584,9 @@ impl SystemCatalog {
            PG_CATALOG_NAME if channel == Channel::Postgres => {
                self.pg_catalog_provider.table_names()
            }
-            DEFAULT_SCHEMA_NAME => self.numbers_table_provider.table_names(),
+            DEFAULT_SCHEMA_NAME => {
+                vec![NUMBERS_TABLE_NAME.to_string()]
+            }
            _ => vec![],
        }
    }
@@ -602,7 +604,7 @@ impl SystemCatalog {
        if schema == INFORMATION_SCHEMA_NAME {
            self.information_schema_provider.table(table).is_some()
        } else if schema == DEFAULT_SCHEMA_NAME {
-            self.numbers_table_provider.table_exists(table)
+            table == NUMBERS_TABLE_NAME
        } else if schema == PG_CATALOG_NAME && channel == Channel::Postgres {
            self.pg_catalog_provider.table(table).is_some()
        } else {
@@ -647,8 +649,8 @@ impl SystemCatalog {
                    });
                pg_catalog_provider.table(table_name)
            }
-        } else if schema == DEFAULT_SCHEMA_NAME {
-            self.numbers_table_provider.table(table_name)
+        } else if schema == DEFAULT_SCHEMA_NAME && table_name == NUMBERS_TABLE_NAME {
+            Some(NumbersTable::table(NUMBERS_TABLE_ID))
        } else {
            None
        }
--- a/src/catalog/src/kvbackend/table_cache.rs
+++ b/src/catalog/src/kvbackend/table_cache.rs
@@ -20,9 +20,9 @@ use common_meta::instruction::CacheIdent;
 use futures::future::BoxFuture;
 use moka::future::Cache;
 use snafu::OptionExt;
-use table::TableRef;
 use table::dist_table::DistTable;
 use table::table_name::TableName;
+use table::TableRef;

 pub type TableCacheRef = Arc<TableCache>;

--- a/src/catalog/src/lib.rs
+++ b/src/catalog/src/lib.rs
@@ -14,6 +14,7 @@

 #![feature(assert_matches)]
 #![feature(try_blocks)]
+#![feature(let_chains)]

 use std::any::Any;
 use std::fmt::{Debug, Formatter};
@@ -24,8 +25,8 @@ use common_catalog::consts::{INFORMATION_SCHEMA_NAME, PG_CATALOG_NAME};
 use futures::future::BoxFuture;
 use futures_util::stream::BoxStream;
 use session::context::QueryContext;
-use table::TableRef;
 use table::metadata::{TableId, TableInfoRef};
+use table::TableRef;

 use crate::error::Result;

--- a/src/catalog/src/memory.rs
+++ b/src/catalog/src/memory.rs
@@ -14,4 +14,4 @@

 pub mod manager;

-pub use manager::{MemoryCatalogManager, new_memory_catalog_manager};
+pub use manager::{new_memory_catalog_manager, MemoryCatalogManager};
--- a/src/catalog/src/memory/manager.rs
+++ b/src/catalog/src/memory/manager.rs
@@ -28,8 +28,8 @@ use common_meta::kv_backend::memory::MemoryKvBackend;
 use futures_util::stream::BoxStream;
 use session::context::QueryContext;
 use snafu::OptionExt;
-use table::TableRef;
 use table::metadata::{TableId, TableInfoRef};
+use table::TableRef;

 use crate::error::{CatalogNotFoundSnafu, Result, SchemaNotFoundSnafu, TableExistsSnafu};
 use crate::information_schema::InformationSchemaProvider;
@@ -392,15 +392,15 @@ impl MemoryCatalogManager {
        if !manager.schema_exist_sync(catalog, schema).unwrap() {
            manager
                .register_schema_sync(RegisterSchemaRequest {
-                    catalog: catalog.clone(),
-                    schema: schema.clone(),
+                    catalog: catalog.to_string(),
+                    schema: schema.to_string(),
                })
                .unwrap();
        }

        let request = RegisterTableRequest {
-            catalog: catalog.clone(),
-            schema: schema.clone(),
+            catalog: catalog.to_string(),
+            schema: schema.to_string(),
            table_name: table.table_info().name.clone(),
            table_id: table.table_info().ident.table_id,
            table,
@@ -419,7 +419,7 @@ pub fn new_memory_catalog_manager() -> Result<Arc<MemoryCatalogManager>> {
 mod tests {
    use common_catalog::consts::*;
    use futures_util::TryStreamExt;
-    use table::table::numbers::{NUMBERS_TABLE_NAME, NumbersTable};
+    use table::table::numbers::{NumbersTable, NUMBERS_TABLE_NAME};

    use super::*;

@@ -454,18 +454,16 @@ mod tests {
            tables[0].table_info().table_id()
        );

-        assert!(
-            catalog_list
-                .table(
-                    DEFAULT_CATALOG_NAME,
-                    DEFAULT_SCHEMA_NAME,
-                    "not_exists",
-                    None
-                )
-                .await
-                .unwrap()
-                .is_none()
-        );
+        assert!(catalog_list
+            .table(
+                DEFAULT_CATALOG_NAME,
+                DEFAULT_SCHEMA_NAME,
+                "not_exists",
+                None
+            )
+            .await
+            .unwrap()
+            .is_none());
    }

    #[test]
@@ -488,13 +486,11 @@ mod tests {
            table: NumbersTable::table(2333),
        };
        catalog.register_table_sync(register_table_req).unwrap();
-        assert!(
-            catalog
-                .table(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, table_name, None)
-                .await
-                .unwrap()
-                .is_some()
-        );
+        assert!(catalog
+            .table(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, table_name, None)
+            .await
+            .unwrap()
+            .is_some());

        let deregister_table_req = DeregisterTableRequest {
            catalog: DEFAULT_CATALOG_NAME.to_string(),
@@ -502,12 +498,10 @@ mod tests {
            table_name: table_name.to_string(),
        };
        catalog.deregister_table_sync(deregister_table_req).unwrap();
-        assert!(
-            catalog
-                .table(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, table_name, None)
-                .await
-                .unwrap()
-                .is_none()
-        );
+        assert!(catalog
+            .table(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, table_name, None)
+            .await
+            .unwrap()
+            .is_none());
    }
 }
--- a/src/catalog/src/process_manager.rs
+++ b/src/catalog/src/process_manager.rs
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use std::collections::HashMap;
 use std::collections::hash_map::Entry;
+use std::collections::HashMap;
 use std::fmt::{Debug, Display, Formatter};
 use std::sync::atomic::{AtomicU32, Ordering};
 use std::sync::{Arc, RwLock};
@@ -30,7 +30,7 @@ use common_time::util::current_time_millis;
 use meta_client::MetaClientRef;
 use promql_parser::parser::EvalStmt;
 use rand::random;
-use snafu::{OptionExt, ResultExt, ensure};
+use snafu::{ensure, OptionExt, ResultExt};
 use sql::statements::statement::Statement;

 use crate::error;
@@ -56,21 +56,14 @@ pub struct ProcessManager {
 #[derive(Debug, Clone)]
 pub enum QueryStatement {
    Sql(Statement),
-    // The optional string is the alias of the PromQL query.
-    Promql(EvalStmt, Option<String>),
+    Promql(EvalStmt),
 }

 impl Display for QueryStatement {
    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
        match self {
            QueryStatement::Sql(stmt) => write!(f, "{}", stmt),
-            QueryStatement::Promql(eval_stmt, alias) => {
-                if let Some(alias) = alias {
-                    write!(f, "{} AS {}", eval_stmt, alias)
-                } else {
-                    write!(f, "{}", eval_stmt)
-                }
-            }
+            QueryStatement::Promql(eval_stmt) => write!(f, "{}", eval_stmt),
        }
    }
 }
@@ -345,9 +338,9 @@ impl SlowQueryTimer {
        };

        match &self.stmt {
-            QueryStatement::Promql(stmt, _alias) => {
+            QueryStatement::Promql(stmt) => {
                slow_query_event.is_promql = true;
-                slow_query_event.query = self.stmt.to_string();
+                slow_query_event.query = stmt.expr.to_string();
                slow_query_event.promql_step = Some(stmt.interval.as_millis() as u64);

                let start = stmt
--- a/src/catalog/src/system_schema.rs
+++ b/src/catalog/src/system_schema.rs
@@ -14,7 +14,6 @@

 pub mod information_schema;
 mod memory_table;
-pub mod numbers_table_provider;
 pub mod pg_catalog;
 pub mod predicate;
 mod utils;
@@ -138,24 +137,21 @@ impl DataSource for SystemTableDataSource {
        &self,
        request: ScanRequest,
    ) -> std::result::Result<SendableRecordBatchStream, BoxedError> {
-        let projected_schema = match &request.projection {
+        let projection = request.projection.clone();
+        let projected_schema = match &projection {
            Some(projection) => self.try_project(projection)?,
            None => self.table.schema(),
        };

-        let projection = request.projection.clone();
        let stream = self
            .table
            .to_stream(request)
            .map_err(BoxedError::new)
            .context(TablesRecordBatchSnafu)
            .map_err(BoxedError::new)?
-            .map(move |batch| match (&projection, batch) {
-                // Some tables (e.g., inspect tables) already honor projection in their inner stream;
-                // others ignore it and return full rows. We will only apply projection here if the
-                // inner batch width doesn't match the projection size.
-                (Some(p), Ok(b)) if b.num_columns() != p.len() => b.try_project(p),
-                (_, res) => res,
+            .map(move |batch| match &projection {
+                Some(p) => batch.and_then(|b| b.try_project(p)),
+                None => batch,
            });

        let stream = RecordBatchStreamWrapper {
--- a/src/catalog/src/system_schema/information_schema.rs
+++ b/src/catalog/src/system_schema/information_schema.rs
@@ -24,7 +24,6 @@ pub mod region_peers;
 mod region_statistics;
 mod runtime_metrics;
 pub mod schemata;
-mod ssts;
 mod table_constraints;
 mod table_names;
 pub mod tables;
@@ -37,26 +36,22 @@ use common_catalog::consts::{self, DEFAULT_CATALOG_NAME, INFORMATION_SCHEMA_NAME
 use common_error::ext::ErrorExt;
 use common_meta::cluster::NodeInfo;
 use common_meta::datanode::RegionStat;
-use common_meta::key::flow::FlowMetadataManager;
 use common_meta::key::flow::flow_state::FlowStat;
+use common_meta::key::flow::FlowMetadataManager;
 use common_meta::kv_backend::KvBackendRef;
 use common_procedure::ProcedureInfo;
 use common_recordbatch::SendableRecordBatchStream;
-use datafusion::error::DataFusionError;
-use datafusion::logical_expr::LogicalPlan;
 use datatypes::schema::SchemaRef;
 use lazy_static::lazy_static;
 use paste::paste;
 use process_list::InformationSchemaProcessList;
-use store_api::sst_entry::{ManifestSstEntry, PuffinIndexMetaEntry, StorageSstEntry};
 use store_api::storage::{ScanRequest, TableId};
-use table::TableRef;
 use table::metadata::TableType;
+use table::TableRef;
 pub use table_names::*;
 use views::InformationSchemaViews;

 use self::columns::InformationSchemaColumns;
-use crate::CatalogManager;
 use crate::error::{Error, Result};
 use crate::process_manager::ProcessManagerRef;
 use crate::system_schema::information_schema::cluster_info::InformationSchemaClusterInfo;
@@ -67,9 +62,6 @@ use crate::system_schema::information_schema::partitions::InformationSchemaParti
 use crate::system_schema::information_schema::region_peers::InformationSchemaRegionPeers;
 use crate::system_schema::information_schema::runtime_metrics::InformationSchemaMetrics;
 use crate::system_schema::information_schema::schemata::InformationSchemaSchemata;
-use crate::system_schema::information_schema::ssts::{
-    InformationSchemaSstsIndexMeta, InformationSchemaSstsManifest, InformationSchemaSstsStorage,
-};
 use crate::system_schema::information_schema::table_constraints::InformationSchemaTableConstraints;
 use crate::system_schema::information_schema::tables::InformationSchemaTables;
 use crate::system_schema::memory_table::MemoryTable;
@@ -77,6 +69,7 @@ pub(crate) use crate::system_schema::predicate::Predicates;
 use crate::system_schema::{
    SystemSchemaProvider, SystemSchemaProviderInner, SystemTable, SystemTableRef,
 };
+use crate::CatalogManager;

 lazy_static! {
    // Memory tables in `information_schema`.
@@ -97,6 +90,7 @@ lazy_static! {
        ROUTINES,
        SCHEMA_PRIVILEGES,
        TABLE_PRIVILEGES,
+        TRIGGERS,
        GLOBAL_STATUS,
        SESSION_STATUS,
        PARTITIONS,
@@ -206,6 +200,7 @@ impl SystemSchemaProviderInner for InformationSchemaProvider {
            ROUTINES => setup_memory_table!(ROUTINES),
            SCHEMA_PRIVILEGES => setup_memory_table!(SCHEMA_PRIVILEGES),
            TABLE_PRIVILEGES => setup_memory_table!(TABLE_PRIVILEGES),
+            TRIGGERS => setup_memory_table!(TRIGGERS),
            GLOBAL_STATUS => setup_memory_table!(GLOBAL_STATUS),
            SESSION_STATUS => setup_memory_table!(SESSION_STATUS),
            KEY_COLUMN_USAGE => Some(Arc::new(InformationSchemaKeyColumnUsage::new(
@@ -255,15 +250,6 @@ impl SystemSchemaProviderInner for InformationSchemaProvider {
                .process_manager
                .as_ref()
                .map(|p| Arc::new(InformationSchemaProcessList::new(p.clone())) as _),
-            SSTS_MANIFEST => Some(Arc::new(InformationSchemaSstsManifest::new(
-                self.catalog_manager.clone(),
-            )) as _),
-            SSTS_STORAGE => Some(Arc::new(InformationSchemaSstsStorage::new(
-                self.catalog_manager.clone(),
-            )) as _),
-            SSTS_INDEX_META => Some(Arc::new(InformationSchemaSstsIndexMeta::new(
-                self.catalog_manager.clone(),
-            )) as _),
            _ => None,
        }
    }
@@ -335,18 +321,6 @@ impl InformationSchemaProvider {
                REGION_STATISTICS.to_string(),
                self.build_table(REGION_STATISTICS).unwrap(),
            );
-            tables.insert(
-                SSTS_MANIFEST.to_string(),
-                self.build_table(SSTS_MANIFEST).unwrap(),
-            );
-            tables.insert(
-                SSTS_STORAGE.to_string(),
-                self.build_table(SSTS_STORAGE).unwrap(),
-            );
-            tables.insert(
-                SSTS_INDEX_META.to_string(),
-                self.build_table(SSTS_INDEX_META).unwrap(),
-            );
        }

        tables.insert(TABLES.to_string(), self.build_table(TABLES).unwrap());
@@ -367,7 +341,7 @@ impl InformationSchemaProvider {
        }
        #[cfg(feature = "enterprise")]
        for name in self.extra_table_factories.keys() {
-            tables.insert(name.clone(), self.build_table(name).expect(name));
+            tables.insert(name.to_string(), self.build_table(name).expect(name));
        }
        // Add memory tables
        for name in MEMORY_TABLES.iter() {
@@ -435,46 +409,8 @@ pub trait InformationExtension {

    /// Get the flow statistics. If no flownode is available, return `None`.
    async fn flow_stats(&self) -> std::result::Result<Option<FlowStat>, Self::Error>;
-
-    /// Inspects the datanode.
-    async fn inspect_datanode(
-        &self,
-        request: DatanodeInspectRequest,
-    ) -> std::result::Result<SendableRecordBatchStream, Self::Error>;
 }

-/// The request to inspect the datanode.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct DatanodeInspectRequest {
-    /// Kind to fetch from datanode.
-    pub kind: DatanodeInspectKind,
-
-    /// Pushdown scan configuration (projection/predicate/limit) for the returned stream.
-    /// This allows server-side filtering to reduce I/O and network costs.
-    pub scan: ScanRequest,
-}
-
-/// The kind of the datanode inspect request.
-#[derive(Debug, Clone, Copy, PartialEq, Eq)]
-pub enum DatanodeInspectKind {
-    /// List SST entries recorded in manifest
-    SstManifest,
-    /// List SST entries discovered in storage layer
-    SstStorage,
-    /// List index metadata collected from manifest
-    SstIndexMeta,
-}
-
-impl DatanodeInspectRequest {
-    /// Builds a logical plan for the datanode inspect request.
-    pub fn build_plan(self) -> std::result::Result<LogicalPlan, DataFusionError> {
-        match self.kind {
-            DatanodeInspectKind::SstManifest => ManifestSstEntry::build_plan(self.scan),
-            DatanodeInspectKind::SstStorage => StorageSstEntry::build_plan(self.scan),
-            DatanodeInspectKind::SstIndexMeta => PuffinIndexMetaEntry::build_plan(self.scan),
-        }
-    }
-}
 pub struct NoopInformationExtension;

 #[async_trait::async_trait]
@@ -496,11 +432,4 @@ impl InformationExtension for NoopInformationExtension {
    async fn flow_stats(&self) -> std::result::Result<Option<FlowStat>, Self::Error> {
        Ok(None)
    }
-
-    async fn inspect_datanode(
-        &self,
-        _request: DatanodeInspectRequest,
-    ) -> std::result::Result<SendableRecordBatchStream, Self::Error> {
-        Ok(common_recordbatch::RecordBatches::empty().as_stream())
-    }
 }
--- a/src/catalog/src/system_schema/information_schema/cluster_info.rs
+++ b/src/catalog/src/system_schema/information_schema/cluster_info.rs
@@ -18,15 +18,14 @@ use std::time::Duration;
 use arrow_schema::SchemaRef as ArrowSchemaRef;
 use common_catalog::consts::INFORMATION_SCHEMA_CLUSTER_INFO_TABLE_ID;
 use common_error::ext::BoxedError;
-use common_meta::cluster::{DatanodeStatus, NodeInfo, NodeStatus};
+use common_meta::cluster::NodeInfo;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use common_time::timestamp::Timestamp;
-use common_workload::DatanodeWorkloadType;
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, ScalarVectorBuilder, VectorRef};
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
 use datatypes::timestamp::TimestampMillisecond;
@@ -34,32 +33,22 @@ use datatypes::value::Value;
 use datatypes::vectors::{
    Int64VectorBuilder, StringVectorBuilder, TimestampMillisecondVectorBuilder,
 };
-use serde::Serialize;
 use snafu::ResultExt;
 use store_api::storage::{ScanRequest, TableId};

-use crate::CatalogManager;
 use crate::error::{CreateRecordBatchSnafu, InternalSnafu, Result};
-use crate::system_schema::information_schema::{CLUSTER_INFO, InformationTable, Predicates};
+use crate::system_schema::information_schema::{InformationTable, Predicates, CLUSTER_INFO};
 use crate::system_schema::utils;
-
-const PEER_TYPE_FRONTEND: &str = "FRONTEND";
-const PEER_TYPE_METASRV: &str = "METASRV";
+use crate::CatalogManager;

 const PEER_ID: &str = "peer_id";
 const PEER_TYPE: &str = "peer_type";
 const PEER_ADDR: &str = "peer_addr";
-const PEER_HOSTNAME: &str = "peer_hostname";
-const TOTAL_CPU_MILLICORES: &str = "total_cpu_millicores";
-const TOTAL_MEMORY_BYTES: &str = "total_memory_bytes";
-const CPU_USAGE_MILLICORES: &str = "cpu_usage_millicores";
-const MEMORY_USAGE_BYTES: &str = "memory_usage_bytes";
 const VERSION: &str = "version";
 const GIT_COMMIT: &str = "git_commit";
 const START_TIME: &str = "start_time";
 const UPTIME: &str = "uptime";
 const ACTIVE_TIME: &str = "active_time";
-const NODE_STATUS: &str = "node_status";

 const INIT_CAPACITY: usize = 42;

@@ -68,17 +57,11 @@ const INIT_CAPACITY: usize = 42;
 /// - `peer_id`: the peer server id.
 /// - `peer_type`: the peer type, such as `datanode`, `frontend`, `metasrv` etc.
 /// - `peer_addr`: the peer gRPC address.
-/// - `peer_hostname`: the hostname of the peer.
-/// - `total_cpu_millicores`: the total CPU millicores of the peer.
-/// - `total_memory_bytes`: the total memory bytes of the peer.
-/// - `cpu_usage_millicores`: the CPU usage millicores of the peer.
-/// - `memory_usage_bytes`: the memory usage bytes of the peer.
 /// - `version`: the build package version of the peer.
 /// - `git_commit`: the build git commit hash of the peer.
 /// - `start_time`: the starting time of the peer.
 /// - `uptime`: the uptime of the peer.
 /// - `active_time`: the time since the last activity of the peer.
-/// - `node_status`: the status info of the peer.
 ///
 #[derive(Debug)]
 pub(super) struct InformationSchemaClusterInfo {
@@ -99,27 +82,6 @@ impl InformationSchemaClusterInfo {
            ColumnSchema::new(PEER_ID, ConcreteDataType::int64_datatype(), false),
            ColumnSchema::new(PEER_TYPE, ConcreteDataType::string_datatype(), false),
            ColumnSchema::new(PEER_ADDR, ConcreteDataType::string_datatype(), true),
-            ColumnSchema::new(PEER_HOSTNAME, ConcreteDataType::string_datatype(), true),
-            ColumnSchema::new(
-                TOTAL_CPU_MILLICORES,
-                ConcreteDataType::int64_datatype(),
-                false,
-            ),
-            ColumnSchema::new(
-                TOTAL_MEMORY_BYTES,
-                ConcreteDataType::int64_datatype(),
-                false,
-            ),
-            ColumnSchema::new(
-                CPU_USAGE_MILLICORES,
-                ConcreteDataType::int64_datatype(),
-                false,
-            ),
-            ColumnSchema::new(
-                MEMORY_USAGE_BYTES,
-                ConcreteDataType::int64_datatype(),
-                false,
-            ),
            ColumnSchema::new(VERSION, ConcreteDataType::string_datatype(), false),
            ColumnSchema::new(GIT_COMMIT, ConcreteDataType::string_datatype(), false),
            ColumnSchema::new(
@@ -129,7 +91,6 @@ impl InformationSchemaClusterInfo {
            ),
            ColumnSchema::new(UPTIME, ConcreteDataType::string_datatype(), true),
            ColumnSchema::new(ACTIVE_TIME, ConcreteDataType::string_datatype(), true),
-            ColumnSchema::new(NODE_STATUS, ConcreteDataType::string_datatype(), true),
        ]))
    }

@@ -179,17 +140,11 @@ struct InformationSchemaClusterInfoBuilder {
    peer_ids: Int64VectorBuilder,
    peer_types: StringVectorBuilder,
    peer_addrs: StringVectorBuilder,
-    peer_hostnames: StringVectorBuilder,
-    total_cpu_millicores: Int64VectorBuilder,
-    total_memory_bytes: Int64VectorBuilder,
-    cpu_usage_millicores: Int64VectorBuilder,
-    memory_usage_bytes: Int64VectorBuilder,
    versions: StringVectorBuilder,
    git_commits: StringVectorBuilder,
    start_times: TimestampMillisecondVectorBuilder,
    uptimes: StringVectorBuilder,
    active_times: StringVectorBuilder,
-    node_status: StringVectorBuilder,
 }

 impl InformationSchemaClusterInfoBuilder {
@@ -200,17 +155,11 @@ impl InformationSchemaClusterInfoBuilder {
            peer_ids: Int64VectorBuilder::with_capacity(INIT_CAPACITY),
            peer_types: StringVectorBuilder::with_capacity(INIT_CAPACITY),
            peer_addrs: StringVectorBuilder::with_capacity(INIT_CAPACITY),
-            peer_hostnames: StringVectorBuilder::with_capacity(INIT_CAPACITY),
-            total_cpu_millicores: Int64VectorBuilder::with_capacity(INIT_CAPACITY),
-            total_memory_bytes: Int64VectorBuilder::with_capacity(INIT_CAPACITY),
-            cpu_usage_millicores: Int64VectorBuilder::with_capacity(INIT_CAPACITY),
-            memory_usage_bytes: Int64VectorBuilder::with_capacity(INIT_CAPACITY),
            versions: StringVectorBuilder::with_capacity(INIT_CAPACITY),
            git_commits: StringVectorBuilder::with_capacity(INIT_CAPACITY),
            start_times: TimestampMillisecondVectorBuilder::with_capacity(INIT_CAPACITY),
            uptimes: StringVectorBuilder::with_capacity(INIT_CAPACITY),
            active_times: StringVectorBuilder::with_capacity(INIT_CAPACITY),
-            node_status: StringVectorBuilder::with_capacity(INIT_CAPACITY),
        }
    }

@@ -227,13 +176,11 @@ impl InformationSchemaClusterInfoBuilder {

    fn add_node_info(&mut self, predicates: &Predicates, node_info: NodeInfo) {
        let peer_type = node_info.status.role_name();
-        let peer_id = peer_id(peer_type, node_info.peer.id);

        let row = [
-            (PEER_ID, &Value::from(peer_id)),
+            (PEER_ID, &Value::from(node_info.peer.id)),
            (PEER_TYPE, &Value::from(peer_type)),
            (PEER_ADDR, &Value::from(node_info.peer.addr.as_str())),
-            (PEER_HOSTNAME, &Value::from(node_info.hostname.as_str())),
            (VERSION, &Value::from(node_info.version.as_str())),
            (GIT_COMMIT, &Value::from(node_info.git_commit.as_str())),
        ];
@@ -242,10 +189,15 @@ impl InformationSchemaClusterInfoBuilder {
            return;
        }

-        self.peer_ids.push(Some(peer_id));
+        if peer_type == "FRONTEND" || peer_type == "METASRV" {
+            // Always set peer_id to be -1 for frontends and metasrvs
+            self.peer_ids.push(Some(-1));
+        } else {
+            self.peer_ids.push(Some(node_info.peer.id as i64));
+        }
+
        self.peer_types.push(Some(peer_type));
        self.peer_addrs.push(Some(&node_info.peer.addr));
-        self.peer_hostnames.push(Some(&node_info.hostname));
        self.versions.push(Some(&node_info.version));
        self.git_commits.push(Some(&node_info.git_commit));
        if node_info.start_time_ms > 0 {
@@ -260,14 +212,6 @@ impl InformationSchemaClusterInfoBuilder {
            self.start_times.push(None);
            self.uptimes.push(None);
        }
-        self.total_cpu_millicores
-            .push(Some(node_info.total_cpu_millicores));
-        self.total_memory_bytes
-            .push(Some(node_info.total_memory_bytes));
-        self.cpu_usage_millicores
-            .push(Some(node_info.cpu_usage_millicores));
-        self.memory_usage_bytes
-            .push(Some(node_info.memory_usage_bytes));

        if node_info.last_activity_ts > 0 {
            self.active_times.push(Some(
@@ -276,8 +220,6 @@ impl InformationSchemaClusterInfoBuilder {
        } else {
            self.active_times.push(None);
        }
-        self.node_status
-            .push(format_node_status(&node_info).as_deref());
    }

    fn format_duration_since(ts: u64) -> String {
@@ -291,17 +233,11 @@ impl InformationSchemaClusterInfoBuilder {
            Arc::new(self.peer_ids.finish()),
            Arc::new(self.peer_types.finish()),
            Arc::new(self.peer_addrs.finish()),
-            Arc::new(self.peer_hostnames.finish()),
-            Arc::new(self.total_cpu_millicores.finish()),
-            Arc::new(self.total_memory_bytes.finish()),
-            Arc::new(self.cpu_usage_millicores.finish()),
-            Arc::new(self.memory_usage_bytes.finish()),
            Arc::new(self.versions.finish()),
            Arc::new(self.git_commits.finish()),
            Arc::new(self.start_times.finish()),
            Arc::new(self.uptimes.finish()),
            Arc::new(self.active_times.finish()),
-            Arc::new(self.node_status.finish()),
        ];
        RecordBatch::new(self.schema.clone(), columns).context(CreateRecordBatchSnafu)
    }
@@ -327,56 +263,3 @@ impl DfPartitionStream for InformationSchemaClusterInfo {
        ))
    }
 }
-
-fn peer_id(peer_type: &str, peer_id: u64) -> i64 {
-    if peer_type == PEER_TYPE_FRONTEND || peer_type == PEER_TYPE_METASRV {
-        -1
-    } else {
-        peer_id as i64
-    }
-}
-
-#[derive(Serialize)]
-struct DisplayMetasrvStatus {
-    is_leader: bool,
-}
-
-#[derive(Serialize)]
-struct DisplayDatanodeStatus {
-    workloads: Vec<DatanodeWorkloadType>,
-    leader_regions: usize,
-    follower_regions: usize,
-}
-
-impl From<&DatanodeStatus> for DisplayDatanodeStatus {
-    fn from(status: &DatanodeStatus) -> Self {
-        Self {
-            workloads: status
-                .workloads
-                .types
-                .iter()
-                .flat_map(|w| DatanodeWorkloadType::from_i32(*w))
-                .collect(),
-            leader_regions: status.leader_regions,
-            follower_regions: status.follower_regions,
-        }
-    }
-}
-
-fn format_node_status(node_info: &NodeInfo) -> Option<String> {
-    match &node_info.status {
-        NodeStatus::Datanode(datanode_status) => {
-            serde_json::to_string(&DisplayDatanodeStatus::from(datanode_status)).ok()
-        }
-        NodeStatus::Frontend(_) => None,
-        NodeStatus::Flownode(_) => None,
-        NodeStatus::Metasrv(metasrv_status) => {
-            if metasrv_status.is_leader {
-                serde_json::to_string(&DisplayMetasrvStatus { is_leader: true }).ok()
-            } else {
-                None
-            }
-        }
-        NodeStatus::Standalone => None,
-    }
-}
--- a/src/catalog/src/system_schema/information_schema/columns.rs
+++ b/src/catalog/src/system_schema/information_schema/columns.rs
@@ -23,9 +23,9 @@ use common_error::ext::BoxedError;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, DataType, MutableVector};
 use datatypes::scalars::ScalarVectorBuilder;
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
@@ -38,12 +38,12 @@ use snafu::{OptionExt, ResultExt};
 use sql::statements;
 use store_api::storage::{ScanRequest, TableId};

-use crate::CatalogManager;
 use crate::error::{
    CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu,
 };
 use crate::information_schema::Predicates;
-use crate::system_schema::information_schema::{COLUMNS, InformationTable};
+use crate::system_schema::information_schema::{InformationTable, COLUMNS};
+use crate::CatalogManager;

 #[derive(Debug)]
 pub(super) struct InformationSchemaColumns {
--- a/src/catalog/src/system_schema/information_schema/flows.rs
+++ b/src/catalog/src/system_schema/information_schema/flows.rs
@@ -16,10 +16,10 @@ use std::sync::{Arc, Weak};

 use common_catalog::consts::INFORMATION_SCHEMA_FLOW_TABLE_ID;
 use common_error::ext::BoxedError;
-use common_meta::key::FlowId;
-use common_meta::key::flow::FlowMetadataManager;
 use common_meta::key::flow::flow_info::FlowInfoValue;
 use common_meta::key::flow::flow_state::FlowStat;
+use common_meta::key::flow::FlowMetadataManager;
+use common_meta::key::FlowId;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{DfSendableRecordBatchStream, RecordBatch, SendableRecordBatchStream};
 use datafusion::execution::TaskContext;
@@ -38,14 +38,14 @@ use futures::TryStreamExt;
 use snafu::{OptionExt, ResultExt};
 use store_api::storage::{ScanRequest, TableId};

-use crate::CatalogManager;
 use crate::error::{
    CreateRecordBatchSnafu, FlowInfoNotFoundSnafu, InternalSnafu, JsonSnafu, ListFlowsSnafu,
    Result, UpgradeWeakCatalogManagerRefSnafu,
 };
-use crate::information_schema::{FLOWS, Predicates};
+use crate::information_schema::{Predicates, FLOWS};
 use crate::system_schema::information_schema::InformationTable;
 use crate::system_schema::utils;
+use crate::CatalogManager;

 const INIT_CAPACITY: usize = 42;

@@ -254,9 +254,9 @@ impl InformationSchemaFlowsBuilder {
                .await
                .map_err(BoxedError::new)
                .context(InternalSnafu)?
-                .with_context(|| FlowInfoNotFoundSnafu {
-                    catalog_name: catalog_name.clone(),
-                    flow_name: flow_name.clone(),
+                .context(FlowInfoNotFoundSnafu {
+                    catalog_name: catalog_name.to_string(),
+                    flow_name: flow_name.to_string(),
                })?;
            self.add_flow(&predicates, flow_id.flow_id(), flow_info, &flow_stat)
                .await?;
@@ -273,11 +273,11 @@ impl InformationSchemaFlowsBuilder {
        flow_stat: &Option<FlowStat>,
    ) -> Result<()> {
        let row = [
-            (FLOW_NAME, &Value::from(flow_info.flow_name().clone())),
+            (FLOW_NAME, &Value::from(flow_info.flow_name().to_string())),
            (FLOW_ID, &Value::from(flow_id)),
            (
                TABLE_CATALOG,
-                &Value::from(flow_info.catalog_name().clone()),
+                &Value::from(flow_info.catalog_name().to_string()),
            ),
        ];
        if !predicates.eval(&row) {
--- a/src/catalog/src/system_schema/information_schema/information_memory_table.rs
+++ b/src/catalog/src/system_schema/information_schema/information_memory_table.rs
@@ -15,7 +15,8 @@
 use std::sync::Arc;

 use common_catalog::consts::{METRIC_ENGINE, MITO_ENGINE};
-use datatypes::schema::{Schema, SchemaRef};
+use datatypes::data_type::ConcreteDataType;
+use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
 use datatypes::vectors::{Int64Vector, StringVector, VectorRef};

 use crate::system_schema::information_schema::table_names::*;
@@ -88,9 +89,9 @@ pub(super) fn get_schema_columns(table_name: &str) -> (SchemaRef, Vec<VectorRef>
                vec![
                    Arc::new(StringVector::from(vec![build_info.branch.to_string()])),
                    Arc::new(StringVector::from(vec![build_info.commit.to_string()])),
-                    Arc::new(StringVector::from(vec![
-                        build_info.commit_short.to_string(),
-                    ])),
+                    Arc::new(StringVector::from(vec![build_info
+                        .commit_short
+                        .to_string()])),
                    Arc::new(StringVector::from(vec![build_info.clean.to_string()])),
                    Arc::new(StringVector::from(vec![build_info.version.to_string()])),
                ],
@@ -365,6 +366,24 @@ pub(super) fn get_schema_columns(table_name: &str) -> (SchemaRef, Vec<VectorRef>
            vec![],
        ),

+        TRIGGERS => (
+            vec![
+                string_column("TRIGGER_NAME"),
+                ColumnSchema::new(
+                    "trigger_id",
+                    ConcreteDataType::uint64_datatype(),
+                    false,
+                ),
+                string_column("TRIGGER_DEFINITION"),
+                ColumnSchema::new(
+                    "flownode_id",
+                    ConcreteDataType::uint64_datatype(),
+                    true,
+                ),
+            ],
+            vec![],
+        ),
+
        // TODO: Considering store internal metrics in `global_status` and
        // `session_status` tables.
        GLOBAL_STATUS => (
--- a/src/catalog/src/system_schema/information_schema/key_column_usage.rs
+++ b/src/catalog/src/system_schema/information_schema/key_column_usage.rs
@@ -20,9 +20,9 @@ use common_error::ext::BoxedError;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, MutableVector, ScalarVectorBuilder, VectorRef};
 use datatypes::schema::{ColumnSchema, FulltextBackend, Schema, SchemaRef};
 use datatypes::value::Value;
@@ -31,11 +31,11 @@ use futures_util::TryStreamExt;
 use snafu::{OptionExt, ResultExt};
 use store_api::storage::{ScanRequest, TableId};

-use crate::CatalogManager;
 use crate::error::{
    CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu,
 };
-use crate::system_schema::information_schema::{InformationTable, KEY_COLUMN_USAGE, Predicates};
+use crate::system_schema::information_schema::{InformationTable, Predicates, KEY_COLUMN_USAGE};
+use crate::CatalogManager;

 pub const CONSTRAINT_SCHEMA: &str = "constraint_schema";
 pub const CONSTRAINT_NAME: &str = "constraint_name";
@@ -277,15 +277,15 @@ impl InformationSchemaKeyColumnUsageBuilder {
                        constraints.push(CONSTRAINT_NAME_INVERTED_INDEX);
                        greptime_index_type.push(INDEX_TYPE_INVERTED_INDEX);
                    }
-                    if let Ok(Some(options)) = column.fulltext_options()
-                        && options.enable
-                    {
-                        constraints.push(CONSTRAINT_NAME_FULLTEXT_INDEX);
-                        let index_type = match options.backend {
-                            FulltextBackend::Bloom => INDEX_TYPE_FULLTEXT_BLOOM,
-                            FulltextBackend::Tantivy => INDEX_TYPE_FULLTEXT_TANTIVY,
-                        };
-                        greptime_index_type.push(index_type);
+                    if let Ok(Some(options)) = column.fulltext_options() {
+                        if options.enable {
+                            constraints.push(CONSTRAINT_NAME_FULLTEXT_INDEX);
+                            let index_type = match options.backend {
+                                FulltextBackend::Bloom => INDEX_TYPE_FULLTEXT_BLOOM,
+                                FulltextBackend::Tantivy => INDEX_TYPE_FULLTEXT_TANTIVY,
+                            };
+                            greptime_index_type.push(index_type);
+                        }
                    }
                    if column.is_skipping_indexed() {
                        constraints.push(CONSTRAINT_NAME_SKIPPING_INDEX);
--- a/src/catalog/src/system_schema/information_schema/partitions.rs
+++ b/src/catalog/src/system_schema/information_schema/partitions.rs
@@ -21,9 +21,9 @@ use common_error::ext::BoxedError;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, ScalarVectorBuilder, VectorRef};
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
 use datatypes::timestamp::TimestampSecond;
@@ -38,13 +38,13 @@ use snafu::{OptionExt, ResultExt};
 use store_api::storage::{ScanRequest, TableId};
 use table::metadata::{TableInfo, TableType};

-use crate::CatalogManager;
 use crate::error::{
    CreateRecordBatchSnafu, FindPartitionsSnafu, InternalSnafu, PartitionManagerNotFoundSnafu,
    Result, UpgradeWeakCatalogManagerRefSnafu,
 };
 use crate::kvbackend::KvBackendCatalogManager;
-use crate::system_schema::information_schema::{InformationTable, PARTITIONS, Predicates};
+use crate::system_schema::information_schema::{InformationTable, Predicates, PARTITIONS};
+use crate::CatalogManager;

 const TABLE_CATALOG: &str = "table_catalog";
 const TABLE_SCHEMA: &str = "table_schema";
--- a/src/catalog/src/system_schema/information_schema/procedure_info.rs
+++ b/src/catalog/src/system_schema/information_schema/procedure_info.rs
@@ -22,9 +22,9 @@ use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use common_time::timestamp::Timestamp;
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, ScalarVectorBuilder, VectorRef};
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
 use datatypes::timestamp::TimestampMillisecond;
@@ -33,10 +33,10 @@ use datatypes::vectors::{StringVectorBuilder, TimestampMillisecondVectorBuilder}
 use snafu::ResultExt;
 use store_api::storage::{ScanRequest, TableId};

-use crate::CatalogManager;
 use crate::error::{CreateRecordBatchSnafu, InternalSnafu, Result};
-use crate::system_schema::information_schema::{InformationTable, PROCEDURE_INFO, Predicates};
+use crate::system_schema::information_schema::{InformationTable, Predicates, PROCEDURE_INFO};
 use crate::system_schema::utils;
+use crate::CatalogManager;

 const PROCEDURE_ID: &str = "procedure_id";
 const PROCEDURE_TYPE: &str = "procedure_type";
--- a/src/catalog/src/system_schema/information_schema/process_list.rs
+++ b/src/catalog/src/system_schema/information_schema/process_list.rs
@@ -135,7 +135,7 @@ async fn make_process_list(

    for process in queries {
        let display_id = DisplayProcessId {
-            server_addr: process.frontend.clone(),
+            server_addr: process.frontend.to_string(),
            id: process.id,
        }
        .to_string();
--- a/src/catalog/src/system_schema/information_schema/region_peers.rs
+++ b/src/catalog/src/system_schema/information_schema/region_peers.rs
@@ -23,9 +23,9 @@ use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use datafusion::common::HashMap;
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, ScalarVectorBuilder, VectorRef};
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
 use datatypes::value::Value;
@@ -35,13 +35,13 @@ use snafu::{OptionExt, ResultExt};
 use store_api::storage::{RegionId, ScanRequest, TableId};
 use table::metadata::TableType;

-use crate::CatalogManager;
 use crate::error::{
    CreateRecordBatchSnafu, FindRegionRoutesSnafu, InternalSnafu, Result,
    UpgradeWeakCatalogManagerRefSnafu,
 };
 use crate::kvbackend::KvBackendCatalogManager;
 use crate::system_schema::information_schema::{InformationTable, Predicates, REGION_PEERS};
+use crate::CatalogManager;

 pub const TABLE_CATALOG: &str = "table_catalog";
 pub const TABLE_SCHEMA: &str = "table_schema";
@@ -199,7 +199,10 @@ impl InformationSchemaRegionPeersBuilder {
                    if table_info.table_type == TableType::Temporary {
                        Ok(None)
                    } else {
-                        Ok(Some((table_info.ident.table_id, table_info.name.clone())))
+                        Ok(Some((
+                            table_info.ident.table_id,
+                            table_info.name.to_string(),
+                        )))
                    }
                });

--- a/src/catalog/src/system_schema/information_schema/region_statistics.rs
+++ b/src/catalog/src/system_schema/information_schema/region_statistics.rs
@@ -30,17 +30,16 @@ use datatypes::vectors::{StringVectorBuilder, UInt32VectorBuilder, UInt64VectorB
 use snafu::ResultExt;
 use store_api::storage::{ScanRequest, TableId};

-use crate::CatalogManager;
 use crate::error::{CreateRecordBatchSnafu, InternalSnafu, Result};
 use crate::information_schema::Predicates;
 use crate::system_schema::information_schema::{InformationTable, REGION_STATISTICS};
 use crate::system_schema::utils;
+use crate::CatalogManager;

 const REGION_ID: &str = "region_id";
 const TABLE_ID: &str = "table_id";
 const REGION_NUMBER: &str = "region_number";
 const REGION_ROWS: &str = "region_rows";
-const WRITTEN_BYTES: &str = "written_bytes_since_open";
 const DISK_SIZE: &str = "disk_size";
 const MEMTABLE_SIZE: &str = "memtable_size";
 const MANIFEST_SIZE: &str = "manifest_size";
@@ -58,7 +57,6 @@ const INIT_CAPACITY: usize = 42;
 /// - `table_id`: The table id.
 /// - `region_number`: The region number.
 /// - `region_rows`: The number of rows in region.
-/// - `written_bytes_since_open`: The total bytes written of the region since region opened.
 /// - `memtable_size`: The memtable size in bytes.
 /// - `disk_size`: The approximate disk size in bytes.
 /// - `manifest_size`: The manifest size in bytes.
@@ -86,7 +84,6 @@ impl InformationSchemaRegionStatistics {
            ColumnSchema::new(TABLE_ID, ConcreteDataType::uint32_datatype(), false),
            ColumnSchema::new(REGION_NUMBER, ConcreteDataType::uint32_datatype(), false),
            ColumnSchema::new(REGION_ROWS, ConcreteDataType::uint64_datatype(), true),
-            ColumnSchema::new(WRITTEN_BYTES, ConcreteDataType::uint64_datatype(), true),
            ColumnSchema::new(DISK_SIZE, ConcreteDataType::uint64_datatype(), true),
            ColumnSchema::new(MEMTABLE_SIZE, ConcreteDataType::uint64_datatype(), true),
            ColumnSchema::new(MANIFEST_SIZE, ConcreteDataType::uint64_datatype(), true),
@@ -150,7 +147,6 @@ struct InformationSchemaRegionStatisticsBuilder {
    table_ids: UInt32VectorBuilder,
    region_numbers: UInt32VectorBuilder,
    region_rows: UInt64VectorBuilder,
-    written_bytes: UInt64VectorBuilder,
    disk_sizes: UInt64VectorBuilder,
    memtable_sizes: UInt64VectorBuilder,
    manifest_sizes: UInt64VectorBuilder,
@@ -170,7 +166,6 @@ impl InformationSchemaRegionStatisticsBuilder {
            table_ids: UInt32VectorBuilder::with_capacity(INIT_CAPACITY),
            region_numbers: UInt32VectorBuilder::with_capacity(INIT_CAPACITY),
            region_rows: UInt64VectorBuilder::with_capacity(INIT_CAPACITY),
-            written_bytes: UInt64VectorBuilder::with_capacity(INIT_CAPACITY),
            disk_sizes: UInt64VectorBuilder::with_capacity(INIT_CAPACITY),
            memtable_sizes: UInt64VectorBuilder::with_capacity(INIT_CAPACITY),
            manifest_sizes: UInt64VectorBuilder::with_capacity(INIT_CAPACITY),
@@ -202,7 +197,6 @@ impl InformationSchemaRegionStatisticsBuilder {
            (TABLE_ID, &Value::from(region_stat.id.table_id())),
            (REGION_NUMBER, &Value::from(region_stat.id.region_number())),
            (REGION_ROWS, &Value::from(region_stat.num_rows)),
-            (WRITTEN_BYTES, &Value::from(region_stat.written_bytes)),
            (DISK_SIZE, &Value::from(region_stat.approximate_bytes)),
            (MEMTABLE_SIZE, &Value::from(region_stat.memtable_size)),
            (MANIFEST_SIZE, &Value::from(region_stat.manifest_size)),
@@ -222,7 +216,6 @@ impl InformationSchemaRegionStatisticsBuilder {
        self.region_numbers
            .push(Some(region_stat.id.region_number()));
        self.region_rows.push(Some(region_stat.num_rows));
-        self.written_bytes.push(Some(region_stat.written_bytes));
        self.disk_sizes.push(Some(region_stat.approximate_bytes));
        self.memtable_sizes.push(Some(region_stat.memtable_size));
        self.manifest_sizes.push(Some(region_stat.manifest_size));
@@ -239,7 +232,6 @@ impl InformationSchemaRegionStatisticsBuilder {
            Arc::new(self.table_ids.finish()),
            Arc::new(self.region_numbers.finish()),
            Arc::new(self.region_rows.finish()),
-            Arc::new(self.written_bytes.finish()),
            Arc::new(self.disk_sizes.finish()),
            Arc::new(self.memtable_sizes.finish()),
            Arc::new(self.manifest_sizes.finish()),
--- a/src/catalog/src/system_schema/information_schema/runtime_metrics.rs
+++ b/src/catalog/src/system_schema/information_schema/runtime_metrics.rs
@@ -21,9 +21,9 @@ use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use common_time::util::current_time_millis;
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, MutableVector};
 use datatypes::scalars::ScalarVectorBuilder;
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
--- a/src/catalog/src/system_schema/information_schema/schemata.rs
+++ b/src/catalog/src/system_schema/information_schema/schemata.rs
@@ -21,9 +21,9 @@ use common_meta::key::schema_name::SchemaNameKey;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, ScalarVectorBuilder, VectorRef};
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
 use datatypes::value::Value;
@@ -31,13 +31,13 @@ use datatypes::vectors::StringVectorBuilder;
 use snafu::{OptionExt, ResultExt};
 use store_api::storage::{ScanRequest, TableId};

-use crate::CatalogManager;
 use crate::error::{
    CreateRecordBatchSnafu, InternalSnafu, Result, TableMetadataManagerSnafu,
    UpgradeWeakCatalogManagerRefSnafu,
 };
 use crate::system_schema::information_schema::{InformationTable, Predicates, SCHEMATA};
 use crate::system_schema::utils;
+use crate::CatalogManager;

 pub const CATALOG_NAME: &str = "catalog_name";
 pub const SCHEMA_NAME: &str = "schema_name";
--- a/src/catalog/src/system_schema/information_schema/ssts.rs
+++ b/src/catalog/src/system_schema/information_schema/ssts.rs
@@ -1,199 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use std::sync::{Arc, Weak};
-
-use common_catalog::consts::{
-    INFORMATION_SCHEMA_SSTS_INDEX_META_TABLE_ID, INFORMATION_SCHEMA_SSTS_MANIFEST_TABLE_ID,
-    INFORMATION_SCHEMA_SSTS_STORAGE_TABLE_ID,
-};
-use common_error::ext::BoxedError;
-use common_recordbatch::SendableRecordBatchStream;
-use common_recordbatch::adapter::AsyncRecordBatchStreamAdapter;
-use datatypes::schema::SchemaRef;
-use snafu::ResultExt;
-use store_api::sst_entry::{ManifestSstEntry, PuffinIndexMetaEntry, StorageSstEntry};
-use store_api::storage::{ScanRequest, TableId};
-
-use crate::CatalogManager;
-use crate::error::{ProjectSchemaSnafu, Result};
-use crate::information_schema::{
-    DatanodeInspectKind, DatanodeInspectRequest, InformationTable, SSTS_INDEX_META, SSTS_MANIFEST,
-    SSTS_STORAGE,
-};
-use crate::system_schema::utils;
-
-/// Information schema table for sst manifest.
-pub struct InformationSchemaSstsManifest {
-    schema: SchemaRef,
-    catalog_manager: Weak<dyn CatalogManager>,
-}
-
-impl InformationSchemaSstsManifest {
-    pub(super) fn new(catalog_manager: Weak<dyn CatalogManager>) -> Self {
-        Self {
-            schema: ManifestSstEntry::schema(),
-            catalog_manager,
-        }
-    }
-}
-
-impl InformationTable for InformationSchemaSstsManifest {
-    fn table_id(&self) -> TableId {
-        INFORMATION_SCHEMA_SSTS_MANIFEST_TABLE_ID
-    }
-
-    fn table_name(&self) -> &'static str {
-        SSTS_MANIFEST
-    }
-
-    fn schema(&self) -> SchemaRef {
-        self.schema.clone()
-    }
-
-    fn to_stream(&self, request: ScanRequest) -> Result<SendableRecordBatchStream> {
-        let schema = if let Some(p) = &request.projection {
-            Arc::new(self.schema.try_project(p).context(ProjectSchemaSnafu)?)
-        } else {
-            self.schema.clone()
-        };
-        let info_ext = utils::information_extension(&self.catalog_manager)?;
-        let req = DatanodeInspectRequest {
-            kind: DatanodeInspectKind::SstManifest,
-            scan: request,
-        };
-
-        let future = async move {
-            info_ext
-                .inspect_datanode(req)
-                .await
-                .map_err(BoxedError::new)
-                .context(common_recordbatch::error::ExternalSnafu)
-        };
-        Ok(Box::pin(AsyncRecordBatchStreamAdapter::new(
-            schema,
-            Box::pin(future),
-        )))
-    }
-}
-
-/// Information schema table for sst storage.
-pub struct InformationSchemaSstsStorage {
-    schema: SchemaRef,
-    catalog_manager: Weak<dyn CatalogManager>,
-}
-
-impl InformationSchemaSstsStorage {
-    pub(super) fn new(catalog_manager: Weak<dyn CatalogManager>) -> Self {
-        Self {
-            schema: StorageSstEntry::schema(),
-            catalog_manager,
-        }
-    }
-}
-
-impl InformationTable for InformationSchemaSstsStorage {
-    fn table_id(&self) -> TableId {
-        INFORMATION_SCHEMA_SSTS_STORAGE_TABLE_ID
-    }
-
-    fn table_name(&self) -> &'static str {
-        SSTS_STORAGE
-    }
-
-    fn schema(&self) -> SchemaRef {
-        self.schema.clone()
-    }
-
-    fn to_stream(&self, request: ScanRequest) -> Result<SendableRecordBatchStream> {
-        let schema = if let Some(p) = &request.projection {
-            Arc::new(self.schema.try_project(p).context(ProjectSchemaSnafu)?)
-        } else {
-            self.schema.clone()
-        };
-
-        let info_ext = utils::information_extension(&self.catalog_manager)?;
-        let req = DatanodeInspectRequest {
-            kind: DatanodeInspectKind::SstStorage,
-            scan: request,
-        };
-
-        let future = async move {
-            info_ext
-                .inspect_datanode(req)
-                .await
-                .map_err(BoxedError::new)
-                .context(common_recordbatch::error::ExternalSnafu)
-        };
-        Ok(Box::pin(AsyncRecordBatchStreamAdapter::new(
-            schema,
-            Box::pin(future),
-        )))
-    }
-}
-
-/// Information schema table for index metadata.
-pub struct InformationSchemaSstsIndexMeta {
-    schema: SchemaRef,
-    catalog_manager: Weak<dyn CatalogManager>,
-}
-
-impl InformationSchemaSstsIndexMeta {
-    pub(super) fn new(catalog_manager: Weak<dyn CatalogManager>) -> Self {
-        Self {
-            schema: PuffinIndexMetaEntry::schema(),
-            catalog_manager,
-        }
-    }
-}
-
-impl InformationTable for InformationSchemaSstsIndexMeta {
-    fn table_id(&self) -> TableId {
-        INFORMATION_SCHEMA_SSTS_INDEX_META_TABLE_ID
-    }
-
-    fn table_name(&self) -> &'static str {
-        SSTS_INDEX_META
-    }
-
-    fn schema(&self) -> SchemaRef {
-        self.schema.clone()
-    }
-
-    fn to_stream(&self, request: ScanRequest) -> Result<SendableRecordBatchStream> {
-        let schema = if let Some(p) = &request.projection {
-            Arc::new(self.schema.try_project(p).context(ProjectSchemaSnafu)?)
-        } else {
-            self.schema.clone()
-        };
-
-        let info_ext = utils::information_extension(&self.catalog_manager)?;
-        let req = DatanodeInspectRequest {
-            kind: DatanodeInspectKind::SstIndexMeta,
-            scan: request,
-        };
-
-        let future = async move {
-            info_ext
-                .inspect_datanode(req)
-                .await
-                .map_err(BoxedError::new)
-                .context(common_recordbatch::error::ExternalSnafu)
-        };
-        Ok(Box::pin(AsyncRecordBatchStreamAdapter::new(
-            schema,
-            Box::pin(future),
-        )))
-    }
-}
--- a/src/catalog/src/system_schema/information_schema/table_constraints.rs
+++ b/src/catalog/src/system_schema/information_schema/table_constraints.rs
@@ -20,9 +20,9 @@ use common_error::ext::BoxedError;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, MutableVector};
 use datatypes::scalars::ScalarVectorBuilder;
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
@@ -32,15 +32,15 @@ use futures::TryStreamExt;
 use snafu::{OptionExt, ResultExt};
 use store_api::storage::{ScanRequest, TableId};

-use crate::CatalogManager;
 use crate::error::{
    CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu,
 };
-use crate::information_schema::Predicates;
 use crate::information_schema::key_column_usage::{
    CONSTRAINT_NAME_PRI, CONSTRAINT_NAME_TIME_INDEX,
 };
+use crate::information_schema::Predicates;
 use crate::system_schema::information_schema::{InformationTable, TABLE_CONSTRAINTS};
+use crate::CatalogManager;

 /// The `TABLE_CONSTRAINTS` table describes which tables have constraints.
 #[derive(Debug)]
--- a/src/catalog/src/system_schema/information_schema/table_names.rs
+++ b/src/catalog/src/system_schema/information_schema/table_names.rs
@@ -48,6 +48,3 @@ pub const FLOWS: &str = "flows";
 pub const PROCEDURE_INFO: &str = "procedure_info";
 pub const REGION_STATISTICS: &str = "region_statistics";
 pub const PROCESS_LIST: &str = "process_list";
-pub const SSTS_MANIFEST: &str = "ssts_manifest";
-pub const SSTS_STORAGE: &str = "ssts_storage";
-pub const SSTS_INDEX_META: &str = "ssts_index_meta";
--- a/src/catalog/src/system_schema/information_schema/tables.rs
+++ b/src/catalog/src/system_schema/information_schema/tables.rs
@@ -23,9 +23,9 @@ use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use common_telemetry::error;
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, ScalarVectorBuilder, VectorRef};
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
 use datatypes::value::Value;
@@ -37,12 +37,12 @@ use snafu::{OptionExt, ResultExt};
 use store_api::storage::{RegionId, ScanRequest, TableId};
 use table::metadata::{TableInfo, TableType};

-use crate::CatalogManager;
 use crate::error::{
    CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu,
 };
 use crate::system_schema::information_schema::{InformationTable, Predicates, TABLES};
 use crate::system_schema::utils;
+use crate::CatalogManager;

 pub const TABLE_CATALOG: &str = "table_catalog";
 pub const TABLE_SCHEMA: &str = "table_schema";
@@ -371,8 +371,7 @@ impl InformationSchemaTablesBuilder {
        self.auto_increment.push(Some(0));
        self.row_format.push(Some("Fixed"));
        self.table_collation.push(Some("utf8_bin"));
-        self.update_time
-            .push(Some(table_info.meta.updated_on.timestamp().into()));
+        self.update_time.push(None);
        self.check_time.push(None);
        // use mariadb default table version number here
        self.version.push(Some(11));
--- a/src/catalog/src/system_schema/information_schema/views.rs
+++ b/src/catalog/src/system_schema/information_schema/views.rs
@@ -20,9 +20,9 @@ use common_error::ext::BoxedError;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::prelude::{ConcreteDataType, ScalarVectorBuilder, VectorRef};
 use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
 use datatypes::value::Value;
@@ -32,13 +32,13 @@ use snafu::{OptionExt, ResultExt};
 use store_api::storage::{ScanRequest, TableId};
 use table::metadata::TableType;

-use crate::CatalogManager;
 use crate::error::{
    CastManagerSnafu, CreateRecordBatchSnafu, GetViewCacheSnafu, InternalSnafu, Result,
    UpgradeWeakCatalogManagerRefSnafu, ViewInfoNotFoundSnafu,
 };
 use crate::kvbackend::KvBackendCatalogManager;
 use crate::system_schema::information_schema::{InformationTable, Predicates, VIEWS};
+use crate::CatalogManager;
 const INIT_CAPACITY: usize = 42;

 pub const TABLE_CATALOG: &str = "table_catalog";
--- a/src/catalog/src/system_schema/memory_table.rs
+++ b/src/catalog/src/system_schema/memory_table.rs
@@ -21,9 +21,9 @@ use common_error::ext::BoxedError;
 use common_recordbatch::adapter::RecordBatchStreamAdapter;
 use common_recordbatch::{RecordBatch, SendableRecordBatchStream};
 use datafusion::execution::TaskContext;
-use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
 use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datafusion::physical_plan::SendableRecordBatchStream as DfSendableRecordBatchStream;
 use datatypes::schema::SchemaRef;
 use datatypes::vectors::VectorRef;
 use snafu::ResultExt;
--- a/src/catalog/src/system_schema/numbers_table_provider.rs
+++ b/src/catalog/src/system_schema/numbers_table_provider.rs
@@ -1,59 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#[cfg(any(test, feature = "testing", debug_assertions))]
-use common_catalog::consts::NUMBERS_TABLE_ID;
-use table::TableRef;
-#[cfg(any(test, feature = "testing", debug_assertions))]
-use table::table::numbers::NUMBERS_TABLE_NAME;
-#[cfg(any(test, feature = "testing", debug_assertions))]
-use table::table::numbers::NumbersTable;
-
-// NumbersTableProvider is a dedicated provider for feature-gating the numbers table.
-#[derive(Clone)]
-pub struct NumbersTableProvider;
-
-#[cfg(any(test, feature = "testing", debug_assertions))]
-impl NumbersTableProvider {
-    pub(crate) fn table_exists(&self, name: &str) -> bool {
-        name == NUMBERS_TABLE_NAME
-    }
-
-    pub(crate) fn table_names(&self) -> Vec<String> {
-        vec![NUMBERS_TABLE_NAME.to_string()]
-    }
-
-    pub(crate) fn table(&self, name: &str) -> Option<TableRef> {
-        if name == NUMBERS_TABLE_NAME {
-            Some(NumbersTable::table(NUMBERS_TABLE_ID))
-        } else {
-            None
-        }
-    }
-}
-
-#[cfg(not(any(test, feature = "testing", debug_assertions)))]
-impl NumbersTableProvider {
-    pub(crate) fn table_exists(&self, _name: &str) -> bool {
-        false
-    }
-
-    pub(crate) fn table_names(&self) -> Vec<String> {
-        vec![]
-    }
-
-    pub(crate) fn table(&self, _name: &str) -> Option<TableRef> {
-        None
-    }
-}
--- a/src/catalog/src/system_schema/pg_catalog.rs
+++ b/src/catalog/src/system_schema/pg_catalog.rs
@@ -12,42 +12,53 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

+mod pg_catalog_memory_table;
+mod pg_class;
+mod pg_database;
+mod pg_namespace;
+mod table_names;
+
 use std::collections::HashMap;
-use std::sync::{Arc, Weak};
+use std::sync::{Arc, LazyLock, Weak};

-use arrow_schema::SchemaRef;
-use async_trait::async_trait;
-use common_catalog::consts::{DEFAULT_CATALOG_NAME, PG_CATALOG_NAME, PG_CATALOG_TABLE_ID_START};
-use common_error::ext::BoxedError;
-use common_recordbatch::SendableRecordBatchStream;
-use common_recordbatch::adapter::RecordBatchStreamAdapter;
-use common_telemetry::warn;
-use datafusion::datasource::TableType;
-use datafusion::error::DataFusionError;
-use datafusion::execution::TaskContext;
-use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
-use datafusion_pg_catalog::pg_catalog::catalog_info::CatalogInfo;
-use datafusion_pg_catalog::pg_catalog::context::EmptyContextProvider;
-use datafusion_pg_catalog::pg_catalog::{
-    PG_CATALOG_TABLES, PgCatalogSchemaProvider, PgCatalogStaticTables, PgCatalogTable,
-};
-use snafu::ResultExt;
-use store_api::storage::ScanRequest;
+use common_catalog::consts::{self, DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, PG_CATALOG_NAME};
+use datatypes::schema::ColumnSchema;
+use lazy_static::lazy_static;
+use paste::paste;
+use pg_catalog_memory_table::get_schema_columns;
+use pg_class::PGClass;
+use pg_database::PGDatabase;
+use pg_namespace::PGNamespace;
+use session::context::{Channel, QueryContext};
 use table::TableRef;
-use table::metadata::TableId;
+pub use table_names::*;

+use self::pg_namespace::oid_map::{PGNamespaceOidMap, PGNamespaceOidMapRef};
+use crate::system_schema::memory_table::MemoryTable;
+use crate::system_schema::utils::tables::u32_column;
+use crate::system_schema::{SystemSchemaProvider, SystemSchemaProviderInner, SystemTableRef};
 use crate::CatalogManager;
-use crate::error::{InternalSnafu, ProjectSchemaSnafu, Result};
-use crate::system_schema::{
-    SystemSchemaProvider, SystemSchemaProviderInner, SystemTable, SystemTableRef,
-};
+
+lazy_static! {
+    static ref MEMORY_TABLES: &'static [&'static str] = &[table_names::PG_TYPE];
+}
+
+/// The column name for the OID column.
+/// The OID column is a unique identifier of type u32 for each object in the database.
+const OID_COLUMN_NAME: &str = "oid";
+
+fn oid_column() -> ColumnSchema {
+    u32_column(OID_COLUMN_NAME)
+}

 /// [`PGCatalogProvider`] is the provider for a schema named `pg_catalog`, it is not a catalog.
 pub struct PGCatalogProvider {
    catalog_name: String,
-    inner: PgCatalogSchemaProvider<CatalogManagerWrapper, EmptyContextProvider>,
+    catalog_manager: Weak<dyn CatalogManager>,
    tables: HashMap<String, TableRef>,
-    table_ids: HashMap<&'static str, u32>,
+
+    // Workaround to store mapping of schema_name to a numeric id
+    namespace_oid_map: PGNamespaceOidMapRef,
 }

 impl SystemSchemaProvider for PGCatalogProvider {
@@ -58,34 +69,30 @@ impl SystemSchemaProvider for PGCatalogProvider {
    }
 }

+// TODO(j0hn50n133): Not sure whether to avoid duplication with `information_schema` or not.
+macro_rules! setup_memory_table {
+    ($name: expr) => {
+        paste! {
+            {
+                let (schema, columns) = get_schema_columns($name);
+                Some(Arc::new(MemoryTable::new(
+                    consts::[<PG_CATALOG_ $name  _TABLE_ID>],
+                    $name,
+                    schema,
+                    columns
+                )) as _)
+            }
+        }
+    };
+}
+
 impl PGCatalogProvider {
    pub fn new(catalog_name: String, catalog_manager: Weak<dyn CatalogManager>) -> Self {
-        // safe to expect/unwrap because it contains only schema read, this can
-        // be ensured by sqlness tests
-        let static_tables =
-            PgCatalogStaticTables::try_new().expect("Failed to initialize static tables");
-        let inner = PgCatalogSchemaProvider::try_new(
-            CatalogManagerWrapper {
-                catalog_name: catalog_name.clone(),
-                catalog_manager,
-            },
-            Arc::new(static_tables),
-            EmptyContextProvider,
-        )
-        .expect("Failed to initialize PgCatalogSchemaProvider");
-
-        let mut table_ids = HashMap::new();
-        let mut table_id = PG_CATALOG_TABLE_ID_START;
-        for name in PG_CATALOG_TABLES {
-            table_ids.insert(*name, table_id);
-            table_id += 1;
-        }
-
        let mut provider = Self {
            catalog_name,
-            inner,
+            catalog_manager,
            tables: HashMap::new(),
-            table_ids,
+            namespace_oid_map: Arc::new(PGNamespaceOidMap::new()),
        };
        provider.build_tables();
        provider
@@ -95,13 +102,23 @@ impl PGCatalogProvider {
        // SECURITY NOTE:
        // Must follow the same security rules as [`InformationSchemaProvider::build_tables`].
        let mut tables = HashMap::new();
+        // TODO(J0HN50N133): modeling the table_name as a enum type to get rid of expect/unwrap here
        // It's safe to unwrap here because we are sure that the constants have been handle correctly inside system_table.
-        for name in PG_CATALOG_TABLES {
-            if let Some(table) = self.build_table(name) {
-                tables.insert(name.to_string(), table);
-            }
+        for name in MEMORY_TABLES.iter() {
+            tables.insert(name.to_string(), self.build_table(name).expect(name));
        }
-
+        tables.insert(
+            PG_NAMESPACE.to_string(),
+            self.build_table(PG_NAMESPACE).expect(PG_NAMESPACE),
+        );
+        tables.insert(
+            PG_CLASS.to_string(),
+            self.build_table(PG_CLASS).expect(PG_NAMESPACE),
+        );
+        tables.insert(
+            PG_DATABASE.to_string(),
+            self.build_table(PG_DATABASE).expect(PG_DATABASE),
+        );
        self.tables = tables;
    }
 }
@@ -112,26 +129,24 @@ impl SystemSchemaProviderInner for PGCatalogProvider {
    }

    fn system_table(&self, name: &str) -> Option<SystemTableRef> {
-        if let Some((table_name, table_id)) = self.table_ids.get_key_value(name) {
-            let table = self.inner.build_table_by_name(name).expect(name);
-
-            if let Some(table) = table {
-                if let Ok(system_table) = DFTableProviderAsSystemTable::try_new(
-                    *table_id,
-                    table_name,
-                    table::metadata::TableType::Temporary,
-                    table,
-                ) {
-                    Some(Arc::new(system_table))
-                } else {
-                    warn!("failed to create pg_catalog system table {}", name);
-                    None
-                }
-            } else {
-                None
-            }
-        } else {
-            None
+        match name {
+            table_names::PG_TYPE => setup_memory_table!(PG_TYPE),
+            table_names::PG_NAMESPACE => Some(Arc::new(PGNamespace::new(
+                self.catalog_name.clone(),
+                self.catalog_manager.clone(),
+                self.namespace_oid_map.clone(),
+            ))),
+            table_names::PG_CLASS => Some(Arc::new(PGClass::new(
+                self.catalog_name.clone(),
+                self.catalog_manager.clone(),
+                self.namespace_oid_map.clone(),
+            ))),
+            table_names::PG_DATABASE => Some(Arc::new(PGDatabase::new(
+                self.catalog_name.clone(),
+                self.catalog_manager.clone(),
+                self.namespace_oid_map.clone(),
+            ))),
+            _ => None,
        }
    }

@@ -140,177 +155,11 @@ impl SystemSchemaProviderInner for PGCatalogProvider {
    }
 }

-#[derive(Clone)]
-pub struct CatalogManagerWrapper {
-    catalog_name: String,
-    catalog_manager: Weak<dyn CatalogManager>,
-}
-
-impl CatalogManagerWrapper {
-    fn catalog_manager(&self) -> std::result::Result<Arc<dyn CatalogManager>, DataFusionError> {
-        self.catalog_manager.upgrade().ok_or_else(|| {
-            DataFusionError::Internal("Failed to access catalog manager".to_string())
-        })
-    }
-}
-
-impl std::fmt::Debug for CatalogManagerWrapper {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("CatalogManagerWrapper").finish()
-    }
-}
-
-#[async_trait]
-impl CatalogInfo for CatalogManagerWrapper {
-    async fn catalog_names(&self) -> std::result::Result<Vec<String>, DataFusionError> {
-        if self.catalog_name == DEFAULT_CATALOG_NAME {
-            CatalogManager::catalog_names(self.catalog_manager()?.as_ref())
-                .await
-                .map_err(|e| DataFusionError::External(Box::new(e)))
-        } else {
-            Ok(vec![self.catalog_name.clone()])
-        }
-    }
-
-    async fn schema_names(
-        &self,
-        catalog_name: &str,
-    ) -> std::result::Result<Option<Vec<String>>, DataFusionError> {
-        self.catalog_manager()?
-            .schema_names(catalog_name, None)
-            .await
-            .map(Some)
-            .map_err(|e| DataFusionError::External(Box::new(e)))
-    }
-
-    async fn table_names(
-        &self,
-        catalog_name: &str,
-        schema_name: &str,
-    ) -> std::result::Result<Option<Vec<String>>, DataFusionError> {
-        self.catalog_manager()?
-            .table_names(catalog_name, schema_name, None)
-            .await
-            .map(Some)
-            .map_err(|e| DataFusionError::External(Box::new(e)))
-    }
-
-    async fn table_schema(
-        &self,
-        catalog_name: &str,
-        schema_name: &str,
-        table_name: &str,
-    ) -> std::result::Result<Option<SchemaRef>, DataFusionError> {
-        let table = self
-            .catalog_manager()?
-            .table(catalog_name, schema_name, table_name, None)
-            .await
-            .map_err(|e| DataFusionError::External(Box::new(e)))?;
-
-        Ok(table.map(|t| t.schema().arrow_schema().clone()))
-    }
-
-    async fn table_type(
-        &self,
-        catalog_name: &str,
-        schema_name: &str,
-        table_name: &str,
-    ) -> std::result::Result<Option<TableType>, DataFusionError> {
-        let table = self
-            .catalog_manager()?
-            .table(catalog_name, schema_name, table_name, None)
-            .await
-            .map_err(|e| DataFusionError::External(Box::new(e)))?;
-
-        Ok(table.map(|t| t.table_type().into()))
-    }
-}
-
-struct DFTableProviderAsSystemTable {
-    pub table_id: TableId,
-    pub table_name: &'static str,
-    pub table_type: table::metadata::TableType,
-    pub schema: Arc<datatypes::schema::Schema>,
-    pub table_provider: PgCatalogTable,
-}
-
-impl DFTableProviderAsSystemTable {
-    pub fn try_new(
-        table_id: TableId,
-        table_name: &'static str,
-        table_type: table::metadata::TableType,
-        table_provider: PgCatalogTable,
-    ) -> Result<Self> {
-        let arrow_schema = table_provider.schema();
-        let schema = Arc::new(arrow_schema.try_into().context(ProjectSchemaSnafu)?);
-        Ok(Self {
-            table_id,
-            table_name,
-            table_type,
-            schema,
-            table_provider,
-        })
-    }
-}
-
-impl SystemTable for DFTableProviderAsSystemTable {
-    fn table_id(&self) -> TableId {
-        self.table_id
-    }
-
-    fn table_name(&self) -> &'static str {
-        self.table_name
-    }
-
-    fn schema(&self) -> Arc<datatypes::schema::Schema> {
-        self.schema.clone()
-    }
-
-    fn table_type(&self) -> table::metadata::TableType {
-        self.table_type
-    }
-
-    fn to_stream(&self, _request: ScanRequest) -> Result<SendableRecordBatchStream> {
-        match &self.table_provider {
-            PgCatalogTable::Static(table) => {
-                let schema = self.schema.arrow_schema().clone();
-                let data = table
-                    .data()
-                    .iter()
-                    .map(|rb| Ok(rb.clone()))
-                    .collect::<Vec<_>>();
-                let stream = Box::pin(DfRecordBatchStreamAdapter::new(
-                    schema,
-                    futures::stream::iter(data),
-                ));
-                Ok(Box::pin(
-                    RecordBatchStreamAdapter::try_new(stream)
-                        .map_err(BoxedError::new)
-                        .context(InternalSnafu)?,
-                ))
-            }
-
-            PgCatalogTable::Dynamic(table) => {
-                let stream = table.execute(Arc::new(TaskContext::default()));
-                Ok(Box::pin(
-                    RecordBatchStreamAdapter::try_new(stream)
-                        .map_err(BoxedError::new)
-                        .context(InternalSnafu)?,
-                ))
-            }
-
-            PgCatalogTable::Empty(_) => {
-                let schema = self.schema.arrow_schema().clone();
-                let stream = Box::pin(DfRecordBatchStreamAdapter::new(
-                    schema,
-                    futures::stream::iter(vec![]),
-                ));
-                Ok(Box::pin(
-                    RecordBatchStreamAdapter::try_new(stream)
-                        .map_err(BoxedError::new)
-                        .context(InternalSnafu)?,
-                ))
-            }
-        }
-    }
+/// Provide query context to call the [`CatalogManager`]'s method.
+static PG_QUERY_CTX: LazyLock<QueryContext> = LazyLock::new(|| {
+    QueryContext::with_channel(DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME, Channel::Postgres)
+});
+
+fn query_ctx() -> Option<&'static QueryContext> {
+    Some(&PG_QUERY_CTX)
 }
--- a/src/catalog/src/system_schema/pg_catalog/pg_catalog_memory_table.rs
+++ b/src/catalog/src/system_schema/pg_catalog/pg_catalog_memory_table.rs
@@ -0,0 +1,69 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::sync::Arc;
+
+use datatypes::schema::{ColumnSchema, Schema, SchemaRef};
+use datatypes::vectors::{Int16Vector, StringVector, UInt32Vector, VectorRef};
+
+use crate::memory_table_cols;
+use crate::system_schema::pg_catalog::oid_column;
+use crate::system_schema::pg_catalog::table_names::PG_TYPE;
+use crate::system_schema::utils::tables::{i16_column, string_column};
+
+fn pg_type_schema_columns() -> (Vec<ColumnSchema>, Vec<VectorRef>) {
+    // TODO(j0hn50n133): acquire this information from `DataType` instead of hardcoding it to avoid regression.
+    memory_table_cols!(
+        [oid, typname, typlen],
+        [
+            (1, "String", -1),
+            (2, "Binary", -1),
+            (3, "Int8", 1),
+            (4, "Int16", 2),
+            (5, "Int32", 4),
+            (6, "Int64", 8),
+            (7, "UInt8", 1),
+            (8, "UInt16", 2),
+            (9, "UInt32", 4),
+            (10, "UInt64", 8),
+            (11, "Float32", 4),
+            (12, "Float64", 8),
+            (13, "Decimal", 16),
+            (14, "Date", 4),
+            (15, "DateTime", 8),
+            (16, "Timestamp", 8),
+            (17, "Time", 8),
+            (18, "Duration", 8),
+            (19, "Interval", 16),
+            (20, "List", -1),
+        ]
+    );
+    (
+        // not quiet identical with pg, we only follow the definition in pg
+        vec![oid_column(), string_column("typname"), i16_column("typlen")],
+        vec![
+            Arc::new(UInt32Vector::from_vec(oid)), // oid
+            Arc::new(StringVector::from(typname)),
+            Arc::new(Int16Vector::from_vec(typlen)), // typlen in bytes
+        ],
+    )
+}
+
+pub(super) fn get_schema_columns(table_name: &str) -> (SchemaRef, Vec<VectorRef>) {
+    let (column_schemas, columns): (_, Vec<VectorRef>) = match table_name {
+        PG_TYPE => pg_type_schema_columns(),
+        _ => unreachable!("Unknown table in pg_catalog: {}", table_name),
+    };
+    (Arc::new(Schema::new(column_schemas)), columns)
+}
--- a/src/catalog/src/system_schema/pg_catalog/pg_class.rs
+++ b/src/catalog/src/system_schema/pg_catalog/pg_class.rs
@@ -0,0 +1,276 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::fmt;
+use std::sync::{Arc, Weak};
+
+use arrow_schema::SchemaRef as ArrowSchemaRef;
+use common_catalog::consts::PG_CATALOG_PG_CLASS_TABLE_ID;
+use common_error::ext::BoxedError;
+use common_recordbatch::adapter::RecordBatchStreamAdapter;
+use common_recordbatch::{DfSendableRecordBatchStream, RecordBatch};
+use datafusion::execution::TaskContext;
+use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
+use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datatypes::scalars::ScalarVectorBuilder;
+use datatypes::schema::{Schema, SchemaRef};
+use datatypes::value::Value;
+use datatypes::vectors::{StringVectorBuilder, UInt32VectorBuilder, VectorRef};
+use futures::TryStreamExt;
+use snafu::{OptionExt, ResultExt};
+use store_api::storage::ScanRequest;
+use table::metadata::TableType;
+
+use crate::error::{
+    CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu,
+};
+use crate::information_schema::Predicates;
+use crate::system_schema::pg_catalog::pg_namespace::oid_map::PGNamespaceOidMapRef;
+use crate::system_schema::pg_catalog::{query_ctx, OID_COLUMN_NAME, PG_CLASS};
+use crate::system_schema::utils::tables::{string_column, u32_column};
+use crate::system_schema::SystemTable;
+use crate::CatalogManager;
+
+// === column name ===
+pub const RELNAME: &str = "relname";
+pub const RELNAMESPACE: &str = "relnamespace";
+pub const RELKIND: &str = "relkind";
+pub const RELOWNER: &str = "relowner";
+
+// === enum value of relkind ===
+pub const RELKIND_TABLE: &str = "r";
+pub const RELKIND_VIEW: &str = "v";
+
+/// The initial capacity of the vector builders.
+const INIT_CAPACITY: usize = 42;
+/// The dummy owner id for the namespace.
+const DUMMY_OWNER_ID: u32 = 0;
+
+/// The `pg_catalog.pg_class` table implementation.
+pub(super) struct PGClass {
+    schema: SchemaRef,
+    catalog_name: String,
+    catalog_manager: Weak<dyn CatalogManager>,
+
+    // Workaround to convert schema_name to a numeric id
+    namespace_oid_map: PGNamespaceOidMapRef,
+}
+
+impl PGClass {
+    pub(super) fn new(
+        catalog_name: String,
+        catalog_manager: Weak<dyn CatalogManager>,
+        namespace_oid_map: PGNamespaceOidMapRef,
+    ) -> Self {
+        Self {
+            schema: Self::schema(),
+            catalog_name,
+            catalog_manager,
+            namespace_oid_map,
+        }
+    }
+
+    fn schema() -> SchemaRef {
+        Arc::new(Schema::new(vec![
+            u32_column(OID_COLUMN_NAME),
+            string_column(RELNAME),
+            u32_column(RELNAMESPACE),
+            string_column(RELKIND),
+            u32_column(RELOWNER),
+        ]))
+    }
+
+    fn builder(&self) -> PGClassBuilder {
+        PGClassBuilder::new(
+            self.schema.clone(),
+            self.catalog_name.clone(),
+            self.catalog_manager.clone(),
+            self.namespace_oid_map.clone(),
+        )
+    }
+}
+
+impl fmt::Debug for PGClass {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("PGClass")
+            .field("schema", &self.schema)
+            .field("catalog_name", &self.catalog_name)
+            .finish()
+    }
+}
+
+impl SystemTable for PGClass {
+    fn table_id(&self) -> table::metadata::TableId {
+        PG_CATALOG_PG_CLASS_TABLE_ID
+    }
+
+    fn table_name(&self) -> &'static str {
+        PG_CLASS
+    }
+
+    fn schema(&self) -> SchemaRef {
+        self.schema.clone()
+    }
+
+    fn to_stream(
+        &self,
+        request: ScanRequest,
+    ) -> Result<common_recordbatch::SendableRecordBatchStream> {
+        let schema = self.schema.arrow_schema().clone();
+        let mut builder = self.builder();
+        let stream = Box::pin(DfRecordBatchStreamAdapter::new(
+            schema,
+            futures::stream::once(async move {
+                builder
+                    .make_class(Some(request))
+                    .await
+                    .map(|x| x.into_df_record_batch())
+                    .map_err(Into::into)
+            }),
+        ));
+        Ok(Box::pin(
+            RecordBatchStreamAdapter::try_new(stream)
+                .map_err(BoxedError::new)
+                .context(InternalSnafu)?,
+        ))
+    }
+}
+
+impl DfPartitionStream for PGClass {
+    fn schema(&self) -> &ArrowSchemaRef {
+        self.schema.arrow_schema()
+    }
+
+    fn execute(&self, _: Arc<TaskContext>) -> DfSendableRecordBatchStream {
+        let schema = self.schema.arrow_schema().clone();
+        let mut builder = self.builder();
+        Box::pin(DfRecordBatchStreamAdapter::new(
+            schema,
+            futures::stream::once(async move {
+                builder
+                    .make_class(None)
+                    .await
+                    .map(|x| x.into_df_record_batch())
+                    .map_err(Into::into)
+            }),
+        ))
+    }
+}
+
+/// Builds the `pg_catalog.pg_class` table row by row
+/// TODO(J0HN50N133): `relowner` is always the [`DUMMY_OWNER_ID`] because we don't have users.
+/// Once we have user system, make it the actual owner of the table.
+struct PGClassBuilder {
+    schema: SchemaRef,
+    catalog_name: String,
+    catalog_manager: Weak<dyn CatalogManager>,
+    namespace_oid_map: PGNamespaceOidMapRef,
+
+    oid: UInt32VectorBuilder,
+    relname: StringVectorBuilder,
+    relnamespace: UInt32VectorBuilder,
+    relkind: StringVectorBuilder,
+    relowner: UInt32VectorBuilder,
+}
+
+impl PGClassBuilder {
+    fn new(
+        schema: SchemaRef,
+        catalog_name: String,
+        catalog_manager: Weak<dyn CatalogManager>,
+        namespace_oid_map: PGNamespaceOidMapRef,
+    ) -> Self {
+        Self {
+            schema,
+            catalog_name,
+            catalog_manager,
+            namespace_oid_map,
+
+            oid: UInt32VectorBuilder::with_capacity(INIT_CAPACITY),
+            relname: StringVectorBuilder::with_capacity(INIT_CAPACITY),
+            relnamespace: UInt32VectorBuilder::with_capacity(INIT_CAPACITY),
+            relkind: StringVectorBuilder::with_capacity(INIT_CAPACITY),
+            relowner: UInt32VectorBuilder::with_capacity(INIT_CAPACITY),
+        }
+    }
+
+    async fn make_class(&mut self, request: Option<ScanRequest>) -> Result<RecordBatch> {
+        let catalog_name = self.catalog_name.clone();
+        let catalog_manager = self
+            .catalog_manager
+            .upgrade()
+            .context(UpgradeWeakCatalogManagerRefSnafu)?;
+        let predicates = Predicates::from_scan_request(&request);
+        for schema_name in catalog_manager
+            .schema_names(&catalog_name, query_ctx())
+            .await?
+        {
+            let mut stream = catalog_manager.tables(&catalog_name, &schema_name, query_ctx());
+            while let Some(table) = stream.try_next().await? {
+                let table_info = table.table_info();
+                self.add_class(
+                    &predicates,
+                    table_info.table_id(),
+                    &schema_name,
+                    &table_info.name,
+                    if table_info.table_type == TableType::View {
+                        RELKIND_VIEW
+                    } else {
+                        RELKIND_TABLE
+                    },
+                );
+            }
+        }
+        self.finish()
+    }
+
+    fn add_class(
+        &mut self,
+        predicates: &Predicates,
+        oid: u32,
+        schema: &str,
+        table: &str,
+        kind: &str,
+    ) {
+        let namespace_oid = self.namespace_oid_map.get_oid(schema);
+        let row = [
+            (OID_COLUMN_NAME, &Value::from(oid)),
+            (RELNAMESPACE, &Value::from(schema)),
+            (RELNAME, &Value::from(table)),
+            (RELKIND, &Value::from(kind)),
+            (RELOWNER, &Value::from(DUMMY_OWNER_ID)),
+        ];
+
+        if !predicates.eval(&row) {
+            return;
+        }
+
+        self.oid.push(Some(oid));
+        self.relnamespace.push(Some(namespace_oid));
+        self.relname.push(Some(table));
+        self.relkind.push(Some(kind));
+        self.relowner.push(Some(DUMMY_OWNER_ID));
+    }
+
+    fn finish(&mut self) -> Result<RecordBatch> {
+        let columns: Vec<VectorRef> = vec![
+            Arc::new(self.oid.finish()),
+            Arc::new(self.relname.finish()),
+            Arc::new(self.relnamespace.finish()),
+            Arc::new(self.relkind.finish()),
+            Arc::new(self.relowner.finish()),
+        ];
+        RecordBatch::new(self.schema.clone(), columns).context(CreateRecordBatchSnafu)
+    }
+}
--- a/src/catalog/src/system_schema/pg_catalog/pg_database.rs
+++ b/src/catalog/src/system_schema/pg_catalog/pg_database.rs
@@ -0,0 +1,223 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::sync::{Arc, Weak};
+
+use arrow_schema::SchemaRef as ArrowSchemaRef;
+use common_catalog::consts::PG_CATALOG_PG_DATABASE_TABLE_ID;
+use common_error::ext::BoxedError;
+use common_recordbatch::adapter::RecordBatchStreamAdapter;
+use common_recordbatch::{DfSendableRecordBatchStream, RecordBatch};
+use datafusion::execution::TaskContext;
+use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
+use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datatypes::scalars::ScalarVectorBuilder;
+use datatypes::schema::{Schema, SchemaRef};
+use datatypes::value::Value;
+use datatypes::vectors::{StringVectorBuilder, UInt32VectorBuilder, VectorRef};
+use snafu::{OptionExt, ResultExt};
+use store_api::storage::ScanRequest;
+
+use crate::error::{
+    CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu,
+};
+use crate::information_schema::Predicates;
+use crate::system_schema::pg_catalog::pg_namespace::oid_map::PGNamespaceOidMapRef;
+use crate::system_schema::pg_catalog::{query_ctx, OID_COLUMN_NAME, PG_DATABASE};
+use crate::system_schema::utils::tables::{string_column, u32_column};
+use crate::system_schema::SystemTable;
+use crate::CatalogManager;
+
+// === column name ===
+pub const DATNAME: &str = "datname";
+
+/// The initial capacity of the vector builders.
+const INIT_CAPACITY: usize = 42;
+
+/// The `pg_catalog.database` table implementation.
+pub(super) struct PGDatabase {
+    schema: SchemaRef,
+    catalog_name: String,
+    catalog_manager: Weak<dyn CatalogManager>,
+
+    // Workaround to convert schema_name to a numeric id
+    namespace_oid_map: PGNamespaceOidMapRef,
+}
+
+impl std::fmt::Debug for PGDatabase {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("PGDatabase")
+            .field("schema", &self.schema)
+            .field("catalog_name", &self.catalog_name)
+            .finish()
+    }
+}
+
+impl PGDatabase {
+    pub(super) fn new(
+        catalog_name: String,
+        catalog_manager: Weak<dyn CatalogManager>,
+        namespace_oid_map: PGNamespaceOidMapRef,
+    ) -> Self {
+        Self {
+            schema: Self::schema(),
+            catalog_name,
+            catalog_manager,
+            namespace_oid_map,
+        }
+    }
+
+    fn schema() -> SchemaRef {
+        Arc::new(Schema::new(vec![
+            u32_column(OID_COLUMN_NAME),
+            string_column(DATNAME),
+        ]))
+    }
+
+    fn builder(&self) -> PGCDatabaseBuilder {
+        PGCDatabaseBuilder::new(
+            self.schema.clone(),
+            self.catalog_name.clone(),
+            self.catalog_manager.clone(),
+            self.namespace_oid_map.clone(),
+        )
+    }
+}
+
+impl DfPartitionStream for PGDatabase {
+    fn schema(&self) -> &ArrowSchemaRef {
+        self.schema.arrow_schema()
+    }
+
+    fn execute(&self, _: Arc<TaskContext>) -> DfSendableRecordBatchStream {
+        let schema = self.schema.arrow_schema().clone();
+        let mut builder = self.builder();
+        Box::pin(DfRecordBatchStreamAdapter::new(
+            schema,
+            futures::stream::once(async move {
+                builder
+                    .make_database(None)
+                    .await
+                    .map(|x| x.into_df_record_batch())
+                    .map_err(Into::into)
+            }),
+        ))
+    }
+}
+
+impl SystemTable for PGDatabase {
+    fn table_id(&self) -> table::metadata::TableId {
+        PG_CATALOG_PG_DATABASE_TABLE_ID
+    }
+
+    fn table_name(&self) -> &'static str {
+        PG_DATABASE
+    }
+
+    fn schema(&self) -> SchemaRef {
+        self.schema.clone()
+    }
+
+    fn to_stream(
+        &self,
+        request: ScanRequest,
+    ) -> Result<common_recordbatch::SendableRecordBatchStream> {
+        let schema = self.schema.arrow_schema().clone();
+        let mut builder = self.builder();
+        let stream = Box::pin(DfRecordBatchStreamAdapter::new(
+            schema,
+            futures::stream::once(async move {
+                builder
+                    .make_database(Some(request))
+                    .await
+                    .map(|x| x.into_df_record_batch())
+                    .map_err(Into::into)
+            }),
+        ));
+        Ok(Box::pin(
+            RecordBatchStreamAdapter::try_new(stream)
+                .map_err(BoxedError::new)
+                .context(InternalSnafu)?,
+        ))
+    }
+}
+
+/// Builds the `pg_catalog.pg_database` table row by row
+/// `oid` use schema name as a workaround since we don't have numeric schema id.
+/// `nspname` is the schema name.
+struct PGCDatabaseBuilder {
+    schema: SchemaRef,
+    catalog_name: String,
+    catalog_manager: Weak<dyn CatalogManager>,
+    namespace_oid_map: PGNamespaceOidMapRef,
+
+    oid: UInt32VectorBuilder,
+    datname: StringVectorBuilder,
+}
+
+impl PGCDatabaseBuilder {
+    fn new(
+        schema: SchemaRef,
+        catalog_name: String,
+        catalog_manager: Weak<dyn CatalogManager>,
+        namespace_oid_map: PGNamespaceOidMapRef,
+    ) -> Self {
+        Self {
+            schema,
+            catalog_name,
+            catalog_manager,
+            namespace_oid_map,
+
+            oid: UInt32VectorBuilder::with_capacity(INIT_CAPACITY),
+            datname: StringVectorBuilder::with_capacity(INIT_CAPACITY),
+        }
+    }
+
+    async fn make_database(&mut self, request: Option<ScanRequest>) -> Result<RecordBatch> {
+        let catalog_name = self.catalog_name.clone();
+        let catalog_manager = self
+            .catalog_manager
+            .upgrade()
+            .context(UpgradeWeakCatalogManagerRefSnafu)?;
+        let predicates = Predicates::from_scan_request(&request);
+        for schema_name in catalog_manager
+            .schema_names(&catalog_name, query_ctx())
+            .await?
+        {
+            self.add_database(&predicates, &schema_name);
+        }
+        self.finish()
+    }
+
+    fn add_database(&mut self, predicates: &Predicates, schema_name: &str) {
+        let oid = self.namespace_oid_map.get_oid(schema_name);
+        let row: [(&str, &Value); 2] = [
+            (OID_COLUMN_NAME, &Value::from(oid)),
+            (DATNAME, &Value::from(schema_name)),
+        ];
+
+        if !predicates.eval(&row) {
+            return;
+        }
+
+        self.oid.push(Some(oid));
+        self.datname.push(Some(schema_name));
+    }
+
+    fn finish(&mut self) -> Result<RecordBatch> {
+        let columns: Vec<VectorRef> =
+            vec![Arc::new(self.oid.finish()), Arc::new(self.datname.finish())];
+        RecordBatch::new(self.schema.clone(), columns).context(CreateRecordBatchSnafu)
+    }
+}
--- a/src/catalog/src/system_schema/pg_catalog/pg_namespace.rs
+++ b/src/catalog/src/system_schema/pg_catalog/pg_namespace.rs
@@ -0,0 +1,221 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! The `pg_catalog.pg_namespace` table implementation.
+//! namespace is a schema in greptime
+
+pub(super) mod oid_map;
+
+use std::fmt;
+use std::sync::{Arc, Weak};
+
+use arrow_schema::SchemaRef as ArrowSchemaRef;
+use common_catalog::consts::PG_CATALOG_PG_NAMESPACE_TABLE_ID;
+use common_error::ext::BoxedError;
+use common_recordbatch::adapter::RecordBatchStreamAdapter;
+use common_recordbatch::{DfSendableRecordBatchStream, RecordBatch, SendableRecordBatchStream};
+use datafusion::execution::TaskContext;
+use datafusion::physical_plan::stream::RecordBatchStreamAdapter as DfRecordBatchStreamAdapter;
+use datafusion::physical_plan::streaming::PartitionStream as DfPartitionStream;
+use datatypes::scalars::ScalarVectorBuilder;
+use datatypes::schema::{Schema, SchemaRef};
+use datatypes::value::Value;
+use datatypes::vectors::{StringVectorBuilder, UInt32VectorBuilder, VectorRef};
+use snafu::{OptionExt, ResultExt};
+use store_api::storage::ScanRequest;
+
+use crate::error::{
+    CreateRecordBatchSnafu, InternalSnafu, Result, UpgradeWeakCatalogManagerRefSnafu,
+};
+use crate::information_schema::Predicates;
+use crate::system_schema::pg_catalog::{
+    query_ctx, PGNamespaceOidMapRef, OID_COLUMN_NAME, PG_NAMESPACE,
+};
+use crate::system_schema::utils::tables::{string_column, u32_column};
+use crate::system_schema::SystemTable;
+use crate::CatalogManager;
+
+const NSPNAME: &str = "nspname";
+const INIT_CAPACITY: usize = 42;
+
+pub(super) struct PGNamespace {
+    schema: SchemaRef,
+    catalog_name: String,
+    catalog_manager: Weak<dyn CatalogManager>,
+
+    // Workaround to convert schema_name to a numeric id
+    oid_map: PGNamespaceOidMapRef,
+}
+
+impl PGNamespace {
+    pub(super) fn new(
+        catalog_name: String,
+        catalog_manager: Weak<dyn CatalogManager>,
+        oid_map: PGNamespaceOidMapRef,
+    ) -> Self {
+        Self {
+            schema: Self::schema(),
+            catalog_name,
+            catalog_manager,
+            oid_map,
+        }
+    }
+
+    fn schema() -> SchemaRef {
+        Arc::new(Schema::new(vec![
+            // TODO(J0HN50N133): we do not have a numeric schema id, use schema name as a workaround. Use a proper schema id once we have it.
+            u32_column(OID_COLUMN_NAME),
+            string_column(NSPNAME),
+        ]))
+    }
+
+    fn builder(&self) -> PGNamespaceBuilder {
+        PGNamespaceBuilder::new(
+            self.schema.clone(),
+            self.catalog_name.clone(),
+            self.catalog_manager.clone(),
+            self.oid_map.clone(),
+        )
+    }
+}
+
+impl fmt::Debug for PGNamespace {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("PGNamespace")
+            .field("schema", &self.schema)
+            .field("catalog_name", &self.catalog_name)
+            .finish()
+    }
+}
+
+impl SystemTable for PGNamespace {
+    fn schema(&self) -> SchemaRef {
+        self.schema.clone()
+    }
+
+    fn table_id(&self) -> table::metadata::TableId {
+        PG_CATALOG_PG_NAMESPACE_TABLE_ID
+    }
+
+    fn table_name(&self) -> &'static str {
+        PG_NAMESPACE
+    }
+
+    fn to_stream(&self, request: ScanRequest) -> Result<SendableRecordBatchStream> {
+        let schema = self.schema.arrow_schema().clone();
+        let mut builder = self.builder();
+        let stream = Box::pin(DfRecordBatchStreamAdapter::new(
+            schema,
+            futures::stream::once(async move {
+                builder
+                    .make_namespace(Some(request))
+                    .await
+                    .map(|x| x.into_df_record_batch())
+                    .map_err(Into::into)
+            }),
+        ));
+        Ok(Box::pin(
+            RecordBatchStreamAdapter::try_new(stream)
+                .map_err(BoxedError::new)
+                .context(InternalSnafu)?,
+        ))
+    }
+}
+
+impl DfPartitionStream for PGNamespace {
+    fn schema(&self) -> &ArrowSchemaRef {
+        self.schema.arrow_schema()
+    }
+
+    fn execute(&self, _: Arc<TaskContext>) -> DfSendableRecordBatchStream {
+        let schema = self.schema.arrow_schema().clone();
+        let mut builder = self.builder();
+        Box::pin(DfRecordBatchStreamAdapter::new(
+            schema,
+            futures::stream::once(async move {
+                builder
+                    .make_namespace(None)
+                    .await
+                    .map(|x| x.into_df_record_batch())
+                    .map_err(Into::into)
+            }),
+        ))
+    }
+}
+
+/// Builds the `pg_catalog.pg_namespace` table row by row
+/// `oid` use schema name as a workaround since we don't have numeric schema id.
+/// `nspname` is the schema name.
+struct PGNamespaceBuilder {
+    schema: SchemaRef,
+    catalog_name: String,
+    catalog_manager: Weak<dyn CatalogManager>,
+    namespace_oid_map: PGNamespaceOidMapRef,
+
+    oid: UInt32VectorBuilder,
+    nspname: StringVectorBuilder,
+}
+
+impl PGNamespaceBuilder {
+    fn new(
+        schema: SchemaRef,
+        catalog_name: String,
+        catalog_manager: Weak<dyn CatalogManager>,
+        namespace_oid_map: PGNamespaceOidMapRef,
+    ) -> Self {
+        Self {
+            schema,
+            catalog_name,
+            catalog_manager,
+            namespace_oid_map,
+            oid: UInt32VectorBuilder::with_capacity(INIT_CAPACITY),
+            nspname: StringVectorBuilder::with_capacity(INIT_CAPACITY),
+        }
+    }
+
+    /// Construct the `pg_catalog.pg_namespace` virtual table
+    async fn make_namespace(&mut self, request: Option<ScanRequest>) -> Result<RecordBatch> {
+        let catalog_name = self.catalog_name.clone();
+        let catalog_manager = self
+            .catalog_manager
+            .upgrade()
+            .context(UpgradeWeakCatalogManagerRefSnafu)?;
+        let predicates = Predicates::from_scan_request(&request);
+        for schema_name in catalog_manager
+            .schema_names(&catalog_name, query_ctx())
+            .await?
+        {
+            self.add_namespace(&predicates, &schema_name);
+        }
+        self.finish()
+    }
+    fn finish(&mut self) -> Result<RecordBatch> {
+        let columns: Vec<VectorRef> =
+            vec![Arc::new(self.oid.finish()), Arc::new(self.nspname.finish())];
+        RecordBatch::new(self.schema.clone(), columns).context(CreateRecordBatchSnafu)
+    }
+
+    fn add_namespace(&mut self, predicates: &Predicates, schema_name: &str) {
+        let oid = self.namespace_oid_map.get_oid(schema_name);
+        let row = [
+            (OID_COLUMN_NAME, &Value::from(oid)),
+            (NSPNAME, &Value::from(schema_name)),
+        ];
+        if !predicates.eval(&row) {
+            return;
+        }
+        self.oid.push(Some(oid));
+        self.nspname.push(Some(schema_name));
+    }
+}
--- a/src/catalog/src/system_schema/pg_catalog/pg_namespace/oid_map.rs
+++ b/src/catalog/src/system_schema/pg_catalog/pg_namespace/oid_map.rs
@@ -0,0 +1,94 @@
+// Copyright 2023 Greptime Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use std::hash::BuildHasher;
+use std::sync::Arc;
+
+use dashmap::DashMap;
+use rustc_hash::FxSeededState;
+
+pub type PGNamespaceOidMapRef = Arc<PGNamespaceOidMap>;
+// Workaround to convert schema_name to a numeric id,
+// remove this when we have numeric schema id in greptime
+pub struct PGNamespaceOidMap {
+    oid_map: DashMap<String, u32>,
+
+    // Rust use SipHasher by default, which provides resistance against DOS attacks.
+    // This will produce different hash value between each greptime instance. This will
+    // cause the sqlness test fail. We need a deterministic hash here to provide
+    // same oid for the same schema name with best effort and DOS attacks aren't concern here.
+    hasher: FxSeededState,
+}
+
+impl PGNamespaceOidMap {
+    pub fn new() -> Self {
+        Self {
+            oid_map: DashMap::new(),
+            hasher: FxSeededState::with_seed(0), // PLEASE DO NOT MODIFY THIS SEED VALUE!!!
+        }
+    }
+
+    fn oid_is_used(&self, oid: u32) -> bool {
+        self.oid_map.iter().any(|e| *e.value() == oid)
+    }
+
+    pub fn get_oid(&self, schema_name: &str) -> u32 {
+        if let Some(oid) = self.oid_map.get(schema_name) {
+            *oid
+        } else {
+            let mut oid = self.hasher.hash_one(schema_name) as u32;
+            while self.oid_is_used(oid) {
+                oid = self.hasher.hash_one(oid) as u32;
+            }
+            self.oid_map.insert(schema_name.to_string(), oid);
+            oid
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+
+    #[test]
+    fn oid_is_stable() {
+        let oid_map_1 = PGNamespaceOidMap::new();
+        let oid_map_2 = PGNamespaceOidMap::new();
+
+        let schema = "schema";
+        let oid = oid_map_1.get_oid(schema);
+
+        // oid keep stable in the same instance
+        assert_eq!(oid, oid_map_1.get_oid(schema));
+
+        // oid keep stable between different instances
+        assert_eq!(oid, oid_map_2.get_oid(schema));
+    }
+
+    #[test]
+    fn oid_collision() {
+        let oid_map = PGNamespaceOidMap::new();
+
+        let key1 = "3178510";
+        let key2 = "4215648";
+
+        // insert them into oid_map
+        let oid1 = oid_map.get_oid(key1);
+        let oid2 = oid_map.get_oid(key2);
+
+        // they should have different id
+        assert_ne!(oid1, oid2);
+    }
+}
--- a/src/catalog/src/system_schema/pg_catalog/table_names.rs
+++ b/src/catalog/src/system_schema/pg_catalog/table_names.rs
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.

-use lazy_static::lazy_static;
-use regex::Regex;
-
-pub const NAME_PATTERN: &str = r"[a-zA-Z_:-][a-zA-Z0-9_:\-\.@#]*";
-
-lazy_static! {
-    pub static ref NAME_PATTERN_REG: Regex = Regex::new(&format!("^{NAME_PATTERN}$")).unwrap();
-}
+// https://www.postgresql.org/docs/current/catalog-pg-database.html
+pub const PG_DATABASE: &str = "pg_database";
+// https://www.postgresql.org/docs/current/catalog-pg-namespace.html
+pub const PG_NAMESPACE: &str = "pg_namespace";
+// https://www.postgresql.org/docs/current/catalog-pg-class.html
+pub const PG_CLASS: &str = "pg_class";
+// https://www.postgresql.org/docs/current/catalog-pg-type.html
+pub const PG_TYPE: &str = "pg_type";
--- a/src/catalog/src/system_schema/predicate.rs
+++ b/src/catalog/src/system_schema/predicate.rs
@@ -339,22 +339,18 @@ mod tests {
        assert!(!p.eval(&wrong_row).unwrap());
        assert!(p.eval(&[]).is_none());
        assert!(p.eval(&[("c", &a_value)]).is_none());
-        assert!(
-            !p.eval(&[(a_col.as_str(), &b_value), (b_col.as_str(), &a_value)])
-                .unwrap()
-        );
-        assert!(
-            !p.eval(&[(a_col.as_str(), &b_value), (b_col.as_str(), &b_value)])
-                .unwrap()
-        );
-        assert!(
-            p.eval(&[(a_col.as_ref(), &a_value), ("c", &a_value)])
-                .is_none()
-        );
-        assert!(
-            !p.eval(&[(a_col.as_ref(), &b_value), ("c", &a_value)])
-                .unwrap()
-        );
+        assert!(!p
+            .eval(&[(a_col.as_str(), &b_value), (b_col.as_str(), &a_value)])
+            .unwrap());
+        assert!(!p
+            .eval(&[(a_col.as_str(), &b_value), (b_col.as_str(), &b_value)])
+            .unwrap());
+        assert!(p
+            .eval(&[(a_col.as_ref(), &a_value), ("c", &a_value)])
+            .is_none());
+        assert!(!p
+            .eval(&[(a_col.as_ref(), &b_value), ("c", &a_value)])
+            .unwrap());

        //Predicate::Or
        let p = Predicate::Or(Box::new(p1), Box::new(p2));
@@ -362,22 +358,18 @@ mod tests {
        assert!(p.eval(&wrong_row).unwrap());
        assert!(p.eval(&[]).is_none());
        assert!(p.eval(&[("c", &a_value)]).is_none());
-        assert!(
-            !p.eval(&[(a_col.as_str(), &b_value), (b_col.as_str(), &a_value)])
-                .unwrap()
-        );
-        assert!(
-            p.eval(&[(a_col.as_str(), &b_value), (b_col.as_str(), &b_value)])
-                .unwrap()
-        );
-        assert!(
-            p.eval(&[(a_col.as_ref(), &a_value), ("c", &a_value)])
-                .unwrap()
-        );
-        assert!(
-            p.eval(&[(a_col.as_ref(), &b_value), ("c", &a_value)])
-                .is_none()
-        );
+        assert!(!p
+            .eval(&[(a_col.as_str(), &b_value), (b_col.as_str(), &a_value)])
+            .unwrap());
+        assert!(p
+            .eval(&[(a_col.as_str(), &b_value), (b_col.as_str(), &b_value)])
+            .unwrap());
+        assert!(p
+            .eval(&[(a_col.as_ref(), &a_value), ("c", &a_value)])
+            .unwrap());
+        assert!(p
+            .eval(&[(a_col.as_ref(), &b_value), ("c", &a_value)])
+            .is_none());
    }

    #[test]
--- a/src/catalog/src/system_schema/utils.rs
+++ b/src/catalog/src/system_schema/utils.rs
@@ -17,10 +17,10 @@ use std::sync::Weak;
 use common_meta::key::TableMetadataManagerRef;
 use snafu::OptionExt;

-use crate::CatalogManager;
 use crate::error::{GetInformationExtensionSnafu, Result, UpgradeWeakCatalogManagerRefSnafu};
 use crate::information_schema::InformationExtensionRef;
 use crate::kvbackend::KvBackendCatalogManager;
+use crate::CatalogManager;

 pub mod tables;

--- a/src/catalog/src/system_schema/utils/tables.rs
+++ b/src/catalog/src/system_schema/utils/tables.rs
@@ -27,6 +27,22 @@ pub fn string_column(name: &str) -> ColumnSchema {
    )
 }

+pub fn u32_column(name: &str) -> ColumnSchema {
+    ColumnSchema::new(
+        str::to_lowercase(name),
+        ConcreteDataType::uint32_datatype(),
+        false,
+    )
+}
+
+pub fn i16_column(name: &str) -> ColumnSchema {
+    ColumnSchema::new(
+        str::to_lowercase(name),
+        ConcreteDataType::int16_datatype(),
+        false,
+    )
+}
+
 pub fn bigint_column(name: &str) -> ColumnSchema {
    ColumnSchema::new(
        str::to_lowercase(name),
--- a/src/catalog/src/table_source.rs
+++ b/src/catalog/src/table_source.rs
@@ -17,27 +17,27 @@ use std::sync::Arc;

 use bytes::Bytes;
 use common_catalog::format_full_table_name;
-use common_query::logical_plan::{SubstraitPlanDecoderRef, rename_logical_plan_columns};
+use common_query::logical_plan::{rename_logical_plan_columns, SubstraitPlanDecoderRef};
 use datafusion::common::{ResolvedTableReference, TableReference};
 use datafusion::datasource::view::ViewTable;
-use datafusion::datasource::{TableProvider, provider_as_source};
+use datafusion::datasource::{provider_as_source, TableProvider};
 use datafusion::logical_expr::TableSource;
 use itertools::Itertools;
 use session::context::QueryContextRef;
-use snafu::{OptionExt, ResultExt, ensure};
+use snafu::{ensure, OptionExt, ResultExt};
 use table::metadata::TableType;
 use table::table::adapter::DfTableProviderAdapter;
 pub mod dummy_catalog;
 use dummy_catalog::DummyCatalogList;
 use table::TableRef;

-use crate::CatalogManagerRef;
 use crate::error::{
    CastManagerSnafu, DecodePlanSnafu, GetViewCacheSnafu, ProjectViewColumnsSnafu,
    QueryAccessDeniedSnafu, Result, TableNotExistSnafu, ViewInfoNotFoundSnafu,
    ViewPlanColumnsChangedSnafu,
 };
 use crate::kvbackend::KvBackendCatalogManager;
+use crate::CatalogManagerRef;

 pub struct DfTableSourceProvider {
    catalog_manager: CatalogManagerRef,
@@ -201,7 +201,7 @@ impl DfTableSourceProvider {

        Ok(Arc::new(ViewTable::new(
            logical_plan,
-            Some(view_info.definition.clone()),
+            Some(view_info.definition.to_string()),
        )))
    }
 }
@@ -272,7 +272,7 @@ mod tests {
    use common_query::logical_plan::SubstraitPlanDecoder;
    use datafusion::catalog::CatalogProviderList;
    use datafusion::logical_expr::builder::LogicalTableSource;
-    use datafusion::logical_expr::{LogicalPlan, LogicalPlanBuilder, col, lit};
+    use datafusion::logical_expr::{col, lit, LogicalPlan, LogicalPlanBuilder};

    use crate::information_schema::NoopInformationExtension;

--- a/src/catalog/src/table_source/dummy_catalog.rs
+++ b/src/catalog/src/table_source/dummy_catalog.rs
@@ -25,8 +25,8 @@ use datafusion::datasource::TableProvider;
 use snafu::OptionExt;
 use table::table::adapter::DfTableProviderAdapter;

-use crate::CatalogManagerRef;
 use crate::error::TableNotExistSnafu;
+use crate::CatalogManagerRef;

 /// Delegate the resolving requests to the `[CatalogManager]` unconditionally.
 #[derive(Clone)]
--- a/src/cli/Cargo.toml
+++ b/src/cli/Cargo.toml
@@ -51,7 +51,6 @@ meta-srv.workspace = true
 nu-ansi-term = "0.46"
 object-store.workspace = true
 operator.workspace = true
-paste.workspace = true
 query.workspace = true
 rand.workspace = true
 reqwest.workspace = true
@@ -61,6 +60,7 @@ servers.workspace = true
 session.workspace = true
 snafu.workspace = true
 store-api.workspace = true
+substrait.workspace = true
 table.workspace = true
 tokio.workspace = true
 tracing-appender.workspace = true
--- a/src/cli/src/bench.rs
+++ b/src/cli/src/bench.rs
@@ -157,7 +157,6 @@ fn create_table_info(table_id: TableId, table_name: TableName) -> RawTableInfo {
        schema: RawSchema::new(column_schemas),
        engine: "mito".to_string(),
        created_on: chrono::DateTime::default(),
-        updated_on: chrono::DateTime::default(),
        primary_key_indices: vec![],
        next_column_id: columns as u32 + 1,
        value_indices: vec![],
--- a/src/cli/src/bench/metadata.rs
+++ b/src/cli/src/bench/metadata.rs
@@ -14,8 +14,8 @@

 use std::time::Instant;

-use common_meta::key::TableMetadataManagerRef;
 use common_meta::key::table_route::TableRouteValue;
+use common_meta::key::TableMetadataManagerRef;
 use table::table_name::TableName;

 use crate::bench::{
--- a/src/cli/src/common.rs
+++ b/src/cli/src/common.rs
@@ -1,19 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-mod object_store;
-mod store;
-
-pub use object_store::{ObjectStoreConfig, new_fs_object_store};
-pub use store::StoreConfig;
--- a/src/cli/src/common/object_store.rs
+++ b/src/cli/src/common/object_store.rs
@@ -1,224 +0,0 @@
-// Copyright 2023 Greptime Team
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-use common_base::secrets::SecretString;
-use common_error::ext::BoxedError;
-use object_store::services::{Azblob, Fs, Gcs, Oss, S3};
-use object_store::util::{with_instrument_layers, with_retry_layers};
-use object_store::{AzblobConnection, GcsConnection, ObjectStore, OssConnection, S3Connection};
-use paste::paste;
-use snafu::ResultExt;
-
-use crate::error::{self};
-
-macro_rules! wrap_with_clap_prefix {
-    (
-        $new_name:ident, $prefix:literal, $base:ty, {
-            $( $( #[doc = $doc:expr] )? $( #[alias = $alias:literal] )? $field:ident : $type:ty $( = $default:expr )? ),* $(,)?
-        }
-    ) => {
-        paste!{
-            #[derive(clap::Parser, Debug, Clone, PartialEq, Default)]
-            pub struct $new_name {
-                $(
-                    $( #[doc = $doc] )?
-                    $( #[clap(alias = $alias)] )?
-                    #[clap(long $(, default_value_t = $default )? )]
-                    [<$prefix $field>]: $type,
-                )*
-            }
-
-            impl From<$new_name> for $base {
-                fn from(w: $new_name) -> Self {
-                    Self {
-                        $( $field: w.[<$prefix $field>] ),*
-                    }
-                }
-            }
-        }
-    };
-}
-
-wrap_with_clap_prefix! {
-    PrefixedAzblobConnection,
-    "azblob-",
-    AzblobConnection,
-    {
-        #[doc = "The container of the object store."]
-        container: String = Default::default(),
-        #[doc = "The root of the object store."]
-        root: String = Default::default(),
-        #[doc = "The account name of the object store."]
-        account_name: SecretString = Default::default(),
-        #[doc = "The account key of the object store."]
-        account_key: SecretString = Default::default(),
-        #[doc = "The endpoint of the object store."]
-        endpoint: String = Default::default(),
-        #[doc = "The SAS token of the object store."]
-        sas_token: Option<String>,
-    }
-}
-
-wrap_with_clap_prefix! {
-    PrefixedS3Connection,
-    "s3-",
-    S3Connection,
-    {
-        #[doc = "The bucket of the object store."]
-        bucket: String = Default::default(),
-        #[doc = "The root of the object store."]
-        root: String = Default::default(),
-        #[doc = "The access key ID of the object store."]
-        access_key_id: SecretString = Default::default(),
-        #[doc = "The secret access key of the object store."]
-        secret_access_key: SecretString = Default::default(),
-        #[doc = "The endpoint of the object store."]
-        endpoint: Option<String>,
-        #[doc = "The region of the object store."]
-        region: Option<String>,
-        #[doc = "Enable virtual host style for the object store."]
-        enable_virtual_host_style: bool = Default::default(),
-    }
-}
-
-wrap_with_clap_prefix! {
-    PrefixedOssConnection,
-    "oss-",
-    OssConnection,
-    {
-        #[doc = "The bucket of the object store."]
-        bucket: String = Default::default(),
-        #[doc = "The root of the object store."]
-        root: String = Default::default(),
-        #[doc = "The access key ID of the object store."]
-        access_key_id: SecretString = Default::default(),
-        #[doc = "The access key secret of the object store."]
-        access_key_secret: SecretString = Default::default(),
-        #[doc = "The endpoint of the object store."]
-        endpoint: String = Default::default(),
-    }
-}
-
-wrap_with_clap_prefix! {
-    PrefixedGcsConnection,
-    "gcs-",
-    GcsConnection,
-    {
-        #[doc = "The root of the object store."]
-        root: String = Default::default(),
-        #[doc = "The bucket of the object store."]
-        bucket: String = Default::default(),
-        #[doc = "The scope of the object store."]
-        scope: String = Default::default(),
-        #[doc = "The credential path of the object store."]
-        credential_path: SecretString = Default::default(),
-        #[doc = "The credential of the object store."]
-        credential: SecretString = Default::default(),
-        #[doc = "The endpoint of the object store."]
-        endpoint: String = Default::default(),
-    }
-}
-
-/// common config for object store.
-#[derive(clap::Parser, Debug, Clone, PartialEq, Default)]
-pub struct ObjectStoreConfig {
-    /// Whether to use S3 object store.
-    #[clap(long, alias = "s3")]
-    pub enable_s3: bool,
-
-    #[clap(flatten)]
-    pub s3: PrefixedS3Connection,
-
-    /// Whether to use OSS.
-    #[clap(long, alias = "oss")]
-    pub enable_oss: bool,
-
-    #[clap(flatten)]
-    pub oss: PrefixedOssConnection,
-
-    /// Whether to use GCS.
-    #[clap(long, alias = "gcs")]
-    pub enable_gcs: bool,
-
-    #[clap(flatten)]
-    pub gcs: PrefixedGcsConnection,
-
-    /// Whether to use Azure Blob.
-    #[clap(long, alias = "azblob")]
-    pub enable_azblob: bool,
-
-    #[clap(flatten)]
-    pub azblob: PrefixedAzblobConnection,
-}
-
-/// Creates a new file system object store.
-pub fn new_fs_object_store(root: &str) -> std::result::Result<ObjectStore, BoxedError> {
-    let builder = Fs::default().root(root);
-    let object_store = ObjectStore::new(builder)
-        .context(error::InitBackendSnafu)
-        .map_err(BoxedError::new)?
-        .finish();
-
-    Ok(with_instrument_layers(object_store, false))
-}
-
-impl ObjectStoreConfig {
-    /// Builds the object store from the config.
-    pub fn build(&self) -> Result<Option<ObjectStore>, BoxedError> {
-        let object_store = if self.enable_s3 {
-            let s3 = S3Connection::from(self.s3.clone());
-            common_telemetry::info!("Building object store with s3: {:?}", s3);
-            Some(
-                ObjectStore::new(S3::from(&s3))
-                    .context(error::InitBackendSnafu)
-                    .map_err(BoxedError::new)?
-                    .finish(),
-            )
-        } else if self.enable_oss {
-            let oss = OssConnection::from(self.oss.clone());
-            common_telemetry::info!("Building object store with oss: {:?}", oss);
-            Some(
-                ObjectStore::new(Oss::from(&oss))
-                    .context(error::InitBackendSnafu)
-                    .map_err(BoxedError::new)?
-                    .finish(),
-            )
-        } else if self.enable_gcs {
-            let gcs = GcsConnection::from(self.gcs.clone());
-            common_telemetry::info!("Building object store with gcs: {:?}", gcs);
-            Some(
-                ObjectStore::new(Gcs::from(&gcs))
-                    .context(error::InitBackendSnafu)
-                    .map_err(BoxedError::new)?
-                    .finish(),
-            )
-        } else if self.enable_azblob {
-            let azblob = AzblobConnection::from(self.azblob.clone());
-            common_telemetry::info!("Building object store with azblob: {:?}", azblob);
-            Some(
-                ObjectStore::new(Azblob::from(&azblob))
-                    .context(error::InitBackendSnafu)
-                    .map_err(BoxedError::new)?
-                    .finish(),
-            )
-        } else {
-            None
-        };
-
-        let object_store = object_store
-            .map(|object_store| with_instrument_layers(with_retry_layers(object_store), false));
-
-        Ok(object_store)
-    }
-}
--- a/src/cli/src/data.rs
+++ b/src/cli/src/data.rs
@@ -16,14 +16,11 @@ mod export;
 mod import;

 use clap::Subcommand;
-use client::DEFAULT_CATALOG_NAME;
 use common_error::ext::BoxedError;

-use crate::Tool;
 use crate::data::export::ExportCommand;
 use crate::data::import::ImportCommand;
-
-pub(crate) const COPY_PATH_PLACEHOLDER: &str = "<PATH/TO/FILES>";
+use crate::Tool;

 /// Command for data operations including exporting data from and importing data into GreptimeDB.
 #[derive(Subcommand)]
@@ -40,7 +37,3 @@ impl DataCommand {
        }
    }
 }
-
-pub(crate) fn default_database() -> String {
-    format!("{DEFAULT_CATALOG_NAME}-*")
-}
--- a/src/cli/src/data/export.rs
+++ b/src/cli/src/data/export.rs
@@ -24,19 +24,18 @@ use common_error::ext::BoxedError;
 use common_telemetry::{debug, error, info};
 use object_store::layers::LoggingLayer;
 use object_store::services::Oss;
-use object_store::{ObjectStore, services};
+use object_store::{services, ObjectStore};
 use serde_json::Value;
 use snafu::{OptionExt, ResultExt};
 use tokio::sync::Semaphore;
 use tokio::time::Instant;

-use crate::data::{COPY_PATH_PLACEHOLDER, default_database};
-use crate::database::{DatabaseClient, parse_proxy_opts};
+use crate::database::{parse_proxy_opts, DatabaseClient};
 use crate::error::{
    EmptyResultSnafu, Error, OpenDalSnafu, OutputDirNotSetSnafu, Result, S3ConfigNotSetSnafu,
    SchemaNotFoundSnafu,
 };
-use crate::{Tool, database};
+use crate::{database, Tool};

 type TableReference = (String, String, String);

@@ -64,7 +63,7 @@ pub struct ExportCommand {
    output_dir: Option<String>,

    /// The name of the catalog to export.
-    #[clap(long, default_value_t = default_database())]
+    #[clap(long, default_value = "greptime-*")]
    database: String,

    /// Parallelism of the export.
@@ -668,26 +667,10 @@ impl Export {
                );

                // Create copy_from.sql file
-                let copy_database_from_sql = {
-                    let command_without_connection = format!(
-                        r#"COPY DATABASE "{}"."{}" FROM '{}' WITH ({});"#,
-                        export_self.catalog, schema, COPY_PATH_PLACEHOLDER, with_options_clone
-                    );
-
-                    if connection_part.is_empty() {
-                        command_without_connection
-                    } else {
-                        let command_with_connection = format!(
-                            r#"COPY DATABASE "{}"."{}" FROM '{}' WITH ({}){};"#,
-                            export_self.catalog, schema, path, with_options_clone, connection_part
-                        );
-
-                        format!(
-                            "-- {}\n{}",
-                            command_with_connection, command_without_connection
-                        )
-                    }
-                };
+                let copy_database_from_sql = format!(
+                    r#"COPY DATABASE "{}"."{}" FROM '{}' WITH ({}){};"#,
+                    export_self.catalog, schema, path, with_options_clone, connection_part
+                );

                let copy_from_path = export_self.get_file_path(&schema, "copy_from.sql");
                export_self
--- a/src/cli/src/data/import.rs
+++ b/src/cli/src/data/import.rs
@@ -21,14 +21,13 @@ use clap::{Parser, ValueEnum};
 use common_catalog::consts::DEFAULT_SCHEMA_NAME;
 use common_error::ext::BoxedError;
 use common_telemetry::{error, info, warn};
-use snafu::{OptionExt, ResultExt, ensure};
+use snafu::{OptionExt, ResultExt};
 use tokio::sync::Semaphore;
 use tokio::time::Instant;

-use crate::data::{COPY_PATH_PLACEHOLDER, default_database};
-use crate::database::{DatabaseClient, parse_proxy_opts};
-use crate::error::{Error, FileIoSnafu, InvalidArgumentsSnafu, Result, SchemaNotFoundSnafu};
-use crate::{Tool, database};
+use crate::database::{parse_proxy_opts, DatabaseClient};
+use crate::error::{Error, FileIoSnafu, Result, SchemaNotFoundSnafu};
+use crate::{database, Tool};

 #[derive(Debug, Default, Clone, ValueEnum)]
 enum ImportTarget {
@@ -53,7 +52,7 @@ pub struct ImportCommand {
    input_dir: String,

    /// The name of the catalog to import.
-    #[clap(long, default_value_t = default_database())]
+    #[clap(long, default_value = "greptime-*")]
    database: String,

    /// Parallelism of the import.
@@ -148,15 +147,12 @@ impl Import {
                let _permit = semaphore_moved.acquire().await.unwrap();
                let database_input_dir = self.catalog_path().join(&schema);
                let sql_file = database_input_dir.join(filename);
-                let mut sql = tokio::fs::read_to_string(sql_file)
+                let sql = tokio::fs::read_to_string(sql_file)
                    .await
                    .context(FileIoSnafu)?;
-                if sql.trim().is_empty() {
+                if sql.is_empty() {
                    info!("Empty `{filename}` {database_input_dir:?}");
                } else {
-                    if filename == "copy_from.sql" {
-                        sql = self.rewrite_copy_database_sql(&schema, &sql)?;
-                    }
                    let db = exec_db.unwrap_or(&schema);
                    self.database_client.sql(&sql, db).await?;
                    info!("Imported `{filename}` for database {schema}");
@@ -229,57 +225,6 @@ impl Import {
        }
        Ok(db_names)
    }
-
-    fn rewrite_copy_database_sql(&self, schema: &str, sql: &str) -> Result<String> {
-        let target_location = self.build_copy_database_location(schema);
-        let escaped_location = target_location.replace('\'', "''");
-
-        let mut first_stmt_checked = false;
-        for line in sql.lines() {
-            let trimmed = line.trim_start();
-            if trimmed.is_empty() || trimmed.starts_with("--") {
-                continue;
-            }
-
-            ensure!(
-                trimmed.starts_with("COPY DATABASE"),
-                InvalidArgumentsSnafu {
-                    msg: "Expected COPY DATABASE statement at start of copy_from.sql"
-                }
-            );
-            first_stmt_checked = true;
-            break;
-        }
-
-        ensure!(
-            first_stmt_checked,
-            InvalidArgumentsSnafu {
-                msg: "COPY DATABASE statement not found in copy_from.sql"
-            }
-        );
-
-        ensure!(
-            sql.contains(COPY_PATH_PLACEHOLDER),
-            InvalidArgumentsSnafu {
-                msg: format!(
-                    "Placeholder `{}` not found in COPY DATABASE statement",
-                    COPY_PATH_PLACEHOLDER
-                )
-            }
-        );
-
-        Ok(sql.replacen(COPY_PATH_PLACEHOLDER, &escaped_location, 1))
-    }
-
-    fn build_copy_database_location(&self, schema: &str) -> String {
-        let mut path = self.catalog_path();
-        path.push(schema);
-        let mut path_str = path.to_string_lossy().into_owned();
-        if !path_str.ends_with('/') {
-            path_str.push('/');
-        }
-        path_str
-    }
 }

 #[async_trait]
@@ -295,52 +240,3 @@ impl Tool for Import {
        }
    }
 }
-
-#[cfg(test)]
-mod tests {
-    use std::time::Duration;
-
-    use super::*;
-
-    fn build_import(input_dir: &str) -> Import {
-        Import {
-            catalog: "catalog".to_string(),
-            schema: None,
-            database_client: DatabaseClient::new(
-                "127.0.0.1:4000".to_string(),
-                "catalog".to_string(),
-                None,
-                Duration::from_secs(0),
-                None,
-            ),
-            input_dir: input_dir.to_string(),
-            parallelism: 1,
-            target: ImportTarget::Data,
-        }
-    }
-
-    #[test]
-    fn rewrite_copy_database_sql_replaces_placeholder() {
-        let import = build_import("/tmp/export-path");
-        let comment = "-- COPY DATABASE \"catalog\".\"schema\" FROM 's3://bucket/demo/' WITH (format = 'parquet') CONNECTION (region = 'us-west-2')";
-        let sql = format!(
-            "{comment}\nCOPY DATABASE \"catalog\".\"schema\" FROM '{}' WITH (format = 'parquet');",
-            COPY_PATH_PLACEHOLDER
-        );
-
-        let rewritten = import.rewrite_copy_database_sql("schema", &sql).unwrap();
-        let expected_location = import.build_copy_database_location("schema");
-        let escaped = expected_location.replace('\'', "''");
-
-        assert!(rewritten.starts_with(comment));
-        assert!(rewritten.contains(&format!("FROM '{escaped}'")));
-        assert!(!rewritten.contains(COPY_PATH_PLACEHOLDER));
-    }
-
-    #[test]
-    fn rewrite_copy_database_sql_requires_placeholder() {
-        let import = build_import("/tmp/export-path");
-        let sql = "COPY DATABASE \"catalog\".\"schema\" FROM '/tmp/export-path/catalog/schema/' WITH (format = 'parquet');";
-        assert!(import.rewrite_copy_database_sql("schema", sql).is_err());
-    }
-}
--- a/src/cli/src/database.rs
+++ b/src/cli/src/database.rs
@@ -14,15 +14,15 @@

 use std::time::Duration;

-use base64::Engine;
 use base64::engine::general_purpose;
+use base64::Engine;
 use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
 use common_error::ext::BoxedError;
 use humantime::format_duration;
 use serde_json::Value;
-use servers::http::GreptimeQueryOutput;
 use servers::http::header::constants::GREPTIME_DB_HEADER_TIMEOUT;
 use servers::http::result::greptime_result_v1::GreptimedbV1Response;
+use servers::http::GreptimeQueryOutput;
 use snafu::ResultExt;

 use crate::error::{
--- a/src/cli/src/error.rs
+++ b/src/cli/src/error.rs
@@ -313,14 +313,6 @@ pub enum Error {
        location: Location,
        source: common_meta::error::Error,
    },
-
-    #[snafu(display("Failed to get current directory"))]
-    GetCurrentDir {
-        #[snafu(implicit)]
-        location: Location,
-        #[snafu(source)]
-        error: std::io::Error,
-    },
 }

 pub type Result<T> = std::result::Result<T, Error>;
@@ -370,9 +362,7 @@ impl ErrorExt for Error {

            Error::BuildRuntime { source, .. } => source.status_code(),

-            Error::CacheRequired { .. }
-            | Error::BuildCacheRegistry { .. }
-            | Error::GetCurrentDir { .. } => StatusCode::Internal,
+            Error::CacheRequired { .. } | Error::BuildCacheRegistry { .. } => StatusCode::Internal,
            Error::MetaClientInit { source, .. } => source.status_code(),
            Error::TableNotFound { .. } => StatusCode::TableNotFound,
            Error::SchemaNotFound { .. } => StatusCode::DatabaseNotFound,
--- a/src/cli/src/lib.rs
+++ b/src/cli/src/lib.rs
@@ -14,16 +14,13 @@

 #![allow(clippy::print_stdout)]
 mod bench;
-mod common;
 mod data;
 mod database;
 pub mod error;
 mod metadata;
-pub mod utils;

 use async_trait::async_trait;
 use clap::Parser;
-pub use common::{ObjectStoreConfig, StoreConfig};
 use common_error::ext::BoxedError;
 pub use database::DatabaseClient;
 use error::Result;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Weny Xu	4bb9ceb63b	chore: cherry pick patches to `release/v0.17.0` branch (#7024 ) * fix: print the output message of the error in admin fn macro (#6994) Signed-off-by: evenyag <realevenyag@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: make EXPIRE (keyword) parsing case-insensitive, when creating flow (#6997) fix: make EXPIRE keyword case-insensitive in CREATE FLOW parser Signed-off-by: Shyamnatesan <shyamnatesan21@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: promql range function has incorrect timestamps (#7006) * fix: promql range function has incorrect timestamps Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * simplify Signed-off-by: Ruihang Xia <waynestxia@gmail.com> --------- Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: incorrect timestamp resolution in information_schema.partitions table (#7004) * fix: incorrect timestamp resolution in information_schema.partitions table Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * use second for all fields in partitions table Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * update sqlness result Signed-off-by: Ruihang Xia <waynestxia@gmail.com> --------- Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: match promql column reference in case sensitive way (#7013) Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: group by expr not as column in step aggr (#7008) * fix: group by expr not as column Signed-off-by: discord9 <discord9@163.com> * test: dist analyzer date_bin Signed-off-by: discord9 <discord9@163.com> * ???fix wip Signed-off-by: discord9 <discord9@163.com> * fix: deduce using correct input fields Signed-off-by: discord9 <discord9@163.com> * refactor: clearer wrapper Signed-off-by: discord9 <discord9@163.com> * chore: update sqlness Signed-off-by: discord9 <discord9@163.com> * chore: per review Signed-off-by: discord9 <discord9@163.com> * chore: per review Signed-off-by: discord9 <discord9@163.com> * chore: rm todo Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com> * fix: skip placeholder when partition columns (#7020) Signed-off-by: discord9 <discord9@163.com> * chore: add function for getting started on metasrv (#7022) Signed-off-by: shuiyisong <xixing.sys@gmail.com> Signed-off-by: discord9 <discord9@163.com> * fix: not step when aggr have order by/filter (#7015) * fix: not applied Signed-off-by: discord9 <discord9@163.com> * chore: per review Signed-off-by: discord9 <discord9@163.com> * test: confirm order by not push down Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com> * feat: supports expression in TQL params (#7014) * feat: supports expression in TQL params Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: by cr comments Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: comment Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: by cr comments Signed-off-by: Dennis Zhuang <killme2008@gmail.com> --------- Signed-off-by: Dennis Zhuang <killme2008@gmail.com> Signed-off-by: discord9 <discord9@163.com> * feat: update dashboard to v0.11.6 (#7026) Co-authored-by: ZonaHex <ZonaHex@users.noreply.github.com> Signed-off-by: discord9 <discord9@163.com> * fix: step aggr merge phase not order nor filter (#6998) * fix: not order Signed-off-by: discord9 <discord9@163.com> * test: redacted Signed-off-by: discord9 <discord9@163.com> * feat: fix up state wrapper Signed-off-by: discord9 <discord9@163.com> * df last_value state not as promised! Signed-off-by: discord9 <discord9@163.com> * fix?: could fix better Signed-off-by: discord9 <discord9@163.com> * test: unstable result Signed-off-by: discord9 <discord9@163.com> * fix: work around by fixing state Signed-off-by: discord9 <discord9@163.com> * chore: after rebase fix Signed-off-by: discord9 <discord9@163.com> * chore: finish some todo Signed-off-by: discord9 <discord9@163.com> * chore: per copilot Signed-off-by: discord9 <discord9@163.com> * refactor: not fix but just notify mismatch Signed-off-by: discord9 <discord9@163.com> * chore: warn -> debug state mismatch Signed-off-by: discord9 <discord9@163.com> * chore: refine error msg Signed-off-by: discord9 <discord9@163.com> * test: sqlness add last_value date_bin test Signed-off-by: discord9 <discord9@163.com> * ?: substrait order by decode failure Signed-off-by: discord9 <discord9@163.com> * unit test reproduce that Signed-off-by: discord9 <discord9@163.com> * feat: support state wrapper's order serde in substrait Signed-off-by: discord9 <discord9@163.com> * refactor: stuff Signed-off-by: discord9 <discord9@163.com> * test: standalone/distributed different exec Signed-off-by: discord9 <discord9@163.com> * fmt Signed-off-by: discord9 <discord9@163.com> * chore: per review Signed-off-by: discord9 <discord9@163.com> * refactor: closure Signed-off-by: discord9 <discord9@163.com> * test: first value order by Signed-off-by: discord9 <discord9@163.com> * refactor: per cr Signed-off-by: discord9 <discord9@163.com> * feat: ScanHint last_value last row selector Signed-off-by: discord9 <discord9@163.com> * docs: per cr Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com> * chore: bump version to 0.17.2 Signed-off-by: WenyXu <wenymedia@gmail.com> Signed-off-by: discord9 <discord9@163.com> * chore: not warning Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: evenyag <realevenyag@gmail.com> Signed-off-by: discord9 <discord9@163.com> Signed-off-by: Shyamnatesan <shyamnatesan21@gmail.com> Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: shuiyisong <xixing.sys@gmail.com> Signed-off-by: Dennis Zhuang <killme2008@gmail.com> Signed-off-by: WenyXu <wenymedia@gmail.com> Co-authored-by: Yingwen <realevenyag@gmail.com> Co-authored-by: shyam <43544082+Shyamnatesan@users.noreply.github.com> Co-authored-by: Ruihang Xia <waynestxia@gmail.com> Co-authored-by: discord9 <55937128+discord9@users.noreply.github.com> Co-authored-by: shuiyisong <113876041+shuiyisong@users.noreply.github.com> Co-authored-by: dennis zhuang <killme2008@gmail.com> Co-authored-by: ZonaHe <zonahe@qq.com> Co-authored-by: ZonaHex <ZonaHex@users.noreply.github.com> Co-authored-by: discord9 <discord9@163.com>	2025-09-28 16:21:06 +08:00
WenyXu	38456638f8	chore: bump version to 0.17.1 Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-17 16:42:28 +08:00
Yingwen	97c0b1f5c1	chore: reduce SeriesScan sender timeout (#6983 ) Signed-off-by: evenyag <realevenyag@gmail.com>	2025-09-17 16:42:28 +08:00
shuiyisong	4fc7f12360	fix: OTel metrics naming wiht Prometheus style (#6982 ) * fix: otel metrics naming Signed-off-by: shuiyisong <xixing.sys@gmail.com> * fix: otel metrics naming & add some tests Signed-off-by: shuiyisong <xixing.sys@gmail.com> --------- Signed-off-by: shuiyisong <xixing.sys@gmail.com>	2025-09-17 16:42:28 +08:00
dennis zhuang	ed17997449	test: migrate join tests from duckdb, part3 (#6881 ) * test: migrate join tests Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: update test results after rebasing main branch Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: unstable query sort results and natural_join test Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: count() with joining Signed-off-by: Dennis Zhuang <killme2008@gmail.com> fix: unstable query sort results and style Signed-off-by: Dennis Zhuang <killme2008@gmail.com> --------- Signed-off-by: Dennis Zhuang <killme2008@gmail.com>	2025-09-17 16:42:28 +08:00
Lei, HUANG	849ae8ebb6	fix: avoid truncating SST statistics during flush (#6977 ) fix/disable-parquet-stats-truncate: - Update `memcomparable` Dependency: Switched from crates.io to a Git repository for `memcomparable` in `Cargo.lock`, `mito-codec/Cargo.toml`, and removed it from `mito2/Cargo.toml`. - Enhance Parquet Writer Properties: Added `set_statistics_truncate_length` and `set_column_index_truncate_length` to `WriterProperties` in `parquet.rs`, `bulk/part.rs`, `partition_tree/data.rs`, and `writer.rs`. - Add Test for Corrupt Scan: Introduced a new test module `scan_corrupt.rs` in `mito2/src/engine` to verify handling of corrupt data. - Update Test Data: Modified test data in `flush.rs` to reflect changes in file sizes and sequences. Signed-off-by: Lei, HUANG <mrsatangel@gmail.com>	2025-09-17 16:42:28 +08:00
Zhenchi	a0587e2e87	fix: clean intm ignore notfound (#6971 ) * fix: clean intm ignore notfound Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> * address comments Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> --------- Signed-off-by: Zhenchi <zhongzc_arch@outlook.com>	2025-09-17 16:42:28 +08:00
discord9	1ed71169ac	feat: support `SubqueryAlias` pushdown (#6963 ) * wip enforce dist requirement rewriter Signed-off-by: discord9 <discord9@163.com> * feat: enforce dist req Signed-off-by: discord9 <discord9@163.com> * test: sqlness result Signed-off-by: discord9 <discord9@163.com> * fix: double projection Signed-off-by: discord9 <discord9@163.com> * test: fix sqlness Signed-off-by: discord9 <discord9@163.com> * refactor: per review Signed-off-by: discord9 <discord9@163.com> * docs: use btree map Signed-off-by: discord9 <discord9@163.com> * test: sqlness explain&comment Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com>	2025-09-17 16:42:28 +08:00
shuiyisong	e62f0e2b64	fix: deadlock in dashmap (#6978 ) * fix: deadlock in dashmap Signed-off-by: shuiyisong <xixing.sys@gmail.com> * Update src/frontend/src/instance.rs Co-authored-by: Yingwen <realevenyag@gmail.com> * chore: extract fast cache check and add test Signed-off-by: shuiyisong <xixing.sys@gmail.com> --------- Signed-off-by: shuiyisong <xixing.sys@gmail.com> Co-authored-by: Yingwen <realevenyag@gmail.com>	2025-09-17 16:42:28 +08:00
Weny Xu	f92e753a34	feat: add postgres tls support for CLI (#6941 ) * feat: add postgres tls support for cli Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: apply suggestions Signed-off-by: WenyXu <wenymedia@gmail.com> --------- Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-17 16:42:28 +08:00
Ruihang Xia	a22b016f90	feat: skip compaction on large file on append only mode (#6838 ) * feat: skip compaction on large file on append only mode Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * log ignored files Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * format Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * only ignore level 1 files Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * early exit Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix typo Signed-off-by: Ruihang Xia <waynestxia@gmail.com> --------- Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2025-09-17 16:42:28 +08:00
shuiyisong	7a9fa99069	fix: shorten lock time (#6968 )	2025-09-17 16:42:28 +08:00
ZonaHe	d808e7be7e	feat: update dashboard to v0.11.4 (#6956 ) Co-authored-by: sunchanglong <sunchanglong@users.noreply.github.com>	2025-09-17 16:42:28 +08:00
fys	8e22fcfd5c	fix: correct jemalloc metrics (#6959 ) The allocated and resident metrics were swapped in the set calls. This commit fixes the issue by ensuring each metric receives its corresponding value.	2025-09-17 16:42:28 +08:00
zyy17	26729c31a6	fix: use `pull_request_target` to fix add labels 403 error (#6958 ) Signed-off-by: zyy17 <zyylsxm@gmail.com>	2025-09-17 16:42:28 +08:00
discord9	b73617eaba	feat(query): better alias tracker (#6909 ) * better resolve Signed-off-by: discord9 <discord9@163.com> feat: layered alias tracker Signed-off-by: discord9 <discord9@163.com> refactor Signed-off-by: discord9 <discord9@163.com> docs: expalin for no offset by one Signed-off-by: discord9 <discord9@163.com> test: more Signed-off-by: discord9 <discord9@163.com> simpify api Signed-off-by: discord9 <discord9@163.com> wip Signed-off-by: discord9 <discord9@163.com> fix: filter non-exist columns Signed-off-by: discord9 <discord9@163.com> feat: stuff Signed-off-by: discord9 <discord9@163.com> feat: cache partition columns Signed-off-by: discord9 <discord9@163.com> refactor: rm unused fn Signed-off-by: discord9 <discord9@163.com> no need res Signed-off-by: discord9 <discord9@163.com> chore: rm unwrap&docs update Signed-off-by: discord9 <discord9@163.com> * chore: after rebase fix Signed-off-by: discord9 <discord9@163.com> * refactor: per review Signed-off-by: discord9 <discord9@163.com> * fix: unsupport part Signed-off-by: discord9 <discord9@163.com> * err msg Signed-off-by: discord9 <discord9@163.com> * fix: pass correct partition cols Signed-off-by: discord9 <discord9@163.com> * fix? use column name only Signed-off-by: discord9 <discord9@163.com> * fix: merge scan has partition columns no alias/no partition diff Signed-off-by: discord9 <discord9@163.com> * refactor: loop instead of recursive Signed-off-by: discord9 <discord9@163.com> * refactor: per review Signed-off-by: discord9 <discord9@163.com> * feat: overlaps Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com>	2025-09-17 16:42:28 +08:00
discord9	3b909f63e3	fix: count(1) instead of count(ts) when >1 inputs (#6952 ) Signed-off-by: discord9 <discord9@163.com>	2025-09-17 16:42:28 +08:00
dennis zhuang	0d4e07eddd	fix: unstable query sort results (#6944 ) Signed-off-by: Dennis Zhuang <killme2008@gmail.com>	2025-09-17 16:42:28 +08:00
dennis zhuang	b94ce9019d	test: migrate duckdb tests, part 1 (#6870 ) * test: migrate duckdb tests Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: style Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * test: add more duckdb tests Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: stable order Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: simplfy comments Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * chore: remove tests/cases/standalone/common/DUCKDB_MIGRATION_GUIDE.md * fix: incorrect_sql.sql Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: integer flow test Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: integer flow test Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * docs: add todo Signed-off-by: Dennis Zhuang <killme2008@gmail.com> --------- Signed-off-by: Dennis Zhuang <killme2008@gmail.com>	2025-09-17 16:42:28 +08:00
Cason Kervis	3dcd40c4ba	fix(path): fix program lookup failure on Windows CI (#6946 ) * fix(path): fix program lookup failure on Windows CI Signed-off-by: Cason Kervis <cscnk52@outlook.com> * fix(path): fix program exec name Signed-off-by: Cason Kervis <cscnk52@outlook.com> * fix(path): using absolute path Signed-off-by: Cason Kervis <cscnk52@outlook.com> * style: using fmt Signed-off-by: Cason Kervis <cscnk52@outlook.com> --------- Signed-off-by: Cason Kervis <cscnk52@outlook.com>	2025-09-17 16:42:28 +08:00
Ruihang Xia	a67803d0e9	fix: handle hash distribution properly (#6943 ) * fix: handle hash distribution properly Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * fix clippy Signed-off-by: Ruihang Xia <waynestxia@gmail.com> * Update src/query/src/optimizer/pass_distribution.rs Co-authored-by: dennis zhuang <killme2008@gmail.com> --------- Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Co-authored-by: dennis zhuang <killme2008@gmail.com>	2025-09-17 16:42:28 +08:00
Ruihang Xia	aa7e7942f8	fix: wrap tql cte in a subquery alias (#6910 ) Signed-off-by: Ruihang Xia <waynestxia@gmail.com>	2025-09-17 16:42:28 +08:00
dennis zhuang	f1b7581dc3	test: adds approx_percentile_cont to range query test (#6903 ) Signed-off-by: Dennis Zhuang <killme2008@gmail.com>	2025-09-17 16:42:28 +08:00
dennis zhuang	cd761df369	test: migrate duckdb tests part2, window functions (#6875 ) * test: migrate window tests Signed-off-by: Dennis Zhuang <killme2008@gmail.com> * fix: blank line at the end Signed-off-by: Dennis Zhuang <killme2008@gmail.com> --------- Signed-off-by: Dennis Zhuang <killme2008@gmail.com>	2025-09-17 16:42:28 +08:00
liyang	0cea6ae64d	fix: fix deploy greptimedb in sqlness-test (#6894 ) Signed-off-by: liyang <daviderli614@gmail.com>	2025-09-17 16:42:28 +08:00
Weny Xu	8bf772fb50	chore: disable stats persistence by default (#6900 ) * chore: disable stats persistence by default Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: apply suggestions Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: apply suggestions Signed-off-by: WenyXu <wenymedia@gmail.com> * fix: fix clippy Signed-off-by: WenyXu <wenymedia@gmail.com> --------- Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 21:25:54 +08:00
discord9	9c1240921d	feat: flow full aggr only trigger on new data (#6880 ) * fix: flow full aggr only trigger on new data Signed-off-by: discord9 <discord9@163.com> * chore: better debug msg Signed-off-by: discord9 <discord9@163.com> * refactor: per review Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com> Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 18:15:17 +08:00
Zhenchi	eb52129a91	fix: move prune_region_dir to region drop (#6891 ) * fix: move prune_region_dir to region drop Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> * address comments Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> --------- Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 15:50:43 +08:00
Weny Xu	a0a2b40cbe	fix: initialize remote WAL regions with correct flushed entry IDs (#6856 ) * fix: initialize remote WAL regions with correct flushed entry IDs Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: add logs Signed-off-by: WenyXu <wenymedia@gmail.com> * fix: correct latest offset Signed-off-by: WenyXu <wenymedia@gmail.com> * fix: update sqlness Signed-off-by: WenyXu <wenymedia@gmail.com> * feat: add replay checkpoint to catchup request Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: apply suggestions Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: logs Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: apply suggestions Signed-off-by: WenyXu <wenymedia@gmail.com> --------- Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 15:50:43 +08:00
Weny Xu	067c4458d6	chore: fix typo (#6887 ) Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 15:50:43 +08:00
Ruihang Xia	4e9c31bf5c	chore: fix typo (#6885 ) Signed-off-by: Ruihang Xia <waynestxia@gmail.com> Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 15:50:43 +08:00
Weny Xu	9320a6ddaa	chore: update dashboard (#6883 ) * chore: update dashboard Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: update json Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: update json Signed-off-by: WenyXu <wenymedia@gmail.com> * chore: add desc Signed-off-by: WenyXu <wenymedia@gmail.com> --------- Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 15:50:43 +08:00
Zhenchi	4c9fcb7dee	fix: prune intermediate dirs on index finish and region pruge (#6878 ) * fix: prune intermediate dirs on index finish and region pruge Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> * address comments Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> --------- Signed-off-by: Zhenchi <zhongzc_arch@outlook.com> Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 15:50:43 +08:00
Weny Xu	9dc16772fe	fix: ignore reserved column IDs and prevent panic on chunk_size is zero (#6882 ) Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 15:50:43 +08:00
discord9	6ee91f6af4	fix(flow): promql auto create table (#6867 ) * fix: non aggr prom ql auto create table Signed-off-by: discord9 <discord9@163.com> * feat: val column use any name Signed-off-by: discord9 <discord9@163.com> * feat: check if it's tql src table Signed-off-by: discord9 <discord9@163.com> * test: check sink table is tql-able Signed-off-by: discord9 <discord9@163.com> * test: sqlness redacted Signed-off-by: discord9 <discord9@163.com> * fix: sql also handle no aggr case Signed-off-by: discord9 <discord9@163.com> --------- Signed-off-by: discord9 <discord9@163.com> Signed-off-by: WenyXu <wenymedia@gmail.com>	2025-09-03 15:50:43 +08:00