Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PHOENIX-7442 Apply Spotless to reformat the entire codebase #2024

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 6 additions & 6 deletions BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ Building from source
On first setup, you may need to run `$ mvn install -DskipTests`
to install the local jars. This is a side-effect of multi-module maven projects

To re-generate the antlr based files:
To re-generate the antlr based files:
`$ mvn process-sources`

To build the jars and the assembly tarball:
To build the jars and the assembly tarball:
`$ mvn package`
and optionally, to just skip all the tests and build the jars:
and optionally, to just skip all the tests and build the jars:
`$ mvn package -DskipTests`

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

You can specify the targeted HBase minor release by setting the `hbase.profile` system property for
You can specify the targeted HBase minor release by setting the `hbase.profile` system property for
maven.

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

All Unit Tests
All Unit Tests
`$ mvn clean test`

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

checkout https://svn.apache.org/repos/asf/phoenix
checkout https://svn.apache.org/repos/asf/phoenix
`$ build.sh`
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@ pipeline {
}
}
}
}
}
2 changes: 1 addition & 1 deletion Jenkinsfile.yetus
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ pipeline {
}
}
}
}
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,4 +19,4 @@ limitations under the License.

<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>.

Copyright ©2014 [Apache Software Foundation](http://www.apache.org/). All Rights Reserved.
Copyright ©2014 [Apache Software Foundation](http://www.apache.org/). All Rights Reserved.
2 changes: 1 addition & 1 deletion bin/end2endTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# !!! PLEASE READ !!!
# !!! Do NOT run the script against a prodcution cluster because it wipes out
# !!! existing data of the cluster
# !!! existing data of the cluster

from __future__ import print_function
import os
Expand Down
2 changes: 1 addition & 1 deletion bin/pherf-standalone.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,6 @@
phoenix_utils.phoenix_pherf_jar + \
'" -Dlog4j2.configurationFile=file:' + \
os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
" org.apache.phoenix.pherf.Pherf " + args
" org.apache.phoenix.pherf.Pherf " + args

os.execl("/bin/sh", "/bin/sh", "-c", java_cmd)
4 changes: 2 additions & 2 deletions bin/phoenix_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ def find(pattern, classPaths):
# remove * if it's at the end of path
if ((path is not None) and (len(path) > 0) and (path[-1] == '*')) :
path = path[:-1]

for root, dirs, files in os.walk(path):
# sort the file names so *-client always precedes *-thin-client
files.sort()
for name in files:
if fnmatch.fnmatch(name, pattern):
return os.path.join(root, name)

return ""

def tryDecode(input):
Expand Down
2 changes: 1 addition & 1 deletion bin/psql.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
os.pathsep + phoenix_utils.logging_jar + \
os.pathsep + phoenix_utils.phoenix_client_embedded_jar + '" -Dlog4j2.configurationFile=file:' + \
os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
" org.apache.phoenix.util.PhoenixRuntime " + args
" org.apache.phoenix.util.PhoenixRuntime " + args

print(java_cmd)

Expand Down
9 changes: 4 additions & 5 deletions bin/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ SqlLine
https://github.com/julianhyde/sqlline

Execute SQL from command line. Sqlline manual is available at https://julianhyde.github.io/sqlline/manual.html
Usage:
$ sqlline.py <zookeeper> <optional_sql_file>
Example:

Usage:
$ sqlline.py <zookeeper> <optional_sql_file>
Example:
$ sqlline.py localhost
$ sqlline.py localhost <examples dir>/STOCK_SYMBOL.sql

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

2 changes: 1 addition & 1 deletion bin/traceserver.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
phoenix_utils.phoenix_traceserver_jar + os.pathsep + phoenix_utils.slf4j_backend_jar + os.pathsep + \
phoenix_utils.logging_jar + os.pathsep + \
phoenix_utils.phoenix_client_embedded_jar + os.pathsep + phoenix_utils.phoenix_queryserver_jar + \

" -Dproc_phoenixtraceserver" + \
" -Dlog4j2.configurationFile=file:" + os.path.join(phoenix_utils.current_dir, "log4j2.properties") + \
" -Dpsql.root.logger=%(root_logger)s" + \
Expand Down
Loading