You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@doris.apache.org by li...@apache.org on 2020/04/07 08:38:27 UTC
[incubator-doris] branch branch-0.12 updated (d4df588 -> 0cc7476)
This is an automated email from the ASF dual-hosted git repository.
lichaoyong pushed a change to branch branch-0.12
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git.
omit d4df588 Add config: tablet writer open rpc timeout (#3258)
add 2ed184e Add config: tablet writer open rpc timeout (#3258)
add 79bac50 Fix the bug that 'username' in broker load is invalid (#3237)
add 1ef4cb2 [Bug] Base compaction failed because of overlapping of input rowsets (#3262)
new 0cc7476 Add License to codes
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (d4df588)
\
N -- N -- N refs/heads/branch-0.12 (0cc7476)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.rat-excludes | 4 ++++
LICENSE.txt | 8 ++++++++
be/src/olap/tablet.cpp | 13 +++++++++++-
docs/website/Makefile | 19 ++++++++++++++++-
docs/website/source/_templates/footer.html | 17 +++++++++++++++
...org.apache.spark.sql.sources.DataSourceRegister | 19 ++++++++++++++++-
.../doris/spark/rest/TestPartitionDefinition.java | 21 ++++++++++++++-----
.../org/apache/doris/analysis/SelectStmtTest.java | 17 +++++++++++++++
.../doris/analysis/SetOperationStmtTest.java | 17 +++++++++++++++
.../doris/catalog/DynamicPartitionTableTest.java | 19 ++++++++++++++++-
.../gson/GsonDerivedClassSerializationTest.java | 17 +++++++++++++++
.../resources/plugin_test/source/plugin.properties | 19 ++++++++++++++++-
.../test_local_plugin/plugin.properties | 19 ++++++++++++++++-
.../auditdemo/src/main/assembly/plugin.properties | 19 ++++++++++++++++-
.../src/main/assembly/plugin.properties | 19 ++++++++++++++++-
.../doris/broker/hdfs/FileSystemManager.java | 24 ++++++++++++++--------
16 files changed, 250 insertions(+), 21 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org
[incubator-doris] 01/01: Add License to codes
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lichaoyong pushed a commit to branch branch-0.12
in repository https://gitbox.apache.org/repos/asf/incubator-doris.git
commit 0cc7476c8c6df213df8c00052c9e9b81b560bfe5
Author: lichaoyong <li...@baidu.com>
AuthorDate: Tue Apr 7 16:24:47 2020 +0800
Add License to codes
---
.rat-excludes | 4 ++++
LICENSE.txt | 8 ++++++++
docs/website/Makefile | 19 ++++++++++++++++++-
docs/website/source/_templates/footer.html | 17 +++++++++++++++++
.../org.apache.spark.sql.sources.DataSourceRegister | 19 ++++++++++++++++++-
.../doris/spark/rest/TestPartitionDefinition.java | 21 ++++++++++++++++-----
.../org/apache/doris/analysis/SelectStmtTest.java | 17 +++++++++++++++++
.../apache/doris/analysis/SetOperationStmtTest.java | 17 +++++++++++++++++
.../doris/catalog/DynamicPartitionTableTest.java | 19 ++++++++++++++++++-
.../gson/GsonDerivedClassSerializationTest.java | 17 +++++++++++++++++
.../resources/plugin_test/source/plugin.properties | 19 ++++++++++++++++++-
.../plugin_test/test_local_plugin/plugin.properties | 19 ++++++++++++++++++-
.../auditdemo/src/main/assembly/plugin.properties | 19 ++++++++++++++++++-
.../auditloader/src/main/assembly/plugin.properties | 19 ++++++++++++++++++-
gensrc/script/gen_build_version.sh | 2 +-
15 files changed, 223 insertions(+), 13 deletions(-)
diff --git a/.rat-excludes b/.rat-excludes
index c659e3a..377bcf0 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -3,13 +3,17 @@
.*svg
.*xml
.*zip
+.clang-format
.gitattributes
.gitignore
.rat-excludes
.travis.yml
+DISCLAIMER-WIP
LICENSE
NOTICE
gutil/*
manifest
patches/*
test_data/*
+test.zip
+test.zip.md5
diff --git a/LICENSE.txt b/LICENSE.txt
index 70a4367..571e94b 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -622,3 +622,11 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
+
+--------------------------------------------------------------------------------
+
+be/src/util/condition_variable* : BSD-style license
+
+Copyright (c) 2011 The Chromium Authors. All rights reserved.
+Use of this source code is governed by a BSD-style license that can be
+found in the LICENSE file.
diff --git a/docs/website/Makefile b/docs/website/Makefile
index 69fe55e..76d13b4 100644
--- a/docs/website/Makefile
+++ b/docs/website/Makefile
@@ -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.
+
# Minimal makefile for Sphinx documentation
#
@@ -16,4 +33,4 @@ help:
# Catch-all target: route all unknown targets to Sphinx using the new
# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS).
%: Makefile
- @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
\ No newline at end of file
+ @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/docs/website/source/_templates/footer.html b/docs/website/source/_templates/footer.html
index ab9402b..21beb5c 100644
--- a/docs/website/source/_templates/footer.html
+++ b/docs/website/source/_templates/footer.html
@@ -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.
+-->
+
{% extends '!footer.html' %}
{% block extrafooter %}
<div role="contentinfo">
diff --git a/extension/spark-doris-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister b/extension/spark-doris-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
index 15f36f6..15b2434 100644
--- a/extension/spark-doris-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
+++ b/extension/spark-doris-connector/src/main/resources/META-INF/services/org.apache.spark.sql.sources.DataSourceRegister
@@ -1 +1,18 @@
-org.apache.doris.spark.sql.DorisSourceProvider
\ No newline at end of file
+# 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.
+
+org.apache.doris.spark.sql.DorisSourceProvider
diff --git a/extension/spark-doris-connector/src/test/java/org/apache/doris/spark/rest/TestPartitionDefinition.java b/extension/spark-doris-connector/src/test/java/org/apache/doris/spark/rest/TestPartitionDefinition.java
index b5f477e..0bfa3aa 100644
--- a/extension/spark-doris-connector/src/test/java/org/apache/doris/spark/rest/TestPartitionDefinition.java
+++ b/extension/spark-doris-connector/src/test/java/org/apache/doris/spark/rest/TestPartitionDefinition.java
@@ -1,8 +1,19 @@
-/**
- * Copyright (c) 2019. Baidu.com, Inc. All Rights Reserved.
- * Author: zhangwenxin01
- * Date: 2019-08-07
- */
+// 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.spark.rest;
diff --git a/fe/src/test/java/org/apache/doris/analysis/SelectStmtTest.java b/fe/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
index d1e2829..171776b 100644
--- a/fe/src/test/java/org/apache/doris/analysis/SelectStmtTest.java
+++ b/fe/src/test/java/org/apache/doris/analysis/SelectStmtTest.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.AnalysisException;
diff --git a/fe/src/test/java/org/apache/doris/analysis/SetOperationStmtTest.java b/fe/src/test/java/org/apache/doris/analysis/SetOperationStmtTest.java
index 7c59ee4..c4eb520 100644
--- a/fe/src/test/java/org/apache/doris/analysis/SetOperationStmtTest.java
+++ b/fe/src/test/java/org/apache/doris/analysis/SetOperationStmtTest.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.util.SqlParserUtils;
diff --git a/fe/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java b/fe/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java
index c65277e..70ce4c0 100644
--- a/fe/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.java
+++ b/fe/src/test/java/org/apache/doris/catalog/DynamicPartitionTableTest.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.Analyzer;
@@ -480,4 +497,4 @@ public class DynamicPartitionTableTest {
catalog.createTable(stmt);
}
-}
\ No newline at end of file
+}
diff --git a/fe/src/test/java/org/apache/doris/persist/gson/GsonDerivedClassSerializationTest.java b/fe/src/test/java/org/apache/doris/persist/gson/GsonDerivedClassSerializationTest.java
index e39938b..3f3a938 100644
--- a/fe/src/test/java/org/apache/doris/persist/gson/GsonDerivedClassSerializationTest.java
+++ b/fe/src/test/java/org/apache/doris/persist/gson/GsonDerivedClassSerializationTest.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.gson;
import org.apache.doris.common.io.Text;
diff --git a/fe/src/test/resources/plugin_test/source/plugin.properties b/fe/src/test/resources/plugin_test/source/plugin.properties
index 24975d9..7df12b6 100644
--- a/fe/src/test/resources/plugin_test/source/plugin.properties
+++ b/fe/src/test/resources/plugin_test/source/plugin.properties
@@ -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.
+
### required:
#
# the plugin name
@@ -23,4 +40,4 @@ classname=doris.test.plugin.PluginTest
### BE-Plugin optional:
#
-#
\ No newline at end of file
+#
diff --git a/fe/src/test/resources/plugin_test/test_local_plugin/plugin.properties b/fe/src/test/resources/plugin_test/test_local_plugin/plugin.properties
index 70e19b4..cb4d744 100644
--- a/fe/src/test/resources/plugin_test/test_local_plugin/plugin.properties
+++ b/fe/src/test/resources/plugin_test/test_local_plugin/plugin.properties
@@ -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.
+
### required:
#
# the plugin name
@@ -23,4 +40,4 @@ classname=plugin.AuditPluginDemo
### BE-Plugin optional:
#
-#
\ No newline at end of file
+#
diff --git a/fe_plugins/auditdemo/src/main/assembly/plugin.properties b/fe_plugins/auditdemo/src/main/assembly/plugin.properties
index c51d54f..c529870 100755
--- a/fe_plugins/auditdemo/src/main/assembly/plugin.properties
+++ b/fe_plugins/auditdemo/src/main/assembly/plugin.properties
@@ -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.
+
### required:
#
# the plugin name
@@ -21,4 +38,4 @@ java.version=1.8.31
classname=org.apache.doris.plugin.audit.AuditPluginDemo
### BE-Plugin optional:
#
-#
\ No newline at end of file
+#
diff --git a/fe_plugins/auditloader/src/main/assembly/plugin.properties b/fe_plugins/auditloader/src/main/assembly/plugin.properties
index 05cb6c7..1226f9b 100755
--- a/fe_plugins/auditloader/src/main/assembly/plugin.properties
+++ b/fe_plugins/auditloader/src/main/assembly/plugin.properties
@@ -1,6 +1,23 @@
+# 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.
+
name=AuditLoader
type=AUDIT
description=load audit log to olap load, and user can view the statistic of queries
version=0.12.0
java.version=1.8.0
-classname=org.apache.doris.plugin.audit.AuditLoaderPlugin
\ No newline at end of file
+classname=org.apache.doris.plugin.audit.AuditLoaderPlugin
diff --git a/gensrc/script/gen_build_version.sh b/gensrc/script/gen_build_version.sh
index 21bb1b8..0b3550b 100755
--- a/gensrc/script/gen_build_version.sh
+++ b/gensrc/script/gen_build_version.sh
@@ -25,7 +25,7 @@
# contains the build version based on the git hash or svn revision.
##############################################################
-build_version="trunk"
+build_version="branch-0.12"
unset LANG
unset LC_CTYPE
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@doris.apache.org
For additional commands, e-mail: commits-help@doris.apache.org