From 2c95dce2191107eeaac854e48bee025ffe052ece Mon Sep 17 00:00:00 2001 From: daixiang0 <764524258@qq.com> Date: Tue, 11 Dec 2018 17:44:15 +0800 Subject: [PATCH 1/2] update hawq help Signed-off-by: daixiang0 <764524258@qq.com> --- tools/bin/hawqpylib/HAWQ_HELP.py | 89 +++++++++++++++++--------------- 1 file changed, 47 insertions(+), 42 deletions(-) diff --git a/tools/bin/hawqpylib/HAWQ_HELP.py b/tools/bin/hawqpylib/HAWQ_HELP.py index d427254267..caf6237a7c 100755 --- a/tools/bin/hawqpylib/HAWQ_HELP.py +++ b/tools/bin/hawqpylib/HAWQ_HELP.py @@ -54,13 +54,14 @@ allsegments Start all segments. The "options" are: - -l --logdir Sets log dir of management tools. - -q --quiet Run in quiet mode. - -v --verbose Displays detailed status, progress and error messages output by the utility. - -t --timeout Sets timeout value in seconds, default is 600 seconds. - -m --masteronly Start hawq in masteronly mode. - -R --restrict Start hawq in restrict mode. - -U --special-mode Start hawq in [upgrade/maintenance] mode. + -l --logdir Sets log dir of management tools. + -q --quiet Run in quiet mode. + -v --verbose Displays detailed status, progress and error messages output by the utility. + -t --timeout Sets timeout value in seconds, default is 600 seconds. + -m --masteronly Start hawq in masteronly mode. + -R --restrict Start hawq in restrict mode. + -U --special-mode Start hawq in [upgrade/maintenance] mode. + -i --ignore-bad-hosts Skips syncing configuration files on hosts on which SSH fails. See 'hawq --help' for more information on other commands. """ @@ -76,13 +77,14 @@ allsegments Stop all segments. The "options" are: - -a --prompt Do not ask before execution. - -l --logdir Sets log dir of management tools. - -q --quiet Run in quiet mode. - -v --verbose Displays detailed status, progress and error messages output by the utility. - -t --timeout Sets timeout value in seconds, default is 600 seconds. - -M --mode Stop with mode [smart|fast|immediate] - -u --reload Reload GUC values without restarting hawq cluster. + -a --prompt Do not ask before execution. + -l --logdir Sets log dir of management tools. + -q --quiet Run in quiet mode. + -v --verbose Displays detailed status, progress and error messages output by the utility. + -t --timeout Sets timeout value in seconds, default is 600 seconds. + -M --mode Stop with mode [smart|fast|immediate] + -u --reload Reload GUC values without restarting hawq cluster. + -i --ignore-bad-hosts Skips syncing configuration files on hosts on which SSH fails. See 'hawq --help' for more information on other commands. """ @@ -128,16 +130,17 @@ allsegments Restart all segments. The "options" are: - -a --prompt Do not ask before execution. - -l --logdir Sets log dir of management tools. - -q --quiet Run in quiet mode. - -v --verbose Displays detailed status, progress and error messages output by the utility. - -t --timeout Sets timeout value in seconds, default is 600 seconds. - -M --mode Stop with mode [smart|fast|immediate] - -u --reload Reload GUC values without restart hawq cluster. - -m --masteronly Start HAWQ in master-only mode. - -R --restrict Start HAWQ in restrict mode. - -U --special-mode Start HAWQ in [upgrade/maintenance] mode. + -a --prompt Do not ask before execution. + -l --logdir Sets log dir of management tools. + -q --quiet Run in quiet mode. + -v --verbose Displays detailed status, progress and error messages output by the utility. + -t --timeout Sets timeout value in seconds, default is 600 seconds. + -M --mode Stop with mode [smart|fast|immediate] + -u --reload Reload GUC values without restart hawq cluster. + -m --masteronly Start HAWQ in master-only mode. + -R --restrict Start HAWQ in restrict mode. + -U --special-mode Start HAWQ in [upgrade/maintenance] mode. + -i --ignore-bad-hosts Skips copying configuration files on host on which SSH fails See 'hawq --help' for more information on other commands. """ @@ -146,10 +149,11 @@ usage: hawq activate standby The "options" are: - -q --quiet Run in quiet mode. - -v --verbose Displays detailed status, progress and error messages output by the utility. - -l --logdir Sets log dir of management tools. - -M --mode Stop with mode [smart|fast|immediate] + -q --quiet Run in quiet mode. + -v --verbose Displays detailed status, progress and error messages output by the utility. + -l --logdir Sets log dir of management tools. + -M --mode Stop with mode [smart|fast|immediate] + -i --ignore-bad-hosts Skips syncing configuration files on hosts on which SSH fails. See 'hawq --help' for more information on other commands. """ @@ -158,14 +162,14 @@ usage: hawq config [--options] The "options" are: - -c --change Changes a configuration parameter setting. - -v --value Sets the configuration parameter value. - -s --show Shows the value for a specified configuration parameter. - -l --list Lists all configuration parameters. - -q --quiet Run in quiet mode. - -r --remove HAWQ GUC name to be removed. - --skipvalidation Skip the system validation checks. - --ignore-bad-hosts Skips copying configuration files on host on which SSH fails + -c --change Changes a configuration parameter setting. + -v --value Sets the configuration parameter value. + -s --show Shows the value for a specified configuration parameter. + -l --list Lists all configuration parameters. + -q --quiet Run in quiet mode. + -r --remove HAWQ GUC name to be removed. + -i --ignore-bad-hosts Skips copying configuration files on host on which SSH fails + --skipvalidation Skip the system validation checks. See 'hawq --help' for more information on other commands. """ @@ -192,12 +196,13 @@ allsegments Reload GUC values for all segments. The "options" are: - -a --prompt Do not ask before execution. - -l --logdir Sets log dir of management tools. - -q --quiet Run in quiet mode. - -v --verbose Displays detailed status, progress and error messages output by the utility. - -t --timeout Sets timeout value in seconds, default is 600 seconds. - -M --mode Stop with mode [smart|fast|immediate] + -a --prompt Do not ask before execution. + -l --logdir Sets log dir of management tools. + -q --quiet Run in quiet mode. + -v --verbose Displays detailed status, progress and error messages output by the utility. + -t --timeout Sets timeout value in seconds, default is 600 seconds. + -M --mode Stop with mode [smart|fast|immediate] + -i --ignore-bad-hosts Skips syncing configuration files on hosts on which SSH fails. See 'hawq --help' for more information on other commands. """ From fe23d9722ad0c4eda2f1707b8aee542d7461af95 Mon Sep 17 00:00:00 2001 From: daixiang0 <764524258@qq.com> Date: Thu, 13 Dec 2018 10:29:19 +0800 Subject: [PATCH 2/2] add apache license header --- contrib/orc/cwrapper/Makefile | 19 ++++++++++++++++++- contrib/orc/cwrapper/format/Makefile | 17 +++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/contrib/orc/cwrapper/Makefile b/contrib/orc/cwrapper/Makefile index d731af8ad2..accb845710 100644 --- a/contrib/orc/cwrapper/Makefile +++ b/contrib/orc/cwrapper/Makefile @@ -1,6 +1,23 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# cwrapper.o: cwrapper.cpp cwrapper.h $(MAKE) -C format liborc_format.so - g++ --shared -o cwrapper.o cwrapper.cpp -Lformat -lorc_format + g++ --shared -o cwrapper.o cwrapper.cpp -Lformat -lorc_format clean distclean: $(MAKE) -C format $@ || true; diff --git a/contrib/orc/cwrapper/format/Makefile b/contrib/orc/cwrapper/format/Makefile index cc896f8910..bc1aa9a34b 100644 --- a/contrib/orc/cwrapper/format/Makefile +++ b/contrib/orc/cwrapper/format/Makefile @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# All: orc_format.so liborc_format.so: orc_format.cpp g++ --shared -o liborc_format.so orc_format.cpp