Repository: parquet-cpp Updated Branches: refs/heads/master aa2753027 -> aba7c374c
PARQUET-742: Add missing license headers - Removed `TODO` as it is totally outdated Author: Uwe L. Korn <uw...@xhochy.com> Closes #174 from xhochy/PARQUET-742 and squashes the following commits: 654f3ad [Uwe L. Korn] Add NOTICE about bpacking.h 1870282 [Uwe L. Korn] PARQUET-742: Add missing license headers Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/aba7c374 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/aba7c374 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/aba7c374 Branch: refs/heads/master Commit: aba7c374c9e47ea8a121f6c80e3a65ceb1cf288d Parents: aa27530 Author: Uwe L. Korn <uw...@xhochy.com> Authored: Tue Oct 11 22:25:55 2016 -0400 Committer: Wes McKinney <w...@apache.org> Committed: Tue Oct 11 22:25:55 2016 -0400 ---------------------------------------------------------------------- NOTICE.txt | 9 +++++++++ README.md | 14 ++++++++++++++ TODO | 9 --------- ci/before_script_travis.sh | 12 ++++++++++++ ci/travis_conda_build.sh | 12 ++++++++++++ ci/travis_script_cpp.sh | 12 ++++++++++++ ci/upload_coverage.sh | 12 ++++++++++++ cmake_modules/clean-all.cmake | 19 ++++++++++++++++++- conda.recipe/build.sh | 17 +++++++++++++++++ conda.recipe/meta.yaml | 17 +++++++++++++++++ dev/README.md | 14 ++++++++++++++ setup_build_env.sh | 17 +++++++++++++++++ src/parquet/symbols.map | 17 +++++++++++++++++ src/parquet/thrift/util.h | 17 +++++++++++++++++ src/parquet/util/bpacking.h | 17 +++++++++++++++++ thirdparty/build_thirdparty.sh | 17 +++++++++++++++++ thirdparty/download_thirdparty.sh | 17 +++++++++++++++++ thirdparty/set_thirdparty_env.sh | 17 +++++++++++++++++ thirdparty/versions.sh | 17 +++++++++++++++++ 19 files changed, 273 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/NOTICE.txt ---------------------------------------------------------------------- diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 0000000..fbcb9a1 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,9 @@ +Apache Parquet +Copyright 2016 The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +This product includes software from FrameOfReference (Apache 2.0) + https://github.com/lemire/FrameOfReference/blob/6ccaf9e97160f9a3b299e23a8ef739e711ef0c71/src/bpacking.cpp + * (c) Daniel Lemire 2013 http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 25634f5..2dc023c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,17 @@ +<!--- + Licensed 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. See accompanying LICENSE file. +--> + ## parquet-cpp: a C++ library to read and write the Apache Parquet columnar data format. <table> http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/TODO ---------------------------------------------------------------------- diff --git a/TODO b/TODO deleted file mode 100644 index bdfd7db..0000000 --- a/TODO +++ /dev/null @@ -1,9 +0,0 @@ -A lot of the format spec is still not implemented: - - Other compression codecs. Only snappy is implemented. - - Nested schema - -The write path is not started. - -We need to design a record abstraction that would make it easy to implement -an AvroRecordReader, ThriftRecordReader, etc. - http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/ci/before_script_travis.sh ---------------------------------------------------------------------- diff --git a/ci/before_script_travis.sh b/ci/before_script_travis.sh index aec40ed..746e10f 100755 --- a/ci/before_script_travis.sh +++ b/ci/before_script_travis.sh @@ -1,5 +1,17 @@ #!/usr/bin/env bash +# Licensed 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. See accompanying LICENSE file. + # Build an isolated thirdparty cp -r $TRAVIS_BUILD_DIR/thirdparty . ./thirdparty/download_thirdparty.sh http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/ci/travis_conda_build.sh ---------------------------------------------------------------------- diff --git a/ci/travis_conda_build.sh b/ci/travis_conda_build.sh index 76fb4ca..4d9c03d 100755 --- a/ci/travis_conda_build.sh +++ b/ci/travis_conda_build.sh @@ -1,5 +1,17 @@ #!/usr/bin/env bash +# Licensed 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. See accompanying LICENSE file. + set -e if [ $TRAVIS_OS_NAME == "linux" ]; then http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/ci/travis_script_cpp.sh ---------------------------------------------------------------------- diff --git a/ci/travis_script_cpp.sh b/ci/travis_script_cpp.sh index 8794559..c8d9b40 100755 --- a/ci/travis_script_cpp.sh +++ b/ci/travis_script_cpp.sh @@ -1,5 +1,17 @@ #!/usr/bin/env bash +# Licensed 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. See accompanying LICENSE file. + set -e : ${CPP_BUILD_DIR=$TRAVIS_BUILD_DIR/parquet-build} http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/ci/upload_coverage.sh ---------------------------------------------------------------------- diff --git a/ci/upload_coverage.sh b/ci/upload_coverage.sh index 066c1f2..7c0caa5 100755 --- a/ci/upload_coverage.sh +++ b/ci/upload_coverage.sh @@ -1,5 +1,17 @@ #!/usr/bin/env bash +# Licensed 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. See accompanying LICENSE file. + set -e set -x http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/cmake_modules/clean-all.cmake ---------------------------------------------------------------------- diff --git a/cmake_modules/clean-all.cmake b/cmake_modules/clean-all.cmake index 35041ea..38e61da 100644 --- a/cmake_modules/clean-all.cmake +++ b/cmake_modules/clean-all.cmake @@ -1,3 +1,20 @@ +# 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. + set(cmake_generated ${CMAKE_BINARY_DIR}/CMakeCache.txt ${CMAKE_BINARY_DIR}/CTestTestfile.cmake ${CMAKE_BINARY_DIR}/cmake_install.cmake @@ -11,4 +28,4 @@ foreach(file ${cmake_generated}) file(REMOVE_RECURSE ${file}) endif() -endforeach(file) \ No newline at end of file +endforeach(file) http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/conda.recipe/build.sh ---------------------------------------------------------------------- diff --git a/conda.recipe/build.sh b/conda.recipe/build.sh index f77475c..4d32777 100644 --- a/conda.recipe/build.sh +++ b/conda.recipe/build.sh @@ -1,5 +1,22 @@ #!/bin/bash +# 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. + set -e set -x http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/conda.recipe/meta.yaml ---------------------------------------------------------------------- diff --git a/conda.recipe/meta.yaml b/conda.recipe/meta.yaml index 81aa949..eff62e2 100644 --- a/conda.recipe/meta.yaml +++ b/conda.recipe/meta.yaml @@ -1,3 +1,20 @@ +# 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: name: parquet-cpp version: "0.1" http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/dev/README.md ---------------------------------------------------------------------- diff --git a/dev/README.md b/dev/README.md index 6dbe1fd..47a6d46 100644 --- a/dev/README.md +++ b/dev/README.md @@ -1,3 +1,17 @@ +<!--- + Licensed 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. See accompanying LICENSE file. +--> + # Parquet Developer Scripts This directory contains scripts useful to developers when packaging, testing, or committing to Parquet. http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/setup_build_env.sh ---------------------------------------------------------------------- diff --git a/setup_build_env.sh b/setup_build_env.sh index 37b702f..eabe6a5 100755 --- a/setup_build_env.sh +++ b/setup_build_env.sh @@ -1,5 +1,22 @@ #!/usr/bin/env bash +# 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. + SOURCE_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd) : ${BUILD_DIR:=$SOURCE_DIR/build} http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/src/parquet/symbols.map ---------------------------------------------------------------------- diff --git a/src/parquet/symbols.map b/src/parquet/symbols.map index d37b0dd..a94f114 100644 --- a/src/parquet/symbols.map +++ b/src/parquet/symbols.map @@ -1,3 +1,20 @@ +# 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. + { # Symbols marked as 'local' are not exported by the DSO and thus may not # be used by client applications. http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/src/parquet/thrift/util.h ---------------------------------------------------------------------- diff --git a/src/parquet/thrift/util.h b/src/parquet/thrift/util.h index a340c6c..1800435 100644 --- a/src/parquet/thrift/util.h +++ b/src/parquet/thrift/util.h @@ -1,3 +1,20 @@ +// 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. + #ifndef PARQUET_THRIFT_UTIL_H #define PARQUET_THRIFT_UTIL_H http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/src/parquet/util/bpacking.h ---------------------------------------------------------------------- diff --git a/src/parquet/util/bpacking.h b/src/parquet/util/bpacking.h index f407538..aa6fdab 100644 --- a/src/parquet/util/bpacking.h +++ b/src/parquet/util/bpacking.h @@ -1,3 +1,20 @@ +// 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. + // This file was modified from its original version for inclusion in parquet-cpp. // Original source: // https://github.com/lemire/FrameOfReference/blob/6ccaf9e97160f9a3b299e23a8ef739e711ef0c71/src/bpacking.cpp http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/thirdparty/build_thirdparty.sh ---------------------------------------------------------------------- diff --git a/thirdparty/build_thirdparty.sh b/thirdparty/build_thirdparty.sh index 9ae4169..6ebcd96 100755 --- a/thirdparty/build_thirdparty.sh +++ b/thirdparty/build_thirdparty.sh @@ -1,5 +1,22 @@ #!/usr/bin/env bash +# 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. + set -x set -e TP_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd) http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/thirdparty/download_thirdparty.sh ---------------------------------------------------------------------- diff --git a/thirdparty/download_thirdparty.sh b/thirdparty/download_thirdparty.sh index 23bdb96..3483321 100755 --- a/thirdparty/download_thirdparty.sh +++ b/thirdparty/download_thirdparty.sh @@ -1,5 +1,22 @@ #!/usr/bin/env bash +# 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. + set -x set -e http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/thirdparty/set_thirdparty_env.sh ---------------------------------------------------------------------- diff --git a/thirdparty/set_thirdparty_env.sh b/thirdparty/set_thirdparty_env.sh index 3733d08..547ed54 100644 --- a/thirdparty/set_thirdparty_env.sh +++ b/thirdparty/set_thirdparty_env.sh @@ -1,5 +1,22 @@ #!/usr/bin/env bash +# 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. + SOURCE_DIR=$(cd "$(dirname "${BASH_SOURCE:-$0}")"; pwd) source $SOURCE_DIR/versions.sh http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/aba7c374/thirdparty/versions.sh ---------------------------------------------------------------------- diff --git a/thirdparty/versions.sh b/thirdparty/versions.sh index 226a401..f058b79 100755 --- a/thirdparty/versions.sh +++ b/thirdparty/versions.sh @@ -1,3 +1,20 @@ +# 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. + ARROW_VERSION="7fb4d24a35269db99fa112c0512d4a32c372dd74" ARROW_URL="https://github.com/apache/arrow/archive/${ARROW_VERSION}.tar.gz" ARROW_BASEDIR="arrow-${ARROW_VERSION}"