Skip to content

Commit be2eff5

Browse files
authored
25.11 HTTP stream errors handling (#478)
1 parent 850ae64 commit be2eff5

31 files changed

+567
-197
lines changed

.docker/clickhouse/single_node_tls/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM clickhouse/clickhouse-server:25.8-alpine
1+
FROM clickhouse/clickhouse-server:25.10-alpine
22
COPY .docker/clickhouse/single_node_tls/certificates /etc/clickhouse-server/certs
33
RUN chown clickhouse:clickhouse -R /etc/clickhouse-server/certs \
44
&& chmod 600 /etc/clickhouse-server/certs/* \

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ about: Create a report to help us improve
44
title: ''
55
labels: bug
66
assignees: ''
7-
87
---
98

109
<!-- delete unnecessary items -->
10+
1111
### Describe the bug
1212

1313
### Steps to reproduce
14+
1415
1.
1516
2.
1617
3.
@@ -22,13 +23,16 @@ assignees: ''
2223
### Error log
2324

2425
### Configuration
26+
2527
#### Environment
26-
* Client version:
27-
* Language version:
28-
* OS:
28+
29+
- Client version:
30+
- Language version:
31+
- OS:
2932

3033
#### ClickHouse server
31-
* ClickHouse Server version:
32-
* ClickHouse Server non-default settings, if any:
33-
* `CREATE TABLE` statements for tables involved:
34-
* Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
34+
35+
- ClickHouse Server version:
36+
- ClickHouse Server non-default settings, if any:
37+
- `CREATE TABLE` statements for tables involved:
38+
- Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary

.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ about: Suggest an idea for the client
44
title: ''
55
labels: enhancement
66
assignees: ''
7-
87
---
98

109
<!-- delete unnecessary items -->
10+
1111
### Use case
1212

1313
### Describe the solution you'd like

.github/pull_request_template.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
## Summary
2+
23
A short description of the changes with a link to an open issue.
34

45
## Checklist
6+
57
Delete items not relevant to your PR:
8+
69
- [ ] Unit and integration tests covering the common scenarios were added
710
- [ ] A human-readable description of the changes was provided to include in CHANGELOG
811
- [ ] For significant changes, documentation in https://github.com/ClickHouse/clickhouse-docs was updated with further explanations or tutorials

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
# 1.13.0
2+
3+
## New features
4+
5+
- Server-side exceptions that occur in the middle of the HTTP stream are now handled correctly. This requires [ClickHouse 25.11+](https://github.com/ClickHouse/ClickHouse/pull/88818). Previous ClickHouse versions are unaffected by this change. ([#478])
6+
7+
[#478]: https://github.com/ClickHouse/clickhouse-js/pull/478
8+
19
# 1.12.1
210

311
## Improvements

docker-compose.cluster.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: '2.3'
22

33
services:
44
clickhouse1:
5-
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-25.8-alpine}'
5+
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-25.10-alpine}'
66
ulimits:
77
nofile:
88
soft: 262144
@@ -21,7 +21,7 @@ services:
2121
- './.docker/clickhouse/users.xml:/etc/clickhouse-server/users.xml'
2222

2323
clickhouse2:
24-
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-25.8-alpine}'
24+
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-25.10-alpine}'
2525
ulimits:
2626
nofile:
2727
soft: 262144

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#version: '3.8'
22
services:
33
clickhouse:
4-
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-25.8-alpine}'
4+
image: 'clickhouse/clickhouse-server:${CLICKHOUSE_VERSION-25.10-alpine}'
55
container_name: 'clickhouse-js-clickhouse-server'
66
environment:
77
CLICKHOUSE_SKIP_USER_SETUP: 1

eslint.config.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,6 @@ export default defineConfig(
7979
},
8080
// Ignore build artifacts and externals
8181
{
82-
ignores: ['out', 'dist', 'node_modules', 'webpack'],
82+
ignores: ['coverage', 'out', 'dist', 'node_modules', 'webpack'],
8383
},
8484
)

karma.config.mjs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ export default function (config) {
3636
],
3737
},
3838
reporters: ['mocha'],
39+
mochaReporter: {
40+
output: 'minimal',
41+
ignoreSkipped: true,
42+
},
3943
port: 9876,
4044
colors: true,
4145
logLevel: config.LOG_INFO,

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
"lint": "eslint .",
2828
"lint:fix": "eslint --fix .",
2929
"test": ".scripts/jasmine.sh jasmine.all.json",
30-
"test:common:unit": ".scripts/jasmine.sh jasmine.common.unit.json",
30+
"test:common:unit": "CLICKHOUSE_TEST_SKIP_INIT=1 .scripts/jasmine.sh jasmine.common.unit.json",
3131
"test:common:integration": ".scripts/jasmine.sh jasmine.common.integration.json",
32-
"test:node:unit": ".scripts/jasmine.sh jasmine.node.unit.json",
32+
"test:node:unit": "CLICKHOUSE_TEST_SKIP_INIT=1 .scripts/jasmine.sh jasmine.node.unit.json",
3333
"test:node:tls": ".scripts/jasmine.sh jasmine.node.tls.json",
3434
"test:node:integration": ".scripts/jasmine.sh jasmine.node.integration.json",
3535
"test:node:integration:local_cluster": "CLICKHOUSE_TEST_ENVIRONMENT=local_cluster npm run test:node:integration",
@@ -42,7 +42,7 @@
4242
"prepare": "husky"
4343
},
4444
"devDependencies": {
45-
"@eslint/js": "^9.34.0",
45+
"@eslint/js": "^9.39.1",
4646
"@faker-js/faker": "^10.0.0",
4747
"@istanbuljs/nyc-config-typescript": "^1.0.2",
4848
"@types/jasmine": "^5.1.8",
@@ -52,7 +52,7 @@
5252
"@types/split2": "^4.2.3",
5353
"@types/uuid": "^11.0.0",
5454
"apache-arrow": "^21.0.0",
55-
"eslint": "^9.34.0",
55+
"eslint": "^9.39.1",
5656
"eslint-config-prettier": "^10.1.8",
5757
"eslint-plugin-expect-type": "^0.6.2",
5858
"eslint-plugin-prettier": "^5.5.4",
@@ -81,8 +81,8 @@
8181
"ts-node": "^10.9.2",
8282
"tsconfig-paths": "^4.2.0",
8383
"tsconfig-paths-webpack-plugin": "^4.2.0",
84-
"typescript": "^5.9.2",
85-
"typescript-eslint": "^8.43.0",
84+
"typescript": "^5.9.3",
85+
"typescript-eslint": "^8.46.4",
8686
"uuid": "^13.0.0",
8787
"webpack": "^5.101.1",
8888
"webpack-cli": "^6.0.1",

0 commit comments

Comments
 (0)