Skip to content

Commit 9cb244c

Browse files
authored
Merge pull request #769 from kgyrtkirk/up-5fee4e1960a214731616c1aab1f3de657e22e5f3
Upstream: 5fee4e1
2 parents af93273 + 5fee4e1 commit 9cb244c

199 files changed

Lines changed: 49900 additions & 11688 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/static-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ jobs:
160160
- name: setup node
161161
uses: actions/setup-node@v3
162162
with:
163-
node-version: 16.17.0
163+
node-version: 18.0.0
164164

165165
- name: docs
166166
run: |

benchmarks/src/test/java/org/apache/druid/server/coordinator/NewestSegmentFirstPolicyBenchmark.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void setup()
9393
final String dataSource = DATA_SOURCE_PREFIX + i;
9494
compactionConfigs.put(
9595
dataSource,
96-
DataSourceCompactionConfig
96+
InlineSchemaDataSourceCompactionConfig
9797
.builder()
9898
.forDataSource(dataSource)
9999
.withTaskPriority(0)

distribution/bin/check-licenses.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ def build_compatible_license_names():
310310
compatible_licenses['SPDX-License-Identifier: MIT'] = 'MIT License'
311311

312312
compatible_licenses['The Go license'] = 'The Go license'
313+
compatible_licenses['Universal Permissive License, Version 1.0'] = 'Universal Permissive License, Version 1.0'
313314

314315
compatible_licenses['-'] = '-'
315316
return compatible_licenses

docs/api-reference/sql-ingestion-api.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,8 @@ print(response.text)
379379

380380
The response shows an example report for a query.
381381

382-
<details><summary>View the response</summary>
382+
<details>
383+
<summary>View the response</summary>
383384

384385
```json
385386
{

docs/comparisons/druid-vs-spark.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ One typical setup seen in production is to process data in Spark, and load the p
3939

4040
For more information about using Druid and Spark together, including benchmarks of the two systems, please see:
4141

42-
<https://www.linkedin.com/pulse/combining-druid-spark-interactive-flexible-analytics-scale-butani>
42+
https://www.linkedin.com/pulse/combining-druid-spark-interactive-flexible-analytics-scale-butani

docs/configuration/extensions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ All of these community extensions can be downloaded using [pull-deps](../operati
101101
|druid-momentsketch|Support for approximate quantile queries using the [momentsketch](https://github.com/stanford-futuredata/momentsketch) library|[link](../development/extensions-contrib/momentsketch-quantiles.md)|
102102
|druid-tdigestsketch|Support for approximate sketch aggregators based on [T-Digest](https://github.com/tdunning/t-digest)|[link](../development/extensions-contrib/tdigestsketch-quantiles.md)|
103103
|gce-extensions|GCE Extensions|[link](../development/extensions-contrib/gce-extensions.md)|
104-
|prometheus-emitter|Exposes [Druid metrics](../operations/metrics.md) for Prometheus server collection (<https://prometheus.io/>)|[link](../development/extensions-contrib/prometheus.md)|
104+
|prometheus-emitter|Exposes [Druid metrics](../operations/metrics.md) for [Prometheus](https://prometheus.io/)|[link](../development/extensions-contrib/prometheus.md)|
105105
|druid-spectator-histogram|Support for efficient approximate percentile queries|[link](../development/extensions-contrib/spectator-histogram.md)|
106106
|druid-rabbit-indexing-service|Support for creating and managing [RabbitMQ](https://www.rabbitmq.com/) indexing tasks|[link](../development/extensions-contrib/rabbit-stream-ingestion.md)|
107107
|druid-ranger-security|Support for access control through Apache Ranger.|[link](../development/extensions-contrib/druid-ranger-security.md)|

docs/configuration/index.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ Metric monitoring is an essential part of Druid operations. The following monito
403403
|`org.apache.druid.server.metrics.SegmentStatsMonitor` | **EXPERIMENTAL** Reports statistics about segments on Historical services. Available only on Historical services. Not to be used when lazy loading is configured.|
404404
|`org.apache.druid.server.metrics.QueryCountStatsMonitor`|Reports how many queries have been successful/failed/interrupted.|
405405
|`org.apache.druid.server.metrics.SubqueryCountStatsMonitor`|Reports how many subqueries have been materialized as rows or bytes and various other statistics related to the subquery execution|
406-
|`org.apache.druid.server.emitter.HttpEmittingMonitor`|Reports internal metrics of `http` or `parametrized` emitter (see below). Must not be used with another emitter type. See the description of the metrics here: <https://github.com/apache/druid/pull/4973>.|
406+
|`org.apache.druid.server.emitter.HttpEmittingMonitor`|Reports internal metrics of `http` or `parametrized` emitter (see below). Must not be used with another emitter type. See the description of the metrics here: https://github.com/apache/druid/pull/4973.|
407407
|`org.apache.druid.server.metrics.TaskCountStatsMonitor`|Reports how many ingestion tasks are currently running/pending/waiting and also the number of successful/failed tasks per emission period.|
408408
|`org.apache.druid.server.metrics.TaskSlotCountStatsMonitor`|Reports metrics about task slot usage per emission period.|
409409
|`org.apache.druid.server.metrics.WorkerTaskCountStatsMonitor`|Reports how many ingestion tasks are currently running/pending/waiting, the number of successful/failed tasks, and metrics about task slot usage for the reporting worker, per emission period. Only supported by Middle Manager node types.|
@@ -1192,7 +1192,8 @@ The following table shows the dynamic configuration properties for the Overlord.
11921192

11931193
The following is an example of an Overlord dynamic config:
11941194

1195-
<details><summary>Click to view the example</summary>
1195+
<details>
1196+
<summary>Click to view the example</summary>
11961197

11971198
```json
11981199
{
@@ -2137,8 +2138,8 @@ The `druid.query.default.context.{query_context_key}` runtime property prefix ap
21372138

21382139
The precedence chain for query context values is as follows:
21392140

2140-
hard-coded default value in Druid code <- runtime property not prefixed with `druid.query.default.context`
2141-
<- runtime property prefixed with `druid.query.default.context` <- context parameter in the query
2141+
hard-coded default value in Druid code `<-` runtime property not prefixed with `druid.query.default.context`
2142+
`<-` runtime property prefixed with `druid.query.default.context` `<-` context parameter in the query
21422143

21432144
Note that not all query context key has a runtime property not prefixed with `druid.query.default.context` that can
21442145
override the hard-coded default value. For example, `maxQueuedBytes` has `druid.broker.http.maxQueuedBytes`

docs/design/extensions-contrib/dropwizard.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -116,13 +116,6 @@ Latest default metrics mapping can be found [here] (https://github.com/apache/dr
116116
"type": "timer",
117117
"timeUnit": "MILLISECONDS"
118118
},
119-
"query/node/backpressure": {
120-
"dimensions": [
121-
"server"
122-
],
123-
"type": "timer",
124-
"timeUnit": "MILLISECONDS"
125-
},
126119
"query/segment/time": {
127120
"dimensions": [],
128121
"type": "timer",

docs/development/docs-contribute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Druid docs contributors:
3434
Druid docs contributors can open an issue about documentation, or contribute a change with a pull request (PR).
3535

3636
The open source Druid docs are located here:
37-
<https://druid.apache.org/docs/latest/design/index.html>
37+
https://druid.apache.org/docs/latest/design/index.html
3838

3939
If you need to update a Druid doc, locate and update the doc in the Druid repo following the instructions below.
4040

docs/development/extensions-core/catalog.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ A tableSpec defines a table
5252
| Property | Type | Description | Required | Default |
5353
|--------------|---------------------------------|---------------------------------------------------------------------------|----------|---------|
5454
| `type` | String | the type of table. The only value supported at this time is `datasource` | yes | null |
55-
| `properties` | Map<String, Object> | the table's defined properties. see [table properties](#table-properties) | no | null |
56-
| `columns` | List<[ColumnSpec](#columnspec)> | the table's defined columns | no | null |
55+
| `properties` | Map&lt;String, Object> | the table's defined properties. see [table properties](#table-properties) | no | null |
56+
| `columns` | List&lt;[ColumnSpec](#columnspec)> | the table's defined columns | no | null |
5757

5858
#### Table Properties
5959

@@ -68,7 +68,7 @@ A tableSpec defines a table
6868
|--------------|---------------------|------------------------------------------------------------------------------------------------------------------------|----------|---------|
6969
| `name` | String | The name of the column | yes | null |
7070
| `dataType` | String | The type of the column. Can be any column data type that is available to Druid. Depends on what extensions are loaded. | no | null |
71-
| `properties` | Map<String, Object> | the column's defined properties. Non properties defined at this time. | no | null |
71+
| `properties` | Map&lt;String, Object\> | the column's defined properties. Non properties defined at this time. | no | null |
7272

7373
### APIs
7474

@@ -189,7 +189,7 @@ Retrieve a table
189189

190190
##### URL
191191

192-
`GET` `/druid/coordinator/v1/catalog/schemas/{schema}/tables/{name}
192+
`GET` `/druid/coordinator/v1/catalog/schemas/{schema}/tables/{name}`
193193

194194
##### Responses
195195

@@ -227,7 +227,7 @@ Retrieve a table
227227

228228
##### Sample request
229229

230-
The following example shows how to retrieve a table named 'test_table' in schema 'druid'
230+
The following example shows how to retrieve a table named `test_table` in schema `druid`:
231231

232232
```shell
233233
curl "http://ROUTER_IP:ROUTER_PORT/druid/coordinator/v1/catalog/schemas/druid/tables/test_table"
@@ -286,7 +286,7 @@ Delete a table
286286

287287
##### URL
288288

289-
`DELETE` `/druid/coordinator/v1/catalog/schemas/{schema}/tables/{name}
289+
`DELETE` `/druid/coordinator/v1/catalog/schemas/{schema}/tables/{name}`
290290

291291
##### Responses
292292

@@ -340,7 +340,7 @@ retrieve list of schema names
340340

341341
##### URL
342342

343-
`GET` `/druid/coordinator/v1/catalog/schemas
343+
`GET` `/druid/coordinator/v1/catalog/schemas`
344344

345345
##### Responses
346346

@@ -403,7 +403,7 @@ Retrieve a list of table names in the schema.
403403

404404
##### URL
405405

406-
`GET` `/druid/coordinator/v1/catalog/schemas/{schema}/table
406+
`GET` `/druid/coordinator/v1/catalog/schemas/{schema}/table`
407407

408408
##### Responses
409409

0 commit comments

Comments
 (0)