Skip to content

Commit

Permalink
Fix code LICENSE for file modified from LevelDB. (#300)
Browse files Browse the repository at this point in the history
  • Loading branch information
李超勇 authored and imay committed Nov 12, 2018
1 parent ae8d16c commit 063f7d7
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 114 deletions.
47 changes: 47 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
19 changes: 3 additions & 16 deletions be/src/olap/lru_cache.cpp
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
19 changes: 3 additions & 16 deletions be/src/olap/lru_cache.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 3 additions & 16 deletions be/src/olap/new_status.cpp
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
19 changes: 3 additions & 16 deletions be/src/olap/new_status.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 3 additions & 16 deletions be/src/olap/skiplist.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion be/src/util/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 3 additions & 16 deletions be/src/util/arena.cc → be/src/util/arena.cpp
Original file line number Diff line number Diff line change
@@ -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 <assert.h>
Expand Down
19 changes: 3 additions & 16 deletions be/src/util/arena.h
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion fe/src/main/java/org/apache/doris/qe/StmtExecutor.java
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ private void unLock(Map<String, Database> dbs) {
// 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);
Expand Down

0 comments on commit 063f7d7

Please sign in to comment.