This is an automated email from the ASF dual-hosted git repository. morningman pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
The following commit(s) were added to refs/heads/master by this push: new dcad6ff [License] Add License header for missing files (#7130) dcad6ff is described below commit dcad6ff5e52a118e0cdec1dd4b01dffafa08bb25 Author: Mingyu Chen <morningman....@gmail.com> AuthorDate: Tue Nov 16 18:37:54 2021 +0800 [License] Add License header for missing files (#7130) 1. Add License header for missing files 2. Modify the spark pom.xml to correct the location of `thrift` --- .licenserc.yaml | 52 ++++++++++++++++++++++ be/src/runtime/runtime_filter_mgr.cpp | 17 +++++++ docs/.vuepress/theme/styles/index.styl | 19 +++++++- extension/DataX/doriswriter/README | 0 .../doriswriter/src/main/assembly/package.xml | 23 +++++++++- .../plugin/writer/doriswriter/DorisCodec.java | 19 ++++++++ extension/DataX/init-env.sh | 14 +++--- extension/flink-doris-connector/pom.xml | 20 +++++++++ .../java/org/apache/doris/flink/cfg/DorisSink.java | 17 +++++++ .../doris/flink/cfg/GenericDorisSinkFunction.java | 19 +++++++- .../apache/doris/flink/DorisStreamSinkExample.java | 19 +++++++- extension/spark-doris-connector/pom.xml | 2 +- extension/spark-doris-connector/pom_3.0.xml | 2 +- fe/README | 17 +++++++ fe/fe-core/src/main/cup/readme | 19 +++++++- fe/fe-core/src/main/cup/sql_parser.cup | 2 +- .../apache/doris/analysis/IsNullPredicateTest.java | 30 ++++++------- .../apache/doris/analysis/RangeCompareTest.java | 2 +- .../apache/doris/analysis/ShowViewStmtTest.java | 17 +++++++ .../apache/doris/catalog/TruncateTableTest.java | 17 +++++++ .../apache/doris/ldap/LdapAuthenticateTest.java | 17 +++++++ .../java/org/apache/doris/ldap/LdapClientTest.java | 17 +++++++ .../apache/doris/ldap/LdapPrivsCheckerTest.java | 17 +++++++ .../org/apache/doris/persist/LdapInfoTest.java | 17 +++++++ .../doris/planner/JoinCostEvaluationTest.java | 19 +++++++- .../doris/planner/RuntimeFilterGeneratorTest.java | 17 +++++++ .../doris/planner/SingleNodePlannerTest.java | 35 +++++++-------- fe/fe-core/src/test/resources/log4j2.xml | 20 +++++++++ fe_plugins/auditdemo/src/main/assembly/zip.xml | 19 ++++++++ fe_plugins/auditloader/src/main/assembly/zip.xml | 19 ++++++++ fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml | 26 ++++++----- gensrc/script/gen_builtins_functions.py | 17 +++++++ gensrc/thrift/HeartbeatService.thrift | 3 ++ gensrc/thrift/PaloBrokerService.thrift | 3 ++ .../src/main/resources/application-druid.yml | 17 +++++++ .../src/main/resources/application.yml | 17 +++++++ 36 files changed, 547 insertions(+), 60 deletions(-) diff --git a/.licenserc.yaml b/.licenserc.yaml new file mode 100644 index 0000000..7f65d6e --- /dev/null +++ b/.licenserc.yaml @@ -0,0 +1,52 @@ +header: + license: + spdx-id: Apache-2.0 + copyright-owner: Apache Software Foundation + + paths-ignore: + - 'dist' + - 'licenses' + - '**/*.md' + - 'LICENSE' + - 'NOTICE' + - 'DISCLAIMER' + - '.clang-format' + - '.gitattributes' + - '.gitignore' + - '.gitmodules' + - '.licenserc.yaml' + - '.rat-excludes' + - 'be/src/common/status.cpp' + - 'be/src/common/status.h' + - 'be/src/env/env.h' + - 'be/src/env/env_posix.cpp' + - '**/glibc-compatibility/**' + - '**/gutil/**' + - '**/test_data/**' + - '**/jmockit/**' + - '**/*.json' + - '**/*.dat' + - '**/*.svg' + - '**/*.md5' + - '**/*.patch' + - '**/*.log' + - 'tsan_suppressions' + - 'docs/.markdownlintignore' + - 'fe/fe-core/src/test/resources/data/net_snmp_normal' + - 'be/src/olap/lru_cache.cpp' + - 'be/src/olap/lru_cache.h' + - 'be/src/olap/skiplist.h' + - 'be/src/runtime/string_search.hpp' + - 'be/src/util/coding.cpp' + - 'be/src/util/coding.h' + - 'be/src/util/condition_variable.cpp' + - 'be/src/util/condition_variable.h' + - 'be/src/util/murmur_hash3.cpp' + - 'be/src/util/murmur_hash3.h' + - 'be/src/util/mustache/mustache.cc' + - 'be/src/util/mustache/mustache.h' + - 'be/src/util/sse2neo.h' + - 'be/src/util/sse2neon.h' + - 'be/src/util/utf8_check.cpp' + + comment: on-failure diff --git a/be/src/runtime/runtime_filter_mgr.cpp b/be/src/runtime/runtime_filter_mgr.cpp index 5915bc2..41c81ab 100644 --- a/be/src/runtime/runtime_filter_mgr.cpp +++ b/be/src/runtime/runtime_filter_mgr.cpp @@ -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. + #include "runtime/runtime_filter_mgr.h" #include <string> diff --git a/docs/.vuepress/theme/styles/index.styl b/docs/.vuepress/theme/styles/index.styl index d6feb22..52c89d3 100644 --- a/docs/.vuepress/theme/styles/index.styl +++ b/docs/.vuepress/theme/styles/index.styl @@ -1,4 +1,21 @@ +// 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. + /* Override style of sidebar's sub-direcotry */ .sidebar-group.is-sub-group > .sidebar-heading:not(.clickable) { opacity: 1 !important; -} \ No newline at end of file +} diff --git a/extension/DataX/doriswriter/README b/extension/DataX/doriswriter/README deleted file mode 100644 index e69de29..0000000 diff --git a/extension/DataX/doriswriter/src/main/assembly/package.xml b/extension/DataX/doriswriter/src/main/assembly/package.xml index 4edb15a..9fca5e9 100644 --- a/extension/DataX/doriswriter/src/main/assembly/package.xml +++ b/extension/DataX/doriswriter/src/main/assembly/package.xml @@ -1,3 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" @@ -32,4 +53,4 @@ <scope>runtime</scope> </dependencySet> </dependencySets> -</assembly> \ No newline at end of file +</assembly> diff --git a/extension/DataX/doriswriter/src/main/java/com/alibaba/datax/plugin/writer/doriswriter/DorisCodec.java b/extension/DataX/doriswriter/src/main/java/com/alibaba/datax/plugin/writer/doriswriter/DorisCodec.java index 37d5008..fd14e56 100644 --- a/extension/DataX/doriswriter/src/main/java/com/alibaba/datax/plugin/writer/doriswriter/DorisCodec.java +++ b/extension/DataX/doriswriter/src/main/java/com/alibaba/datax/plugin/writer/doriswriter/DorisCodec.java @@ -1,3 +1,22 @@ +/* + 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. + --> + */ package com.alibaba.datax.plugin.writer.doriswriter; import com.alibaba.datax.common.element.Column; diff --git a/extension/DataX/init-env.sh b/extension/DataX/init-env.sh index 5231110..b43756f 100755 --- a/extension/DataX/init-env.sh +++ b/extension/DataX/init-env.sh @@ -1,9 +1,11 @@ -#!/usr/bin/env bash -# Copyright (c) 2017, Baidu.com, Inc. All Rights Reserved - -# 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 +#/bin/bash +# 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 # diff --git a/extension/flink-doris-connector/pom.xml b/extension/flink-doris-connector/pom.xml index c5c3905..3cdd0db 100644 --- a/extension/flink-doris-connector/pom.xml +++ b/extension/flink-doris-connector/pom.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> diff --git a/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/cfg/DorisSink.java b/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/cfg/DorisSink.java index f11c587..2c3db4c 100644 --- a/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/cfg/DorisSink.java +++ b/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/cfg/DorisSink.java @@ -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. + package org.apache.doris.flink.cfg; import org.apache.doris.flink.table.DorisDynamicOutputFormat; diff --git a/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/cfg/GenericDorisSinkFunction.java b/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/cfg/GenericDorisSinkFunction.java index 92dd300..6be6aa4 100644 --- a/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/cfg/GenericDorisSinkFunction.java +++ b/extension/flink-doris-connector/src/main/java/org/apache/doris/flink/cfg/GenericDorisSinkFunction.java @@ -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. + package org.apache.doris.flink.cfg; import org.apache.doris.flink.table.DorisDynamicOutputFormat; @@ -50,4 +67,4 @@ public class GenericDorisSinkFunction<T> extends RichSinkFunction<T> super.close(); } -} \ No newline at end of file +} diff --git a/extension/flink-doris-connector/src/test/java/org/apache/doris/flink/DorisStreamSinkExample.java b/extension/flink-doris-connector/src/test/java/org/apache/doris/flink/DorisStreamSinkExample.java index d37fd0d..cf35db6 100644 --- a/extension/flink-doris-connector/src/test/java/org/apache/doris/flink/DorisStreamSinkExample.java +++ b/extension/flink-doris-connector/src/test/java/org/apache/doris/flink/DorisStreamSinkExample.java @@ -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. + package org.apache.doris.flink; import org.apache.doris.flink.cfg.DorisExecutionOptions; @@ -216,4 +233,4 @@ public class DorisStreamSinkExample { )); env.execute("doris stream sink example"); } -} \ No newline at end of file +} diff --git a/extension/spark-doris-connector/pom.xml b/extension/spark-doris-connector/pom.xml index 2c41bfc..a030d92 100644 --- a/extension/spark-doris-connector/pom.xml +++ b/extension/spark-doris-connector/pom.xml @@ -37,7 +37,7 @@ <maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version> <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <doris.thirdparty>${basedir}/../../thirdparty</doris.thirdparty> + <doris.thirdparty>${env.DORIS_THIRDPARTY}</doris.thirdparty> </properties> <profiles> diff --git a/extension/spark-doris-connector/pom_3.0.xml b/extension/spark-doris-connector/pom_3.0.xml index 25aa355..e2aaded 100644 --- a/extension/spark-doris-connector/pom_3.0.xml +++ b/extension/spark-doris-connector/pom_3.0.xml @@ -37,7 +37,7 @@ <maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version> <maven-source-plugin.version>3.2.1</maven-source-plugin.version> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <doris.thirdparty>${basedir}/../../thirdparty</doris.thirdparty> + <doris.thirdparty>${env.DORIS_THIRDPARTY}</doris.thirdparty> </properties> <profiles> diff --git a/fe/README b/fe/README index 4b7e81a..59c0aca 100644 --- a/fe/README +++ b/fe/README @@ -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. + # fe-common This module is used to store some common classes of other modules. diff --git a/fe/fe-core/src/main/cup/readme b/fe/fe-core/src/main/cup/readme index f9ad4a9..77b3ae8 100644 --- a/fe/fe-core/src/main/cup/readme +++ b/fe/fe-core/src/main/cup/readme @@ -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. + If you want to modify this file, it is recommended to read the cup documentation (http://www2.cs.tum.edu/projects/cup/docs.php) first. -Please pay attention to and resolve the conflicts after the modification. \ No newline at end of file +Please pay attention to and resolve the conflicts after the modification. diff --git a/fe/fe-core/src/main/cup/sql_parser.cup b/fe/fe-core/src/main/cup/sql_parser.cup index fc81a60..1b76f28 100644 --- a/fe/fe-core/src/main/cup/sql_parser.cup +++ b/fe/fe-core/src/main/cup/sql_parser.cup @@ -10,7 +10,7 @@ // // Unless required by applicable law or agreed to in writing, // software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES ORF CONDITIONS OF ANY +// "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. diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateTest.java index 3f0bb48..3ff261b 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/IsNullPredicateTest.java @@ -1,19 +1,19 @@ // 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. +// 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. package org.apache.doris.analysis; diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/RangeCompareTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/RangeCompareTest.java index fd76a11..bd3b306 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/RangeCompareTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/RangeCompareTest.java @@ -4,7 +4,7 @@ // 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 Licenser at +// with the License. You may obtain a copy of the License at // // http://www.apache.org/licenses/LICENSE-2.0 // diff --git a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowViewStmtTest.java b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowViewStmtTest.java index 87efc37..ffa2d9f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowViewStmtTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/analysis/ShowViewStmtTest.java @@ -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. + package org.apache.doris.analysis; import org.apache.doris.common.UserException; diff --git a/fe/fe-core/src/test/java/org/apache/doris/catalog/TruncateTableTest.java b/fe/fe-core/src/test/java/org/apache/doris/catalog/TruncateTableTest.java index 42ebd62..15a8f82 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/catalog/TruncateTableTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/catalog/TruncateTableTest.java @@ -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. + package org.apache.doris.catalog; import org.apache.doris.analysis.AlterTableStmt; diff --git a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapAuthenticateTest.java b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapAuthenticateTest.java index 63b6c06..dba4283 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapAuthenticateTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapAuthenticateTest.java @@ -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. + package org.apache.doris.ldap; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java index 3918e9a..d018c27 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapClientTest.java @@ -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. + package org.apache.doris.ldap; import com.clearspring.analytics.util.Lists; diff --git a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapPrivsCheckerTest.java b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapPrivsCheckerTest.java index e5cb54a..6261b5a 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapPrivsCheckerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/ldap/LdapPrivsCheckerTest.java @@ -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. + package org.apache.doris.ldap; import mockit.Expectations; diff --git a/fe/fe-core/src/test/java/org/apache/doris/persist/LdapInfoTest.java b/fe/fe-core/src/test/java/org/apache/doris/persist/LdapInfoTest.java index ea5535d..46e1e0d 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/persist/LdapInfoTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/persist/LdapInfoTest.java @@ -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. + package org.apache.doris.persist; import org.junit.Assert; diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/JoinCostEvaluationTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/JoinCostEvaluationTest.java index 26baf13..ed4cd3c 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/JoinCostEvaluationTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/JoinCostEvaluationTest.java @@ -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. + package org.apache.doris.planner; import org.apache.doris.analysis.BinaryPredicate; @@ -112,4 +129,4 @@ public class JoinCostEvaluationTest { Assert.assertEquals(hashTableSpace, joinCostEvaluation.constructHashTableSpace()); } -} \ No newline at end of file +} diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java index 9c9816c..e5c361f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/RuntimeFilterGeneratorTest.java @@ -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. + package org.apache.doris.planner; import org.apache.doris.analysis.Analyzer; diff --git a/fe/fe-core/src/test/java/org/apache/doris/planner/SingleNodePlannerTest.java b/fe/fe-core/src/test/java/org/apache/doris/planner/SingleNodePlannerTest.java index 8b77b48..2639401 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/planner/SingleNodePlannerTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/planner/SingleNodePlannerTest.java @@ -1,22 +1,19 @@ -/* - * // 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. - * - */ +// 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. package org.apache.doris.planner; diff --git a/fe/fe-core/src/test/resources/log4j2.xml b/fe/fe-core/src/test/resources/log4j2.xml index 7e0957b..7a36940 100644 --- a/fe/fe-core/src/test/resources/log4j2.xml +++ b/fe/fe-core/src/test/resources/log4j2.xml @@ -1,4 +1,24 @@ <?xml version="1.0" encoding="UTF-8"?> + +<!-- +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. +--> + <Configuration status="WARN"> <Appenders> <Console name="Console" target="SYSTEM_OUT"> diff --git a/fe_plugins/auditdemo/src/main/assembly/zip.xml b/fe_plugins/auditdemo/src/main/assembly/zip.xml index e2925fb..8ff8aa3 100644 --- a/fe_plugins/auditdemo/src/main/assembly/zip.xml +++ b/fe_plugins/auditdemo/src/main/assembly/zip.xml @@ -1,3 +1,22 @@ +<!-- +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. +--> + <assembly> <id>plugin</id> <formats> diff --git a/fe_plugins/auditloader/src/main/assembly/zip.xml b/fe_plugins/auditloader/src/main/assembly/zip.xml index 9fb9226..c8a5be0 100644 --- a/fe_plugins/auditloader/src/main/assembly/zip.xml +++ b/fe_plugins/auditloader/src/main/assembly/zip.xml @@ -1,3 +1,22 @@ +<!-- +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. +--> + <assembly> <id>plugin</id> <formats> diff --git a/fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml b/fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml index d2ddf89..8ce34a7 100644 --- a/fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml +++ b/fs_brokers/apache_hdfs_broker/conf/hdfs-site.xml @@ -1,19 +1,25 @@ <?xml version="1.0" encoding="UTF-8"?> -<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> + <!-- - 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 +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 + 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. See accompanying LICENSE file. +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. --> +<?xml-stylesheet type="text/xsl" href="configuration.xsl"?> <!-- Put site-specific property overrides in this file. --> <configuration> diff --git a/gensrc/script/gen_builtins_functions.py b/gensrc/script/gen_builtins_functions.py index 26ee29f..95c12ff 100755 --- a/gensrc/script/gen_builtins_functions.py +++ b/gensrc/script/gen_builtins_functions.py @@ -1,6 +1,23 @@ #!/usr/bin/env python # encoding: utf-8 +# 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. + """ This module is doris builtin functions """ diff --git a/gensrc/thrift/HeartbeatService.thrift b/gensrc/thrift/HeartbeatService.thrift index ef0eb3c..c2445a9 100644 --- a/gensrc/thrift/HeartbeatService.thrift +++ b/gensrc/thrift/HeartbeatService.thrift @@ -1,3 +1,6 @@ +// 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 diff --git a/gensrc/thrift/PaloBrokerService.thrift b/gensrc/thrift/PaloBrokerService.thrift index f3525ba..489e8ca 100644 --- a/gensrc/thrift/PaloBrokerService.thrift +++ b/gensrc/thrift/PaloBrokerService.thrift @@ -1,3 +1,6 @@ +// 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 diff --git a/samples/doris-demo/spring-jdbc-demo/src/main/resources/application-druid.yml b/samples/doris-demo/spring-jdbc-demo/src/main/resources/application-druid.yml index 21996a1..7f8a107 100644 --- a/samples/doris-demo/spring-jdbc-demo/src/main/resources/application-druid.yml +++ b/samples/doris-demo/spring-jdbc-demo/src/main/resources/application-druid.yml @@ -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. + # Data source configuration spring: datasource: diff --git a/samples/doris-demo/spring-jdbc-demo/src/main/resources/application.yml b/samples/doris-demo/spring-jdbc-demo/src/main/resources/application.yml index c7174ea..2f1cd09 100644 --- a/samples/doris-demo/spring-jdbc-demo/src/main/resources/application.yml +++ b/samples/doris-demo/spring-jdbc-demo/src/main/resources/application.yml @@ -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. + # Development environment configuration server: # The HTTP port of the server, the default is 8080 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org For additional commands, e-mail: commits-h...@doris.apache.org