fix(core): update
This commit is contained in:
parent
b8d929f4de
commit
ab4ed2602f
571
package-lock.json
generated
571
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -21,7 +21,7 @@
|
||||
"tslint-config-prettier": "^1.15.0"
|
||||
},
|
||||
"dependencies": {
|
||||
"clickhouse": "^2.4.4"
|
||||
"@depyronick/clickhouse-client": "^1.0.12"
|
||||
},
|
||||
"browserslist": [
|
||||
"last 1 chrome versions"
|
||||
|
41
test/test.ts
41
test/test.ts
@ -1,12 +1,12 @@
|
||||
import { expect, expectAsync, tap } from '@pushrocks/tapbundle';
|
||||
import * as smartclickhouse from '../ts/index';
|
||||
|
||||
let testClickhouseDb: smartclickhouse.ClickhouseDb;
|
||||
let testClickhouseDb: smartclickhouse.SmartClickHouseDb;
|
||||
|
||||
tap.test('first test', async () => {
|
||||
testClickhouseDb = new smartclickhouse.ClickhouseDb({
|
||||
url: 'http://localhost',
|
||||
port: 8123,
|
||||
testClickhouseDb = new smartclickhouse.SmartClickHouseDb({
|
||||
host: 'localhost',
|
||||
database: 'test2'
|
||||
});
|
||||
});
|
||||
|
||||
@ -14,32 +14,23 @@ tap.test('should start the clickhouse db', async () => {
|
||||
await testClickhouseDb.start();
|
||||
})
|
||||
|
||||
tap.test('should write something to the clickhouse db', async () => {
|
||||
const result = await testClickhouseDb.clickhouseClient.query(`CREATE DATABASE IF NOT EXISTS lossless`).toPromise();
|
||||
console.log(result);
|
||||
const result2 = await testClickhouseDb.clickhouseClient.query(`CREATE TABLE IF NOT EXISTS lossless.visits (
|
||||
tap.skip.test('should write something to the clickhouse db', async () => {
|
||||
const result2 = await testClickhouseDb.clickhouseClient.queryPromise(`CREATE TABLE IF NOT EXISTS visits2 (
|
||||
timestamp UInt64,
|
||||
ip String,
|
||||
os String,
|
||||
userAgent String,
|
||||
version String
|
||||
) ENGINE=MergeTree() ORDER BY timestamp`).toPromise();
|
||||
console.log(result2);
|
||||
const ws = testClickhouseDb.clickhouseClient.insert('INSERT INTO lossless.visits FORMAT JSONEachRow').stream();
|
||||
for(let i = 0; i <= 1000; i++) {
|
||||
await ws.writeRow(
|
||||
JSON.stringify({
|
||||
timestamp: Date.now(),
|
||||
ip: '127.0.01',
|
||||
os: 'Mac OS X',
|
||||
userAgent: 'some',
|
||||
version: 'someversion'
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
//wait stream finish
|
||||
const result3 = await ws.exec();
|
||||
) ENGINE=MergeTree() ORDER BY timestamp`);
|
||||
const result3 = await testClickhouseDb.clickhouseClient.insertPromise('visits2', [
|
||||
{
|
||||
timestamp: Date.now(),
|
||||
ip: '127.0.01',
|
||||
os: 'Mac OS X',
|
||||
userAgent: 'some',
|
||||
version: 'someversion'
|
||||
}
|
||||
]);
|
||||
})
|
||||
|
||||
tap.start();
|
||||
|
28
ts/index.ts
28
ts/index.ts
@ -1,26 +1,2 @@
|
||||
import * as plugins from './smartclickhouse.plugins';
|
||||
|
||||
export interface IClickhouseConstructorOptions {
|
||||
url: string;
|
||||
port?: number;
|
||||
}
|
||||
|
||||
export class ClickhouseDb {
|
||||
public options: IClickhouseConstructorOptions;
|
||||
public clickhouseClient: plugins.clickhouse.ClickHouse;
|
||||
|
||||
constructor(optionsArg: IClickhouseConstructorOptions) {
|
||||
this.options = optionsArg;
|
||||
}
|
||||
|
||||
/**
|
||||
* starts the connection to the Clickhouse db
|
||||
*/
|
||||
public start() {
|
||||
this.clickhouseClient = new plugins.clickhouse.ClickHouse({
|
||||
...this.options,
|
||||
basicAuth: null,
|
||||
format: 'json'
|
||||
});
|
||||
}
|
||||
}
|
||||
export * from './smartclickhouse.classes.smartclickhouse';
|
||||
export * from './smartclickhouse.classes.timedatatable';
|
||||
|
49
ts/smartclickhouse.classes.smartclickhouse.ts
Normal file
49
ts/smartclickhouse.classes.smartclickhouse.ts
Normal file
@ -0,0 +1,49 @@
|
||||
import * as plugins from './smartclickhouse.plugins';
|
||||
import { TimeDataTable } from './smartclickhouse.classes.timedatatable';
|
||||
|
||||
export interface IClickhouseConstructorOptions {
|
||||
host: string;
|
||||
database: string;
|
||||
password?: string;
|
||||
}
|
||||
|
||||
|
||||
|
||||
export class SmartClickHouseDb {
|
||||
public options: IClickhouseConstructorOptions;
|
||||
public clickhouseClient: plugins.clickhouse.ClickHouseClient;
|
||||
|
||||
constructor(optionsArg: IClickhouseConstructorOptions) {
|
||||
this.options = optionsArg;
|
||||
}
|
||||
|
||||
/**
|
||||
* starts the connection to the Clickhouse db
|
||||
*/
|
||||
public async start() {
|
||||
console.log(`Connecting to default database first.`)
|
||||
const defaultClient = new plugins.clickhouse.ClickHouseClient({
|
||||
...this.options,
|
||||
database: 'default'
|
||||
});
|
||||
console.log(`Create database ${this.options.database}, if it does not exist...`);
|
||||
await defaultClient.queryPromise(`CREATE DATABASE IF NOT EXISTS ${this.options.database}`);
|
||||
|
||||
console.log(`Ensured database. Now connecting to wanted database: ${this.options.database}`)
|
||||
this.clickhouseClient = new plugins.clickhouse.ClickHouseClient({
|
||||
...this.options,
|
||||
|
||||
});
|
||||
console.log(`trying to ping database...`);
|
||||
const result = await this.clickhouseClient.ping();
|
||||
console.log(`Ping successfull?: ${result}`);
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* gets a table
|
||||
*/
|
||||
public async getTable(tableName: string) {
|
||||
const newTable = TimeDataTable.getTable(this, tableName);
|
||||
}
|
||||
}
|
20
ts/smartclickhouse.classes.timedatatable.ts
Normal file
20
ts/smartclickhouse.classes.timedatatable.ts
Normal file
@ -0,0 +1,20 @@
|
||||
import * as plugins from './smartclickhouse.plugins';
|
||||
import { SmartClickHouseDb } from './smartclickhouse.classes.smartclickhouse';
|
||||
|
||||
export class TimeDataTable {
|
||||
public static async getTable(smartClickHouseDbRefArg: SmartClickHouseDb, tableNameArg: string) {
|
||||
const newTable = new TimeDataTable(smartClickHouseDbRefArg, tableNameArg);
|
||||
|
||||
// create table in clickhouse
|
||||
smartClickHouseDbRefArg;
|
||||
}
|
||||
|
||||
// INSTANCE
|
||||
public smartClickHouseDbRef: SmartClickHouseDb;
|
||||
public tableName: string;
|
||||
|
||||
constructor(smartClickHouseDbRefArg: SmartClickHouseDb,tableNameArg: string) {
|
||||
this.smartClickHouseDbRef = smartClickHouseDbRefArg;
|
||||
this.tableName = tableNameArg;
|
||||
}
|
||||
}
|
@ -1,4 +1,4 @@
|
||||
import * as clickhouse from 'clickhouse';
|
||||
import * as clickhouse from '@depyronick/clickhouse-client';
|
||||
|
||||
export {
|
||||
clickhouse
|
||||
|
Loading…
Reference in New Issue
Block a user