IMPALA-3853: More RAT cleaning. Apache RAT is a tool to audit code repositories for the ASF copyright rules. Our wrapper script around it found a few more things; this patch fixes those things.
Change-Id: I01367ea26feaf6a3e2cf4ac04f1c6a63f6e66195 Reviewed-on: http://gerrit.cloudera.org:8080/4904 Reviewed-by: Jim Apple <[email protected]> Tested-by: Internal Jenkins Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/f397d756 Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/f397d756 Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/f397d756 Branch: refs/heads/master Commit: f397d756005a766ed1561ada0e43948051d164cd Parents: a9a0085 Author: Jim Apple <[email protected]> Authored: Tue Nov 1 12:00:54 2016 -0700 Committer: Internal Jenkins <[email protected]> Committed: Thu Nov 3 22:53:04 2016 +0000 ---------------------------------------------------------------------- bin/check-rat-report.py | 13 +++++-------- bin/rat_exclude_files.txt | 2 ++ testdata/datasets/tpcds/tpcds_kudu_template.sql | 17 +++++++++++++++++ testdata/datasets/tpch/tpch_kudu_template.sql | 17 +++++++++++++++++ 4 files changed, 41 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f397d756/bin/check-rat-report.py ---------------------------------------------------------------------- diff --git a/bin/check-rat-report.py b/bin/check-rat-report.py index a2f3b52..b296c6d 100755 --- a/bin/check-rat-report.py +++ b/bin/check-rat-report.py @@ -25,16 +25,13 @@ # # I tested this with # -# pushd "${IMPALA_HOME}" -# export SANDBOX=$(mktemp -d) # Just a place to put files for testing -# echo "${SANDBOX}" -# git --prefix=foo/ archive -o "${SANDBOX}/test-impala.tar.gz" HEAD # Make tarball -# java -jar ~/Downloads/apache-rat-0.12/apache-rat-0.12.jar -x \ -# "${SANDBOX}/test-impala.tar.gz" >"${SANDBOX}/rat.xml" -# bin/check-rat-report.py bin/rat_exclude_files.txt "${SANDBOX}/rat.xml" +# git archive --prefix=foo/ -o test-impala.zip HEAD +# java -jar apache-rat-0.12.jar -x test-impala.zip >rat.xml +# bin/check-rat-report.py bin/rat_exclude_files.txt rat.xml # # This is copied from a similar file in Apache Kudu. Only RAT 0.12 is supported at this -# time. +# time, and the RAT JAR is not included in the Impala repo; it must be downloaded +# separately. import fnmatch import re http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f397d756/bin/rat_exclude_files.txt ---------------------------------------------------------------------- diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt index a27355e..2f09ce1 100644 --- a/bin/rat_exclude_files.txt +++ b/bin/rat_exclude_files.txt @@ -51,6 +51,8 @@ README.md */README.dox testdata/bin/README-BENCHMARK-TEST-GENERATION tests/comparison/ORACLE.txt +bin/distcc/README.md +tests/comparison/POSTGRES.txt # http://www.apache.org/legal/src-headers.html: "Test data for which the addition of a # source header would cause the tests to fail." http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f397d756/testdata/datasets/tpcds/tpcds_kudu_template.sql ---------------------------------------------------------------------- diff --git a/testdata/datasets/tpcds/tpcds_kudu_template.sql b/testdata/datasets/tpcds/tpcds_kudu_template.sql index dbf4ea9..a147f12 100644 --- a/testdata/datasets/tpcds/tpcds_kudu_template.sql +++ b/testdata/datasets/tpcds/tpcds_kudu_template.sql @@ -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. + ---- Template SQL statements to create and load TPCDS tables in KUDU. ---- TODO: Use range partitioning for some tables ---- TODO: Remove the 'kudu.master_addresses' from TBLPROPERTIES once CM properly sets http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/f397d756/testdata/datasets/tpch/tpch_kudu_template.sql ---------------------------------------------------------------------- diff --git a/testdata/datasets/tpch/tpch_kudu_template.sql b/testdata/datasets/tpch/tpch_kudu_template.sql index 6cfb9bb..26dbb7a 100644 --- a/testdata/datasets/tpch/tpch_kudu_template.sql +++ b/testdata/datasets/tpch/tpch_kudu_template.sql @@ -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. + ---- Template SQL statements to create and load TPCH tables in KUDU. ---- TODO: Fix the primary key column order ---- TODO: Remove the 'kudu.master_addresses' from TBLPROPERTIES once CM properly sets
