Cherrypick to v2.6.1 (#3264)

* Enhancement (#3223) * Remove Common Clause License (#3263) * Remove Common Clause 1.0 License * Again * Cleanup CC * Cleanup useless files Co-authored-by: jakevin <[email protected]>
vesoft-inc · Nov 3, 2021 · de03025 · de03025
1 parent da6b9b5
commit de03025
Show file tree

Hide file tree

Showing 1,774 changed files with 1,788 additions and 3,561 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,7 +1,6 @@
 # Copyright (c) 2020 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 #
 # This is the output of clang-format-10.0.0 --style=google --dump-config,
 # except for changes mentioned below.

diff --git a/.github/ISSUE_TEMPLATE/enhancement.md b/.github/ISSUE_TEMPLATE/enhancement.md
@@ -0,0 +1,16 @@
+---
+name: Enhancement
+about: make the code neat or more efficient.
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+## Introduction
+<!-- concise introduction to problem, motivation, and overview of proposed solution -->
+
+## Contents
+<!-- Please describe the enhancement what you want in this section -->
+
+## Related work
+<!-- In this section you can add other related tasks to help assigner to complete the task more easily -->
diff --git a/.linters/cpp/checkKeyword.py b/.linters/cpp/checkKeyword.py
@@ -2,8 +2,7 @@
 
 # Copyright (c) 2019 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 import os
 import re

diff --git a/.linters/cpp/hooks/pre-commit.sh b/.linters/cpp/hooks/pre-commit.sh
@@ -2,8 +2,7 @@
 
 # Copyright (c) 2018 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 CPPLINT=`dirname $0`/../../.linters/cpp/cpplint.py
 CHECKKEYWORD=`dirname $0`/../../.linters/cpp/checkKeyword.py

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (c) 2018 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 # The build can be controlled by defining following variables on the
 # <cmake> command line

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -7,4 +7,4 @@ Currently we use clang-format to format the code. We recommend you to configure
 - Emacs
   https://github.com/llvm-mirror/clang/blob/master/tools/clang-format/clang-format.el
 - VS Code
-  https://code.visualstudio.com/docs/cpp/cpp-ide#_code-formatting
+  https://code.visualstudio.com/docs/cpp/cpp-ide#_code-formatting
diff --git a/LICENSES/CC-1.0.txt b/LICENSES/CC-1.0.txt
diff --git a/README-CN.md b/README-CN.md
@@ -90,8 +90,6 @@ Nebula Graph 1.x 后续不再进行功能的更新，请升级到2.0版本中。
 
 **Nebula Graph** 使用 [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0) 许可证，您可以免费下载，修改以及部署源代码。您还可以将 **Nebula Graph** 作为后端服务部署以支持您的 SaaS 部署。
 
-为防止云供应商从项目赢利而不回馈，**Nebula Graph** 在项目中添加了 [Commons Clause 1.0](https://commonsclause.com/) 条款。如上所述，**Nebula Graph** 是一个完全开源的项目，欢迎您就许可模式提出建议，帮助 **Nebula Graph** 社区更好地发展。
-
 ## 联系方式
 
 * 访问[官网](http://nebula-graph.com.cn/)

diff --git a/README.md b/README.md
@@ -78,8 +78,6 @@ Contributions are warmly welcomed and greatly appreciated. And here are a few wa
 
 **Nebula Graph** is under [Apache 2.0](https://www.apache.org/licenses/LICENSE-2.0) license, so you can freely download, modify, and deploy the source code to meet your needs. You can also freely deploy **Nebula Graph** as a back-end service to support your SaaS deployment.
 
-In order to prevent cloud providers monetizing from the project without contributing back, we added [Commons Clause 1.0](https://commonsclause.com/) to the project. As mentioned above, we fully commit to the open source community. We would love to hear your thoughts on the licensing model and are willing to make it more suitable for the community.
-
 ## Contact
 
 * [Slack channel](https://join.slack.com/t/nebulagraph/shared_invite/zt-7ybejuqa-NCZBroh~PCh66d9kOQj45g)

diff --git a/cmake/CPackage.cmake b/cmake/CPackage.cmake
@@ -1,7 +1,6 @@
 # Copyright (c) 2020 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 #
 
 
@@ -10,7 +9,7 @@ macro(package to_one name home_page scripts_dir)
     set(CPACK_PACKAGE_DESCRIPTION ${name})
     set(CPACK_PACKAGE_CONTACT ${name})
     set(CPACK_PACKAGE_VERSION ${NEBULA_BUILD_VERSION})
-    set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0 + Common Clause 1.0")
+    set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0")
     set(CPACK_PACKAGE_NAME ${name})
     # set(CPACK_SET_DESTDIR TRUE)
     set(CPACK_PACKAGE_RELOCATABLE ON)

diff --git a/cmake/FetchModule.cmake b/cmake/FetchModule.cmake
@@ -1,7 +1,6 @@
 # Copyright (c) 2020 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 #
 
 find_package(Git)

diff --git a/codecov.yml b/codecov.yml
@@ -1,7 +1,6 @@
 # Copyright (c) 2021 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 # For more configuration details:
 # https://docs.codecov.io/docs/codecov-yaml

diff --git a/conf/CMakeLists.txt b/conf/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (c) 2021 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 # These configuration files are for reference to generate your own customized ones.
 # Thus, they are installed as read-only, even for the owner.

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (c) 2021 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 install(
     FILES

diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (c) 2021 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 install(
     FILES

diff --git a/scripts/services.sh b/scripts/services.sh
@@ -2,8 +2,7 @@
 
 # Copyright (c) 2019 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 SCRIPT_PATH=$(cd "$(dirname "$0")";pwd)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (c) 2020 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 nebula_add_subdirectory(clients)
 nebula_add_subdirectory(codec)

diff --git a/src/clients/CMakeLists.txt b/src/clients/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (c) 2020 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 nebula_add_subdirectory(meta)
 nebula_add_subdirectory(storage)
diff --git a/src/clients/meta/CMakeLists.txt b/src/clients/meta/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (c) 2020 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 nebula_add_library(
     meta_client_obj OBJECT

diff --git a/src/clients/meta/FileBasedClusterIdMan.cpp b/src/clients/meta/FileBasedClusterIdMan.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2019 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include "clients/meta/FileBasedClusterIdMan.h"

diff --git a/src/clients/meta/FileBasedClusterIdMan.h b/src/clients/meta/FileBasedClusterIdMan.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2019 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #ifndef CLIENTS_META_FILEBASEDCLUSTERIDMAN_H_

diff --git a/src/clients/meta/MetaClient.cpp b/src/clients/meta/MetaClient.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include "clients/meta/MetaClient.h"

diff --git a/src/clients/meta/MetaClient.h b/src/clients/meta/MetaClient.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #ifndef CLIENTS_META_METACLIENT_H_

diff --git a/src/clients/meta/test/CMakeLists.txt b/src/clients/meta/test/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (c) 2020 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 nebula_add_test(
     NAME file_based_cluster_id_man_test

diff --git a/src/clients/meta/test/FileBasedClusterIdManTest.cpp b/src/clients/meta/test/FileBasedClusterIdManTest.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2019 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include <gtest/gtest.h>

diff --git a/src/clients/storage/CMakeLists.txt b/src/clients/storage/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright (c) 2020 vesoft inc. All rights reserved.
 #
-# This source code is licensed under Apache 2.0 License,
-# attached with Common Clause Condition 1.0, found in the LICENSES directory.
+# This source code is licensed under Apache 2.0 License.
 
 nebula_add_library(
     graph_storage_client_obj OBJECT

diff --git a/src/clients/storage/GeneralStorageClient.cpp b/src/clients/storage/GeneralStorageClient.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2020 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include "clients/storage/GeneralStorageClient.h"

diff --git a/src/clients/storage/GeneralStorageClient.h b/src/clients/storage/GeneralStorageClient.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2020 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #ifndef CLIENTS_STORAGE_GENERALSTORAGECLIENT_H_

diff --git a/src/clients/storage/GraphStorageClient.cpp b/src/clients/storage/GraphStorageClient.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include "clients/storage/GraphStorageClient.h"

diff --git a/src/clients/storage/GraphStorageClient.h b/src/clients/storage/GraphStorageClient.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #ifndef CLIENTS_STORAGE_GRAPHSTORAGECLIENT_H_

diff --git a/src/clients/storage/InternalStorageClient.cpp b/src/clients/storage/InternalStorageClient.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2020 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include "clients/storage/InternalStorageClient.h"

diff --git a/src/clients/storage/InternalStorageClient.h b/src/clients/storage/InternalStorageClient.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2020 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #ifndef CLIENTS_STORAGE_INTERNALSTORAGEClient_H_

diff --git a/src/clients/storage/StorageClientBase-inl.h b/src/clients/storage/StorageClientBase-inl.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #pragma once

diff --git a/src/clients/storage/StorageClientBase.cpp b/src/clients/storage/StorageClientBase.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2020 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include "clients/storage/StorageClientBase.h"

diff --git a/src/clients/storage/StorageClientBase.h b/src/clients/storage/StorageClientBase.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #ifndef CLIENTS_STORAGE_STORAGECLIENTBASE_H_

diff --git a/src/codec/Common.h b/src/codec/Common.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #ifndef CODEC_COMMON_H_

diff --git a/src/codec/NebulaCodecImpl.cpp b/src/codec/NebulaCodecImpl.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include "codec/NebulaCodecImpl.h"

diff --git a/src/codec/NebulaCodecImpl.h b/src/codec/NebulaCodecImpl.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #ifndef NEBULA_GRAPH_NEBULACODECIMPL_H

diff --git a/src/codec/RowReader.cpp b/src/codec/RowReader.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include "codec/RowReader.h"

diff --git a/src/codec/RowReader.h b/src/codec/RowReader.h
@@ -1,7 +1,6 @@
 /* Copyright (c) 2018 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #ifndef CODEC_ROWREADER_H_

diff --git a/src/codec/RowReaderV1.cpp b/src/codec/RowReaderV1.cpp
@@ -1,7 +1,6 @@
 /* Copyright (c) 2020 vesoft inc. All rights reserved.
  *
- * This source code is licensed under Apache 2.0 License,
- * attached with Common Clause Condition 1.0, found in the LICENSES directory.
+ * This source code is licensed under Apache 2.0 License.
  */
 
 #include "codec/RowReaderV1.h"