From 9d96d71d9387f2fdc1ed0be743a429733a9eb750 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Thu, 21 Mar 2024 17:45:01 +0800 Subject: [PATCH] HIVE-27468: (2.3) Restore original license in PriorityBlockingDeque --- .../daemon/impl/PriorityBlockingDeque.java | 53 +++++++++++++------ pom.xml | 7 +-- 2 files changed, 40 insertions(+), 20 deletions(-) diff --git a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/PriorityBlockingDeque.java b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/PriorityBlockingDeque.java index 3bf51cd7601c..1e5f153bd2f7 100644 --- a/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/PriorityBlockingDeque.java +++ b/llap-server/src/java/org/apache/hadoop/hive/llap/daemon/impl/PriorityBlockingDeque.java @@ -1,20 +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. - */ package org.apache.hadoop.hive.llap.daemon.impl; import java.util.*; @@ -23,6 +6,38 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.ReentrantLock; +/* + * Copyright (c) 2007, Aviad Ben Dov + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * 2. 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. + * 3. Neither the name of Infomancers, Ltd. 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. + * + */ + + /** * An optionally-bounded {@linkplain BlockingDeque blocking deque} based on * a navigable set. @@ -36,6 +51,10 @@ * Iterator} interfaces. *

* This code is loosely based on the {@linkplain java.util.concurrent.LinkedBlockingDeque linked blocking deque} code. + * + * @author Aviad Ben Dov + * @param the type of elements held in this collection + * @since 0.3 */ public class PriorityBlockingDeque extends AbstractQueue diff --git a/pom.xml b/pom.xml index 8589825182a0..52f9edccc3ed 100644 --- a/pom.xml +++ b/pom.xml @@ -1091,8 +1091,8 @@ bin/** itests/** docs/** - **/README.md - **/*.iml + **/README.md + **/*.iml **/*.txt **/*.log **/*.arcconfig @@ -1118,7 +1118,8 @@ **/xmlReport.pl **/*.html **/sit - **/test/queries/**/*.sql + **/test/queries/**/*.sql + **/PriorityBlockingDeque.java