Skip to content

Commit 5dd82b4

Browse files
glasstigerglasstiger
committed
Merge remote-tracking branch 'origin/main' into ia_oidc_device_flow
2 parents cea40a5 + 84da57d commit 5dd82b4

79 files changed

Lines changed: 8187 additions & 1619 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
9+
concurrency:
10+
group: ci-${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
defaults:
14+
run:
15+
shell: bash
16+
17+
jobs:
18+
# JDK 8 is the source of truth: the client ships as a Java 8 artifact
19+
# (io.questdb:questdb-client) and is released from JDK 8, so on JDK 8 it must
20+
# compile, the full test suite must pass against the committed native
21+
# libraries, and the javadoc jar must build (-P javadoc attaches it at the
22+
# package phase). The committed native .so/.dylib/.dll are enough -- the only
23+
# git submodule (zstd) is needed solely for C++ native rebuilds, not here.
24+
build-jdk8:
25+
name: Build, test & javadoc (JDK 8)
26+
runs-on: ubuntu-latest
27+
timeout-minutes: 45
28+
steps:
29+
- name: Check out
30+
uses: actions/checkout@v4
31+
32+
- name: Set up JDK 8
33+
uses: actions/setup-java@v4
34+
with:
35+
distribution: temurin
36+
java-version: "8"
37+
cache: maven
38+
39+
- name: Compile, test, and build javadoc
40+
run: mvn -B -ntp -P javadoc clean install
41+
42+
# The client is also consumed as a submodule of the main questdb repo, which
43+
# builds on JDK 25. Guard against JDK 25 compile breakage (main + test
44+
# sources, both modules) and confirm the javadoc jar builds on JDK 25 too
45+
# (-P javadoc attaches it at the package phase). Do NOT run the tests -- the
46+
# parent repo runs them against a real server.
47+
compile-jdk25:
48+
name: Compile & javadoc smoke (JDK 25)
49+
runs-on: ubuntu-latest
50+
timeout-minutes: 20
51+
steps:
52+
- name: Check out
53+
uses: actions/checkout@v4
54+
55+
- name: Set up JDK 25
56+
uses: actions/setup-java@v4
57+
with:
58+
distribution: temurin
59+
java-version: "25"
60+
cache: maven
61+
62+
- name: Compile (main + test) and build javadoc (no tests run)
63+
run: mvn -B -ntp -P javadoc -DskipTests clean package

‎CLAUDE.md‎

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,30 @@ Guidance for Claude Code when working with the QuestDB Java client
77

88
The standalone client repo for QuestDB ingestion (legacy ILP and QWP). It is
99
a Git submodule of the `questdb` repository and ships as the
10-
`io.questdb:questdb-client` Maven artifact. The module targets Java 11, so
11-
only legacy Java features are available here — no enhanced switch, no
12-
multiline strings, no pattern variables in `instanceof`.
10+
`io.questdb:questdb-client` Maven artifact.
11+
12+
**Dual JDK target — always aim at both.** The client ships as a Java 8
13+
artifact (JDK 8 is the source of truth: CI builds, tests, and releases on
14+
JDK 8) but must also compile cleanly on JDK 11+ (CI runs a JDK 25
15+
compile/javadoc smoke job). The right Maven profile (`java8` /
16+
`java11+`) auto-activates from the running JDK; a `src/main/java8` vs
17+
`src/main/java11` source root supplies the per-JDK shims. Practically this
18+
means **Java 8 is the language/API floor** — every change must build on
19+
both, so write to Java 8 and never introduce an API or syntax that only a
20+
newer JDK has.
21+
22+
Disallowed here (newer than Java 8), among others:
23+
- `var` local-variable type inference (10), enhanced `switch` (14),
24+
multiline text blocks (15), pattern variables in `instanceof` (16)
25+
- `List.of` / `List.copyOf` / `Map.of` and friends (9/10),
26+
`String.repeat` / `String.strip` / `String.isBlank` (11)
27+
- `ProcessHandle` (9), `Thread.onSpinWait` (9),
28+
the `Provider(String, String, String)` ctor (9 — use the Java 8
29+
`Provider(String, double, String)` overload)
30+
31+
When in doubt, check the API's `@since` and keep it `<= 1.8`. JDK
32+
9+-only behaviour belongs behind the `src/main/java11` shim with a Java 8
33+
counterpart in `src/main/java8`.
1334

1435
## Git & PR Conventions
1536

@@ -35,13 +56,18 @@ multiline strings, no pattern variables in `instanceof`.
3556

3657
## Build
3758

38-
Standard Maven build. Targets Java 11:
59+
Standard Maven build. Dual-target (Java 8 floor, Java 11+ also supported);
60+
the `java8` / `java11+` profile auto-activates from the JDK running Maven:
3961

4062
```bash
4163
mvn clean install -DskipTests # build + install to local Maven cache
4264
mvn -pl core test # run client unit tests
4365
```
4466

67+
Build on a JDK 8 to validate the shipping artifact (the source-of-truth
68+
target); also confirm it compiles on a modern JDK (11+) before merging, the
69+
same two fronts CI guards.
70+
4571
The parent `questdb` repo's `local-client` profile pulls this module as a
4672
sub-module so server changes can build against unpublished client code; if
4773
you change client code, install it (or pass `-P local-client` in the parent)

‎core/pom.xml‎

Lines changed: 78 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
<test.exclude>None</test.exclude>
3838
<test.include>%regex[.*[^o].class]</test.include><!-- exclude module-info.class-->
3939
<jmh.version>1.37</jmh.version>
40+
<!-- JDK-version-specific source root; overridden in the java8 profile -->
41+
<compat.src.dir>src/main/java11</compat.src.dir>
42+
<!-- logback 1.5.x needs Java 11; the java8 profile drops to the 1.3.x line -->
43+
<logback.version>1.5.25</logback.version>
4044
</properties>
4145

4246
<version>1.3.5-SNAPSHOT</version>
@@ -184,6 +188,27 @@
184188
</excludes>
185189
</configuration>
186190
</plugin>
191+
<!-- Adds the JDK-version-specific source root (src/main/java11 or src/main/java8)
192+
so the FDBigInteger bridge / module-access shim compiles on each JDK. -->
193+
<plugin>
194+
<groupId>org.codehaus.mojo</groupId>
195+
<artifactId>build-helper-maven-plugin</artifactId>
196+
<version>3.6.0</version>
197+
<executions>
198+
<execution>
199+
<id>add-compat-source</id>
200+
<phase>generate-sources</phase>
201+
<goals>
202+
<goal>add-source</goal>
203+
</goals>
204+
<configuration>
205+
<sources>
206+
<source>${compat.src.dir}</source>
207+
</sources>
208+
</configuration>
209+
</execution>
210+
</executions>
211+
</plugin>
187212
</plugins>
188213
</build>
189214

@@ -206,11 +231,11 @@
206231
</executions>
207232
<configuration>
208233
<doclint>none</doclint>
209-
<source>11</source>
234+
<source>${javac.compile.source}</source>
210235
<detectJavaApiLink>false</detectJavaApiLink>
211236
<additionalJOptions>
212-
<additionalJOption>${compilerArg1}</additionalJOption>
213-
<additionalJOption>${compilerArg2}</additionalJOption>
237+
<additionalJOption>${javadocJOption1}</additionalJOption>
238+
<additionalJOption>${javadocJOption2}</additionalJOption>
214239
</additionalJOptions>
215240
<sourceFileExcludes>
216241
<sourceFileExclude>${excludePattern1}</sourceFileExclude>
@@ -338,11 +363,11 @@
338363
</executions>
339364
<configuration>
340365
<doclint>none</doclint>
341-
<source>11</source>
366+
<source>${javac.compile.source}</source>
342367
<detectJavaApiLink>false</detectJavaApiLink>
343368
<additionalJOptions>
344-
<additionalJOption>${compilerArg1}</additionalJOption>
345-
<additionalJOption>${compilerArg2}</additionalJOption>
369+
<additionalJOption>${javadocJOption1}</additionalJOption>
370+
<additionalJOption>${javadocJOption2}</additionalJOption>
346371
</additionalJOptions>
347372
<sourceFileExcludes>
348373
<sourceFileExclude>${excludePattern1}</sourceFileExclude>
@@ -444,6 +469,11 @@
444469
<questdb.artifactid>questdb</questdb.artifactid>
445470
<compilerArg1>--add-exports</compilerArg1>
446471
<compilerArg2>java.base/jdk.internal.math=io.questdb.client</compilerArg2>
472+
<!-- javadoc needs the same module export to resolve jdk.internal.math.FDBigInteger
473+
referenced by the src/main/java11 FdBig bridge. Kept separate from the javac
474+
compilerArgs because javadoc and javac accept different option sets. -->
475+
<javadocJOption1>--add-exports</javadocJOption1>
476+
<javadocJOption2>java.base/jdk.internal.math=io.questdb.client</javadocJOption2>
447477
<excludePattern1>nothing-to-exclude-dummy-value-include-all-java11plus</excludePattern1>
448478
<excludeTestPattern1>nothing-to-exclude-dummy-value-include-all-java11plus</excludeTestPattern1>
449479
<javac.compile.source>${javac.target}</javac.compile.source>
@@ -466,6 +496,47 @@
466496
</dependency>
467497
</dependencies>
468498
</profile>
499+
<profile>
500+
<id>java8</id>
501+
<properties>
502+
<jdk.version>8</jdk.version>
503+
<java.enforce.version>[1.8,11)</java.enforce.version>
504+
<questdb.artifactid>questdb</questdb.artifactid>
505+
<!-- JDK8 javac rejects the add-exports flag; use a harmless no-op flag instead -->
506+
<compilerArg1>-Xlint:none</compilerArg1>
507+
<compilerArg2>-Xlint:none</compilerArg2>
508+
<!-- JDK8 javadoc rejects javac's -Xlint and needs no module export (the java8 FdBig
509+
bridge uses the open sun.misc.FDBigInteger). Pass a harmless no-op instead. -->
510+
<javadocJOption1>-quiet</javadocJOption1>
511+
<javadocJOption2>-quiet</javadocJOption2>
512+
<!-- module-info.java cannot be compiled on JDK8; exclude it from both the main
513+
(<excludes> = excludeTestPattern1) and test (<testExcludes> = excludePattern1)
514+
source sets. -->
515+
<excludePattern1>**/module-info.java</excludePattern1>
516+
<excludeTestPattern1>**/module-info.java</excludeTestPattern1>
517+
<compat.src.dir>src/main/java8</compat.src.dir>
518+
<javac.compile.source>1.8</javac.compile.source>
519+
<javac.compile.target>1.8</javac.compile.target>
520+
<!-- logback 1.5.x requires Java 11; the 1.3.x line is the Java 8 compatible branch -->
521+
<logback.version>1.3.15</logback.version>
522+
</properties>
523+
<activation>
524+
<jdk>1.8</jdk>
525+
</activation>
526+
<dependencies>
527+
<dependency>
528+
<groupId>org.jetbrains</groupId>
529+
<artifactId>annotations</artifactId>
530+
<version>17.0.0</version>
531+
<scope>provided</scope>
532+
</dependency>
533+
<dependency>
534+
<groupId>org.slf4j</groupId>
535+
<artifactId>slf4j-api</artifactId>
536+
<version>2.0.17</version>
537+
</dependency>
538+
</dependencies>
539+
</profile>
469540
</profiles>
470541

471542
<dependencies>
@@ -485,7 +556,7 @@
485556
<dependency>
486557
<groupId>ch.qos.logback</groupId>
487558
<artifactId>logback-classic</artifactId>
488-
<version>1.5.25</version>
559+
<version>${logback.version}</version>
489560
<scope>test</scope>
490561
</dependency>
491562
<dependency>

‎core/src/main/java/io/questdb/client/QuestDB.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,15 @@ static QuestDBBuilder builder() {
5959

6060
/**
6161
* Connects with a single configuration string used for both ingest and
62-
* egress. The schema must be {@code http}, {@code https}, {@code ws} or
63-
* {@code wss}; the other half of the deployment is derived by schema
64-
* translation ({@code http}&lt;-&gt;{@code ws}, {@code https}&lt;-&gt;{@code wss}).
62+
* egress. The schema must be {@code ws} or {@code wss}: QuestDB ingests and
63+
* queries over QWP (the QuestDB WebSocket protocol), so one string
64+
* configures both clients.
6565
* <p>
6666
* Use {@link #connect(CharSequence, CharSequence)} or {@link #builder()}
67-
* for ingest transports other than HTTP/HTTPS, or when ingest and egress
68-
* use different addresses.
67+
* when ingest and egress use different addresses or credentials.
6968
*
70-
* @param configurationString a Sender- or QwpQueryClient-style config
71-
* string (see {@link Sender#fromConfig} or
69+
* @param configurationString a {@code ws}/{@code wss} config string (see
70+
* {@link Sender#fromConfig} or
7271
* {@link io.questdb.client.cutlass.qwp.client.QwpQueryClient#fromConfig})
7372
* @return a connected QuestDB handle
7473
*/

0 commit comments

Comments
 (0)