push.rocks/smartclickhouse
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(TimeDataTable options): switch to better options

Browse Source
This commit is contained in:
Philipp Kunz 2022-03-14 20:00:03 +01:00
parent 51e76623f9
commit b67acc1b78
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ts/smartclickhouse.classes.timedatatable.ts
View File

@ -26,14 +26,22 @@ export interface IColumnInfo {
datetime_precision: '3'; datetime_precision: '3';
} }
export interface ITimeDataTableOptions {
tableName: string;
retainDataForDays: number;
}
export class TimeDataTable { export class TimeDataTable {
public static async getTable(smartClickHouseDbRefArg: SmartClickHouseDb, tableNameArg: string) { public static async getTable(smartClickHouseDbRefArg: SmartClickHouseDb, tableNameArg: string) {
const newTable = new TimeDataTable(smartClickHouseDbRefArg, tableNameArg); const newTable = new TimeDataTable(smartClickHouseDbRefArg, {
tableName: tableNameArg,
retainDataForDays: 30
});
// create table in clickhouse // create table in clickhouse
await smartClickHouseDbRefArg.clickhouseClient await smartClickHouseDbRefArg.clickhouseClient
.queryPromise(` .queryPromise(`
CREATE TABLE IF NOT EXISTS ${newTable.tableName} ( CREATE TABLE IF NOT EXISTS ${newTable.options.tableName} (
timestamp DateTime64(3, 'Europe/Berlin'), timestamp DateTime64(3, 'Europe/Berlin'),
message String message String
) ENGINE=MergeTree() ORDER BY timestamp`); ) ENGINE=MergeTree() ORDER BY timestamp`);
@ -41,13 +49,13 @@ export class TimeDataTable {
// lets adjust the TTL // lets adjust the TTL
await smartClickHouseDbRefArg.clickhouseClient await smartClickHouseDbRefArg.clickhouseClient
.queryPromise(` .queryPromise(`
ALTER TABLE ${newTable.tableName} MODIFY TTL toDateTime(timestamp) + INTERVAL 1 MONTH ALTER TABLE ${newTable.options.tableName} MODIFY TTL toDateTime(timestamp) + INTERVAL ${newTable.options.retainDataForDays} DAY
`); `);
await newTable.updateColumns(); await newTable.updateColumns();
console.log(`=======================`) console.log(`=======================`)
console.log( console.log(
`table with name "${newTable.tableName}" in databse ${newTable.smartClickHouseDbRef.options.database} has the following columns:` `table with name "${newTable.options.tableName}" in databse ${newTable.smartClickHouseDbRef.options.database} has the following columns:`
); );
for (const column of newTable.columns) { for (const column of newTable.columns) {
console.log(`>> ${column.name}: ${column.type}`); console.log(`>> ${column.name}: ${column.type}`);
@ -59,11 +67,11 @@ export class TimeDataTable {
// INSTANCE // INSTANCE
public smartClickHouseDbRef: SmartClickHouseDb; public smartClickHouseDbRef: SmartClickHouseDb;
public tableName: string; public options: ITimeDataTableOptions;
constructor(smartClickHouseDbRefArg: SmartClickHouseDb, tableNameArg: string) { constructor(smartClickHouseDbRefArg: SmartClickHouseDb, optionsArg: ITimeDataTableOptions) {
this.smartClickHouseDbRef = smartClickHouseDbRefArg; this.smartClickHouseDbRef = smartClickHouseDbRefArg;
this.tableName = tableNameArg; this.options = optionsArg;
} }
public columns: IColumnInfo[] = []; public columns: IColumnInfo[] = [];
@ -75,7 +83,7 @@ export class TimeDataTable {
this.columns = await this.smartClickHouseDbRef.clickhouseClient.queryPromise(` this.columns = await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
SELECT * FROM system.columns SELECT * FROM system.columns
WHERE database LIKE '${this.smartClickHouseDbRef.options.database}' WHERE database LIKE '${this.smartClickHouseDbRef.options.database}'
AND table LIKE '${this.tableName}' AND table LIKE '${this.options.tableName}'
`); `);
return this.columns; return this.columns;
} }
@ -120,7 +128,7 @@ export class TimeDataTable {
await checkPath(pathArg, typeArg, true); await checkPath(pathArg, typeArg, true);
return; return;
} }
const alterString = `ALTER TABLE ${this.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST` const alterString = `ALTER TABLE ${this.options.tableName} ADD COLUMN ${pathArg} ${typeArg} FIRST`
try { try {
await this.smartClickHouseDbRef.clickhouseClient.queryPromise(` await this.smartClickHouseDbRef.clickhouseClient.queryPromise(`
${alterString} ${alterString}
@ -154,7 +162,7 @@ export class TimeDataTable {
storageJson[key] = value; storageJson[key] = value;
} }
const result = await this.smartClickHouseDbRef.clickhouseClient.insertPromise(this.tableName, [ const result = await this.smartClickHouseDbRef.clickhouseClient.insertPromise(this.options.tableName, [
storageJson, storageJson,
]); ]);
return result; return result;