You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datasketches.apache.org by le...@apache.org on 2019/08/02 05:22:06 UTC
[incubator-datasketches-memory] branch UpdateLicense created (now
6e287db)
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a change to branch UpdateLicense
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git.
at 6e287db Use WIP DISCLAIMER
This branch includes the following new commits:
new 8f5d897 Update LICENSE file.
new 6e287db Use WIP DISCLAIMER
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[incubator-datasketches-memory] 02/02: Use WIP DISCLAIMER
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch UpdateLicense
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git
commit 6e287db900dd47c012b1c5af1178cfe12195c102
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Thu Aug 1 22:13:52 2019 -0700
Use WIP DISCLAIMER
---
DISCLAIMER | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/DISCLAIMER b/DISCLAIMER
index 7f1416f..dc5046b 100644
--- a/DISCLAIMER
+++ b/DISCLAIMER
@@ -1,10 +1,27 @@
-Apache DataSketches (incubating) is an effort undergoing incubation at the Apache Software
-Foundation (ASF), sponsored by the Apache Incubator PMC.
+Apache DataSketches (incubating) is an effort undergoing incubation
+at The Apache Software Foundation (ASF), sponsored by the Apache Incubator.
-Incubation is required of all newly accepted projects until a further review
-indicates that the infrastructure, communications, and decision making process
+Incubation is required of all newly accepted projects until a further review
+indicates that the infrastructure, communications, and decision making process
have stabilized in a manner consistent with other successful ASF projects.
-While incubation status is not necessarily a reflection of the completeness
-or stability of the code, it does indicate that the project has yet to be
-fully endorsed by the ASF.
+While incubation status is not necessarily a reflection of the
+completeness or stability of the code, it does indicate that the
+project has yet to be fully endorsed by the ASF.
+
+
+Some of the incubating project's releases may not be fully compliant
+with ASF policy. For example, releases may have incomplete or
+un-reviewed licensing conditions. What follows is a list of known
+issues the project is currently aware of (note that this list, by
+definition, is likely to be incomplete):
+
+ * The LICENSE file is incomplete and will be fixed with the next release.
+
+If you are planning to incorporate this work into your
+product/project, please be aware that you will need to conduct a
+thorough licensing review to determine the overall implications of
+including this work. For the current status of this project through the Apache
+Incubator visit:
+
+http://incubator.apache.org/project/#Podling-Name#.html
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org
[incubator-datasketches-memory] 01/02: Update LICENSE file.
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leerho pushed a commit to branch UpdateLicense
in repository https://gitbox.apache.org/repos/asf/incubator-datasketches-memory.git
commit 8f5d89708bb9615e8cea766a4ae88bfbaa4a87a1
Author: Lee Rhodes <le...@users.noreply.github.com>
AuthorDate: Thu Aug 1 18:07:16 2019 -0700
Update LICENSE file.
---
LICENSE | 74 ++++++++++++++++++++++
.../datasketches/memory/AccessByteBuffer.java | 4 +-
.../java/org/apache/datasketches/memory/Utf8.java | 6 +-
.../org/apache/datasketches/memory/XxHash64.java | 8 ++-
.../datasketches/memory/IsValidUtf8TestUtil.java | 4 +-
.../org/apache/datasketches/memory/Utf8Test.java | 4 +-
.../datasketches/memory/XxHash64LoopingTest.java | 5 +-
.../apache/datasketches/memory/XxHash64Test.java | 2 +-
8 files changed, 92 insertions(+), 15 deletions(-)
diff --git a/LICENSE b/LICENSE
index d645695..ab1f114 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,77 @@
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.
+
+ APACHE DataSketches-memory (INCUBATING):
+
+ Apache DataSketches-memory (incubating) includes a number of source files with
+ separate copyright notices and license terms. Your use of the source
+ code for these subcomponents is subject to the terms and
+ conditions of the following licenses.
+
+Apache License version 2.0
+================================
+
+ This product contains a method to create a dummy read-only ByteBuffer using unsafe
+ adapted from https://github.com/odnoklassniki/one-nio/blob/master/src/one/nio/mem/DirectMemory.java : wrap(...).
+ * src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java : getDummyReadOnlyDirectByteBuffer(...)
+
+ This product contains code to implement and test the xxHash function
+ adapted from https://github.com/OpenHFT/Zero-Allocation-Hashing
+ * src/main/java/org/apache/datasketches/memory/XxHash64.java
+ * src/test/java/org/apache/datasketches/memory/XxHash64Test.java
+ * src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java
+
+
+Google Protobuf License:
+================================
+
+Copyright 2008 Google Inc. 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 Google Inc. 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.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it. This code is not
+standalone and requires a support library to be linked with it. This
+support library is itself covered by the above license.
+
+ This product contains code for encoding, decoding and testing UTF8
+ adapted from https://github.com/protocolbuffers/protobuf.
+ * src/main/java/org/apache/datasketches/memory/Utf8.java
+ * src/test/java/org/apache/datasketches/memory/Utf8Test.java
+ * src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java
+
+Public Domain
+================================
+ This product contains the text of Lincoln's Gettysburg Address which is used in various file tests.
+ This file is read-only and tested for its exact character sequence and cannot be appended with any additional text.
+ * src/test/java/org/apache/datasketches/memory/AllocateDirectMapMemoryTest.java
+ * src/test/java/org/apache/datasketches/memory/AllocateDirectWritableMapMemoryTest.java
+ * src/test/java/org/apache/datasketches/memory/MemoryTest.java
+ * src/test/java/org/apache/datasketches/memory/UtilTest.java
+
+
\ No newline at end of file
diff --git a/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java b/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java
index a05c1ec..dc56718 100644
--- a/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java
+++ b/src/main/java/org/apache/datasketches/memory/AccessByteBuffer.java
@@ -76,8 +76,8 @@ final class AccessByteBuffer {
}
/**
- * This method is copied from https://github.com/odnoklassniki/one-nio/blob/
- * 27c768cbd28ece949c299f2d437c9a0ebd874500/src/one/nio/mem/DirectMemory.java#L95
+ * This method is adapted from https://github.com/odnoklassniki/one-nio\
+ * /blob/master/src/one/nio/mem/DirectMemory.java : wrap(...). See LICENSE.
*/
static ByteBuffer getDummyReadOnlyDirectByteBuffer(final long address, final int capacity) {
final ByteBuffer buf = ZERO_READ_ONLY_DIRECT_BYTE_BUFFER.duplicate();
diff --git a/src/main/java/org/apache/datasketches/memory/Utf8.java b/src/main/java/org/apache/datasketches/memory/Utf8.java
index d4a474d..0ab612b 100644
--- a/src/main/java/org/apache/datasketches/memory/Utf8.java
+++ b/src/main/java/org/apache/datasketches/memory/Utf8.java
@@ -35,9 +35,9 @@ import java.nio.CharBuffer;
* <p>This is specifically designed to reduce the production of intermediate objects (garbage),
* thus significantly reducing pressure on the JVM Garbage Collector.
*
- * <p>UTF-8 encoding/decoding is based on
- * https://github.com/google/protobuf/blob/3e944aec9ebdf5043780fba751d604c0a55511f2/
- * java/core/src/main/java/com/google/protobuf/Utf8.java
+ * <p>UTF-8 encoding/decoding is adapted from
+ * https://github.com/protocolbuffers/protobuf\
+ * /blob/master/java/core/src/main/java/com/google/protobuf/Utf8.java
*
* <p>Copyright 2008 Google Inc. All rights reserved.
* https://developers.google.com/protocol-buffers/
diff --git a/src/main/java/org/apache/datasketches/memory/XxHash64.java b/src/main/java/org/apache/datasketches/memory/XxHash64.java
index 3b42dff..bbc2944 100644
--- a/src/main/java/org/apache/datasketches/memory/XxHash64.java
+++ b/src/main/java/org/apache/datasketches/memory/XxHash64.java
@@ -47,9 +47,11 @@ import static org.apache.datasketches.memory.UnsafeUtil.unsafe;
* <a href="http://www.opensource.org/licenses/bsd-license.php">
* http://www.opensource.org/licenses/bsd-license.php</a>
*
- * <p>Portions of this code were leveraged from
- * <a href="https://github.com/OpenHFT/Zero-Allocation-Hashing/blob/master/src/main/java/net/openhft/hashing/XxHash.java">
- * OpenHFT/Zero-Allocation-Hashing</a>, which has an Apache 2 license as does this site.
+ * <p>Portions of this code were adapted from
+ * <a href="https://github.com/OpenHFT/Zero-Allocation-Hashing\
+ * /blob/master/src/main/java/net/openhft/hashing/XxHash.java">
+ * OpenHFT/Zero-Allocation-Hashing</a>,
+ * which has an Apache 2 license as does this site.
*
* @author Lee Rhodes
*/
diff --git a/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java b/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java
index 02f1d83..1cbd6b1 100644
--- a/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java
+++ b/src/test/java/org/apache/datasketches/memory/IsValidUtf8TestUtil.java
@@ -21,8 +21,8 @@ package org.apache.datasketches.memory;
/**
* Stripped down version of
- * https://github.com/google/protobuf/blob/3e944aec9ebdf5043780fba751d604c0a55511f2/
- * java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
+ * https://github.com/protocolbuffers/protobuf\
+ * /blob/master/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
*
* Copyright 2008 Google Inc. All rights reserved.
* https://developers.google.com/protocol-buffers/
diff --git a/src/test/java/org/apache/datasketches/memory/Utf8Test.java b/src/test/java/org/apache/datasketches/memory/Utf8Test.java
index d19a999..ef1ba88 100644
--- a/src/test/java/org/apache/datasketches/memory/Utf8Test.java
+++ b/src/test/java/org/apache/datasketches/memory/Utf8Test.java
@@ -35,8 +35,8 @@ import org.apache.datasketches.memory.Util.RandomCodePoints;
/**
* Adapted version of
- * https://github.com/google/protobuf/blob/3e944aec9ebdf5043780fba751d604c0a55511f2/
- * java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java
+ * https://github.com/protocolbuffers/protobuf\
+ * /blob/master/java/core/src/test/java/com/google/protobuf/DecodeUtf8Test.java
*
* Copyright 2008 Google Inc. All rights reserved.
* https://developers.google.com/protocol-buffers/
diff --git a/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java b/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java
index f53fec0..19f9747 100644
--- a/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java
+++ b/src/test/java/org/apache/datasketches/memory/XxHash64LoopingTest.java
@@ -29,8 +29,9 @@ import org.testng.annotations.Test;
public class XxHash64LoopingTest {
/*
- * This test is modeled from
- * <a href="https://github.com/OpenHFT/Zero-Allocation-Hashing/blob/master/src/test/java/net/openhft/hashing/XxHashTest.java">
+ * This test is adapted from
+ * <a href="https://github.com/OpenHFT/Zero-Allocation-Hashing\
+ * /blob/master/src/test/java/net/openhft/hashing/XxHashTest.java">
* OpenHFT/Zero-Allocation-Hashing</a> to test hash compatibility with that implementation.
*/
@Test
diff --git a/src/test/java/org/apache/datasketches/memory/XxHash64Test.java b/src/test/java/org/apache/datasketches/memory/XxHash64Test.java
index 0f5ee2e..1448dc1 100644
--- a/src/test/java/org/apache/datasketches/memory/XxHash64Test.java
+++ b/src/test/java/org/apache/datasketches/memory/XxHash64Test.java
@@ -78,7 +78,7 @@ public class XxHash64Test {
}
/*
- * This test is modeled from
+ * This test is adapted from
* <a href="https://github.com/OpenHFT/Zero-Allocation-Hashing/blob/master/src/test/java/net\
* /openhft/hashing/XxHashCollisionTest.java">
* OpenHFT/Zero-Allocation-Hashing</a> to test hash compatibility with that implementation.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datasketches.apache.org
For additional commands, e-mail: commits-help@datasketches.apache.org