You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kvrocks.apache.org by ca...@apache.org on 2023/02/14 12:29:02 UTC
[incubator-kvrocks] branch 2.3 updated (f210be7d -> 477a96e2)
This is an automated email from the ASF dual-hosted git repository.
caipengbo pushed a change to branch 2.3
in repository https://gitbox.apache.org/repos/asf/incubator-kvrocks.git
omit f210be7d [source-release] prepare release apache-kvrocks-2.3.0
new afef1dbf fix: license headers in third-party code (#1259)
new 477a96e2 [source-release] prepare release apache-kvrocks-2.3.0-rc2
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 (f210be7d)
\
N -- N -- N refs/heads/2.3 (477a96e2)
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 2 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:
.github/config/licenserc.yml | 5 +++++
src/VERSION.txt | 2 +-
src/common/rand.cc | 5 +++++
src/common/rand.h | 5 +++++
src/common/sha1.cc | 22 ----------------------
src/common/sha1.h | 20 --------------------
src/storage/scripting.cc | 29 -----------------------------
src/types/geohash.cc | 20 --------------------
src/types/geohash.h | 20 --------------------
9 files changed, 16 insertions(+), 112 deletions(-)
[incubator-kvrocks] 01/02: fix: license headers in third-party code (#1259)
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caipengbo pushed a commit to branch 2.3
in repository https://gitbox.apache.org/repos/asf/incubator-kvrocks.git
commit afef1dbf80e6722eaa2a6d159a5598c1bc2bc204
Author: tison <wa...@gmail.com>
AuthorDate: Tue Feb 14 12:30:18 2023 +0800
fix: license headers in third-party code (#1259)
Signed-off-by: tison <wa...@gmail.com>
---
.github/config/licenserc.yml | 5 +++++
src/common/rand.cc | 5 +++++
src/common/rand.h | 5 +++++
src/common/sha1.cc | 22 ----------------------
src/common/sha1.h | 20 --------------------
src/storage/scripting.cc | 29 -----------------------------
src/types/geohash.cc | 20 --------------------
src/types/geohash.h | 20 --------------------
8 files changed, 15 insertions(+), 111 deletions(-)
diff --git a/.github/config/licenserc.yml b/.github/config/licenserc.yml
index 0f0325f5..ec82c321 100644
--- a/.github/config/licenserc.yml
+++ b/.github/config/licenserc.yml
@@ -31,3 +31,8 @@ header:
- '**/*.tcl'
- '**/*.yml'
- '**/*.yaml'
+ paths-ignore:
+ - 'src/common/sha1.h'
+ - 'src/common/sha1.cc'
+ - 'src/types/geohash.h'
+ - 'src/types/geohash.cc'
diff --git a/src/common/rand.cc b/src/common/rand.cc
index dae0fc3f..778b0c25 100644
--- a/src/common/rand.cc
+++ b/src/common/rand.cc
@@ -18,6 +18,11 @@
*
*/
+/*
+ * Rewritten in C++ with constexprs and templates by @tanruixiang in
+ * https://github.com/apache/incubator-kvrocks/commit/900e0f44781d9459649e9864ba09abe6000ce987
+ */
+
/* Pseudo random number generation functions derived from the drand48()
* function obtained from pysam source code.
*
diff --git a/src/common/rand.h b/src/common/rand.h
index 62b37adb..4ffdd9bd 100644
--- a/src/common/rand.h
+++ b/src/common/rand.h
@@ -18,6 +18,11 @@
*
*/
+/*
+ * 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.
diff --git a/src/common/sha1.cc b/src/common/sha1.cc
index 94aff0c3..97182cfd 100644
--- a/src/common/sha1.cc
+++ b/src/common/sha1.cc
@@ -1,25 +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.
- *
- */
-
-/* from valgrind tests */
-
/* ================ sha1.c ================ */
/*
SHA-1 in C
diff --git a/src/common/sha1.h b/src/common/sha1.h
index 88124dce..19c5d68c 100644
--- a/src/common/sha1.h
+++ b/src/common/sha1.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.
- *
- */
-
#pragma once
/* ================ sha1.h ================ */
diff --git a/src/storage/scripting.cc b/src/storage/scripting.cc
index 52696a4a..bb9a1b34 100644
--- a/src/storage/scripting.cc
+++ b/src/storage/scripting.cc
@@ -18,35 +18,6 @@
*
*/
-/*
- * Copyright (c) 2009-2012, Salvatore Sanfilippo <antirez at gmail dot com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * * Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Redis nor the names of its contributors may be used
- * to endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
// This file is modified from several source code files about lua scripting of Redis.
// See the original code at https://github.com/redis/redis.
diff --git a/src/types/geohash.cc b/src/types/geohash.cc
index c613abd4..583c57c7 100644
--- a/src/types/geohash.cc
+++ b/src/types/geohash.cc
@@ -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) 2013-2014, yinqiwen <yi...@gmail.com>
* Copyright (c) 2014, Matt Stancliff <ma...@genges.com>.
diff --git a/src/types/geohash.h b/src/types/geohash.h
index 290d2905..29a8e00f 100644
--- a/src/types/geohash.h
+++ b/src/types/geohash.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) 2013-2014, yinqiwen <yi...@gmail.com>
* Copyright (c) 2014, Matt Stancliff <ma...@genges.com>.
[incubator-kvrocks] 02/02: [source-release] prepare release apache-kvrocks-2.3.0-rc2
Posted by ca...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
caipengbo pushed a commit to branch 2.3
in repository https://gitbox.apache.org/repos/asf/incubator-kvrocks.git
commit 477a96e257b080fed0e3575d783cefa70314f510
Author: Myth <ca...@outlook.com>
AuthorDate: Tue Feb 14 12:12:24 2023 +0000
[source-release] prepare release apache-kvrocks-2.3.0-rc2
---
src/VERSION.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/VERSION.txt b/src/VERSION.txt
index 71e0f70d..276cbf9e 100644
--- a/src/VERSION.txt
+++ b/src/VERSION.txt
@@ -1 +1 @@
-999.999.999
\ No newline at end of file
+2.3.0