Skip to content

Commit

Permalink
Extract qst-type from qst (deephaven#5054)
Browse files Browse the repository at this point in the history
This extracts io.deephaven.qst.type from the qst package into a new qst-type package. This allows downstream consumers to more appropriately use just the type information.
  • Loading branch information
devinrsmith authored Jan 19, 2024
1 parent 1593f91 commit d0e8786
Show file tree
Hide file tree
Showing 44 changed files with 33 additions and 10 deletions.
1 change: 1 addition & 0 deletions engine/time/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies {
api project(':Base')
api project(':Util')

implementation project(':table-api')
implementation project(':engine-function')
implementation project(':Configuration')
implementation project(':log-factory')
Expand Down
2 changes: 0 additions & 2 deletions engine/updategraph/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ plugins {
description 'Engine Update Graph: Core utilities for maintaining a DAG for update processing'

dependencies {
api project(':qst')

implementation project(':engine-chunk')
implementation project(':hotspot')
implementation project(':log-factory')
Expand Down
2 changes: 1 addition & 1 deletion engine/vector/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ description 'Engine Vectors: Array-like data structures for in-place data access

dependencies {
api project(':Util')
api project(':qst')
api project(':qst-type')
api project(':engine-primitive')

implementation project(':Base')
Expand Down
2 changes: 1 addition & 1 deletion extensions/protobuf/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

dependencies {
api project(':qst')
api project(':qst-type')
api 'com.google.protobuf:protobuf-java:3.24.1'
implementation project(':engine-query-constants')

Expand Down
1 change: 1 addition & 0 deletions qst/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ plugins {
description = 'The Deephaven Query Syntax Tree POJOs'

dependencies {
api project(':qst-type')
api project(':table-api')
implementation project(':engine-query-constants')

Expand Down
10 changes: 5 additions & 5 deletions qst/graphviz/README.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
### Development

```shell
./gradlew qst:graphviz:installDist
./gradlew qst-graphviz:installDist
```

Run:

```shell
./qst/graphviz/build/install/graphviz/bin/graphviz --help
./qst/graphviz/build/install/qst-graphviz/bin/qst-graphviz --help
```

### Build

```shell
./gradlew qst:graphviz:build
./gradlew qst-graphviz:build
```

Artifacts:

* `qst/graphviz/build/distributions/graphviz-<version>.tar`
* `qst/graphviz/build/distributions/graphviz-<version>.zip`
* `qst/graphviz/build/distributions/qst-graphviz-<version>.tar`
* `qst/graphviz/build/distributions/qst-graphviz-<version>.zip`
17 changes: 17 additions & 0 deletions qst/type/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
plugins {
id 'java-library'
id 'io.deephaven.project.register'
}

description = 'The Deephaven QST Types'

dependencies {
Classpaths.inheritImmutables(project)
Classpaths.inheritJUnitPlatform(project)
Classpaths.inheritAssertJ(project)
testImplementation 'org.junit.jupiter:junit-jupiter'
}

test {
useJUnitPlatform()
}
2 changes: 2 additions & 0 deletions qst/type/gradle.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
io.deephaven.project.ProjectType=JAVA_PUBLIC
languageLevel=8
6 changes: 5 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,11 @@ project(':java-client-barrage-examples').projectDir = file('java-client/barrage-
include(':java-client-example-utilities')
project(':java-client-example-utilities').projectDir = file('java-client/example-utilities')

include(':qst:graphviz')
include(':qst-graphviz')
project(':qst-graphviz').projectDir = file('qst/graphviz')

include(':qst-type')
project(':qst-type').projectDir = file('qst/type')

include(':application-mode')

Expand Down

0 comments on commit d0e8786

Please sign in to comment.