You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ar...@apache.org on 2020/03/02 15:00:45 UTC
[drill] 08/08: DRILL-7592: Add missing licenses and update plugins
exclusion list and fix licenses
This is an automated email from the ASF dual-hosted git repository.
arina pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
commit ab60b3d8e5d062edaccb9d292fac95d076d322e5
Author: Volodymyr Vysotskyi <vv...@gmail.com>
AuthorDate: Wed Feb 19 13:23:47 2020 +0200
DRILL-7592: Add missing licenses and update plugins exclusion list and fix licenses
closes #1989
---
.github/workflows/ci.yml | 16 +-
.mvn/extensions.xml | 29 +--
common/src/main/resources/drill-default.conf | 32 +--
common/src/main/resources/drill-module.conf | 38 ++--
common/src/test/resources/drill-module.conf | 32 +--
.../src/main/resources/drill-module.conf | 39 ++--
.../src/main/resources/drill-module.conf | 18 ++
.../src/main/resources/drill-module.conf | 39 ++--
.../src/main/resources/drill-module.conf | 39 ++--
.../src/main/resources/drill-module.conf | 41 ++--
.../src/main/resources/drill-module.conf | 39 ++--
.../src/main/resources/drill-module.conf | 39 ++--
.../storage-hive/core/src/main/codegen/config.fmpp | 4 +-
.../core/src/main/codegen/data/HiveTypes.tdd | 4 +-
.../core/src/main/resources/drill-module.conf | 24 ++-
.../core/src/test/resources/drill-module.conf | 24 ++-
.../src/main/resources/drill-module.conf | 24 ++-
.../src/main/resources/drill-module.conf | 39 ++--
.../src/main/resources/drill-module.conf | 39 ++--
contrib/storage-kudu/src/main/codegen/config.fmpp | 4 +-
.../src/main/resources/drill-module.conf | 39 ++--
.../src/main/resources/drill-module.conf | 39 ++--
.../src/main/resources/drill-module.conf | 39 ++--
contrib/udfs/src/main/resources/drill-module.conf | 39 ++--
.../src/main/resources/drill-on-yarn-example.conf | 19 +-
.../src/main/resources/drill-override-example.conf | 17 +-
.../src/main/resources/drill-override.conf | 17 +-
.../resources/drill-sqlline-override-example.conf | 17 +-
.../storage-plugins-override-example.conf | 17 +-
.../drill/yarn/core/drill-on-yarn-defaults.conf | 19 +-
.../src/test/resources/second-test-config.conf | 17 +-
drill-yarn/src/test/resources/test-doy-config.conf | 17 +-
.../src/test/resources/test-doy-distrib.conf | 17 +-
.../src/test/resources/third-test-config.conf | 17 +-
exec/java-exec/src/main/codegen/config.fmpp | 4 +-
.../main/codegen/data/AggrBitwiseLogicalTypes.tdd | 4 +-
.../java-exec/src/main/codegen/data/AggrTypes1.tdd | 4 +-
.../java-exec/src/main/codegen/data/AggrTypes2.tdd | 4 +-
.../java-exec/src/main/codegen/data/AggrTypes3.tdd | 4 +-
exec/java-exec/src/main/codegen/data/CastHigh.tdd | 4 +-
exec/java-exec/src/main/codegen/data/Casts.tdd | 4 +-
.../main/codegen/data/ComparisonTypesDecimal.tdd | 5 +-
.../src/main/codegen/data/ComparisonTypesMain.tdd | 4 +-
.../src/main/codegen/data/CorrelationTypes.tdd | 4 +-
.../src/main/codegen/data/CountAggrTypes.tdd | 18 ++
.../java-exec/src/main/codegen/data/CovarTypes.tdd | 4 +-
.../src/main/codegen/data/DateIntervalFunc.tdd | 5 +-
.../src/main/codegen/data/DecimalAggrTypes1.tdd | 4 +-
.../src/main/codegen/data/DecimalAggrTypes2.tdd | 4 +-
.../src/main/codegen/data/DecimalAggrTypes3.tdd | 4 +-
.../src/main/codegen/data/ExtractTypes.tdd | 4 +-
.../src/main/codegen/data/IntervalNumericTypes.tdd | 5 +-
exec/java-exec/src/main/codegen/data/MathFunc.tdd | 4 +-
.../src/main/codegen/data/MathFunctionTypes.tdd | 4 +-
.../src/main/codegen/data/NumericTypes.tdd | 4 +-
exec/java-exec/src/main/codegen/data/Parser.tdd | 4 +-
exec/java-exec/src/main/codegen/data/SumZero.tdd | 4 +-
.../java-exec/src/main/resources/drill-module.conf | 215 +++++++++++----------
.../src/main/resources/drill-rm-default.conf | 46 ++---
.../src/main/resources/drill-sqlline.conf | 17 +-
.../src/test/resources/drill-external-sort.conf | 24 ++-
.../java-exec/src/test/resources/drill-module.conf | 24 ++-
.../src/test/resources/drill-oom-xsort.conf | 24 ++-
.../test/resources/drill-spool-test-module.conf | 24 ++-
.../resources/drill-sqlline-test-override.conf | 17 +-
.../drill-udf/src/main/resources/drill-module.conf | 18 ++
exec/java-exec/src/test/resources/zkacltest.conf | 33 ++--
exec/jdbc-all/example-conf/drill-module.conf | 18 ++
exec/jdbc-all/src/main/resources/profile.props | 1 +
.../base/src/main/resources/drill-module.conf | 37 ++--
exec/vector/src/main/codegen/config.fmpp | 4 +-
.../src/main/codegen/data/ValueVectorTypes.tdd | 4 +-
logical/src/main/resources/drill-module.conf | 38 ++--
.../src/main/resources/drill-metastore-module.conf | 66 ++++---
.../main/resources/drill-metastore-default.conf | 32 +--
pom.xml | 63 ++++--
protocol/src/main/protobuf/BitControl.proto | 18 ++
protocol/src/main/protobuf/BitData.proto | 18 ++
protocol/src/main/protobuf/Coordination.proto | 18 ++
protocol/src/main/protobuf/ExecutionProtos.proto | 18 ++
protocol/src/main/protobuf/GeneralRPC.proto | 18 ++
protocol/src/main/protobuf/SchemaDef.proto | 18 ++
protocol/src/main/protobuf/Types.proto | 4 +-
protocol/src/main/protobuf/User.proto | 18 ++
protocol/src/main/protobuf/UserBitShared.proto | 18 ++
.../logos/drill-vector-logo.graffle/data.plist | 27 +--
86 files changed, 1208 insertions(+), 674 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 763f8a1..d0d4587 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,11 +1,13 @@
-# 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
+# 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,
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
index cee0598..f3e73ca 100644
--- a/.mvn/extensions.xml
+++ b/.mvn/extensions.xml
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
-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
+ 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.
-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.
-->
<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
diff --git a/common/src/main/resources/drill-default.conf b/common/src/main/resources/drill-default.conf
index a7261c0..31b3792 100644
--- a/common/src/main/resources/drill-default.conf
+++ b/common/src/main/resources/drill-default.conf
@@ -1,18 +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.
+#
+# 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.
+#
drill: {
logical: {
diff --git a/common/src/main/resources/drill-module.conf b/common/src/main/resources/drill-module.conf
index f8226f8..bbccf19 100644
--- a/common/src/main/resources/drill-module.conf
+++ b/common/src/main/resources/drill-module.conf
@@ -1,22 +1,24 @@
-// 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.
+#
+# 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+# This file tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill {
classpath.scanning {
base.classes : ${?drill.classpath.scanning.base.classes} [
diff --git a/common/src/test/resources/drill-module.conf b/common/src/test/resources/drill-module.conf
index 4236559..e62dcc7 100644
--- a/common/src/test/resources/drill-module.conf
+++ b/common/src/test/resources/drill-module.conf
@@ -1,17 +1,19 @@
-// 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.
+#
+# 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.
+#
drill.classpath.scanning.packages += "org.apache.drill.storage"
diff --git a/contrib/format-esri/src/main/resources/drill-module.conf b/contrib/format-esri/src/main/resources/drill-module.conf
index 697fe1b..11054c6 100644
--- a/contrib/format-esri/src/main/resources/drill-module.conf
+++ b/contrib/format-esri/src/main/resources/drill-module.conf
@@ -1,20 +1,23 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning.packages += "org.apache.drill.exec.store.esri"
diff --git a/contrib/format-excel/src/main/resources/drill-module.conf b/contrib/format-excel/src/main/resources/drill-module.conf
index f70ab5d..1ea9082 100644
--- a/contrib/format-excel/src/main/resources/drill-module.conf
+++ b/contrib/format-excel/src/main/resources/drill-module.conf
@@ -1 +1,19 @@
+#
+# 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.
+#
+
drill.classpath.scanning.packages += "org.apache.drill.exec.store.excel"
diff --git a/contrib/format-hdf5/src/main/resources/drill-module.conf b/contrib/format-hdf5/src/main/resources/drill-module.conf
index 2bb6136..97dc3f6 100644
--- a/contrib/format-hdf5/src/main/resources/drill-module.conf
+++ b/contrib/format-hdf5/src/main/resources/drill-module.conf
@@ -1,20 +1,23 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning.packages += "org.apache.drill.exec.store.hdf5"
diff --git a/contrib/format-ltsv/src/main/resources/drill-module.conf b/contrib/format-ltsv/src/main/resources/drill-module.conf
index faf1632..e4aa090 100644
--- a/contrib/format-ltsv/src/main/resources/drill-module.conf
+++ b/contrib/format-ltsv/src/main/resources/drill-module.conf
@@ -1,20 +1,23 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning.packages += "org.apache.drill.exec.store.ltsv"
diff --git a/contrib/format-maprdb/src/main/resources/drill-module.conf b/contrib/format-maprdb/src/main/resources/drill-module.conf
index a4270c7..9dc9588 100644
--- a/contrib/format-maprdb/src/main/resources/drill-module.conf
+++ b/contrib/format-maprdb/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
format-maprdb: {
json: {
@@ -34,5 +37,5 @@ format-maprdb: {
}
}
-// this picks up the UDFs
+# this picks up the UDFs
drill.classpath.scanning.packages += "org.apache.drill.exec.udf.mapr.db"
diff --git a/contrib/format-syslog/src/main/resources/drill-module.conf b/contrib/format-syslog/src/main/resources/drill-module.conf
index d56f649..92b4c80 100644
--- a/contrib/format-syslog/src/main/resources/drill-module.conf
+++ b/contrib/format-syslog/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning: {
packages += "org.apache.drill.exec.store.syslog"
diff --git a/contrib/storage-hbase/src/main/resources/drill-module.conf b/contrib/storage-hbase/src/main/resources/drill-module.conf
index 150a3bb..a8abfc2 100644
--- a/contrib/storage-hbase/src/main/resources/drill-module.conf
+++ b/contrib/storage-hbase/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill: {
classpath.scanning: {
diff --git a/contrib/storage-hive/core/src/main/codegen/config.fmpp b/contrib/storage-hive/core/src/main/codegen/config.fmpp
index cd36891..731d67d 100644
--- a/contrib/storage-hive/core/src/main/codegen/config.fmpp
+++ b/contrib/storage-hive/core/src/main/codegen/config.fmpp
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
data: {
drillOI:tdd(../data/HiveTypes.tdd)
diff --git a/contrib/storage-hive/core/src/main/codegen/data/HiveTypes.tdd b/contrib/storage-hive/core/src/main/codegen/data/HiveTypes.tdd
index 864610c..3ea9dbb 100644
--- a/contrib/storage-hive/core/src/main/codegen/data/HiveTypes.tdd
+++ b/contrib/storage-hive/core/src/main/codegen/data/HiveTypes.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
map: [
diff --git a/contrib/storage-hive/core/src/main/resources/drill-module.conf b/contrib/storage-hive/core/src/main/resources/drill-module.conf
index bef453b..8f0f575 100644
--- a/contrib/storage-hive/core/src/main/resources/drill-module.conf
+++ b/contrib/storage-hive/core/src/main/resources/drill-module.conf
@@ -1,6 +1,24 @@
-// This file tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill {
classpath.scanning {
diff --git a/contrib/storage-hive/core/src/test/resources/drill-module.conf b/contrib/storage-hive/core/src/test/resources/drill-module.conf
index 7451eae..1a8f675 100644
--- a/contrib/storage-hive/core/src/test/resources/drill-module.conf
+++ b/contrib/storage-hive/core/src/test/resources/drill-module.conf
@@ -1,5 +1,23 @@
-// This file tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning.packages += "org.apache.hadoop.hive"
diff --git a/contrib/storage-hive/hive-exec-shade/src/main/resources/drill-module.conf b/contrib/storage-hive/hive-exec-shade/src/main/resources/drill-module.conf
index 7451eae..1a8f675 100644
--- a/contrib/storage-hive/hive-exec-shade/src/main/resources/drill-module.conf
+++ b/contrib/storage-hive/hive-exec-shade/src/main/resources/drill-module.conf
@@ -1,5 +1,23 @@
-// This file tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning.packages += "org.apache.hadoop.hive"
diff --git a/contrib/storage-jdbc/src/main/resources/drill-module.conf b/contrib/storage-jdbc/src/main/resources/drill-module.conf
old mode 100755
new mode 100644
index 0f98d05..90702cd
--- a/contrib/storage-jdbc/src/main/resources/drill-module.conf
+++ b/contrib/storage-jdbc/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning: {
packages += "org.apache.drill.exec.store.jdbc"
}
diff --git a/contrib/storage-kafka/src/main/resources/drill-module.conf b/contrib/storage-kafka/src/main/resources/drill-module.conf
index 4b813a4..6d2e3f6 100644
--- a/contrib/storage-kafka/src/main/resources/drill-module.conf
+++ b/contrib/storage-kafka/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning: {
packages += "org.apache.drill.exec.store.kafka"
}
diff --git a/contrib/storage-kudu/src/main/codegen/config.fmpp b/contrib/storage-kudu/src/main/codegen/config.fmpp
index 40a29b4..9d868fe 100644
--- a/contrib/storage-kudu/src/main/codegen/config.fmpp
+++ b/contrib/storage-kudu/src/main/codegen/config.fmpp
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
data: {
vv: tdd(../data/ValueVectorTypes.tdd),
diff --git a/contrib/storage-kudu/src/main/resources/drill-module.conf b/contrib/storage-kudu/src/main/resources/drill-module.conf
index e225600..26e5e06 100644
--- a/contrib/storage-kudu/src/main/resources/drill-module.conf
+++ b/contrib/storage-kudu/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill: {
classpath.scanning: {
diff --git a/contrib/storage-mongo/src/main/resources/drill-module.conf b/contrib/storage-mongo/src/main/resources/drill-module.conf
index 81490f0..4f7d387 100644
--- a/contrib/storage-mongo/src/main/resources/drill-module.conf
+++ b/contrib/storage-mongo/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning: {
packages += "org.apache.drill.exec.store.mongo"
}
diff --git a/contrib/storage-opentsdb/src/main/resources/drill-module.conf b/contrib/storage-opentsdb/src/main/resources/drill-module.conf
index d5743da..7724910 100644
--- a/contrib/storage-opentsdb/src/main/resources/drill-module.conf
+++ b/contrib/storage-opentsdb/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning: {
packages += "org.apache.drill.exec.store.openTSDB"
}
diff --git a/contrib/udfs/src/main/resources/drill-module.conf b/contrib/udfs/src/main/resources/drill-module.conf
index 741aac0..a345559 100644
--- a/contrib/udfs/src/main/resources/drill-module.conf
+++ b/contrib/udfs/src/main/resources/drill-module.conf
@@ -1,20 +1,23 @@
-// 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill.classpath.scanning.packages += "org.apache.drill.exec.udfs"
diff --git a/distribution/src/main/resources/drill-on-yarn-example.conf b/distribution/src/main/resources/drill-on-yarn-example.conf
index 1076676..e6dd850 100644
--- a/distribution/src/main/resources/drill-on-yarn-example.conf
+++ b/distribution/src/main/resources/drill-on-yarn-example.conf
@@ -1,18 +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
+# 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.
-# ---------------------------------------------------------------------------
+#
+
# Configuration for the Drill-on-YARN feature. Provides information needed to
# launch the Drill Application Master under YARN, and to configure the
# Drill cluster.
diff --git a/distribution/src/main/resources/drill-override-example.conf b/distribution/src/main/resources/drill-override-example.conf
index 0c04175..ad942bb 100644
--- a/distribution/src/main/resources/drill-override-example.conf
+++ b/distribution/src/main/resources/drill-override-example.conf
@@ -1,17 +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
+# 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 tells Drill to consider this module when class path scanning.
# This file can also include any supplementary configuration information.
diff --git a/distribution/src/main/resources/drill-override.conf b/distribution/src/main/resources/drill-override.conf
index 9f07e19..5c15234 100644
--- a/distribution/src/main/resources/drill-override.conf
+++ b/distribution/src/main/resources/drill-override.conf
@@ -1,17 +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
+# 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 tells Drill to consider this module when class path scanning.
# This file can also include any supplementary configuration information.
diff --git a/distribution/src/main/resources/drill-sqlline-override-example.conf b/distribution/src/main/resources/drill-sqlline-override-example.conf
index 6507079..7873f13 100644
--- a/distribution/src/main/resources/drill-sqlline-override-example.conf
+++ b/distribution/src/main/resources/drill-sqlline-override-example.conf
@@ -1,17 +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
+# 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 customizes SqlLine application.
# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
diff --git a/distribution/src/main/resources/storage-plugins-override-example.conf b/distribution/src/main/resources/storage-plugins-override-example.conf
index d471708..bd5d958 100644
--- a/distribution/src/main/resources/storage-plugins-override-example.conf
+++ b/distribution/src/main/resources/storage-plugins-override-example.conf
@@ -1,17 +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
+# 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 involves storage plugins configs, which can be updated on the Drill start-up.
# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
diff --git a/drill-yarn/src/main/resources/org/apache/drill/yarn/core/drill-on-yarn-defaults.conf b/drill-yarn/src/main/resources/org/apache/drill/yarn/core/drill-on-yarn-defaults.conf
index bda8152..0a88837 100644
--- a/drill-yarn/src/main/resources/org/apache/drill/yarn/core/drill-on-yarn-defaults.conf
+++ b/drill-yarn/src/main/resources/org/apache/drill/yarn/core/drill-on-yarn-defaults.conf
@@ -1,18 +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
+# 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.
-# ---------------------------------------------------------------------------
+#
+
# Configuration for the Drill-on-YARN feature.
# See drill-on-yarn-example.conf for details.
# Some properties are private; the are meant for use by the Drill
diff --git a/drill-yarn/src/test/resources/second-test-config.conf b/drill-yarn/src/test/resources/second-test-config.conf
index 72cf09b..77cb504 100644
--- a/drill-yarn/src/test/resources/second-test-config.conf
+++ b/drill-yarn/src/test/resources/second-test-config.conf
@@ -1,17 +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
+# 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 contains a test set of configuration settings used by the
# TestConfig unit test. It has a benign name to prevent any accidental
diff --git a/drill-yarn/src/test/resources/test-doy-config.conf b/drill-yarn/src/test/resources/test-doy-config.conf
index f6d257c..7e0a562 100644
--- a/drill-yarn/src/test/resources/test-doy-config.conf
+++ b/drill-yarn/src/test/resources/test-doy-config.conf
@@ -1,17 +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
+# 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 contains a test set of configuration settings used by the
# TestConfig unit test. It has a benign name to prevent any accidental
diff --git a/drill-yarn/src/test/resources/test-doy-distrib.conf b/drill-yarn/src/test/resources/test-doy-distrib.conf
index 98afc16..b8ff997 100644
--- a/drill-yarn/src/test/resources/test-doy-distrib.conf
+++ b/drill-yarn/src/test/resources/test-doy-distrib.conf
@@ -1,17 +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
+# 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 contains a test set of configuration settings used by the
# TestConfig unit test. It has a benign name to prevent any accidental
diff --git a/drill-yarn/src/test/resources/third-test-config.conf b/drill-yarn/src/test/resources/third-test-config.conf
index c33d8e9..3b249b7 100644
--- a/drill-yarn/src/test/resources/third-test-config.conf
+++ b/drill-yarn/src/test/resources/third-test-config.conf
@@ -1,17 +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
+# 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 contains a test set of configuration settings used by the
# TestConfig unit test. It has a benign name to prevent any accidental
diff --git a/exec/java-exec/src/main/codegen/config.fmpp b/exec/java-exec/src/main/codegen/config.fmpp
index 50f110d..c6f86f3 100644
--- a/exec/java-exec/src/main/codegen/config.fmpp
+++ b/exec/java-exec/src/main/codegen/config.fmpp
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
data: {
# TODO: Rename to ~valueVectorModesAndTypes for clarity.
diff --git a/exec/java-exec/src/main/codegen/data/AggrBitwiseLogicalTypes.tdd b/exec/java-exec/src/main/codegen/data/AggrBitwiseLogicalTypes.tdd
index 1070faa..2ed875a 100644
--- a/exec/java-exec/src/main/codegen/data/AggrBitwiseLogicalTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/AggrBitwiseLogicalTypes.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
logicalAggrTypes: [
diff --git a/exec/java-exec/src/main/codegen/data/AggrTypes1.tdd b/exec/java-exec/src/main/codegen/data/AggrTypes1.tdd
index d8b1cae..f6ed110 100644
--- a/exec/java-exec/src/main/codegen/data/AggrTypes1.tdd
+++ b/exec/java-exec/src/main/codegen/data/AggrTypes1.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
aggrtypes: [
diff --git a/exec/java-exec/src/main/codegen/data/AggrTypes2.tdd b/exec/java-exec/src/main/codegen/data/AggrTypes2.tdd
index 183d028..452ae52 100644
--- a/exec/java-exec/src/main/codegen/data/AggrTypes2.tdd
+++ b/exec/java-exec/src/main/codegen/data/AggrTypes2.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
aggrtypes: [
diff --git a/exec/java-exec/src/main/codegen/data/AggrTypes3.tdd b/exec/java-exec/src/main/codegen/data/AggrTypes3.tdd
index 7fb67cf..825b8cd 100644
--- a/exec/java-exec/src/main/codegen/data/AggrTypes3.tdd
+++ b/exec/java-exec/src/main/codegen/data/AggrTypes3.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
aggrtypes: [
diff --git a/exec/java-exec/src/main/codegen/data/CastHigh.tdd b/exec/java-exec/src/main/codegen/data/CastHigh.tdd
index dc4830b..78ed40b 100644
--- a/exec/java-exec/src/main/codegen/data/CastHigh.tdd
+++ b/exec/java-exec/src/main/codegen/data/CastHigh.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
types: [
diff --git a/exec/java-exec/src/main/codegen/data/Casts.tdd b/exec/java-exec/src/main/codegen/data/Casts.tdd
index 7652ab7..f9ccbf8 100644
--- a/exec/java-exec/src/main/codegen/data/Casts.tdd
+++ b/exec/java-exec/src/main/codegen/data/Casts.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
types: [
diff --git a/exec/java-exec/src/main/codegen/data/ComparisonTypesDecimal.tdd b/exec/java-exec/src/main/codegen/data/ComparisonTypesDecimal.tdd
index f5b912e..019428a 100644
--- a/exec/java-exec/src/main/codegen/data/ComparisonTypesDecimal.tdd
+++ b/exec/java-exec/src/main/codegen/data/ComparisonTypesDecimal.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,15 @@
# "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
+# 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.
+#
+
{
{ decimalTypes: [
{name: "VarDecimal"},
diff --git a/exec/java-exec/src/main/codegen/data/ComparisonTypesMain.tdd b/exec/java-exec/src/main/codegen/data/ComparisonTypesMain.tdd
index a647535..dfa5926 100644
--- a/exec/java-exec/src/main/codegen/data/ComparisonTypesMain.tdd
+++ b/exec/java-exec/src/main/codegen/data/ComparisonTypesMain.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
# Template data/configuration file for ComparisonFunctions.java for
# comparison functions--currently, for primitive numeric types, for Bit/Boolean,
diff --git a/exec/java-exec/src/main/codegen/data/CorrelationTypes.tdd b/exec/java-exec/src/main/codegen/data/CorrelationTypes.tdd
index cc6d2a5..a374de3 100644
--- a/exec/java-exec/src/main/codegen/data/CorrelationTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/CorrelationTypes.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
correlationTypes: [
diff --git a/exec/java-exec/src/main/codegen/data/CountAggrTypes.tdd b/exec/java-exec/src/main/codegen/data/CountAggrTypes.tdd
index 60777e6..8d4f05b 100644
--- a/exec/java-exec/src/main/codegen/data/CountAggrTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/CountAggrTypes.tdd
@@ -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.
+#
+
{
countFunctionsInput: [
"Bit",
diff --git a/exec/java-exec/src/main/codegen/data/CovarTypes.tdd b/exec/java-exec/src/main/codegen/data/CovarTypes.tdd
index d0ec489..6eac1c2 100644
--- a/exec/java-exec/src/main/codegen/data/CovarTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/CovarTypes.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
covarianceTypes: [
diff --git a/exec/java-exec/src/main/codegen/data/DateIntervalFunc.tdd b/exec/java-exec/src/main/codegen/data/DateIntervalFunc.tdd
index bfa44c8..190ae1e 100644
--- a/exec/java-exec/src/main/codegen/data/DateIntervalFunc.tdd
+++ b/exec/java-exec/src/main/codegen/data/DateIntervalFunc.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,15 @@
# "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
+# 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.
+#
+
{
{dates: ["Date", "TimeStamp", "Time"] },
{intervals: ["Interval", "IntervalDay", "IntervalYear", "Int", "BigInt"] },
diff --git a/exec/java-exec/src/main/codegen/data/DecimalAggrTypes1.tdd b/exec/java-exec/src/main/codegen/data/DecimalAggrTypes1.tdd
index 4e06d04..561c656 100644
--- a/exec/java-exec/src/main/codegen/data/DecimalAggrTypes1.tdd
+++ b/exec/java-exec/src/main/codegen/data/DecimalAggrTypes1.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
aggrtypes: [
diff --git a/exec/java-exec/src/main/codegen/data/DecimalAggrTypes2.tdd b/exec/java-exec/src/main/codegen/data/DecimalAggrTypes2.tdd
index 36a9233..0562182 100644
--- a/exec/java-exec/src/main/codegen/data/DecimalAggrTypes2.tdd
+++ b/exec/java-exec/src/main/codegen/data/DecimalAggrTypes2.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
aggrtypes: [
diff --git a/exec/java-exec/src/main/codegen/data/DecimalAggrTypes3.tdd b/exec/java-exec/src/main/codegen/data/DecimalAggrTypes3.tdd
index 670c53d..d0aca12 100644
--- a/exec/java-exec/src/main/codegen/data/DecimalAggrTypes3.tdd
+++ b/exec/java-exec/src/main/codegen/data/DecimalAggrTypes3.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
aggrtypes: [
diff --git a/exec/java-exec/src/main/codegen/data/ExtractTypes.tdd b/exec/java-exec/src/main/codegen/data/ExtractTypes.tdd
index 70d7861..4d8473d 100644
--- a/exec/java-exec/src/main/codegen/data/ExtractTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/ExtractTypes.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
toTypes: [Second, Minute, Hour, Day, Month, Year],
diff --git a/exec/java-exec/src/main/codegen/data/IntervalNumericTypes.tdd b/exec/java-exec/src/main/codegen/data/IntervalNumericTypes.tdd
index 1646820..b43b33c 100644
--- a/exec/java-exec/src/main/codegen/data/IntervalNumericTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/IntervalNumericTypes.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,15 @@
# "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
+# 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.
+#
+
{
{interval: ["Interval", "IntervalDay", "IntervalYear"] },
{numeric: ["Int", "BigInt", "Float4", "Float8"] }
diff --git a/exec/java-exec/src/main/codegen/data/MathFunc.tdd b/exec/java-exec/src/main/codegen/data/MathFunc.tdd
index 51a1b28..6f9e4ad 100644
--- a/exec/java-exec/src/main/codegen/data/MathFunc.tdd
+++ b/exec/java-exec/src/main/codegen/data/MathFunc.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
diff --git a/exec/java-exec/src/main/codegen/data/MathFunctionTypes.tdd b/exec/java-exec/src/main/codegen/data/MathFunctionTypes.tdd
index 1724373..c0a5034 100644
--- a/exec/java-exec/src/main/codegen/data/MathFunctionTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/MathFunctionTypes.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
mathFunctionTypes: [
diff --git a/exec/java-exec/src/main/codegen/data/NumericTypes.tdd b/exec/java-exec/src/main/codegen/data/NumericTypes.tdd
index 9f33353..6b28c1a 100644
--- a/exec/java-exec/src/main/codegen/data/NumericTypes.tdd
+++ b/exec/java-exec/src/main/codegen/data/NumericTypes.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
numeric: ["Int", "BigInt", "TinyInt", "SmallInt", "UInt1", "UInt2", "UInt4", "UInt8", "Float4", "Float8", "VarDecimal"],
diff --git a/exec/java-exec/src/main/codegen/data/Parser.tdd b/exec/java-exec/src/main/codegen/data/Parser.tdd
index 3a4412c..d1ec2e0 100644
--- a/exec/java-exec/src/main/codegen/data/Parser.tdd
+++ b/exec/java-exec/src/main/codegen/data/Parser.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
# Generated parser implementation class package and name
diff --git a/exec/java-exec/src/main/codegen/data/SumZero.tdd b/exec/java-exec/src/main/codegen/data/SumZero.tdd
index c6532b4..c4d4fa5 100644
--- a/exec/java-exec/src/main/codegen/data/SumZero.tdd
+++ b/exec/java-exec/src/main/codegen/data/SumZero.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
types: [
diff --git a/exec/java-exec/src/main/resources/drill-module.conf b/exec/java-exec/src/main/resources/drill-module.conf
index a0846af..bdfeb57 100644
--- a/exec/java-exec/src/main/resources/drill-module.conf
+++ b/exec/java-exec/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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.
+#
+# 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+# This file tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill {
classpath.scanning {
@@ -48,8 +51,8 @@ drill {
org.apache.drill.exec.coord.zk
],
- // caches scanned result during build time
- // set to false to avoid the need for a full Drill build during development
+ # caches scanned result during build time
+ # set to false to avoid the need for a full Drill build during development
cache.enabled: true
}
}
@@ -58,8 +61,8 @@ drill.client: {
supports-complex-types: true
}
-// Location Drill uses for temporary files, such as downloaded dynamic UDFs jars.
-// By default ${DRILL_TMP_DIR} is used if set or ${drill.tmp-dir} if it's been overridden.
+# Location Drill uses for temporary files, such as downloaded dynamic UDFs jars.
+# By default ${DRILL_TMP_DIR} is used if set or ${drill.tmp-dir} if it's been overridden.
drill.tmp-dir: "/tmp"
drill.tmp-dir: ${?DRILL_TMP_DIR}
drill.exec: {
@@ -195,7 +198,7 @@ drill.exec: {
},
web.options.filters: ["planner", "store", "parquet", "hashagg", "hashjoin"]
},
- //setting javax variables for ssl configurations is being deprecated.
+ # setting javax variables for ssl configurations is being deprecated.
ssl: {
keyStoreType = ${?javax.net.ssl.keyStoreType},
keyStorePath = ${?javax.net.ssl.keyStore},
@@ -272,110 +275,110 @@ drill.exec: {
debug: true,
janino_maxsize: 262144,
cache_max_size: 1000,
- // Where to save the generated source. See ClassBuilder
+ # Where to save the generated source. See ClassBuilder
code_dir: "/tmp/drill/codegen"
- // Disable code cache. Only for testing.
+ # Disable code cache. Only for testing.
disable_cache: false,
- // Use plain Java compilation where available
+ # Use plain Java compilation where available
prefer_plain_java: false
},
debug: {
- // If true, inserts the iterator validator atop each operator.
- // Primarily used for testing.
+ # If true, inserts the iterator validator atop each operator.
+ # Primarily used for testing.
validate_iterators: false,
- // If iterator validation is enabled, also validates the vectors
- // in each batch. Primarily used for testing. To enable from
- // the command line:
- // java ... -ea -Ddrill.exec.debug.validate_vectors=true ...
+ # If iterator validation is enabled, also validates the vectors
+ # in each batch. Primarily used for testing. To enable from
+ # the command line:
+ # java ... -ea -Ddrill.exec.debug.validate_vectors=true ...
validate_vectors: false
- // If true, dumps several record batches when an operator fails.
- // Generally disabled in testing, especially when we expect
- // a failure
+ # If true, dumps several record batches when an operator fails.
+ # Generally disabled in testing, especially when we expect
+ # a failure
dump_batches: true
},
spill: {
- // *** Options common to all the operators that may spill
- // File system to use. Local file system by default.
+ # *** Options common to all the operators that may spill
+ # File system to use. Local file system by default.
fs: "file:///",
- // List of directories to use. Directories are created
- // if they do not exist.
+ # List of directories to use. Directories are created
+ # if they do not exist.
directories: [ "/tmp/drill/spill" ]
},
hashjoin: {
spill: {
- // -- The 2 options below can be used to override the common ones
- // -- (common to all spilling operators)
- // File system to use. Local file system by default.
+ # -- The 2 options below can be used to override the common ones
+ # -- (common to all spilling operators)
+ # File system to use. Local file system by default.
fs: ${drill.exec.spill.fs},
- // List of directories to use. Directories are created
- // if they do not exist.
+ # List of directories to use. Directories are created
+ # if they do not exist.
directories: ${drill.exec.spill.directories},
}
},
hashagg: {
spill: {
- // -- The 2 options below can be used to override the common ones
- // -- (common to all spilling operators)
- // File system to use. Local file system by default.
+ # -- The 2 options below can be used to override the common ones
+ # -- (common to all spilling operators)
+ # File system to use. Local file system by default.
fs: ${drill.exec.spill.fs},
- // List of directories to use. Directories are created
- // if they do not exist.
+ # List of directories to use. Directories are created
+ # if they do not exist.
directories: ${drill.exec.spill.directories},
}
},
sort: {
purge.threshold : 10,
external: {
- // Limit on the number of batches buffered in memory.
- // Primarily for testing.
- // 0 = unlimited
+ # Limit on the number of batches buffered in memory.
+ # Primarily for testing.
+ # 0 = unlimited
batch_limit: 0,
- // Limit on the amount of memory used for xsort. Overrides the
- // value provided by Foreman. Primarily for testing.
- // 0 = unlimited, Supports HOCON memory suffixes.
+ # Limit on the amount of memory used for xsort. Overrides the
+ # value provided by Foreman. Primarily for testing.
+ # 0 = unlimited, Supports HOCON memory suffixes.
mem_limit: 0,
- // Limit on the number of batches that can be merged in
- // a single pass. Limits the number of open file handles.
- // 0 = unlimited
+ # Limit on the number of batches that can be merged in
+ # a single pass. Limits the number of open file handles.
+ # 0 = unlimited
merge_limit: 128,
spill: {
- // Deprecated for managed xsort; used only by legacy xsort
+ # Deprecated for managed xsort; used only by legacy xsort
group.size: 40000,
- // Deprecated for managed xsort; used only by legacy xsort
+ # Deprecated for managed xsort; used only by legacy xsort
threshold: 40000,
- // -- The two options below can be used to override the options common
- // -- for all spilling operators (see "spill" above).
- // -- This is done for backward compatibility; in the future they
- // -- would be deprecated (you should be using only the common ones)
- // File system to use. Local file system by default.
+ # -- The two options below can be used to override the options common
+ # -- for all spilling operators (see "spill" above).
+ # -- This is done for backward compatibility; in the future they
+ # -- would be deprecated (you should be using only the common ones)
+ # File system to use. Local file system by default.
fs: ${drill.exec.spill.fs},
- // List of directories to use. Directories are created
- // if they do not exist.
+ # List of directories to use. Directories are created
+ # if they do not exist.
directories: ${drill.exec.spill.directories},
- // Size of the batches written to, and read from, the spill files.
- // Determines the ratio of memory to input data size for a single-
- // generation sort. Smaller values are better, but too small
- // incurs per-batch overhead.
+ # Size of the batches written to, and read from, the spill files.
+ # Determines the ratio of memory to input data size for a single-
+ # generation sort. Smaller values are better, but too small
+ # incurs per-batch overhead.
spill_batch_size = 1M,
- // Preferred file size for "first-generation" spill files.
- // Set large enough to get long, continuous writes, but not so
- // large as to overwhelm a temp directory.
- // Supports HOCON memory suffixes.
+ # Preferred file size for "first-generation" spill files.
+ # Set large enough to get long, continuous writes, but not so
+ # large as to overwhelm a temp directory.
+ # Supports HOCON memory suffixes.
file_size: 256M
}
}
},
queue : {
- // Settings for the local query queue available for embedded drillbits.
+ # Settings for the local query queue available for embedded drillbits.
embedded : {
- // Enable the local query queue
+ # Enable the local query queue
enable: false,
- // Maximum number of queries that can run simultaneously.
- // All others queue.
+ # Maximum number of queries that can run simultaneously.
+ # All others queue.
size: 2,
- // Maximum wait time in the queue before the query times out and
- // fails.
- timeout_ms: 5000 // 5 seconds
+ # Maximum wait time in the queue before the query times out and
+ # fails.
+ timeout_ms: 5000 # 5 seconds
}
}
memory: {
@@ -397,26 +400,26 @@ drill.exec: {
},
udf: {
retry-attempts: 5,
- // Disables (parts of) the dynamic UDF functionality.
- // Primarily for testing.
+ # Disables (parts of) the dynamic UDF functionality.
+ # Primarily for testing.
disable_dynamic: false,
directory: {
- // Base directory for remote and local udf directories, unique among clusters.
+ # Base directory for remote and local udf directories, unique among clusters.
base: ${drill.exec.zk.root}"/udf",
- // Path to local udf directory, always created on local file system.
- // Root for these directory is generated at runtime unless Drill temporary directory is set.
+ # Path to local udf directory, always created on local file system.
+ # Root for these directory is generated at runtime unless Drill temporary directory is set.
local: ${drill.exec.udf.directory.base}"/local",
- // Set this property if custom file system should be used to create remote directories, ex: fs: "file:///".
- // fs: "",
- // Set this property if custom absolute root should be used for remote directories, ex: root: "/app/drill".
- // root: "",
+ # Set this property if custom file system should be used to create remote directories, ex: fs: "file:///".
+ # fs: "",
+ # Set this property if custom absolute root should be used for remote directories, ex: root: "/app/drill".
+ # root: "",
- // Relative path to all remote udf directories.
- // Directories are created under default file system taken from Hadoop configuration
- // unless ${drill.exec.udf.directory.fs} is set.
- // User home directory is used as root unless ${drill.exec.udf.directory.root} is set.
+ # Relative path to all remote udf directories.
+ # Directories are created under default file system taken from Hadoop configuration
+ # unless ${drill.exec.udf.directory.fs} is set.
+ # User home directory is used as root unless ${drill.exec.udf.directory.root} is set.
staging: ${drill.exec.udf.directory.base}"/staging",
registry: ${drill.exec.udf.directory.base}"/registry",
tmp: ${drill.exec.udf.directory.base}"/tmp"
@@ -427,19 +430,19 @@ drill.exec: {
# Workspace MUST be file-based and writable. Workspace name is case-sensitive.
default_temporary_workspace: "dfs.tmp"
- // Resource management
+ # Resource management
rm : {
- // Enables Drill RM feature by default. To disable it set the below parameter to false
+ # Enables Drill RM feature by default. To disable it set the below parameter to false
enabled: false
- // Memory per node normally comes from the direct memory alloated on the JVM
- // command line. This parameter, if other than 0, further limits the amount.
- // Primarily for testing.
+ # Memory per node normally comes from the direct memory alloated on the JVM
+ # command line. This parameter, if other than 0, further limits the amount.
+ # Primarily for testing.
memory_per_node: 0,
- // The number of available CPUs normally comes directly from the system itself.
- // This parameter, if other than 0, further limits the number of CPUs will
- // will consider when planning. Note that, sadly, this parameter does not
- // limit *actual* CPU usage; only the amount of CPU assumed to exist when
- // planning and managing queries. Primarily for testing.
+ # The number of available CPUs normally comes directly from the system itself.
+ # This parameter, if other than 0, further limits the number of CPUs will
+ # will consider when planning. Note that, sadly, this parameter does not
+ # limit *actual* CPU usage; only the amount of CPU assumed to exist when
+ # planning and managing queries. Primarily for testing.
cpus_per_node: 0,
}
# Grace period is the amount of time where the drillbit accepts work after
@@ -449,9 +452,9 @@ drill.exec: {
# to have a grace period that is atleast twice the amount of zookeeper
# refresh time.
grace_period_ms : 0,
- //port hunting for drillbits. Enabled only for testing purposes.
+ # port hunting for drillbits. Enabled only for testing purposes.
port_hunt : false,
- // Allow drillbit to bind to loopback address in distributed mode. Enabled only for testing purposes.
+ # Allow drillbit to bind to loopback address in distributed mode. Enabled only for testing purposes.
allow_loopback_address_binding : false
}
diff --git a/exec/java-exec/src/main/resources/drill-rm-default.conf b/exec/java-exec/src/main/resources/drill-rm-default.conf
index 520947f..f661c09 100644
--- a/exec/java-exec/src/main/resources/drill-rm-default.conf
+++ b/exec/java-exec/src/main/resources/drill-rm-default.conf
@@ -1,23 +1,25 @@
-// 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.
+#
+# 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.
+#
drill.exec.rm: {
pool_name: "root",
- memory: 0.9, // 90% of total direct memory allocated to Drill
- queue_selection_policy: "bestfit", // policy to select queue for a query when multiple queues are eligible
+ memory: 0.9, # 90% of total direct memory allocated to Drill
+ queue_selection_policy: "bestfit", # policy to select queue for a query when multiple queues are eligible
selector: {
acl: {
users: ["*"],
@@ -25,10 +27,10 @@ drill.exec.rm: {
}
}
queue: {
- max_query_memory_per_node: 8G // supported format regex [0-9]*[kKmMgG]?
- max_waiting: 10, // default
- max_admissible: 10, // default
- max_wait_timeout: 30000, // default in ms
- wait_for_preferred_nodes: true // default
+ max_query_memory_per_node: 8G # supported format regex [0-9]*[kKmMgG]?
+ max_waiting: 10, # default
+ max_admissible: 10, # default
+ max_wait_timeout: 30000, # default in ms
+ wait_for_preferred_nodes: true # default
}
}
\ No newline at end of file
diff --git a/exec/java-exec/src/main/resources/drill-sqlline.conf b/exec/java-exec/src/main/resources/drill-sqlline.conf
index cde49cb..1f28fc4 100644
--- a/exec/java-exec/src/main/resources/drill-sqlline.conf
+++ b/exec/java-exec/src/main/resources/drill-sqlline.conf
@@ -1,17 +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
+# 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 customizes SqlLine application.
# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
diff --git a/exec/java-exec/src/test/resources/drill-external-sort.conf b/exec/java-exec/src/test/resources/drill-external-sort.conf
index aa3b43d..d763efd 100644
--- a/exec/java-exec/src/test/resources/drill-external-sort.conf
+++ b/exec/java-exec/src/test/resources/drill-external-sort.conf
@@ -1,6 +1,24 @@
-// This file tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill: {
classpath.scanning: {
diff --git a/exec/java-exec/src/test/resources/drill-module.conf b/exec/java-exec/src/test/resources/drill-module.conf
index 3ddc2ef..d1b5bb2 100644
--- a/exec/java-exec/src/test/resources/drill-module.conf
+++ b/exec/java-exec/src/test/resources/drill-module.conf
@@ -1,6 +1,24 @@
-// This file tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill: {
classpath.scanning: {
diff --git a/exec/java-exec/src/test/resources/drill-oom-xsort.conf b/exec/java-exec/src/test/resources/drill-oom-xsort.conf
index d91bdbb..bee0662 100644
--- a/exec/java-exec/src/test/resources/drill-oom-xsort.conf
+++ b/exec/java-exec/src/test/resources/drill-oom-xsort.conf
@@ -1,6 +1,24 @@
-// This file tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill: {
classpath.scanning: {
diff --git a/exec/java-exec/src/test/resources/drill-spool-test-module.conf b/exec/java-exec/src/test/resources/drill-spool-test-module.conf
index b305835..a3c280d 100644
--- a/exec/java-exec/src/test/resources/drill-spool-test-module.conf
+++ b/exec/java-exec/src/test/resources/drill-spool-test-module.conf
@@ -1,6 +1,24 @@
-// This file tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+#
+# 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 tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill: {
classpath.scanning: {
diff --git a/exec/java-exec/src/test/resources/drill-sqlline-test-override.conf b/exec/java-exec/src/test/resources/drill-sqlline-test-override.conf
index b7d949e..bbe0f69 100644
--- a/exec/java-exec/src/test/resources/drill-sqlline-test-override.conf
+++ b/exec/java-exec/src/test/resources/drill-sqlline-test-override.conf
@@ -1,17 +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
+# 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 customizes SqlLine application.
# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
diff --git a/exec/java-exec/src/test/resources/drill-udf/src/main/resources/drill-module.conf b/exec/java-exec/src/test/resources/drill-udf/src/main/resources/drill-module.conf
index 0b2948a..497564d 100644
--- a/exec/java-exec/src/test/resources/drill-udf/src/main/resources/drill-module.conf
+++ b/exec/java-exec/src/test/resources/drill-udf/src/main/resources/drill-module.conf
@@ -1 +1,19 @@
+#
+# 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.
+#
+
drill.classpath.scanning.packages += "org.apache.drill.udf.dynamic"
diff --git a/exec/java-exec/src/test/resources/zkacltest.conf b/exec/java-exec/src/test/resources/zkacltest.conf
index b95e2ad..e9b7445 100644
--- a/exec/java-exec/src/test/resources/zkacltest.conf
+++ b/exec/java-exec/src/test/resources/zkacltest.conf
@@ -1,19 +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.
+#
+# 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 contains ZK client and server config for testing ZK ACLs
+# This file contains ZK client and server config for testing ZK ACLs
Server {
org.apache.zookeeper.server.auth.DigestLoginModule required
diff --git a/exec/jdbc-all/example-conf/drill-module.conf b/exec/jdbc-all/example-conf/drill-module.conf
index 6d8498c..e6414f3 100644
--- a/exec/jdbc-all/example-conf/drill-module.conf
+++ b/exec/jdbc-all/example-conf/drill-module.conf
@@ -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.
+#
+
drill: {
classpath.scanning: {
packages: [
diff --git a/exec/jdbc-all/src/main/resources/profile.props b/exec/jdbc-all/src/main/resources/profile.props
index 4ed395a..af75b4c 100644
--- a/exec/jdbc-all/src/main/resources/profile.props
+++ b/exec/jdbc-all/src/main/resources/profile.props
@@ -15,4 +15,5 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
package.namespace.prefix=${package.namespace.prefix}
diff --git a/exec/memory/base/src/main/resources/drill-module.conf b/exec/memory/base/src/main/resources/drill-module.conf
index 593ef8e..fa42b03 100644
--- a/exec/memory/base/src/main/resources/drill-module.conf
+++ b/exec/memory/base/src/main/resources/drill-module.conf
@@ -1,21 +1,24 @@
-// 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.
+#
+# 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
+# This file tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
drill: {
memory: {
debug.error_on_leak: true,
diff --git a/exec/vector/src/main/codegen/config.fmpp b/exec/vector/src/main/codegen/config.fmpp
index 663677c..cd98ae6 100644
--- a/exec/vector/src/main/codegen/config.fmpp
+++ b/exec/vector/src/main/codegen/config.fmpp
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
data: {
# TODO: Rename to ~valueVectorModesAndTypes for clarity.
diff --git a/exec/vector/src/main/codegen/data/ValueVectorTypes.tdd b/exec/vector/src/main/codegen/data/ValueVectorTypes.tdd
index 64a5710..50a4258 100644
--- a/exec/vector/src/main/codegen/data/ValueVectorTypes.tdd
+++ b/exec/vector/src/main/codegen/data/ValueVectorTypes.tdd
@@ -1,3 +1,4 @@
+#
# 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
@@ -6,13 +7,14 @@
# "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
+# 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.
+#
{
modes: [
diff --git a/logical/src/main/resources/drill-module.conf b/logical/src/main/resources/drill-module.conf
index b6cb266..25f6cc5 100644
--- a/logical/src/main/resources/drill-module.conf
+++ b/logical/src/main/resources/drill-module.conf
@@ -1,19 +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.
+#
+# 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 tells Drill to consider this module when class path scanning.
-// This file can also include any supplementary configuration information.
-// This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
\ No newline at end of file
+# This file tells Drill to consider this module when class path scanning.
+# This file can also include any supplementary configuration information.
+# This file is in HOCON format, see https://github.com/typesafehub/config/blob/master/HOCON.md for more information.
\ No newline at end of file
diff --git a/metastore/iceberg-metastore/src/main/resources/drill-metastore-module.conf b/metastore/iceberg-metastore/src/main/resources/drill-metastore-module.conf
index de1f1f9..c2c466e 100644
--- a/metastore/iceberg-metastore/src/main/resources/drill-metastore-module.conf
+++ b/metastore/iceberg-metastore/src/main/resources/drill-metastore-module.conf
@@ -1,62 +1,64 @@
-// 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.
+#
+# 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.
+#
drill.metastore.iceberg: {
- // File system config can be specified
+ # File system config can be specified
config.properties: {
- // Iceberg tables location will be created under default file system
- // taken from Hadoop configuration unless the below property is set
- // fs.defaultFS: "file:///"
+ # Iceberg tables location will be created under default file system
+ # taken from Hadoop configuration unless the below property is set
+ # fs.defaultFS: "file:///"
}
- // Iceberg Metastore location is constructed based on
- // combination of base_path and relative_path config values
+ # Iceberg Metastore location is constructed based on
+ # combination of base_path and relative_path config values
location: {
- // Iceberg table base path, if not indicated, user home directory will be used
- // base_path: "/app",
+ # Iceberg table base path, if not indicated, user home directory will be used
+ # base_path: "/app",
- // Iceberg table relative path unique among clusters
- // ${drill.exec.zk.root} value will be substituted from Drill main config
+ # Iceberg table relative path unique among clusters
+ # ${drill.exec.zk.root} value will be substituted from Drill main config
relative_path: ${drill.exec.zk.root}"/metastore/iceberg"
}
components: {
- // Common properties for all Iceberg tables from org.apache.iceberg.TableProperties can be specified
+ # Common properties for all Iceberg tables from org.apache.iceberg.TableProperties can be specified
common.properties: {
write.metadata.compression-codec: "none",
- // Enables metadata expiration to avoid consuming space with historical data
- // In Drill the same table properties apply to the snapshots expiration process as well
+ # Enables metadata expiration to avoid consuming space with historical data
+ # In Drill the same table properties apply to the snapshots expiration process as well
write.metadata.delete-after-commit.enabled: true
write.metadata.previous-versions-max: 2,
},
tables: {
- // Iceberg table location in Iceberg Metastore
+ # Iceberg table location in Iceberg Metastore
location: "tables",
- // Specific tables properties from org.apache.iceberg.TableProperties can be specified
+ # Specific tables properties from org.apache.iceberg.TableProperties can be specified
properties: {}
},
views: {
- // Iceberg table location in Iceberg Metastore
+ # Iceberg table location in Iceberg Metastore
location: "views",
- // Specific views properties from org.apache.iceberg.TableProperties can be specified
+ # Specific views properties from org.apache.iceberg.TableProperties can be specified
properties: {}
}
}
diff --git a/metastore/metastore-api/src/main/resources/drill-metastore-default.conf b/metastore/metastore-api/src/main/resources/drill-metastore-default.conf
index 3ab55b1..750c3a4 100644
--- a/metastore/metastore-api/src/main/resources/drill-metastore-default.conf
+++ b/metastore/metastore-api/src/main/resources/drill-metastore-default.conf
@@ -1,18 +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.
+#
+# 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.
+#
drill.metastore: {
implementation.class: "org.apache.drill.metastore.iceberg.IcebergMetastore"
diff --git a/pom.xml b/pom.xml
index 359f059..9bcc9c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -336,12 +336,20 @@
<configuration>
<excludes>
<!-- Types log1, log2, sqllog and sqllog2, ssdlog are used to test he logRegex format plugin. -->
+ <exclude>**/clientlib/y2038/*.c</exclude> <!-- All the files here should have MIT License -->
+ <exclude>**/clientlib/y2038/*.h</exclude> <!-- All the files here should have MIT License -->
+ <exclude>**/resources/parquet/**/*</exclude>
+ <exclude>**/*.woff2</exclude>
+ <exclude>**/*.ks</exclude>
+ <exclude>**/*.pcap</exclude>
<exclude>**/*.log1</exclude>
<exclude>**/*.log2</exclude>
<exclude>**/*.h5</exclude>
<exclude>**/*.sqllog</exclude>
<exclude>**/*.sqllog2</exclude>
<exclude>**/*.syslog</exclude>
+ <exclude>**/*.xls</exclude>
+ <exclude>**/*.xlsx</exclude>
<exclude>**/*.syslog1</exclude>
<exclude>**/*.ssdlog</exclude>
<exclude>**/*.ltsv</exclude>
@@ -353,6 +361,7 @@
<exclude>**/*.json</exclude>
<exclude>**/*.seq</exclude>
<exclude>**/*.parquet</exclude>
+ <exclude>**/*.avro</exclude>
<exclude>**/*.sql</exclude>
<exclude>**/git.properties</exclude>
<exclude>**/*.csv</exclude>
@@ -361,24 +370,18 @@
<exclude>**/*.tsv</exclude>
<exclude>**/*.txt</exclude>
<exclude>**/*.ssv</exclude>
- <exclude>**/drill-*.conf</exclude>
<exclude>**/.buildpath</exclude>
- <exclude>**/*.proto</exclude>
- <exclude>**/*.fmpp</exclude>
<exclude>**/target/**</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/.idea/**</exclude>
- <exclude>**/*.tdd</exclude>
<exclude>**/*.project</exclude>
<exclude>**/TAGS</exclude>
<exclude>**/*.checkstyle</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
- <exclude>.*/**</exclude>
<exclude>**/*.patch</exclude>
<exclude>**/*.pb.cc</exclude>
<exclude>**/*.pb.h</exclude>
- <exclude>**/*.linux</exclude>
<exclude>**/client/*build*/**</exclude>
<exclude>**/client/tags</exclude>
<exclude>**/cmake_install.cmake</exclude>
@@ -390,7 +393,26 @@
<exclude>**/*.autotools</exclude>
<exclude>**/*.cproject</exclude>
<exclude>**/*.drill</exclude>
+ <exclude>**/LICENSE</exclude>
+ <exclude>**/NOTICE</exclude>
+ <exclude>KEYS</exclude>
+ <exclude>header</exclude>
<exclude>**/.drill.parquet_metadata</exclude>
+ <exclude>**/*.mov</exclude>
+ <exclude>**/*.mp4</exclude>
+ <exclude>**/*.avi</exclude>
+ <exclude>**/*.pcx</exclude>
+ <exclude>**/*.webp</exclude>
+ <exclude>**/*.pcapng</exclude>
+ <exclude>**/*.psd</exclude>
+ <exclude>**/*.pcx</exclude>
+ <exclude>**/*.log1</exclude>
+ <exclude>**/*.log2</exclude>
+ <exclude>**/*.sqllog</exclude>
+ <exclude>**/*.sqllog2</exclude>
+ <exclude>**/*.ltsv</exclude>
+ <exclude>**/*.wav</exclude>
+ <exclude>**/control</exclude>
<!-- TODO DRILL-4336: try to avoid the need to add this -->
<exclude>dependency-reduced-pom.xml</exclude>
<exclude>**/*.prj</exclude>
@@ -620,17 +642,20 @@
<exclude>**/clientlib/y2038/*.c</exclude> <!-- All the files here should have MIT License -->
<exclude>**/clientlib/y2038/*.h</exclude> <!-- All the files here should have MIT License -->
<exclude>**/resources/parquet/**/*</exclude>
- <exclude>**/*.g</exclude>
<exclude>**/*.woff2</exclude>
<exclude>**/*.ks</exclude>
<exclude>**/*.pcap</exclude>
+ <exclude>**/*.log1</exclude>
+ <exclude>**/*.log2</exclude>
<exclude>**/*.h5</exclude>
+ <exclude>**/*.sqllog</exclude>
+ <exclude>**/*.sqllog2</exclude>
<exclude>**/*.syslog</exclude>
<exclude>**/*.xls</exclude>
<exclude>**/*.xlsx</exclude>
<exclude>**/*.syslog1</exclude>
- <exclude>**/*.props</exclude>
- <exclude>**/*.conf</exclude>
+ <exclude>**/*.ssdlog</exclude>
+ <exclude>**/*.ltsv</exclude>
<exclude>**/*.log</exclude>
<exclude>**/*.css</exclude>
<exclude>**/*.js</exclude>
@@ -639,6 +664,7 @@
<exclude>**/*.json</exclude>
<exclude>**/*.seq</exclude>
<exclude>**/*.parquet</exclude>
+ <exclude>**/*.avro</exclude>
<exclude>**/*.sql</exclude>
<exclude>**/git.properties</exclude>
<exclude>**/*.csv</exclude>
@@ -647,24 +673,18 @@
<exclude>**/*.tsv</exclude>
<exclude>**/*.txt</exclude>
<exclude>**/*.ssv</exclude>
- <exclude>**/drill-*.conf</exclude>
<exclude>**/.buildpath</exclude>
- <exclude>**/*.proto</exclude>
- <exclude>**/*.fmpp</exclude>
<exclude>**/target/**</exclude>
<exclude>**/*.iml</exclude>
<exclude>**/.idea/**</exclude>
- <exclude>**/*.tdd</exclude>
<exclude>**/*.project</exclude>
<exclude>**/TAGS</exclude>
<exclude>**/*.checkstyle</exclude>
<exclude>**/.classpath</exclude>
<exclude>**/.settings/**</exclude>
- <exclude>.*/**</exclude>
<exclude>**/*.patch</exclude>
<exclude>**/*.pb.cc</exclude>
<exclude>**/*.pb.h</exclude>
- <exclude>**/*.linux</exclude>
<exclude>**/client/*build*/**</exclude>
<exclude>**/client/tags</exclude>
<exclude>**/cmake_install.cmake</exclude>
@@ -676,7 +696,6 @@
<exclude>**/*.autotools</exclude>
<exclude>**/*.cproject</exclude>
<exclude>**/*.drill</exclude>
- <exclude>**/*.plist</exclude>
<exclude>**/LICENSE</exclude>
<exclude>**/NOTICE</exclude>
<exclude>KEYS</exclude>
@@ -699,6 +718,9 @@
<exclude>**/control</exclude>
<!-- TODO DRILL-4336: try to avoid the need to add this -->
<exclude>dependency-reduced-pom.xml</exclude>
+ <exclude>**/*.prj</exclude>
+ <exclude>**/*.shp</exclude>
+ <exclude>**/*.dbf</exclude>
</excludes>
<mapping>
<java>SLASHSTAR_STYLE</java>
@@ -724,6 +746,15 @@
<submit_plan>SCRIPT_STYLE</submit_plan>
<drill-embedded>SCRIPT_STYLE</drill-embedded>
<conffiles>SCRIPT_STYLE</conffiles>
+ <!-- license format for login.conf files should precede the license format for *.conf files-->
+ <login.conf>SLASHSTAR_STYLE</login.conf>
+ <conf>SCRIPT_STYLE</conf>
+ <props>SCRIPT_STYLE</props>
+ <proto>DOUBLESLASH_STYLE</proto>
+ <fmpp>SCRIPT_STYLE</fmpp>
+ <tdd>SCRIPT_STYLE</tdd>
+ <linux>SLASHSTAR_STYLE</linux>
+ <plist>XML_STYLE</plist>
</mapping>
</configuration>
<executions>
diff --git a/protocol/src/main/protobuf/BitControl.proto b/protocol/src/main/protobuf/BitControl.proto
index 3bc3c86..44335d6 100644
--- a/protocol/src/main/protobuf/BitControl.proto
+++ b/protocol/src/main/protobuf/BitControl.proto
@@ -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.
+//
+
package exec.bit.control;
option java_package = "org.apache.drill.exec.proto";
diff --git a/protocol/src/main/protobuf/BitData.proto b/protocol/src/main/protobuf/BitData.proto
index ae9c4c7..177ff9f 100644
--- a/protocol/src/main/protobuf/BitData.proto
+++ b/protocol/src/main/protobuf/BitData.proto
@@ -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.
+//
+
package exec.bit.data;
option java_package = "org.apache.drill.exec.proto";
diff --git a/protocol/src/main/protobuf/Coordination.proto b/protocol/src/main/protobuf/Coordination.proto
index f872233..d2ae706 100644
--- a/protocol/src/main/protobuf/Coordination.proto
+++ b/protocol/src/main/protobuf/Coordination.proto
@@ -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.
+//
+
package exec;
option java_package = "org.apache.drill.exec.proto";
diff --git a/protocol/src/main/protobuf/ExecutionProtos.proto b/protocol/src/main/protobuf/ExecutionProtos.proto
index 58ca5ad..12570f2 100644
--- a/protocol/src/main/protobuf/ExecutionProtos.proto
+++ b/protocol/src/main/protobuf/ExecutionProtos.proto
@@ -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.
+//
+
package exec.bit;
option java_package = "org.apache.drill.exec.proto";
diff --git a/protocol/src/main/protobuf/GeneralRPC.proto b/protocol/src/main/protobuf/GeneralRPC.proto
index bed2ad3..783bcb3 100644
--- a/protocol/src/main/protobuf/GeneralRPC.proto
+++ b/protocol/src/main/protobuf/GeneralRPC.proto
@@ -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.
+//
+
package exec.rpc;
option java_package = "org.apache.drill.exec.proto";
diff --git a/protocol/src/main/protobuf/SchemaDef.proto b/protocol/src/main/protobuf/SchemaDef.proto
index 206e9d3..cf202ce 100644
--- a/protocol/src/main/protobuf/SchemaDef.proto
+++ b/protocol/src/main/protobuf/SchemaDef.proto
@@ -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.
+//
+
package exec;
option java_package = "org.apache.drill.exec.proto";
diff --git a/protocol/src/main/protobuf/Types.proto b/protocol/src/main/protobuf/Types.proto
index 5e819c1..d5cf943 100644
--- a/protocol/src/main/protobuf/Types.proto
+++ b/protocol/src/main/protobuf/Types.proto
@@ -1,3 +1,4 @@
+//
// 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
@@ -6,13 +7,14 @@
// "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
+// 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 common;
diff --git a/protocol/src/main/protobuf/User.proto b/protocol/src/main/protobuf/User.proto
index 9dddc22..29eb7b1 100644
--- a/protocol/src/main/protobuf/User.proto
+++ b/protocol/src/main/protobuf/User.proto
@@ -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.
+//
+
package exec.user;
option java_package = "org.apache.drill.exec.proto";
diff --git a/protocol/src/main/protobuf/UserBitShared.proto b/protocol/src/main/protobuf/UserBitShared.proto
index b31837e..55cfde5 100644
--- a/protocol/src/main/protobuf/UserBitShared.proto
+++ b/protocol/src/main/protobuf/UserBitShared.proto
@@ -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.
+//
+
package exec.shared;
option java_package = "org.apache.drill.exec.proto";
diff --git a/src/main/resources/logos/drill-vector-logo.graffle/data.plist b/src/main/resources/logos/drill-vector-logo.graffle/data.plist
index 5a63e8b..c2a0a01 100644
--- a/src/main/resources/logos/drill-vector-logo.graffle/data.plist
+++ b/src/main/resources/logos/drill-vector-logo.graffle/data.plist
@@ -1,19 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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
+ 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.
- 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.
-->
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">