Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build break on 21.3 #737

Merged
merged 5 commits into from
Oct 8, 2021
Merged

Fix build break on 21.3 #737

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
aea7d4b
Fix maven build warnings
zhicwu Oct 7, 2021
f66139a
Remove groupId declaration for consistency
zhicwu Oct 7, 2021
77e67bc
Skip negative test of DateTime/DateTime32 on 21.3
zhicwu Oct 7, 2021
85c3bcf
Only compares year and major version
zhicwu Oct 7, 2021
7f505be
Skip failed cases in certain releases
zhicwu Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/benchmark.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ jobs:
continue-on-error: true
- name: Update version and group id
run: |
find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ github.event.inputs.version }}|g' \
find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ github.event.inputs.driver }}|g' \
-e 's|^\( <version>\).*\(</version>\)$|\1${{ github.event.inputs.driver }}\2|' \
-e 's|${parent.groupId}|com.clickhouse|g' '{}' \;
-e 's|${parent.groupId}|com.clickhouse|g' -e 's|${project.parent.groupId}|com.clickhouse|g' '{}' \;
find . -type f -name "log4j.*" -exec rm -fv '{}' \;
continue-on-error: true
- name: Install driver as needed
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: |
find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ github.event.inputs.version }}|g' \
-e 's|^\( <version>\).*\(</version>\)$|\1${{ github.event.inputs.version }}\2|' \
-e 's|${parent.groupId}|com.clickhouse|g' '{}' \;
-e 's|${parent.groupId}|com.clickhouse|g' -e 's|${project.parent.groupId}|com.clickhouse|g' '{}' \;
find . -type f -name "log4j.*" -exec rm -fv '{}' \;
- name: Release Maven package
uses: samuelmeuli/action-maven-publish@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/third_party_libs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
run: |
find . -type f -name "pom.xml" -exec sed -i -e 's|${revision}|${{ github.event.inputs.version }}|g' \
-e 's|^\( <version>\).*\(</version>\)$|\1${{ github.event.inputs.version }}\2|' \
-e 's|${parent.groupId}|com.clickhouse|g' '{}' \;
-e 's|${parent.groupId}|com.clickhouse|g' -e 's|${project.parent.groupId}|com.clickhouse|g' '{}' \;
find . -type f -name "log4j.*" -exec rm -fv '{}' \;
- name: Release Maven package
uses: samuelmeuli/action-maven-publish@v1
Expand Down
50 changes: 29 additions & 21 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,19 +162,22 @@ Java 8 or higher is required in order to use Java client and/or JDBC driver.

### Data Type

| Data Type(s) | Java Client | JDBC Driver | Remark |
| ------------------ | ----------- | -------------------------- | --------------------------------------------------------------------- |
| Date\* | Y | Y | |
| DateTime\* | Y | Y | |
| Decimal\* | Y | Y | `SET output_format_decimal_trailing_zeros=1` in 21.9+ for consistency |
| Enum\* | Y | Treated as integer |
| Int*, UInt* | Y | UInt64 is mapped to `long` |
| Geo Types | Y | N | |
| AggregatedFunction | N | N | Partially supported |
| Array | Y | N | |
| Map | Y | Y | |
| Nested | Y | N | |
| Tuple | Y | N | |
| Data Type(s) | Java Client | JDBC Driver | Remark |
| ------------------ | ----------- | ----------- | --------------------------------------------------------------------- |
| Date\* | Y | Y | |
| DateTime\* | Y | Y | |
| Decimal\* | Y | Y | `SET output_format_decimal_trailing_zeros=1` in 21.9+ for consistency |
| Enum\* | Y | Y | Treated as integer |
| Int*, UInt* | Y | Y | UInt64 is mapped to `long` |
| IPv\* | Y | Y | |
| Geo Types | Y | N | |
| \*String | Y | Y | |
| UUID | Y | Y | |
| AggregatedFunction | N | N | Partially supported |
| Array | Y | N | |
| Map | Y | Y | |
| Nested | Y | N | |
| Tuple | Y | N | |

### Server Version

Expand All @@ -196,11 +199,16 @@ By default, docker container will be created automatically during integration te

In the case you prefer to test against an existing server, please follow instructions below:

- make sure the server can be accessed using default account(`default` user without password), which has both DDL and DML privileges
- add below two configuration files to the existing server and expose all ports for external access
- [ports.xml](./tree/master/clickhouse-client/src/test/resources/containers/clickhouse-server/config.d/ports.xml) - enable all ports
- and [users.xml](./tree/master/clickhouse-client/src/test/resources/containers/clickhouse-server/users.d/users.xml) - accounts used for integration test
- put `test.properties` under either `test/resources` or `~/.m2/clickhouse` with content like below:
```properties
clickhouseServer=127.0.0.1
```
- make sure the server can be accessed using default account(`default` user without password), which has both DDL and DML privileges
- add below two configuration files to the existing server and expose all ports for external access
- [ports.xml](./tree/master/clickhouse-client/src/test/resources/containers/clickhouse-server/config.d/ports.xml) - enable all ports
- and [users.xml](./tree/master/clickhouse-client/src/test/resources/containers/clickhouse-server/users.d/users.xml) - accounts used for integration test
- put `test.properties` under either `~/.m2/clickhouse` or `src/test/resources` of your project, with content like below:
```properties
clickhouseServer=127.0.0.1
# below properties are only useful for test containers
#clickhouseVersion=latest
#clickhouseTimezone=UTC
#clickhouseImage=clickhouse/clickhouse-server
#additionalPackages=
```
2 changes: 0 additions & 2 deletions clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
Expand Down
Loading