Merge pull request #57 from RedisLabsModules/license-update

License update

LICENSE

@@ -1,30 +1,52 @@
-                               Redis Time-Series Licensing
-                 Copyright 2018-2019 Redis Labs Ltd. and Contributors.
-
-Licensed under the Apache License, Version 2.0 (the "License") modified with Commons Clause
-Restriction; 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.
-
-Commons Clause Restriction
-
-The Software is provided to you by the Licensor under the License, as defined below, subject to
-the following condition.
-Without limiting other conditions in the License, the grant of rights under the License will not
-include, and the License does not grant to you, the right to Sell the Software.
-For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you
-under the License to provide to third parties, for a fee or other consideration (including without
-limitation fees for hosting or consulting/ support services related to the Software), a product or
-service whose value derives, entirely or substantially, from the functionality of the Software.
-Any license notice or attribution required by the License must also include this Commons Clause
-License Condition notice.
-
-For purposes of the clause above, the “Licensor” is Redis Labs Ltd., the “License” is the Apache
-License, Version 2.0, and the Software is the Redis Time-Series software provided with this
-notice.
+REDIS SOURCE AVAILABLE LICENSE AGREEMENT
+
+Version 1, February 21, 2019
+
+This Agreement sets forth the terms on which the Licensor makes available the Software. BY INSTALLING, DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY OF THE SOFTWARE, YOU AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO SUCH TERMS AND CONDITIONS, YOU MUST NOT USE THE SOFTWARE. If you are receiving the Software on behalf of a legal entity, you represent and warrant that you have the actual authority to agree to the terms and conditions of this agreement on behalf of such entity.
+
+
+0.	DEFINITIONS
+
+The terms below have the meanings set forth below for purposes of this Agreement:
+
+Agreement: this Redis Source Available License Agreement.
+
+Database Product: any of the following products or services: (a) database; (b) caching engine; (c) stream processing engine; (d) search engine; (e) indexing engine; (f) machine learning or deep learning or artificial intelligence serving engine;
+(g) a product or service exposing the Redis API; (h) a product or service exposing the Redis Modules API; or
+(i) a product or service exposing the Software API.
+
+License: the Redis Source Available License described in Section 1.
+
+Licensor: Redis Labs Ltd.
+
+Modification: a modification of the Software made by You under the License, Section 1.1(c).
+
+Redis: the open source Redis software as described in redis.io.
+
+Software: certain software components designed to work with Redis and provided to you under this Agreement.
+
+You:  the recipient of this Software, an individual, or the entity on whose behalf you are receiving the Software.
+
+Your Application: an application developed by or for You, where such application is not a Database Product.
+
+1.	LICENSE GRANT AND CONDITIONS
+
+	1.1 Subject to the terms and conditions of this Section 1, Licensor hereby grants to You a non-exclusive, royalty-free, worldwide, non-transferable license during the term of this Agreement to:
+		(a) distribute or make available the Software or your Modifications under the terms of this Agreement, only as part of Your Application, so long as you include the following notice on any copy you distribute: "This software is subject to the terms of the Redis Source Available License Agreement".
+		(b) use the Software, or your Modifications, only as part of Your Application, but not in connection with any Database Product that is distributed or otherwise made available by any third party.
+		(c) modify the Software, provided that Modifications remain subject to the terms of this License.
+		(d) reproduce the Software as necessary for the above.
+
+	1.2.	Sublicensing. You may sublicense the right to use the Software fully embedded in Your Application as distributed by you in accordance with Section 1.1(a), pursuant to a written license that disclaims all warranties and liabilities on behalf of Licensor.
+
+	1.3.	Notices. On all copies of the Software that you make, you must retain all copyright or other proprietary notices.
+
+2.	TERM AND TERMINATION.  This Agreement will continue unless and until earlier terminated as set forth herein.  If You breach any of its conditions or obligations under this Agreement, this Agreement will terminate automatically and the licenses granted herein will terminate automatically.
+
+3.	INTELLECTUAL PROPERTY.  As between the parties, Licensor retains all right, title, and interest in the Software, and to Redis or other Licensor trademarks or service marks, and all intellectual property rights therein. Licensor hereby reserves all rights not expressly granted to You in this Agreement.
+
+4.	DISCLAIMER.  TO THE EXTENT ALLOWABLE UNDER LAW, LICENSOR HEREBY DISCLAIMS ANY AND ALL WARRANTIES AND CONDITIONS, EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, AND SPECIFICALLY DISCLAIMS ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, WITH RESPECT TO THE SOFTWARE. Licensor has no obligation to support the Software.
+
+5.	LIMITATION OF LIABILITY.  TO THE EXTENT ALLOWABLE UNDER LAW, LICENSOR WILL NOT BE LIABLE FOR ANY DAMAGES OF ANY KIND, INCLUDING BUT NOT LIMITED TO, LOST PROFITS OR ANY CONSEQUENTIAL, SPECIAL, INCIDENTAL, INDIRECT, OR DIRECT DAMAGES, ARISING OUT OF OR RELATING TO THIS AGREEMENT.
+
+6.	GENERAL. You are not authorized to assign Your rights under this Agreement to any third party. Licensor may freely assign its rights under this Agreement to any third party. This Agreement is the entire agreement between the parties on the subject matter hereof.  No amendment or modification hereof will be valid or binding upon the parties unless made in writing and signed by the duly authorized representatives of both parties.  In the event that any provision, including without limitation any condition, of this Agreement is held to be unenforceable, this Agreement and all licenses and rights granted hereunder will immediately terminate.  Failure by Licensor to exercise any right hereunder will not be construed as a waiver of any subsequent breach of that right or as a waiver of any other right.  This Agreement will be governed by and interpreted in accordance with the laws of the state of California, without reference to its conflict of laws principles. If You are located within the United States, all disputes arising out of this Agreement are subject to the exclusive jurisdiction of courts located in Santa Clara County, California. USA.  If You are located outside of the United States, any dispute, controversy or claim arising out of or relating to this Agreement will be referred to and finally determined by arbitration in accordance with the JAMS before a single arbitrator in Santa Clara County, California. Judgment upon the award rendered by the arbitrator may be entered in any court having jurisdiction thereof.

README.md

@@ -63,4 +63,4 @@ Got questions? Feel free to ask at the [RedisTimeSeries mailing list](https://gr
 
 ## License
 
-Apache 2.0 with Commons Clause - see [LICENSE](LICENSE)
+Redis Source Available License Agreement, see [LICENSE](LICENSE)

ramp.yml

@@ -3,7 +3,7 @@ author: RedisLabs
 email: danni@redislabs.com
 description: Time-Series data structure for redis
 homepage: https://oss.redislabs.com/redistimeseries/
-license: Apache 2.0 with Commons Clause
+license: Redis Source Available License Agreement
 command_line_args: ""
 min_redis_version: "5.0"
 min_redis_pack_version: "5.4"

src/chunk.c

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include "chunk.h"
 #include <string.h>
 #include "rmutil/alloc.h"

src/chunk.h

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #ifndef CHUNK_H
 #define CHUNK_H
 

src/compaction.c

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include <ctype.h>
 #include <string.h>
 #include "compaction.h"

src/compaction.h

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #ifndef COMPACTION_H
 #define COMPACTION_H
 #include <sys/types.h>

src/config.c

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include "redismodule.h"
 #include "rmutil/util.h"
 #include "rmutil/strings.h"
@@ -43,6 +48,6 @@ int ReadConfig(RedisModuleString **argv, int argc) {
         printf("loaded default MAX_SAMPLE_PER_CHUNK policy: %lld \n", TSGlobalConfig.maxSamplesPerChunk);
     } else {
         TSGlobalConfig.maxSamplesPerChunk = SAMPLES_PER_CHUNK_DEFAULT_SECS;
+        return TSDB_OK;
     }
-    return TSDB_OK;
 }

src/config.h

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #ifndef CONFIG_H
 #define CONFIG_H
 

src/consts.h

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #ifndef CONSTS_H
 #define CONSTS_H
 

src/indexer.c

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include <string.h>
 #include <rmutil/alloc.h>
 #include <rmutil/vector.h>

src/indexer.h

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #ifndef INDEXER_H
 #define INDEXER_H
 

src/module.c

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include <time.h>
 #include <string.h>
 #include "redismodule.h"

src/module.h

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #ifndef MODULE_H
 #define MODULE_H
 

src/parse_policies.c

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include <string.h>
 #include <stdio.h>
 #include <rmutil/alloc.h>

src/parse_policies.h

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #ifndef PARSE_POLICIES_H
 #define PARSE_POLICIES_H
 

src/rdb.c

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include <string.h>
 #include "rmutil/alloc.h"
 #include "rdb.h"

src/rdb.h

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include "redismodule.h"
 #include "tsdb.h"
 

src/tests.c

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include "parse_policies.h"
 #include "minunit.h"
 #include "compaction.h"

src/tsdb.c

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #include <time.h>
 #include <string.h>
 #include <redismodule.h>

src/tsdb.h

@@ -1,3 +1,8 @@
+/*
+* Copyright 2018-2019 Redis Labs Ltd. and Contributors
+*
+* This file is available under the Redis Labs Source Available License Agreement
+*/
 #ifndef TSDB_H
 #define TSDB_H