From 063f7d7a9aa896d61c35bb2bbb0c9ff6e8fee62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E8=B6=85=E5=8B=87?= Date: Mon, 12 Nov 2018 16:09:40 +0800 Subject: [PATCH] Fix code LICENSE for file modified from LevelDB. (#300) --- LICENSE.txt | 47 +++++++++++++++++++ be/src/olap/lru_cache.cpp | 19 ++------ be/src/olap/lru_cache.h | 19 ++------ be/src/olap/new_status.cpp | 19 ++------ be/src/olap/new_status.h | 19 ++------ be/src/olap/skiplist.h | 19 ++------ be/src/util/CMakeLists.txt | 2 +- be/src/util/{arena.cc => arena.cpp} | 19 ++------ be/src/util/arena.h | 19 ++------ .../org/apache/doris/qe/StmtExecutor.java | 1 - 10 files changed, 69 insertions(+), 114 deletions(-) rename be/src/util/{arena.cc => arena.cpp} (70%) diff --git a/LICENSE.txt b/LICENSE.txt index fc21cb8edd..2e24764f61 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -340,6 +340,14 @@ Parts of be/src/runtime/string_search.hpp: Python Software License V2 -------------------------------------------------------------------------------- +be/src/olap/lru_cache.h : BSD-style license + + Copyright (c) 2011 The LevelDB Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. See the AUTHORS file for names of contributors. + +-------------------------------------------------------------------------------- + be/src/olap/lru_cache.cpp : BSD-style license Copyright (c) 2011 The LevelDB Authors. All rights reserved. @@ -348,6 +356,45 @@ be/src/olap/lru_cache.cpp : BSD-style license -------------------------------------------------------------------------------- +be/src/olap/skiplist.h : BSD-style license + + Copyright (c) 2011 The LevelDB Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. See the AUTHORS file for names of contributors. + +-------------------------------------------------------------------------------- + +be/src/util/arena.h : BSD-style license + + Copyright (c) 2011 The LevelDB Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. See the AUTHORS file for names of contributors. + +-------------------------------------------------------------------------------- + +be/src/util/arena.cpp : BSD-style license + + Copyright (c) 2011 The LevelDB Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. See the AUTHORS file for names of contributors. + +-------------------------------------------------------------------------------- + +be/src/util/new_status.h : BSD-style license + + Copyright (c) 2011 The LevelDB Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. See the AUTHORS file for names of contributors. + +-------------------------------------------------------------------------------- + +be/src/util/new_status.cpp : BSD-style license + + Copyright (c) 2011 The LevelDB Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. See the AUTHORS file for names of contributors. +-------------------------------------------------------------------------------- + be/src/util/murmur_hash3.cpp : licensed under the following terms: MurmurHash3 was written by Austin Appleby, and is placed in the public diff --git a/be/src/olap/lru_cache.cpp b/be/src/olap/lru_cache.cpp index 779033f433..5b96a969df 100644 --- a/be/src/olap/lru_cache.cpp +++ b/be/src/olap/lru_cache.cpp @@ -1,19 +1,6 @@ -// 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 The LevelDB Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. See the AUTHORS file for names of contributors. #include "olap/lru_cache.h" diff --git a/be/src/olap/lru_cache.h b/be/src/olap/lru_cache.h index 7f118bd4bc..42b240120f 100644 --- a/be/src/olap/lru_cache.h +++ b/be/src/olap/lru_cache.h @@ -1,19 +1,6 @@ -// 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 The LevelDB Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. See the AUTHORS file for names of contributors. #ifndef DORIS_BE_SRC_OLAP_LRU_CACHE_H #define DORIS_BE_SRC_OLAP_LRU_CACHE_H diff --git a/be/src/olap/new_status.cpp b/be/src/olap/new_status.cpp index edd397cdbf..ef9e79daf9 100644 --- a/be/src/olap/new_status.cpp +++ b/be/src/olap/new_status.cpp @@ -1,19 +1,6 @@ -// 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 The LevelDB Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. See the AUTHORS file for names of contributors. #include "olap/new_status.h" diff --git a/be/src/olap/new_status.h b/be/src/olap/new_status.h index ddad3b70e2..8d694815c1 100644 --- a/be/src/olap/new_status.h +++ b/be/src/olap/new_status.h @@ -1,19 +1,6 @@ -// 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 The LevelDB Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. See the AUTHORS file for names of contributors. #ifndef DORIS_BE_SRC_OLAP_STATUS_H #define DORIS_BE_SRC_OLAP_STATUS_H diff --git a/be/src/olap/skiplist.h b/be/src/olap/skiplist.h index e639d08c11..5bd77acd67 100644 --- a/be/src/olap/skiplist.h +++ b/be/src/olap/skiplist.h @@ -1,19 +1,6 @@ -// 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 The LevelDB Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. See the AUTHORS file for names of contributors. #ifndef DORIS_BE_SRC_OLAP_SKIPLIST_H #define DORIS_BE_SRC_OLAP_SKIPLIST_H diff --git a/be/src/util/CMakeLists.txt b/be/src/util/CMakeLists.txt index 4ad07b691f..13d8670522 100644 --- a/be/src/util/CMakeLists.txt +++ b/be/src/util/CMakeLists.txt @@ -22,7 +22,7 @@ set(LIBRARY_OUTPUT_PATH "${BUILD_DIR}/src/util") set(EXECUTABLE_OUTPUT_PATH "${BUILD_DIR}/src/util") add_library(Util STATIC - arena.cc + arena.cpp bfd_parser.cpp bitmap.cpp codec.cpp diff --git a/be/src/util/arena.cc b/be/src/util/arena.cpp similarity index 70% rename from be/src/util/arena.cc rename to be/src/util/arena.cpp index fe9a9d906c..cf72db82b8 100644 --- a/be/src/util/arena.cc +++ b/be/src/util/arena.cpp @@ -1,19 +1,6 @@ -// 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 The LevelDB Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. See the AUTHORS file for names of contributors. #include "util/arena.h" #include diff --git a/be/src/util/arena.h b/be/src/util/arena.h index e0c3d34914..4a260e91ff 100644 --- a/be/src/util/arena.h +++ b/be/src/util/arena.h @@ -1,19 +1,6 @@ -// 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 The LevelDB Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. See the AUTHORS file for names of contributors. #ifndef DORIS_BE_SRC_COMMON_UTIL_ARENA_H #define DORIS_BE_SRC_COMMON_UTIL_ARENA_H diff --git a/fe/src/main/java/org/apache/doris/qe/StmtExecutor.java b/fe/src/main/java/org/apache/doris/qe/StmtExecutor.java index 81647f9e59..bf250169ba 100644 --- a/fe/src/main/java/org/apache/doris/qe/StmtExecutor.java +++ b/fe/src/main/java/org/apache/doris/qe/StmtExecutor.java @@ -331,7 +331,6 @@ public class StmtExecutor { // Analyze one statement to structure in memory. private void analyze() throws AnalysisException, UserException, NotImplementedException { - LOG.info("begin to analyze stmt: {}", context.getStmtId()); // Parse statement with parser generated by CUP&FLEX SqlScanner input = new SqlScanner(new StringReader(originStmt)); SqlParser parser = new SqlParser(input);