You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kvrocks.apache.org by tw...@apache.org on 2023/02/22 07:07:24 UTC
[incubator-kvrocks] branch unstable updated: Fix license issues in rand.h, rocksdb_crc32c.h and batch_debugger.h (#1274)
This is an automated email from the ASF dual-hosted git repository.
twice pushed a commit to branch unstable
in repository https://gitbox.apache.org/repos/asf/incubator-kvrocks.git
The following commit(s) were added to refs/heads/unstable by this push:
new a4e75902 Fix license issues in rand.h, rocksdb_crc32c.h and batch_debugger.h (#1274)
a4e75902 is described below
commit a4e75902b9eba388f8a65d23f1fdf6178ee9adf8
Author: Twice <tw...@gmail.com>
AuthorDate: Wed Feb 22 15:07:17 2023 +0800
Fix license issues in rand.h, rocksdb_crc32c.h and batch_debugger.h (#1274)
Co-authored-by: tison <wa...@gmail.com>
---
.github/config/licenserc.yml | 3 +++
NOTICE | 9 +++++++--
src/common/rand.h | 30 +++++-------------------------
src/common/rocksdb_crc32c.h | 20 --------------------
src/storage/batch_debugger.h | 20 --------------------
5 files changed, 15 insertions(+), 67 deletions(-)
diff --git a/.github/config/licenserc.yml b/.github/config/licenserc.yml
index ec82c321..21a2127c 100644
--- a/.github/config/licenserc.yml
+++ b/.github/config/licenserc.yml
@@ -32,7 +32,10 @@ header:
- '**/*.yml'
- '**/*.yaml'
paths-ignore:
+ - 'src/common/rand.h'
+ - 'src/common/rocksdb_crc32c.h'
- 'src/common/sha1.h'
- 'src/common/sha1.cc'
+ - 'src/storage/batch_debugger.h'
- 'src/types/geohash.h'
- 'src/types/geohash.cc'
diff --git a/NOTICE b/NOTICE
index 3c72f25e..3ad7ccf7 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache Kvrocks (Incubating)
-Copyright 2022 The Apache Software Foundation
+Copyright 2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
@@ -223,11 +223,16 @@ It is under the MIT license with an optional exception:
without including the above copyright and permission notices.
For src/types/geohash.*, src/common/rand.*, src/common/sha1.*, src/storage/scripting.* and
-some functions in src/common/util.cc are modified from Redis.
+some utility functions in src/common are modified from Redis.
We have added the Redis license notice in each file header, can also see bundled license file
https://github.com/apache/incubator-kvrocks/blob/unstable/licenses/LICENSE.redis for details.
+For src/common/rocksdb_crc32c.h and src/storage/batch_debugger.h are modified from RocksDB.
+
+We choose the Apache License 2.0 from the dual-licensed RocksDB code,
+and have added the RocksDB license notice in each file header.
+
For the library LuaJIT(https://github.com/KvrocksLabs/LuaJIT) -- a Just-In-Time Compiler for Lua. https://luajit.org/
LuaJIT is free software, released under the MIT license.
diff --git a/src/common/rand.h b/src/common/rand.h
index 4ffdd9bd..311ce3ad 100644
--- a/src/common/rand.h
+++ b/src/common/rand.h
@@ -1,28 +1,3 @@
-/*
- * 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.
- *
- */
-
-/*
- * Modified by @PragmaTwice to leverage constexprs over defines in
- * https://github.com/apache/incubator-kvrocks/commit/1dcf225acad001175df0ea142b5e498f29d1b18b
- */
-
/*
* Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
* All rights reserved.
@@ -52,6 +27,11 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+/*
+ * Modified by @PragmaTwice to leverage constexprs over defines in
+ * https://github.com/apache/incubator-kvrocks/commit/1dcf225acad001175df0ea142b5e498f29d1b18b
+ */
+
#pragma once
#include <stdint.h>
diff --git a/src/common/rocksdb_crc32c.h b/src/common/rocksdb_crc32c.h
index 68342d60..a85bf7bd 100644
--- a/src/common/rocksdb_crc32c.h
+++ b/src/common/rocksdb_crc32c.h
@@ -1,23 +1,3 @@
-/*
- * 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.
- *
- */
-
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
// This source code is licensed under both the GPLv2 (found in the
// COPYING file in the root directory) and Apache 2.0 License
diff --git a/src/storage/batch_debugger.h b/src/storage/batch_debugger.h
index 17b0d7b3..39e98e3f 100644
--- a/src/storage/batch_debugger.h
+++ b/src/storage/batch_debugger.h
@@ -1,23 +1,3 @@
-/*
- * 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.
- *
- */
-
// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
// This source code is licensed under both the GPLv2 (found in the
// COPYING file in the root directory) and Apache 2.0 License