From 90912dba7055d35ac5c93c8d5cf122c9d3ee4301 Mon Sep 17 00:00:00 2001 From: Zhigao Tong Date: Fri, 25 Mar 2022 17:24:02 +0800 Subject: [PATCH 1/2] fix license Signed-off-by: Zhigao Tong --- .github/licenserc.yml | 3 +++ cmake/sequential.cmake | 3 +++ .../DeltaMerge/File/DMFileBlockInputStream.cpp | 14 ++++++++++++++ dbms/src/TestUtils/bench_dbms_main.cpp | 14 ++++++++++++++ format-diff.py | 2 +- 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/.github/licenserc.yml b/.github/licenserc.yml index ee2bd5f43ce..92936ad76e3 100644 --- a/.github/licenserc.yml +++ b/.github/licenserc.yml @@ -32,5 +32,8 @@ header: - '**/NOTICE' - 'dbms/src/IO/tests/limit_read_buffer.reference' - 'dbms/src/IO/tests/DevicePixelRatio' + - 'Cargo.lock' + - 'Cargo.toml' + - 'rust-toolchain' comment: on-failure diff --git a/cmake/sequential.cmake b/cmake/sequential.cmake index 0a86cf8e280..0d702f2a6d2 100644 --- a/cmake/sequential.cmake +++ b/cmake/sequential.cmake @@ -1,3 +1,6 @@ +# Copyright 2022 PingCAP, Ltd. +# +# Licensed 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 # diff --git a/dbms/src/Storages/DeltaMerge/File/DMFileBlockInputStream.cpp b/dbms/src/Storages/DeltaMerge/File/DMFileBlockInputStream.cpp index b062b391e62..3cd34db0b66 100644 --- a/dbms/src/Storages/DeltaMerge/File/DMFileBlockInputStream.cpp +++ b/dbms/src/Storages/DeltaMerge/File/DMFileBlockInputStream.cpp @@ -1,3 +1,17 @@ +// Copyright 2022 PingCAP, Ltd. +// +// Licensed 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. + #include #include diff --git a/dbms/src/TestUtils/bench_dbms_main.cpp b/dbms/src/TestUtils/bench_dbms_main.cpp index c793fe5c093..48bd02a71f7 100644 --- a/dbms/src/TestUtils/bench_dbms_main.cpp +++ b/dbms/src/TestUtils/bench_dbms_main.cpp @@ -1,3 +1,17 @@ +// Copyright 2022 PingCAP, Ltd. +// +// Licensed 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. + #include #include diff --git a/format-diff.py b/format-diff.py index 8aac65ec5a7..c8d12925fb3 100755 --- a/format-diff.py +++ b/format-diff.py @@ -32,7 +32,7 @@ def main(): default_suffix = ['.cpp', '.h', '.cc', '.hpp'] parser = argparse.ArgumentParser(description='TiFlash Code Format', formatter_class=argparse.ArgumentDefaultsHelpFormatter) - parser.add_argument('--repo_path', help='path of tics repository', + parser.add_argument('--repo_path', help='path of tiflash repository', default=os.path.dirname(os.path.abspath(__file__))) parser.add_argument('--suffix', help='suffix of files to format, split by space', default=' '.join(default_suffix)) From 6b179e40e9e4d67eed96d72feecb5981b01f4c2d Mon Sep 17 00:00:00 2001 From: Zhigao Tong Date: Fri, 25 Mar 2022 23:37:44 +0800 Subject: [PATCH 2/2] 1 Signed-off-by: Zhigao Tong --- .github/licenserc.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/licenserc.yml b/.github/licenserc.yml index 92936ad76e3..eaf7a49eee4 100644 --- a/.github/licenserc.yml +++ b/.github/licenserc.yml @@ -34,6 +34,6 @@ header: - 'dbms/src/IO/tests/DevicePixelRatio' - 'Cargo.lock' - 'Cargo.toml' - - 'rust-toolchain' + - 'rust-toolchain' comment: on-failure