You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by hu...@apache.org on 2019/08/19 06:50:46 UTC
[hawq] branch master updated: HAWQ-1749. Add some license and
change pom.xml
This is an automated email from the ASF dual-hosted git repository.
huor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git
The following commit(s) were added to refs/heads/master by this push:
new c1fd0b5 HAWQ-1749. Add some license and change pom.xml
c1fd0b5 is described below
commit c1fd0b52e738478a9a12ca18a9097dce577b9c6d
Author: wang.ziming <wa...@oushu.io>
AuthorDate: Mon Aug 19 10:41:31 2019 +0800
HAWQ-1749. Add some license and change pom.xml
---
contrib/exthdfs/Makefile | 1 +
contrib/orc/Makefile | 18 ++++++++++++++++++
contrib/orc/orc.c | 19 +++++++++++++++++++
pom.xml | 10 ++++++++++
src/test/feature/ExternalSource/sql/init_file | 1 +
src/test/feature/ExternalSource/test_extfmt_orc.cpp | 18 ++++++++++++++++++
src/test/feature/lib/compent_config.h | 2 +-
src/test/feature/lib/parse_out.h | 3 ++-
src/test/feature/lib/sql_util_parallel.h | 1 +
src/test/feature/lib/sqlfile-parsebase.h | 3 ++-
10 files changed, 73 insertions(+), 3 deletions(-)
diff --git a/contrib/exthdfs/Makefile b/contrib/exthdfs/Makefile
index 8a98978..355b74e 100644
--- a/contrib/exthdfs/Makefile
+++ b/contrib/exthdfs/Makefile
@@ -15,6 +15,7 @@
# specific language governing permissions and limitations
# under the License.
#
+
MODULE_big = exthdfs
OBJS = exthdfs.o
diff --git a/contrib/orc/Makefile b/contrib/orc/Makefile
index 86c20a0..540da15 100644
--- a/contrib/orc/Makefile
+++ b/contrib/orc/Makefile
@@ -1,3 +1,21 @@
+# 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.
+#
+
MODULE_big = orc
OBJS = orc.o
diff --git a/contrib/orc/orc.c b/contrib/orc/orc.c
index 8109e62..36018cf 100644
--- a/contrib/orc/orc.c
+++ b/contrib/orc/orc.c
@@ -1,3 +1,22 @@
+/*
+ * 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.
+ */
+
#include <json-c/json.h>
#include "c.h"
diff --git a/pom.xml b/pom.xml
index 421f433..f97a955 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,6 +58,9 @@
<exclude>depends/libhdfs3/CMake/**</exclude>
<exclude>depends/libyarn/CMake/**</exclude>
+ <exclude>depends/dbcommon/CMake/**</exclude>
+ <exclude>depends/storage/CMake/**</exclude>>
+ <exclude>depends/univplan/CMake/**</exclude>
<!-- Open-source Python modules with BSD license -->
@@ -65,6 +68,9 @@
<exclude>tools/bin/pythonSrc/unittest2-0.5.1/**</exclude>
<exclude>tools/bin/ext/figleaf/**</exclude>
<exclude>tools/bin/ext/pg8000/**</exclude>
+ <exclude>depends/dbcommon/test/parallel/**</exclude>
+ <exclude>depends/storage/test/parallel/**</exclude>
+ <exclude>depends/univplan/test/parallel/**</exclude>
<!-- BZIP2 license (4 clause BSD) -->
@@ -221,6 +227,9 @@
<exclude>depends/libhdfs3/test/data/*</exclude>
<exclude>depends/libhdfs3/debian/**</exclude>
+ <exclude>depends/dbcommon/test/data/*</exclude>
+ <exclude>depends/storage/test/data/*</exclude>
+ <exclude>depends/univplan/test/data/*</exclude>
<!-- Following files are licensed to ASF via the initial HAWQ SGA,
however it is tricky to maintain headers in them -->
@@ -276,6 +285,7 @@
<exclude>**/*.gdb</exclude>
<exclude>**/*.patch</exclude>
<exclude>**/*.commit</exclude>
+ <exclude>**/*.cfg</exclude>
<exclude>**/__init__.py</exclude>
<exclude>**/*README*</exclude>
</excludes>
diff --git a/src/test/feature/ExternalSource/sql/init_file b/src/test/feature/ExternalSource/sql/init_file
index 925032a..49c33b0 100644
--- a/src/test/feature/ExternalSource/sql/init_file
+++ b/src/test/feature/ExternalSource/sql/init_file
@@ -10,6 +10,7 @@
# 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.
+
-- start_matchignore
s/LINE.*exttable_ext.*_test/exttable_ext_test/
s/.*failed to begin insert: type not supported for orc.*/failed to begin insert: type not supported for orc/
diff --git a/src/test/feature/ExternalSource/test_extfmt_orc.cpp b/src/test/feature/ExternalSource/test_extfmt_orc.cpp
index 7a20f9b..edb2d7d 100644
--- a/src/test/feature/ExternalSource/test_extfmt_orc.cpp
+++ b/src/test/feature/ExternalSource/test_extfmt_orc.cpp
@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
+
#include "gtest/gtest.h"
#include "lib/file_replace.h"
diff --git a/src/test/feature/lib/compent_config.h b/src/test/feature/lib/compent_config.h
index 3d8d39a..f43b902 100644
--- a/src/test/feature/lib/compent_config.h
+++ b/src/test/feature/lib/compent_config.h
@@ -1,5 +1,5 @@
/*
-[- * Licensed to the Apache Software Foundation (ASF) under one
+ * 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
diff --git a/src/test/feature/lib/parse_out.h b/src/test/feature/lib/parse_out.h
index ef681a1..6f5689e 100644
--- a/src/test/feature/lib/parse_out.h
+++ b/src/test/feature/lib/parse_out.h
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#ifndef HAWQ_SRC_TEST_FEATURE_PARSE_OUT_H_
#define HAWQ_SRC_TEST_FEATURE_PARSE_OUT_H_
@@ -82,4 +83,4 @@ class Sqlout_parser : public SqlFileParseBase {
};
} // namespace test
} // namespace hawq
-#endif
\ No newline at end of file
+#endif
diff --git a/src/test/feature/lib/sql_util_parallel.h b/src/test/feature/lib/sql_util_parallel.h
index 46b9e9c..b447b73 100644
--- a/src/test/feature/lib/sql_util_parallel.h
+++ b/src/test/feature/lib/sql_util_parallel.h
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
/*
*
* This is control different sessions sequence issue
diff --git a/src/test/feature/lib/sqlfile-parsebase.h b/src/test/feature/lib/sqlfile-parsebase.h
index 4434422..57e1cd0 100644
--- a/src/test/feature/lib/sqlfile-parsebase.h
+++ b/src/test/feature/lib/sqlfile-parsebase.h
@@ -15,6 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
#ifndef HAWQ_SRC_TEST_FEATURE_SQLFILE_PARSEBASE_OUT_H_
#define HAWQ_SRC_TEST_FEATURE_SQLFILE_PARSEBASE_OUT_H_
@@ -57,4 +58,4 @@ class SqlFileParseBase {
const std::string parseName_;
};
-#endif
\ No newline at end of file
+#endif