This is an automated email from the ASF dual-hosted git repository.
jackie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 1b16615a49 Fix controller host / port / protocol CLI option
description for admin commands (#13237)
1b16615a49 is described below
commit 1b16615a491fedcc130ef3c4df02ff4a3d9bcfe8
Author: Yash Mayya <[email protected]>
AuthorDate: Wed May 29 04:11:59 2024 +0530
Fix controller host / port / protocol CLI option description for admin
commands (#13237)
---
.../org/apache/pinot/tools/admin/command/AddSchemaCommand.java | 6 +++---
.../java/org/apache/pinot/tools/admin/command/AddTableCommand.java | 7 +++----
.../org/apache/pinot/tools/admin/command/AddTenantCommand.java | 7 +++----
.../apache/pinot/tools/admin/command/BootstrapTableCommand.java | 6 +++---
.../org/apache/pinot/tools/admin/command/DeleteSchemaCommand.java | 6 +++---
.../org/apache/pinot/tools/admin/command/DeleteTableCommand.java | 7 +++----
.../pinot/tools/admin/command/OperateClusterConfigCommand.java | 6 +++---
.../org/apache/pinot/tools/admin/command/UploadSegmentCommand.java | 4 ++--
8 files changed, 23 insertions(+), 26 deletions(-)
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddSchemaCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddSchemaCommand.java
index 5996a548f2..b777646c45 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddSchemaCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddSchemaCommand.java
@@ -38,13 +38,13 @@ import picocli.CommandLine;
public class AddSchemaCommand extends AbstractBaseAdminCommand implements
Command {
private static final Logger LOGGER =
LoggerFactory.getLogger(AddSchemaCommand.class);
- @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "host name for controller.")
+ @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "Host name for controller.")
private String _controllerHost;
- @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "port name for controller.")
+ @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number for controller.")
private String _controllerPort = DEFAULT_CONTROLLER_PORT;
- @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "protocol for controller.")
+ @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "Protocol for controller.")
private String _controllerProtocol = CommonConstants.HTTP_PROTOCOL;
@CommandLine.Option(names = {"-schemaFile"}, required = true, description =
"Path to schema file.")
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
index 657b640ce1..078196b29d 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
@@ -69,14 +69,13 @@ public class AddTableCommand extends
AbstractBaseAdminCommand implements Command
+ " table schema file.")
private String _schemaFile = null;
- @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "host name for controller.")
+ @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "Host name for controller.")
private String _controllerHost;
- @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number to start the "
- + "controller at.")
+ @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number for controller.")
private String _controllerPort = DEFAULT_CONTROLLER_PORT;
- @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "protocol for controller.")
+ @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "Protocol for controller.")
private String _controllerProtocol = CommonConstants.HTTP_PROTOCOL;
@CommandLine.Option(names = {"-update"}, required = false, description =
"Update the existing table instead of "
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTenantCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTenantCommand.java
index d15e522c4a..288bc70b0f 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTenantCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTenantCommand.java
@@ -35,14 +35,13 @@ import picocli.CommandLine;
public class AddTenantCommand extends AbstractBaseAdminCommand implements
Command {
private static final Logger LOGGER =
LoggerFactory.getLogger(AddTenantCommand.class);
- @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "host name for controller.")
+ @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "Host name for controller.")
private String _controllerHost;
- @CommandLine.Option(names = {"-controllerPort"}, required = false,
- description = "Port number to start the controller at.")
+ @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number for controller.")
private String _controllerPort = DEFAULT_CONTROLLER_PORT;
- @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "protocol for controller.")
+ @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "Protocol for controller.")
private String _controllerProtocol = CommonConstants.HTTP_PROTOCOL;
@CommandLine.Option(names = {"-name"}, required = true, description = "Name
of the tenant to be created")
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/BootstrapTableCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/BootstrapTableCommand.java
index 59fdc70a7e..a7afc3d99e 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/BootstrapTableCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/BootstrapTableCommand.java
@@ -67,13 +67,13 @@ import picocli.CommandLine;
public class BootstrapTableCommand extends AbstractBaseAdminCommand implements
Command {
private static final Logger LOGGER =
LoggerFactory.getLogger(BootstrapTableCommand.class.getName());
- @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "host name for controller.")
+ @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "Host name for controller.")
private String _controllerHost;
- @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "http port for broker.")
+ @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number for controller.")
private String _controllerPort = DEFAULT_CONTROLLER_PORT;
- @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "protocol for controller.")
+ @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "Protocol for controller.")
private String _controllerProtocol = CommonConstants.HTTP_PROTOCOL;
@CommandLine.Option(names = {"-dir", "-d", "-directory"}, required = false,
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/DeleteSchemaCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/DeleteSchemaCommand.java
index 5fd9d36fa7..c0dd09c3ff 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/DeleteSchemaCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/DeleteSchemaCommand.java
@@ -34,13 +34,13 @@ import picocli.CommandLine;
public class DeleteSchemaCommand extends AbstractBaseAdminCommand implements
Command {
private static final Logger LOGGER =
LoggerFactory.getLogger(DeleteSchemaCommand.class);
- @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "host name for controller.")
+ @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "Host name for controller.")
private String _controllerHost;
- @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "port name for controller.")
+ @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number for controller.")
private String _controllerPort = DEFAULT_CONTROLLER_PORT;
- @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "protocol for controller.")
+ @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "Protocol for controller.")
private String _controllerProtocol = CommonConstants.HTTP_PROTOCOL;
@CommandLine.Option(names = {"-schemaName"}, required = true, description =
"Schema name.")
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/DeleteTableCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/DeleteTableCommand.java
index 4766b22fcf..cc31e20ab5 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/DeleteTableCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/DeleteTableCommand.java
@@ -45,14 +45,13 @@ public class DeleteTableCommand extends
AbstractBaseAdminCommand implements Comm
+ "the cluster setting, then '7d'. Using 0d or -1d will instantly delete
segments without retention.")
private String _retention;
- @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "host name for controller.")
+ @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "Host name for controller.")
private String _controllerHost;
- @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number to start the "
- + "controller at.")
+ @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number for controller.")
private String _controllerPort = DEFAULT_CONTROLLER_PORT;
- @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "protocol for controller.")
+ @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "Protocol for controller.")
private String _controllerProtocol = CommonConstants.HTTP_PROTOCOL;
@CommandLine.Option(names = {"-exec"}, required = false, description =
"Execute the command.")
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/OperateClusterConfigCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/OperateClusterConfigCommand.java
index 2c7a9cd22e..260a9d43ba 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/OperateClusterConfigCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/OperateClusterConfigCommand.java
@@ -39,13 +39,13 @@ import picocli.CommandLine;
public class OperateClusterConfigCommand extends AbstractBaseAdminCommand
implements Command {
private static final Logger LOGGER =
LoggerFactory.getLogger(OperateClusterConfigCommand.class.getName());
- @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "host name for controller.")
+ @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "Host name for controller.")
private String _controllerHost;
- @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "http port for controller.")
+ @CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number for controller.")
private String _controllerPort = DEFAULT_CONTROLLER_PORT;
- @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "protocol for controller.")
+ @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "Protocol for controller.")
private String _controllerProtocol = CommonConstants.HTTP_PROTOCOL;
@CommandLine.Option(names = {"-user"}, required = false, description =
"Username for basic auth.")
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/UploadSegmentCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/UploadSegmentCommand.java
index c174046617..16d5ecf6c3 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/UploadSegmentCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/UploadSegmentCommand.java
@@ -48,13 +48,13 @@ public class UploadSegmentCommand extends
AbstractBaseAdminCommand implements Co
private static final Logger LOGGER =
LoggerFactory.getLogger(UploadSegmentCommand.class);
private static final String SEGMENT_UPLOADER = "segmentUploader";
- @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "host name for controller.")
+ @CommandLine.Option(names = {"-controllerHost"}, required = false,
description = "Host name for controller.")
private String _controllerHost;
@CommandLine.Option(names = {"-controllerPort"}, required = false,
description = "Port number for controller.")
private String _controllerPort = DEFAULT_CONTROLLER_PORT;
- @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "protocol for controller.")
+ @CommandLine.Option(names = {"-controllerProtocol"}, required = false,
description = "Protocol for controller.")
private String _controllerProtocol = CommonConstants.HTTP_PROTOCOL;
@CommandLine.Option(names = {"-user"}, required = false, description =
"Username for basic auth.")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
