You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@impala.apache.org by kw...@apache.org on 2016/10/20 06:03:04 UTC
[2/4] incubator-impala git commit: IMPALA-4230: ASF policy issues
from 2.7.0 rc3.
IMPALA-4230: ASF policy issues from 2.7.0 rc3.
In our IPMC vote to release 2.7.0 rc3, Justing Mclean pointed out a
number of issues of compliance with ASF policy. He asked:
1. "Please place build instruction and supported platforms in the
README. The wiki may change over time and that may make it difficult
to build older versions."
2. Remove binary file llvm-ir/test-loop.bc
3. Add be/src/gutil/valgrind.h,
shell/ext-py/sqlparse-0.1.14/sqlparse/pipeline.py and
cmake_modules/FindJNI.cmake, normalize.css (embedded in bootstrap.css)
to LICENSE.txt
4. Fix be/src/thirdparty/squeasel/squeasel* in LICENSE.txt
5. Remove outdated copyright lines from HBase (see
https://issues.apache.org/jira/browse/HBASE-3870)
6. Remove duplicate jquery notice from LICENSE.txt
Change-Id: I30ff77d7ac28ce67511c200764fba19ae69922e0
Reviewed-on: http://gerrit.cloudera.org:8080/4582
Reviewed-by: Jim Apple <jb...@cloudera.com>
Tested-by: Internal Jenkins
Project: http://git-wip-us.apache.org/repos/asf/incubator-impala/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-impala/commit/5a2c50a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-impala/tree/5a2c50a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-impala/diff/5a2c50a1
Branch: refs/heads/master
Commit: 5a2c50a1633d8bc2d848f609e867b324c24fe06c
Parents: ef5d0c3
Author: Jim Apple <jb...@cloudera.com>
Authored: Fri Sep 30 14:29:45 2016 -0700
Committer: Internal Jenkins <cl...@gerrit.cloudera.org>
Committed: Wed Oct 19 23:59:02 2016 +0000
----------------------------------------------------------------------
LICENSE.txt | 130 ++++++++++++++++++-
README.md | 10 +-
be/src/codegen/CMakeLists.txt | 7 +
bin/rat_exclude_files.txt | 1 -
fe/src/test/resources/hbase-site.xml.template | 2 -
llvm-ir/test-loop.bc | Bin 1828 -> 0 bytes
.../common/etc/hadoop/conf/hadoop-policy.xml | 2 -
.../etc/hadoop/conf/log4j.properties.tmpl | 2 -
8 files changed, 144 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5a2c50a1/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index eb5990d..4cda0f2 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -251,6 +251,47 @@ src/be/gutil/utf: licensed under the following terms:
--------------------------------------------------------------------------------
+src/be/gutil/valgrind.h: licensed under the following terms:
+
+ This file is part of Valgrind, a dynamic binary instrumentation
+ framework.
+
+ Copyright (C) 2000-2008 Julian Seward. 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. The origin of this software must not be misrepresented; you must
+ not claim that you wrote the original software. If you use this
+ software in a product, an acknowledgment in the product
+ documentation would be appreciated but is not required.
+
+ 3. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 4. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
+
+--------------------------------------------------------------------------------
+
www/d3.v3.[min.]js: BSD 3-clause license
Copyright (c) 2012, Michael Bostock
@@ -458,6 +499,31 @@ tests/comparison/leopard/static/fonts/glyphicons-halflings*: MIT license
--------------------------------------------------------------------------------
+normalize.css embedded in www/bootstrap/css/bootstrap.css: MIT
+normalize.css embedded in tests/comparison/leopard/static/css/bootstrap.css: MIT
+
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+--------------------------------------------------------------------------------
+
www/highlight: 3-clause BSD
tests/comparison/leopard/static/css/hljs.css: 3-clause BSD
tests/comparison/leopard/static/js/highlight.pack.js: 3-clause BSD
@@ -521,7 +587,7 @@ shell/ext-py/prettytable-0.7.1: 3-clause BSD
--------------------------------------------------------------------------------
-shell/ext-py/sqlparse-0.1.14: 3-clause BSD
+shell/ext-py/sqlparse-0.1.14 (most parts): 3-clause BSD
Copyright (c) 2009, Andi Albrecht <al...@gmail.com>
@@ -573,6 +639,34 @@ THE SOFTWARE.
--------------------------------------------------------------------------------
+shell/ext-py/sqlparse-0.1.14/sqlparse/pipeline.py:
+
+Copyright (C) 2011 Jesus Leganes "piranna", piranna@gmail.com
+
+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.
+
+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 HOLDER 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.
+
+--------------------------------------------------------------------------------
+
be/src/thirdparty/mustache: Apache 2.0 license
be/src/expr/hll-bias.h: Apache 2.0 license
shell/ext-py/sasl-0.1.1: Apache 2.0 license
@@ -603,4 +697,36 @@ cmake_modules/FindGTest.cmake: MIT license
--------------------------------------------------------------------------------
-www/jquery/jquery-1.12.4.min.js: MIT license
+cmake_modules/FindJNI.cmake: 3-clause BSD
+
+ Copyright 2001-2009 Kitware, Inc.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * 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.
+
+ * Neither the names of Kitware, Inc., the Insight Software Consortium,
+ nor the names of their 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
+ HOLDER 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.
+
+--------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5a2c50a1/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index b7778e9..b90e7c7 100644
--- a/README.md
+++ b/README.md
@@ -23,4 +23,12 @@ visit the [Impala homepage](https://impala.apache.org).
If you are interested in contributing to Impala as a developer, or learning more about
Impala's internals and architecture, visit the
-[Impala wiki](https://cwiki.apache.org/confluence/display/IMPALA/Impala+Home).
\ No newline at end of file
+[Impala wiki](https://cwiki.apache.org/confluence/display/IMPALA/Impala+Home).
+
+## Supported Platforms
+
+Impala only supports Linux at the moment.
+
+## Build Instructions
+
+./buildall.sh -notests
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5a2c50a1/be/src/codegen/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/be/src/codegen/CMakeLists.txt b/be/src/codegen/CMakeLists.txt
index 8ae44e0..d002c68 100644
--- a/be/src/codegen/CMakeLists.txt
+++ b/be/src/codegen/CMakeLists.txt
@@ -99,5 +99,12 @@ add_custom_command(
DEPENDS ${IR_NO_SSE_OUTPUT_FILE}
)
+# Run the clang compiler to generate BC for llvm-codegen-test
+add_custom_target(test-loop.bc
+ COMMAND ${LLVM_CLANG_EXECUTABLE} ${CLANG_IR_CXX_FLAGS} ${CLANG_INCLUDE_FLAGS} ${CMAKE_SOURCE_DIR}/testdata/llvm/test-loop.cc -o ${CMAKE_SOURCE_DIR}/llvm-ir/test-loop.bc
+ SOURCES ${CMAKE_SOURCE_DIR}/testdata/llvm/test-loop.cc
+)
+
ADD_BE_TEST(llvm-codegen-test)
+add_dependencies(llvm-codegen-test test-loop.bc)
ADD_BE_TEST(instruction-counter-test)
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5a2c50a1/bin/rat_exclude_files.txt
----------------------------------------------------------------------
diff --git a/bin/rat_exclude_files.txt b/bin/rat_exclude_files.txt
index 2a07b68..a27355e 100644
--- a/bin/rat_exclude_files.txt
+++ b/bin/rat_exclude_files.txt
@@ -61,7 +61,6 @@ be/src/testutil/*.pem
fe/src/test/resources/*.xml
fe/src/test/resources/hbase-jaas-client.conf.template
fe/src/test/resources/hbase-jaas-server.conf.template
-llvm-ir/test-loop.bc
testdata/AllTypesError/*.txt
testdata/AllTypesErrorNoNulls/*.txt
*.avsc
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5a2c50a1/fe/src/test/resources/hbase-site.xml.template
----------------------------------------------------------------------
diff --git a/fe/src/test/resources/hbase-site.xml.template b/fe/src/test/resources/hbase-site.xml.template
index 7a72924..e17c0b8 100644
--- a/fe/src/test/resources/hbase-site.xml.template
+++ b/fe/src/test/resources/hbase-site.xml.template
@@ -2,8 +2,6 @@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
/**
- * Copyright 2010 The Apache Software Foundation
- *
* 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
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5a2c50a1/llvm-ir/test-loop.bc
----------------------------------------------------------------------
diff --git a/llvm-ir/test-loop.bc b/llvm-ir/test-loop.bc
deleted file mode 100644
index f7b50c1..0000000
Binary files a/llvm-ir/test-loop.bc and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5a2c50a1/testdata/cluster/node_templates/common/etc/hadoop/conf/hadoop-policy.xml
----------------------------------------------------------------------
diff --git a/testdata/cluster/node_templates/common/etc/hadoop/conf/hadoop-policy.xml b/testdata/cluster/node_templates/common/etc/hadoop/conf/hadoop-policy.xml
index cc83bc5..db85124 100644
--- a/testdata/cluster/node_templates/common/etc/hadoop/conf/hadoop-policy.xml
+++ b/testdata/cluster/node_templates/common/etc/hadoop/conf/hadoop-policy.xml
@@ -2,8 +2,6 @@
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
<!--
- Copyright 2011 The Apache Software Foundation
-
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
http://git-wip-us.apache.org/repos/asf/incubator-impala/blob/5a2c50a1/testdata/cluster/node_templates/common/etc/hadoop/conf/log4j.properties.tmpl
----------------------------------------------------------------------
diff --git a/testdata/cluster/node_templates/common/etc/hadoop/conf/log4j.properties.tmpl b/testdata/cluster/node_templates/common/etc/hadoop/conf/log4j.properties.tmpl
index c9bd0ff..aa477d7 100644
--- a/testdata/cluster/node_templates/common/etc/hadoop/conf/log4j.properties.tmpl
+++ b/testdata/cluster/node_templates/common/etc/hadoop/conf/log4j.properties.tmpl
@@ -1,5 +1,3 @@
-# Copyright 2011 The Apache Software Foundation
-#
# 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