@oneuptime/common 11.3.2 → 11.3.3

package/UI/Components/Pagination/Pagination.tsx

@@ -133,116 +133,81 @@ const Pagination: FunctionComponent<ComponentProps> = (
             />
           </div>
 
-          <ul className="py-3" role="list">
-            <li
-              role="button"
-              tabIndex={isPreviousDisabled ? -1 : 0}
-              aria-disabled={isPreviousDisabled}
-              aria-label="Go to previous page"
-              onClick={() => {
-                let currentPageNumber: number = props.currentPageNumber;
-
-                if (typeof currentPageNumber === "string") {
-                  currentPageNumber = parseInt(currentPageNumber);
-                }
-
-                if (props.onNavigateToPage && !isPreviousDisabled) {
-                  props.onNavigateToPage(
-                    currentPageNumber - 1,
-                    props.itemsOnPage,
-                  );
-                }
-              }}
-              onKeyDown={(e: React.KeyboardEvent) => {
-                if (
-                  (e.key === "Enter" || e.key === " ") &&
-                  !isPreviousDisabled
-                ) {
-                  e.preventDefault();
+          <ul className="flex py-3" role="list">
+            <li className="flex">
+              <button
+                type="button"
+                disabled={isPreviousDisabled}
+                aria-label="Go to previous page"
+                onClick={() => {
                   let currentPageNumber: number = props.currentPageNumber;
+
                   if (typeof currentPageNumber === "string") {
                     currentPageNumber = parseInt(currentPageNumber);
                   }
-                  if (props.onNavigateToPage) {
+
+                  if (props.onNavigateToPage && !isPreviousDisabled) {
                     props.onNavigateToPage(
                       currentPageNumber - 1,
                       props.itemsOnPage,
                     );
                   }
-                }
-              }}
-              className={` inline-flex items-center rounded-l-md border border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-500   ${
-                isPreviousDisabled
-                  ? "bg-gray-100"
-                  : "hover:bg-gray-50 cursor-pointer"
-              }`}
-            >
-              <span className="page-link">Previous</span>
+                }}
+                className={` inline-flex items-center rounded-l-md border border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-500 focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-indigo-500   ${
+                  isPreviousDisabled
+                    ? "bg-gray-100 cursor-not-allowed"
+                    : "hover:bg-gray-50 cursor-pointer"
+                }`}
+              >
+                <span className="page-link">Previous</span>
+              </button>
             </li>
-            <li
-              role="button"
-              tabIndex={isCurrentPageButtonDisabled ? -1 : 0}
-              aria-current="page"
-              aria-label={`Page ${props.currentPageNumber}, click to change page`}
-              data-testid="current-page-link"
-              className={` z-10 inline-flex items-center border border-x-0 border-gray-300 hover:bg-gray-50 px-4 py-2 text-sm font-medium text-text-600  cursor-pointer ${
-                isCurrentPageButtonDisabled ? "bg-gray-100" : ""
-              }`}
-              onClick={() => {
-                if (!isHasMoreMode) {
-                  setShowPaginationModel(true);
-                }
-              }}
-              onKeyDown={(e: React.KeyboardEvent) => {
-                if ((e.key === "Enter" || e.key === " ") && !isHasMoreMode) {
-                  e.preventDefault();
-                  setShowPaginationModel(true);
-                }
-              }}
-            >
-              <span>{props.currentPageNumber}</span>
+            <li className="flex">
+              <button
+                type="button"
+                disabled={isCurrentPageButtonDisabled}
+                aria-current="page"
+                aria-label={`Page ${props.currentPageNumber}, current page. Select to jump to another page.`}
+                data-testid="current-page-link"
+                className={` z-10 inline-flex items-center border border-x-0 border-gray-300 hover:bg-gray-50 px-4 py-2 text-sm font-medium text-text-600 cursor-pointer focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-indigo-500 ${
+                  isCurrentPageButtonDisabled ? "bg-gray-100" : ""
+                }`}
+                onClick={() => {
+                  if (!isHasMoreMode) {
+                    setShowPaginationModel(true);
+                  }
+                }}
+              >
+                <span>{props.currentPageNumber}</span>
+              </button>
             </li>
-            <li
-              role="button"
-              tabIndex={isNextDisabled ? -1 : 0}
-              aria-disabled={isNextDisabled}
-              aria-label="Go to next page"
-              onClick={() => {
-                let currentPageNumber: number = props.currentPageNumber;
-
-                if (typeof currentPageNumber === "string") {
-                  currentPageNumber = parseInt(currentPageNumber);
-                }
-
-                if (props.onNavigateToPage && !isNextDisabled) {
-                  props.onNavigateToPage(
-                    currentPageNumber + 1,
-                    props.itemsOnPage,
-                  );
-                }
-              }}
-              onKeyDown={(e: React.KeyboardEvent) => {
-                if ((e.key === "Enter" || e.key === " ") && !isNextDisabled) {
-                  e.preventDefault();
+            <li className="flex">
+              <button
+                type="button"
+                disabled={isNextDisabled}
+                aria-label="Go to next page"
+                onClick={() => {
                   let currentPageNumber: number = props.currentPageNumber;
+
                   if (typeof currentPageNumber === "string") {
                     currentPageNumber = parseInt(currentPageNumber);
                   }
-                  if (props.onNavigateToPage) {
+
+                  if (props.onNavigateToPage && !isNextDisabled) {
                     props.onNavigateToPage(
                       currentPageNumber + 1,
                       props.itemsOnPage,
                     );
                   }
-                }
-              }}
-              className={` inline-flex items-center rounded-r-md border border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-500  ${
-                isNextDisabled
-                  ? "bg-gray-100"
-                  : " hover:bg-gray-50 cursor-pointer"
-              }`}
-            >
-              <span>Next</span>
+                }}
+                className={` inline-flex items-center rounded-r-md border border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-500 focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-indigo-500  ${
+                  isNextDisabled
+                    ? "bg-gray-100 cursor-not-allowed"
+                    : " hover:bg-gray-50 cursor-pointer"
+                }`}
+              >
+                <span>Next</span>
+              </button>
             </li>
           </ul>
         </div>
@@ -265,116 +230,81 @@ const Pagination: FunctionComponent<ComponentProps> = (
 
       <div className="md:hidden">
         <div className="inline-flex -space-x-px rounded-md shadow-sm">
-          <ul role="list">
-            <li
-              role="button"
-              tabIndex={isPreviousDisabled ? -1 : 0}
-              aria-disabled={isPreviousDisabled}
-              aria-label="Go to previous page"
-              onClick={() => {
-                let currentPageNumber: number = props.currentPageNumber;
-
-                if (typeof currentPageNumber === "string") {
-                  currentPageNumber = parseInt(currentPageNumber);
-                }
-
-                if (props.onNavigateToPage && !isPreviousDisabled) {
-                  props.onNavigateToPage(
-                    currentPageNumber - 1,
-                    props.itemsOnPage,
-                  );
-                }
-              }}
-              onKeyDown={(e: React.KeyboardEvent) => {
-                if (
-                  (e.key === "Enter" || e.key === " ") &&
-                  !isPreviousDisabled
-                ) {
-                  e.preventDefault();
+          <ul className="flex" role="list">
+            <li className="flex">
+              <button
+                type="button"
+                disabled={isPreviousDisabled}
+                aria-label="Go to previous page"
+                onClick={() => {
                   let currentPageNumber: number = props.currentPageNumber;
+
                   if (typeof currentPageNumber === "string") {
                     currentPageNumber = parseInt(currentPageNumber);
                   }
-                  if (props.onNavigateToPage) {
+
+                  if (props.onNavigateToPage && !isPreviousDisabled) {
                     props.onNavigateToPage(
                       currentPageNumber - 1,
                       props.itemsOnPage,
                     );
                   }
-                }
-              }}
-              className={` inline-flex items-center rounded-l-md border border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-500   ${
-                isPreviousDisabled
-                  ? "bg-gray-100"
-                  : "hover:bg-gray-50 cursor-pointer"
-              }`}
-            >
-              <span className="page-link">Previous</span>
+                }}
+                className={` inline-flex items-center rounded-l-md border border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-500 focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-indigo-500   ${
+                  isPreviousDisabled
+                    ? "bg-gray-100 cursor-not-allowed"
+                    : "hover:bg-gray-50 cursor-pointer"
+                }`}
+              >
+                <span className="page-link">Previous</span>
+              </button>
             </li>
-            <li
-              role="button"
-              tabIndex={isCurrentPageButtonDisabled ? -1 : 0}
-              aria-current="page"
-              aria-label={`Page ${props.currentPageNumber}, click to change page`}
-              data-testid="current-page-link-mobile"
-              className={` z-10 inline-flex items-center border border-x-0 border-gray-300 hover:bg-gray-50 px-4 py-2 text-sm font-medium text-text-600  cursor-pointer ${
-                isCurrentPageButtonDisabled ? "bg-gray-100" : ""
-              }`}
-              onClick={() => {
-                if (!isHasMoreMode) {
-                  setShowPaginationModel(true);
-                }
-              }}
-              onKeyDown={(e: React.KeyboardEvent) => {
-                if ((e.key === "Enter" || e.key === " ") && !isHasMoreMode) {
-                  e.preventDefault();
-                  setShowPaginationModel(true);
-                }
-              }}
-            >
-              <span>{props.currentPageNumber}</span>
+            <li className="flex">
+              <button
+                type="button"
+                disabled={isCurrentPageButtonDisabled}
+                aria-current="page"
+                aria-label={`Page ${props.currentPageNumber}, current page. Select to jump to another page.`}
+                data-testid="current-page-link-mobile"
+                className={` z-10 inline-flex items-center border border-x-0 border-gray-300 hover:bg-gray-50 px-4 py-2 text-sm font-medium text-text-600 cursor-pointer focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-indigo-500 ${
+                  isCurrentPageButtonDisabled ? "bg-gray-100" : ""
+                }`}
+                onClick={() => {
+                  if (!isHasMoreMode) {
+                    setShowPaginationModel(true);
+                  }
+                }}
+              >
+                <span>{props.currentPageNumber}</span>
+              </button>
             </li>
-            <li
-              role="button"
-              tabIndex={isNextDisabled ? -1 : 0}
-              aria-disabled={isNextDisabled}
-              aria-label="Go to next page"
-              onClick={() => {
-                let currentPageNumber: number = props.currentPageNumber;
-
-                if (typeof currentPageNumber === "string") {
-                  currentPageNumber = parseInt(currentPageNumber);
-                }
-
-                if (props.onNavigateToPage && !isNextDisabled) {
-                  props.onNavigateToPage(
-                    currentPageNumber + 1,
-                    props.itemsOnPage,
-                  );
-                }
-              }}
-              onKeyDown={(e: React.KeyboardEvent) => {
-                if ((e.key === "Enter" || e.key === " ") && !isNextDisabled) {
-                  e.preventDefault();
+            <li className="flex">
+              <button
+                type="button"
+                disabled={isNextDisabled}
+                aria-label="Go to next page"
+                onClick={() => {
                   let currentPageNumber: number = props.currentPageNumber;
+
                   if (typeof currentPageNumber === "string") {
                     currentPageNumber = parseInt(currentPageNumber);
                   }
-                  if (props.onNavigateToPage) {
+
+                  if (props.onNavigateToPage && !isNextDisabled) {
                     props.onNavigateToPage(
                       currentPageNumber + 1,
                       props.itemsOnPage,
                     );
                   }
-                }
-              }}
-              className={` inline-flex items-center rounded-r-md border border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-500  ${
-                isNextDisabled
-                  ? "bg-gray-100"
-                  : " hover:bg-gray-50 cursor-pointer"
-              }`}
-            >
-              <span>Next</span>
+                }}
+                className={` inline-flex items-center rounded-r-md border border-gray-300 bg-white px-2 py-2 text-sm font-medium text-gray-500 focus:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-indigo-500  ${
+                  isNextDisabled
+                    ? "bg-gray-100 cursor-not-allowed"
+                    : " hover:bg-gray-50 cursor-pointer"
+                }`}
+              >
+                <span>Next</span>
+              </button>
             </li>
           </ul>
         </div>

package/build/dist/Server/Infrastructure/ClickhouseConfig.js

@@ -70,5 +70,22 @@ if (ShouldClickhouseSslEnable &&
 }
 export const dataSourceOptions = options;
 export const ingestDataSourceOptions = Object.assign(Object.assign({}, options), { max_open_connections: MaxClickhouseIngestConnections });
+/*
+ * Dedicated pool for schema sync + data migrations. The 58s request_timeout
+ * above is a socket *idle* timer (see the note on request_timeout) sized for
+ * dashboard reads sitting behind nginx's 60s proxy_read_timeout. Migrations
+ * do NOT go through nginx (the app connects straight to clickhouse:8123), and
+ * a single migration statement — an ON CLUSTER DDL, an MV / projection
+ * rebuild, or a type/codec-rewrite MODIFY COLUMN on a multi-billion-row
+ * telemetry table — can legitimately stream zero bytes for many minutes,
+ * which the 58s idle timer would destroy mid-flight ("Timeout error.") and
+ * crash the boot process. Give migrations a much higher idle ceiling. It is
+ * finite (not 0) on purpose: a genuinely dead connection / network black hole
+ * must still fail eventually rather than hang forever. Long statements should
+ * additionally carry send_progress_in_http_headers (see MigrationExecuteOptions
+ * in AnalyticsDatabaseService) so the socket stays non-idle, and a server-side
+ * SETTINGS max_execution_time so ClickHouse remains the authoritative cap.
+ */
+export const migrationDataSourceOptions = Object.assign(Object.assign({}, options), { request_timeout: 30 * 60 * 1000 });
 export const testDataSourceOptions = dataSourceOptions;
 //# sourceMappingURL=ClickhouseConfig.js.map

package/build/dist/Server/Infrastructure/ClickhouseConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClickhouseConfig.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/ClickhouseConfig.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACxB,8BAA8B,EAC9B,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAIhD,MAAM,YAAY,GAAW,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AAEtE,MAAM,cAAc,GAAa,cAAc,IAAI,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC9E,MAAM,cAAc,GAAW,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEnE,MAAM,OAAO,GAAkC;IAC7C,GAAG,EAAE,GAAG,YAAY,MAAM,cAAc,CAAC,QAAQ,EAAE,IAAI,cAAc,EAAE;IACvE,QAAQ,EAAE,kBAAkB;IAC5B,QAAQ,EAAE,kBAAkB;IAC5B,QAAQ,EAAE,kBAAkB;IAC5B,WAAW,EAAE,WAAW;IACxB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,eAAe,EAAE,KAAM;IACvB;;;;;OAKG;IACH,oBAAoB,EAAE,wBAAwB;IAC9C;;;;;;;;;;OAUG;IACH,WAAW,EAAE;QACX,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI;KACf;CACF,CAAC;AAEF,IAAI,yBAAyB,IAAI,eAAe,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,GAAG;QACZ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,IACE,yBAAyB;IACzB,eAAe;IACf,iBAAiB;IACjB,gBAAgB,EAChB,CAAC;IACD,OAAO,CAAC,GAAG,GAAG;QACZ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;QACrC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;QACpC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;KACnC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAkC,OAAO,CAAC;AAExE,MAAM,CAAC,MAAM,uBAAuB,mCAC/B,OAAO,KACV,oBAAoB,EAAE,8BAA8B,GACrD,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAChC,iBAAiB,CAAC"}
+{"version":3,"file":"ClickhouseConfig.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/ClickhouseConfig.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAClB,cAAc,EACd,kBAAkB,EAClB,cAAc,EACd,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,kBAAkB,EAClB,wBAAwB,EACxB,8BAA8B,EAC9B,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,QAAQ,MAAM,0BAA0B,CAAC;AAIhD,MAAM,YAAY,GAAW,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;AAEtE,MAAM,cAAc,GAAa,cAAc,IAAI,IAAI,QAAQ,CAAC,YAAY,CAAC,CAAC;AAC9E,MAAM,cAAc,GAAW,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;AAEnE,MAAM,OAAO,GAAkC;IAC7C,GAAG,EAAE,GAAG,YAAY,MAAM,cAAc,CAAC,QAAQ,EAAE,IAAI,cAAc,EAAE;IACvE,QAAQ,EAAE,kBAAkB;IAC5B,QAAQ,EAAE,kBAAkB;IAC5B,QAAQ,EAAE,kBAAkB;IAC5B,WAAW,EAAE,WAAW;IACxB;;;;;;;;;;;;;;;;;;;OAmBG;IACH,eAAe,EAAE,KAAM;IACvB;;;;;OAKG;IACH,oBAAoB,EAAE,wBAAwB;IAC9C;;;;;;;;;;OAUG;IACH,WAAW,EAAE;QACX,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI;KACf;CACF,CAAC;AAEF,IAAI,yBAAyB,IAAI,eAAe,EAAE,CAAC;IACjD,OAAO,CAAC,GAAG,GAAG;QACZ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,IACE,yBAAyB;IACzB,eAAe;IACf,iBAAiB;IACjB,gBAAgB,EAChB,CAAC;IACD,OAAO,CAAC,GAAG,GAAG;QACZ,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC;QACrC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC;QACpC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC;KACnC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAkC,OAAO,CAAC;AAExE,MAAM,CAAC,MAAM,uBAAuB,mCAC/B,OAAO,KACV,oBAAoB,EAAE,8BAA8B,GACrD,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,MAAM,CAAC,MAAM,0BAA0B,mCAClC,OAAO,KACV,eAAe,EAAE,EAAE,GAAG,EAAE,GAAG,IAAI,GAChC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAChC,iBAAiB,CAAC"}

package/build/dist/Server/Infrastructure/ClickhouseDatabase.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import logger from "../Utils/Logger";
-import { dataSourceOptions, ingestDataSourceOptions, testDataSourceOptions, } from "./ClickhouseConfig";
+import { dataSourceOptions, ingestDataSourceOptions, migrationDataSourceOptions, testDataSourceOptions, } from "./ClickhouseConfig";
 import { createClient } from "@clickhouse/client";
 import DatabaseNotConnectedException from "../../Types/Exception/DatabaseNotConnectedException";
 import Sleep from "../../Types/Sleep";
@@ -150,4 +150,13 @@ export const ClickhouseAppInstance = new ClickhouseDatabase(dataSourceOptions);
  * sockets when ingest is bursting.
  */
 export const ClickhouseIngestInstance = new ClickhouseDatabase(ingestDataSourceOptions);
+/*
+ * Separate pool for schema sync + data migrations. Identical to the App pool
+ * except for a much higher request_timeout (see migrationDataSourceOptions):
+ * the App pool's 58s socket-idle timer is correct for dashboard reads but
+ * would destroy a long-running migration DDL/mutation mid-flight and crash
+ * boot. Schema sync and migrations route through this instance via
+ * MigrationExecuteOptions (AnalyticsDatabaseService).
+ */
+export const ClickhouseMigrationInstance = new ClickhouseDatabase(migrationDataSourceOptions);
 //# sourceMappingURL=ClickhouseDatabase.js.map

package/build/dist/Server/Infrastructure/ClickhouseDatabase.js.map

@@ -1 +1 @@
-{"version":3,"file":"ClickhouseDatabase.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/ClickhouseDatabase.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAEL,iBAAiB,EACjB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAc,YAAY,EAAoB,MAAM,oBAAoB,CAAC;AAChF,OAAO,6BAA6B,MAAM,qDAAqD,CAAC;AAChG,OAAO,KAAK,MAAM,mBAAmB,CAAC;AACtC,OAAO,GAAG,MAAM,iBAAiB,CAAC;AAClC,OAAO,GAAG,MAAM,qBAAqB,CAAC;AACtC,OAAO,iBAAiB,MAAM,mCAAmC,CAAC;AAGlE,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,gBAAgB,EAAE,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAI/E,MAAqB,kBAAkB;IAYrC,YACE,UAAyC,iBAAiB;QAH3C,eAAU,GAAW,EAAE,kBAAkB,CAAC,eAAe,CAAC;QAKzE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,oBAAoB;QACzB,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAEM,wBAAwB;QAC7B,OAAO,qBAAqB,CAAC;IAC/B,CAAC;IAEM,aAAa;QAClB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAEM,WAAW;QAChB,OAAO,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAGY,AAAN,KAAK,CAAC,OAAO,CAClB,iBAAgD;QAEhD,IAAI,KAAK,GAAW,CAAC,CAAC;QAEtB,IAAI,CAAC;YAEH,MAAM,iBAAiB,GACrB,KAAK,IAA+B,EAAE;;gBACpC,IAAI,CAAC;oBACH,MAAM,eAAe,GAAqB,YAAY,iCACjD,iBAAiB,KACpB,QAAQ,EAAE,SAAS,IACnB,CAAC;oBACH,MAAM,eAAe,CAAC,IAAI,CAAC;wBACzB,KAAK,EAAE,iCAAiC,iBAAiB,CAAC,QAAQ,EAAE;qBACrE,CAAC,CAAC;oBAEH,MAAM,eAAe,CAAC,KAAK,EAAE,CAAC;oBAE9B,MAAM,gBAAgB,GACpB,YAAY,CAAC,iBAAiB,CAAC,CAAC;oBAClC,IAAI,CAAC,UAAU,GAAG,gBAAgB,CAAC;oBAEnC,MAAM,MAAM,GAAe,MAAM,gBAAgB,CAAC,IAAI,EAAE,CAAC;oBAEzD,IAAI,MAAM,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;wBAC7B,MAAM,IAAI,6BAA6B,CACrC,sCAAsC,CACvC,CAAC;oBACJ,CAAC;oBAED,MAAM,CAAC,KAAK,CACV,kCAAkC,MAAA,iBAAiB,CAAC,IAAI,0CAAE,QAAQ,EAAE,EAAE,CACvE,CAAC;oBAEF,OAAO,gBAAgB,CAAC;gBAC1B,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;wBACd,MAAM,CAAC,KAAK,CACV,2DAA2D,CAC5D,CAAC;wBACF,uBAAuB;wBAEvB,MAAM,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBAExB,KAAK,EAAE,CAAC;wBACR,OAAO,MAAM,iBAAiB,EAAE,CAAC;oBACnC,CAAC;oBACD,MAAM,GAAG,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC;YAEJ,MAAM,MAAM,GAAqB,MAAM,iBAAiB,EAAE,CAAC;YAE3D,0CAA0C;YAC1C,gBAAgB,CAAC,eAAe,CAC9B,sBAAsB,IAAI,CAAC,UAAU,EAAE,EACvC,gBAAgB,CAAC,UAAU,EAC3B,GAAG,EAAE;gBACH,OAAO,IAAI,CAAC,UAAU,EAAE,CAAC;YAC3B,CAAC,CACF,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;YACtD,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAGY,AAAN,KAAK,CAAC,UAAU;QACrB,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,MAAM,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAC9B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACzB,CAAC;IACH,CAAC;IAGY,AAAN,KAAK,CAAC,sBAAsB;QACjC,4DAA4D;QAC5D,IAAI,CAAC;YACH,MAAM,CAAC,KAAK,CACV,4DAA4D,CAC7D,CAAC;YAEF,MAAM,KAAK,GAAuB,IAAI,CAAC,oBAAoB,EAAE,CAAC,GAEjD,CAAC;YAEd,IAAI,CAAC,KAAK,EAAE,CAAC;gBACX,MAAM,IAAI,6BAA6B,CAAC,0BAA0B,CAAC,CAAC;YACtE,CAAC;YAED,MAAM,MAAM,GACV,MAAM,GAAG,CAAC,GAAG,CAAC;gBACZ,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;aACtC,CAAC,CAAC;YAEL,MAAM,CAAC,KAAK,CAAC,qCAAqC,CAAC,CAAC;YACpD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAErB,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,6BAA6B,CACrC,sCAAsC,CACvC,CAAC;YACJ,CAAC;YAED,IAAI,MAAM,YAAY,iBAAiB,EAAE,CAAC;gBACxC,MAAM,IAAI,6BAA6B,CACrC,sCAAsC,CACvC,CAAC;YACJ,CAAC;YAED,IACE,MAAM,CAAC,IAAI;gBACT,MAAM,CAAC,IAAmB,CAAC,MAAM,CAAY;gBAC7C,MAAM,CAAC,IAAmB,CAAC,MAAM,CAAY,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE;oBAC/D,KAAK,EACP,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,IAAI,6BAA6B,CACrC,sCAAsC,CACvC,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;YAC3C,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAClB,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;;AApKD;;;;GAIG;AACY,kCAAe,GAAW,CAAC,AAAZ,CAAa;eATxB,kBAAkB;AAmCxB;IADZ,WAAW,EAAE;;;;iDAuEb;AAGY;IADZ,WAAW,EAAE;;;;oDAMb;AAGY;IADZ,WAAW,EAAE;;;;gEAqDb;AAGH,MAAM,CAAC,MAAM,qBAAqB,GAAuB,IAAI,kBAAkB,CAC7E,iBAAiB,CAClB,CAAC;AAEF;;;;GAIG;AACH,MAAM,CAAC,MAAM,wBAAwB,GACnC,IAAI,kBAAkB,CAAC,uBAAuB,CAAC,CAAC"}
+{"version":3,"file":"ClickhouseDatabase.js","sourceRoot":"","sources":["../../../../Server/Infrastructure/ClickhouseDatabase.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/AnalyticsDatabaseService.js

@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import { WorkflowHostname } from "../EnvironmentConfig";
-import { ClickhouseAppInstance, ClickhouseIngestInstance, } from "../Infrastructure/ClickhouseDatabase";
+import { ClickhouseAppInstance, ClickhouseIngestInstance, ClickhouseMigrationInstance, } from "../Infrastructure/ClickhouseDatabase";
 import ClusterKeyAuthorization from "../Middleware/ClusterKeyAuthorization";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import ModelPermission from "../Types/AnalyticsDatabase/ModelPermission";
@@ -40,6 +40,29 @@ import Typeof from "../../Types/Typeof";
 import API from "../../Utils/API";
 import AggregationType from "../../Types/BaseDatabase/AggregationType";
 import ModelEventType from "../../Types/Realtime/ModelEventType";
+/**
+ * Standard options for every schema-sync / data-migration statement. Two
+ * layers of protection against the socket-idle `request_timeout` killing a
+ * long migration:
+ *   1. `useMigrationConnection` routes through ClickhouseMigrationInstance
+ *      (30-minute idle ceiling) — reliable even for pure-DDL / ON CLUSTER
+ *      coordination that streams no bytes at all.
+ *   2. `send_progress_in_http_headers` makes the server emit periodic
+ *      X-ClickHouse-Progress header lines for data-rewriting statements
+ *      (MODIFY COLUMN rewrites, MATERIALIZE, INSERT...SELECT), keeping the
+ *      socket non-idle so the request completes instead of timing out.
+ * Pass this as the second arg to `execute` / `executeQuery` from migration
+ * code. The schema-mutating helpers on this service default to it already.
+ */
+export const MigrationExecuteOptions = {
+    useMigrationConnection: true,
+    clickhouseSettings: {
+        send_progress_in_http_headers: 1,
+        // Emit a progress header every 10s — well under the App pool's 58s and the
+        // migration pool's 30-minute idle ceiling.
+        http_headers_progress_interval_ms: "10000",
+    },
+};
 const insertDedupContext = new AsyncLocalStorage();
 export function runWithInsertDedup(tokenBase, fn) {
     return insertDedupContext.run({ tokenBase, chunkIndexByTable: new Map() }, fn);
@@ -61,8 +84,15 @@ export default class AnalyticsDatabaseService extends BaseService {
         else {
             this.ingestDatabase = ClickhouseIngestInstance;
         }
+        /*
+         * Migrations route through their own pool (higher socket-idle timeout) via
+         * MigrationExecuteOptions. In tests `data.database` is the in-test instance,
+         * so reuse it there to keep tests on a single mocked client.
+         */
+        this.migrationDatabase = data.database || ClickhouseMigrationInstance;
         this.databaseClient = this.database.getDataSource();
         this.ingestDatabaseClient = this.ingestDatabase.getDataSource();
+        this.migrationDatabaseClient = this.migrationDatabase.getDataSource();
         this.statementGenerator = new StatementGenerator({
             modelType: this.modelType,
             database: this.database,
@@ -228,11 +258,14 @@ export default class AnalyticsDatabaseService extends BaseService {
     }
     async addColumnInDatabase(column) {
         const statement = this.statementGenerator.toAddColumnStatement(column);
-        await this.execute(statement);
+        // Schema-sync / migration-only path: route through the migration pool so a
+        // column add that backfills a DEFAULT/MATERIALIZED expression on a large
+        // table is not destroyed at the App pool's 58s socket-idle timeout.
+        await this.execute(statement, MigrationExecuteOptions);
         // Add skip index separately (ClickHouse requires ADD INDEX as a separate ALTER statement)
         const indexStatement = this.statementGenerator.toAddSkipIndexStatement(column);
         if (indexStatement) {
-            await this.execute(indexStatement);
+            await this.execute(indexStatement, MigrationExecuteOptions);
         }
     }
     async dropColumnInDatabase(columnName) {
@@ -244,9 +277,9 @@ export default class AnalyticsDatabaseService extends BaseService {
             return col.key === columnName;
         });
         if (column === null || column === void 0 ? void 0 : column.skipIndex) {
-            await this.execute(this.statementGenerator.toDropSkipIndexStatement(column.skipIndex.name));
+            await this.execute(this.statementGenerator.toDropSkipIndexStatement(column.skipIndex.name), MigrationExecuteOptions);
         }
-        await this.execute(this.statementGenerator.toDropColumnStatement(columnName));
+        await this.execute(this.statementGenerator.toDropColumnStatement(columnName), MigrationExecuteOptions);
     }
     async doesColumnExist(columnName) {
         // Columns live on the physical (local) storage table in cluster mode.
@@ -290,7 +323,7 @@ export default class AnalyticsDatabaseService extends BaseService {
             logger.info(`${tableName}.${data.columnName} already has ${data.expectedCodecValue}, skipping`, { tableName });
             return;
         }
-        await this.execute(`ALTER TABLE ${tableName} MODIFY COLUMN ${data.columnName} ${data.columnType} CODEC(${data.codec}) SETTINGS mutations_sync=0`);
+        await this.execute(`ALTER TABLE ${tableName} MODIFY COLUMN ${data.columnName} ${data.columnType} CODEC(${data.codec}) SETTINGS mutations_sync=0`, MigrationExecuteOptions);
         logger.info(`Applied ${data.codec} codec to ${tableName}.${data.columnName} (async)`, { tableName });
     }
     async findBy(findBy) {
@@ -892,9 +925,13 @@ export default class AnalyticsDatabaseService extends BaseService {
         this.databaseClient = this.database.getDataSource();
         this.ingestDatabase = ClickhouseIngestInstance;
         this.ingestDatabaseClient = this.ingestDatabase.getDataSource();
+        this.migrationDatabase = ClickhouseMigrationInstance;
+        this.migrationDatabaseClient = this.migrationDatabase.getDataSource();
     }
     async execute(statement, options) {
-        const client = this.getDatabaseClient();
+        const client = (options === null || options === void 0 ? void 0 : options.useMigrationConnection)
+            ? this.getMigrationClient()
+            : this.getDatabaseClient();
         const query = statement instanceof Statement ? statement.query : statement;
         const queryParams = statement instanceof Statement ? statement.query_params : undefined;
         return (await client.exec(Object.assign(Object.assign({ query: query, query_params: queryParams || undefined }, ((options === null || options === void 0 ? void 0 : options.clickhouseSettings)
@@ -902,7 +939,9 @@ export default class AnalyticsDatabaseService extends BaseService {
             : {})), ((options === null || options === void 0 ? void 0 : options.queryId) ? { query_id: options.queryId } : {}))));
     }
     async executeQuery(statement, options) {
-        const client = this.getDatabaseClient();
+        const client = (options === null || options === void 0 ? void 0 : options.useMigrationConnection)
+            ? this.getMigrationClient()
+            : this.getDatabaseClient();
         const query = statement instanceof Statement ? statement.query : statement;
         const queryParams = statement instanceof Statement ? statement.query_params : undefined;
         return await client.query(Object.assign(Object.assign({ query: query, format: "JSON", query_params: queryParams || undefined }, ((options === null || options === void 0 ? void 0 : options.clickhouseSettings)
@@ -937,6 +976,18 @@ export default class AnalyticsDatabaseService extends BaseService {
         }
         return this.ingestDatabaseClient;
     }
+    getMigrationClient() {
+        if (!this.migrationDatabase) {
+            this.useDefaultDatabase();
+        }
+        if (!this.migrationDatabaseClient && this.migrationDatabase) {
+            this.migrationDatabaseClient = this.migrationDatabase.getDataSource();
+        }
+        if (!this.migrationDatabaseClient) {
+            throw new Exception(ExceptionCode.DatabaseNotConnectedException, "ClickHouse migration client is not connected");
+        }
+        return this.migrationDatabaseClient;
+    }
     async onUpdateSuccess(onUpdate, _updatedItemIds) {
         // A place holder method used for overriding.
         return Promise.resolve(onUpdate);