Skip to content

Commit 3ae0e76

Browse files
committed
PHOENIX-7442 Apply Spotless to reformat the entire codebase
1 parent 078071b commit 3ae0e76

File tree

1,865 files changed

+270396
-270748
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,865 files changed

+270396
-270748
lines changed

BUILDING.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ Building from source
5959
On first setup, you may need to run `$ mvn install -DskipTests`
6060
to install the local jars. This is a side-effect of multi-module maven projects
6161

62-
To re-generate the antlr based files:
62+
To re-generate the antlr based files:
6363
`$ mvn process-sources`
6464

65-
To build the jars and the assembly tarball:
65+
To build the jars and the assembly tarball:
6666
`$ mvn package`
67-
and optionally, to just skip all the tests and build the jars:
67+
and optionally, to just skip all the tests and build the jars:
6868
`$ mvn package -DskipTests`
6969

7070
Note: javadocs are generated in target/apidocs
@@ -79,7 +79,7 @@ Phoenix, even within the same HBase minor release.
7979
By default, Phoenix will be built for the latest known patch level of the latest HBase 2.x
8080
minor release that Phoenix supports.
8181

82-
You can specify the targeted HBase minor release by setting the `hbase.profile` system property for
82+
You can specify the targeted HBase minor release by setting the `hbase.profile` system property for
8383
maven.
8484

8585
You can also specify the exact HBase release to build Phoenix with by additionally
@@ -102,7 +102,7 @@ Use the m2e eclipse plugin and do Import->Maven Project and just pick the root '
102102
Running the tests
103103
-----------------
104104

105-
All Unit Tests
105+
All Unit Tests
106106
`$ mvn clean test`
107107

108108
All Unit Tests and Integration tests (takes a few hours)
@@ -133,5 +133,5 @@ as well as each of the subprojects. (not every project has all reports)
133133
Generate Apache Web Site
134134
------------------------
135135

136-
checkout https://svn.apache.org/repos/asf/phoenix
136+
checkout https://svn.apache.org/repos/asf/phoenix
137137
`$ build.sh`

Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,4 +116,4 @@ pipeline {
116116
}
117117
}
118118
}
119-
}
119+
}

Jenkinsfile.yetus

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,4 @@ pipeline {
5555
}
5656
}
5757
}
58-
}
58+
}

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ limitations under the License.
1919

2020
<b>[Apache Phoenix](http://phoenix.apache.org/)</b> is a SQL skin over HBase delivered as a client-embedded JDBC driver targeting low latency queries over HBase data. Visit the Apache Phoenix website <b>[here](http://phoenix.apache.org/)</b>.
2121

22-
Copyright ©2014 [Apache Software Foundation](http://www.apache.org/). All Rights Reserved.
22+
Copyright ©2014 [Apache Software Foundation](http://www.apache.org/). All Rights Reserved.

bin/end2endTest.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
# !!! PLEASE READ !!!
2323
# !!! Do NOT run the script against a prodcution cluster because it wipes out
24-
# !!! existing data of the cluster
24+
# !!! existing data of the cluster
2525

2626
from __future__ import print_function
2727
import os

bin/pherf-standalone.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,6 @@
4040
phoenix_utils.phoenix_pherf_jar + \
4141
'" -Dlog4j2.configurationFile=file:' + \
4242
os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
43-
" org.apache.phoenix.pherf.Pherf " + args
43+
" org.apache.phoenix.pherf.Pherf " + args
4444

4545
os.execl("/bin/sh", "/bin/sh", "-c", java_cmd)

bin/phoenix_utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ def find(pattern, classPaths):
3333
# remove * if it's at the end of path
3434
if ((path is not None) and (len(path) > 0) and (path[-1] == '*')) :
3535
path = path[:-1]
36-
36+
3737
for root, dirs, files in os.walk(path):
3838
# sort the file names so *-client always precedes *-thin-client
3939
files.sort()
4040
for name in files:
4141
if fnmatch.fnmatch(name, pattern):
4242
return os.path.join(root, name)
43-
43+
4444
return ""
4545

4646
def tryDecode(input):

bin/psql.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
os.pathsep + phoenix_utils.logging_jar + \
3737
os.pathsep + phoenix_utils.phoenix_client_embedded_jar + '" -Dlog4j2.configurationFile=file:' + \
3838
os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
39-
" org.apache.phoenix.util.PhoenixRuntime " + args
39+
" org.apache.phoenix.util.PhoenixRuntime " + args
4040

4141
print(java_cmd)
4242

bin/readme.txt

+4-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ SqlLine
33
https://github.com/julianhyde/sqlline
44

55
Execute SQL from command line. Sqlline manual is available at https://julianhyde.github.io/sqlline/manual.html
6-
7-
Usage:
8-
$ sqlline.py <zookeeper> <optional_sql_file>
9-
Example:
6+
7+
Usage:
8+
$ sqlline.py <zookeeper> <optional_sql_file>
9+
Example:
1010
$ sqlline.py localhost
1111
$ sqlline.py localhost <examples dir>/STOCK_SYMBOL.sql
1212

@@ -47,4 +47,3 @@ Usage: hadoop jar phoneix-[version]-mapreduce.jar <parameters>
4747
-s,--schema <arg> Phoenix schema name (optional)
4848
-t,--table <arg> Phoenix table name (mandatory)
4949
-z,--zookeeper <arg> Zookeeper quorum to connect to (optional)
50-

bin/traceserver.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
phoenix_utils.phoenix_traceserver_jar + os.pathsep + phoenix_utils.slf4j_backend_jar + os.pathsep + \
124124
phoenix_utils.logging_jar + os.pathsep + \
125125
phoenix_utils.phoenix_client_embedded_jar + os.pathsep + phoenix_utils.phoenix_queryserver_jar + \
126-
126+
127127
" -Dproc_phoenixtraceserver" + \
128128
" -Dlog4j2.configurationFile=file:" + os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
129129
" -Dpsql.root.logger=%(root_logger)s" + \

dev/PhoenixCodeTemplate.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -415,4 +415,4 @@
415415
<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
416416
<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
417417
</profile>
418-
</profiles>
418+
</profiles>

dev/cache-apache-project-artifact.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,4 +138,4 @@ echo "moving artifact into place at '${target}'"
138138
mv "${working_dir}/artifact" "${target}.copying"
139139
# attempt atomic move
140140
mv "${target}.copying" "${target}"
141-
echo "all done!"
141+
echo "all done!"

dev/create-release/release-util.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -771,4 +771,4 @@ function rebuild_hbase_for_omid() {
771771
function rebuild_hbase_locally() {
772772
local hbase_version="$1"
773773
MAVEN_SETTINGS_FILE="$MAVEN_SETTINGS_FILE" "$SELF"/rebuild_hbase.sh "$hbase_version"
774-
}
774+
}

dev/jenkinsEnv.sh

-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,3 @@ export PATH=$PATH:$JAVA_HOME/bin:$ANT_HOME/bin:$MAVEN_HOME/bin
2828
export MAVEN_OPTS="${MAVEN_OPTS:-"-Xmx3100M -XX:-UsePerfData -XX:MaxPermSize=256m"}"
2929

3030
ulimit -n
31-

dev/misc_utils/README.md

+2-4
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ The script also requires below inputs:
7272

7373
Example of script execution:
7474
```
75-
$ python3 dev/misc_utils/git_jira_fix_version_check.py
75+
$ python3 dev/misc_utils/git_jira_fix_version_check.py
7676
JIRA Project Name (e.g PHOENIX / OMID / TEPHRA etc): PHOENIX
7777
First commit hash to start excluding commits from history: a2adf5e572c5a4bcccee7f8ac43bad6b84293ec6
7878
Fix Version: 4.16.0
79-
Jira server url (default: https://issues.apache.org/jira):
79+
Jira server url (default: https://issues.apache.org/jira):
8080
Path of project's working dir with release branch checked-in: /Users/{USER}/Documents/phoenix
8181
8282
Check git status output and verify expected branch
@@ -114,5 +114,3 @@ Completed diff: ##############################################
114114
115115
116116
```
117-
118-

dev/rebuild_hbase.sh

-1
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,3 @@ cd hbase-$HBASE_VERSION
7373
echo mvn ${SETTINGS[@]} clean install -Dhadoop.profile=3.0 -DskipTests -B $LOCALREPO
7474
mvn ${SETTINGS[@]} clean install -Dhadoop.profile=3.0 -DskipTests -B $LOCALREPO
7575
cd ${STARTDIR}
76-

dev/smart-apply-patch.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ if $PATCH -p0 -E --dry-run < $PATCH_FILE 2>&1 > $TMP; then
5252
# correct place to put those files.
5353

5454
# NOTE 2014/07/17:
55-
# Temporarily disabling below check since our jenkins boxes seems to be not defaulting to bash
55+
# Temporarily disabling below check since our jenkins boxes seems to be not defaulting to bash
5656
# causing below checks to fail. Once it is fixed, we can revert the commit and enable this again.
5757

5858
# TMP2=/tmp/tmp.paths.2.$$

dev/test-patch.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
set -x
2121

22-
### Setup some variables.
22+
### Setup some variables.
2323
### GIT_COMMIT and BUILD_URL are set by Hudson if it is run by patch process
2424
### Read variables from properties file
2525
bindir=$(dirname $0)
@@ -160,7 +160,7 @@ parseArgs() {
160160
### Check if $PATCH_DIR exists. If it does not exist, create a new directory
161161
if [[ ! -e "$PATCH_DIR" ]] ; then
162162
mkdir "$PATCH_DIR"
163-
if [[ $? == 0 ]] ; then
163+
if [[ $? == 0 ]] ; then
164164
echo "$PATCH_DIR has been created"
165165
else
166166
echo "Unable to create $PATCH_DIR"
@@ -296,7 +296,7 @@ setup () {
296296
VERSION=${GIT_COMMIT}_${defect}_PATCH-${patchNum}
297297
findBranchNameFromPatchName ${relativePatchURL}
298298
checkoutBranch
299-
JIRA_COMMENT="Here are the results of testing the latest attachment
299+
JIRA_COMMENT="Here are the results of testing the latest attachment
300300
$patchURL
301301
against ${BRANCH_NAME} branch at commit ${GIT_COMMIT}.
302302
ATTACHMENT ID: ${ATTACHMENT_ID}"
@@ -485,7 +485,7 @@ applyPatch () {
485485
echo "======================================================================"
486486
echo ""
487487
echo ""
488-
488+
489489
export PATCH
490490
$BASEDIR/dev/smart-apply-patch.sh $PATCH_DIR/patch
491491
if [[ $? != 0 ]] ; then
@@ -786,7 +786,7 @@ checkFindbugsWarnings () {
786786
echo "======================================================================"
787787
echo ""
788788
echo ""
789-
echo "$MVN clean package findbugs:findbugs -D${PROJECT_NAME}PatchProcess"
789+
echo "$MVN clean package findbugs:findbugs -D${PROJECT_NAME}PatchProcess"
790790
export MAVEN_OPTS="${MAVEN_OPTS}"
791791
$MVN clean package findbugs:findbugs -D${PROJECT_NAME}PatchProcess -DskipTests < /dev/null
792792

@@ -797,7 +797,7 @@ checkFindbugsWarnings () {
797797
return 1
798798
fi
799799

800-
collectFindbugsReports patch $BASEDIR $PATCH_DIR
800+
collectFindbugsReports patch $BASEDIR $PATCH_DIR
801801
#this files are generated by collectFindbugsReports() named with its first argument
802802
patch_xml=$PATCH_DIR/patchFindbugsWarnings.xml
803803
trunk_xml=$PATCH_DIR/trunkFindbugsWarnings.xml
@@ -884,7 +884,7 @@ runTests () {
884884
if [[ $? != 0 ]] ; then
885885
### Find and format names of failed tests
886886
failed_tests=`find . -name 'TEST*.xml' | xargs $GREP -l -E "<failure|<error" | sed -e "s|.*target/surefire-reports/TEST-| |g" | sed -e "s|\.xml||g"`
887-
887+
888888
JIRA_COMMENT="$JIRA_COMMENT
889889
890890
{color:red}-1 core tests{color}. The patch failed these unit tests:
@@ -962,7 +962,7 @@ checkInjectSystemFaults () {
962962
echo "======================================================================"
963963
echo ""
964964
echo ""
965-
965+
966966
### Kill any rogue build processes from the last attempt
967967
$PS auxwww | $GREP ${PROJECT_NAME}PatchProcess | $AWK '{print $2}' | /usr/bin/xargs -t -I {} /bin/kill -9 {} > /dev/null
968968

@@ -1004,7 +1004,7 @@ $JIRA_COMMENT_FOOTER"
10041004
10051005
10061006
1007-
$comment"
1007+
$comment"
10081008

10091009
if [[ $JENKINS == "true" ]] ; then
10101010
echo ""
@@ -1099,7 +1099,7 @@ checkLineLengths
10991099
(( RESULT = RESULT + $? ))
11001100
# checkSiteXml
11011101
# (( RESULT = RESULT + $?))
1102-
### Do not call these when run by a developer
1102+
### Do not call these when run by a developer
11031103
if [[ $JENKINS == "true" ]] ; then
11041104
runTests
11051105
(( RESULT = RESULT + $? ))

0 commit comments

Comments
 (0)