Skip to content

Commit 170c825

Browse files
vogievetskygianm
andauthored
Web console: totalNumMergeTasks can be set on range also (apache#12648) (apache#12650)
* Web console: totalNumMergeTasks can be set on range also (apache#12648) * totalNumMergeTasks can be set on range also * fix formatting * Update node to 14.19.3. (apache#12632) Co-authored-by: Gian Merlino <gianmerlino@gmail.com>
1 parent 7bb7add commit 170c825

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ jobs:
387387
install: web-console/script/druid build
388388
before_script:
389389
- ./check_test_suite.py && travis_terminate 0 || echo 'Starting nvm install...'
390-
- nvm install 14.19.0
390+
- nvm install 14.19.3
391391
- web-console/script/druid start
392392
script: (cd web-console && npm run test-e2e)
393393
after_script: web-console/script/druid stop

web-console/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"node": ">=14"
5656
},
5757
"volta": {
58-
"node": "14.19.0",
58+
"node": "14.19.3",
5959
"npm": "6.14.16"
6060
},
6161
"browserslist": [

web-console/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<properties>
3535
<resources.directory>${project.build.directory}/resources</resources.directory>
3636
<druid.console.skip>false</druid.console.skip> <!-- this property is overidden in Travis CI to skip the javascript-related work -->
37-
<node.version>v14.19.0</node.version>
37+
<node.version>v14.19.3</node.version>
3838
<npm.version>6.14.16</npm.version>
3939
</properties>
4040

web-console/src/druid-models/compaction-config.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,8 @@ export const COMPACTION_CONFIG_FIELDS: Field<CompactionConfig>[] = [
250250
type: 'number',
251251
defaultValue: 10,
252252
min: 1,
253-
defined: t => oneOf(deepGet(t, 'tuningConfig.partitionsSpec.type'), 'hashed', 'single_dim'),
253+
defined: t =>
254+
oneOf(deepGet(t, 'tuningConfig.partitionsSpec.type'), 'hashed', 'single_dim', 'range'),
254255
info: <>Maximum number of merge tasks which can be run at the same time.</>,
255256
},
256257
{

0 commit comments

Comments
 (0)