@@ -77,6 +82,15 @@ var round = function(val, n) { return Math.round(val * Math.pow(10, n)) / Math.pow(10, n); }; + var isAllocator = function(metricName) { + return (metricName.startsWith("drill.allocator")); + }; + function getGBUsageText(val, perc) { + if (isNaN(perc)) { + perc = 0; + } + return round((val / 1073741824), 2) + "GB (" + Math.max(0, perc) + "%)"; + } function updateGauges(gauges) { $("#gaugesTable").html(function() { @@ -109,18 +123,23 @@ }; function updateBars(gauges) { - $.each(["heap","non-heap","total"], function(i, key) { - var used = gauges[key + ".used"].value; - var max = gauges[key + ".max"].value; - var usage = round((used / 1073741824), 2) + "GB"; - var percent = round((used / max), 2); - - var styleVal = "width: " + percent + "%;" - $("#" + key + "Usage").attr({ + $.each(["heap","non-heap","total","drill.allocator.root"], function(i, key) { + var used = gauges[key + ".used"].value; + var max; + if (isAllocator(key)) { + max = gauges[key + ".peak"].value; + } else { + max = gauges[key + ".max"].value; + } + var percent = round((100 * used / max), 2); + var usage = getGBUsageText(used, percent); + + var styleVal = "width: " + percent + "%;color: #202020;white-space: nowrap" + $("#" + (isAllocator(key) ? "estDirect" : key) + "Usage").attr({ "aria-valuenow" : percent, "style" : styleVal }); - $("#" + key + "Usage").html(usage); + $("#" + (isAllocator(key) ? "estDirect" : key) + "Usage").html(usage); }); }; @@ -159,7 +178,7 @@ }; update(); - setInterval(update, 2000); + setInterval(update, 3000); From d55b62f9ea76372c823c15780b2a69f81f0b945c Mon Sep 17 00:00:00 2001 From: Padma Penumarthy Date: Thu, 15 Mar 2018 21:50:54 -0700 Subject: [PATCH 11/44] DRILL-6231: Fix memory allocation for repeated list vector closes #1171 --- .../drill/exec/record/RecordBatchSizer.java | 15 + .../physical/unit/TestOutputBatchSize.java | 257 +++++++++++++++++- 2 files changed, 267 insertions(+), 5 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java index 9525c91506d..bfe0ef1c302 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java @@ -395,11 +395,26 @@ private void allocateMap(AbstractMapVector map, int recordCount) { } } + private void allocateRepeatedList(RepeatedListVector vector, int recordCount) { + vector.allocateOffsetsNew(recordCount); + recordCount *= getCardinality(); + ColumnSize child = children.get(vector.getField().getName()); + if (vector.getDataVector() != null) { + child.allocateVector(vector.getDataVector(), recordCount); + } + } + public void allocateVector(ValueVector vector, int recordCount) { if (vector instanceof AbstractMapVector) { allocateMap((AbstractMapVector) vector, recordCount); return; } + + if (vector instanceof RepeatedListVector) { + allocateRepeatedList((RepeatedListVector) vector, recordCount); + return; + } + AllocationHelper.allocate(vector, recordCount, getEntryWidth(), getCardinality()); } diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java index edd4cbf4a44..76de3811386 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java @@ -1194,20 +1194,267 @@ public void testSizerRepeatedList() throws Exception { // Allocates to nearest power of two colSize.allocateVector(v, testRowCount); + + // offset vector of delegate vector i.e. outer array should have row count number of values. UInt4Vector offsetVector = ((RepeatedListVector) v).getOffsetVector(); - assertEquals((Integer.highestOneBit(testRowCount * 2) << 1), offsetVector.getValueCapacity()); - ValueVector dataVector = ((RepeatedValueVector) v).getDataVector(); - assertEquals(Integer.highestOneBit((testRowCount * 2) << 1) - 1, dataVector.getValueCapacity()); + assertEquals((Integer.highestOneBit(testRowCount) << 1), offsetVector.getValueCapacity()); + + // Get inner vector of delegate vector. + ValueVector vector = ((RepeatedValueVector) v).getDataVector(); + + // Data vector of inner vector should + // have 2 (outer array cardinality) * 4 (inner array cardinality) * row count number of values. + ValueVector dataVector = ((RepeatedValueVector) vector).getDataVector(); + assertEquals(Integer.highestOneBit((testRowCount*8) << 1), dataVector.getValueCapacity()); + + // offset vector of inner vector should have + // 2 (outer array cardinality) * row count number of values. + offsetVector = ((RepeatedValueVector) vector).getOffsetVector(); + assertEquals((Integer.highestOneBit(testRowCount*2) << 1), offsetVector.getValueCapacity()); v.clear(); // Allocates the same as value passed since it is already power of two. // -1 is done for adjustment needed for offset vector. colSize.allocateVector(v, testRowCountPowerTwo - 1); + + // offset vector of delegate vector i.e. outer array should have row count number of values. offsetVector = ((RepeatedListVector) v).getOffsetVector(); assertEquals(testRowCountPowerTwo, offsetVector.getValueCapacity()); - dataVector = ((RepeatedValueVector) v).getDataVector(); - assertEquals(Integer.highestOneBit(testRowCountPowerTwo)-1, dataVector.getValueCapacity()); + + // Get inner vector of delegate vector. + vector = ((RepeatedValueVector) v).getDataVector(); + + // Data vector of inner vector should + // have 2 (outer array cardinality) * 4 (inner array cardinality) * row count number of values. + dataVector = ((RepeatedValueVector) vector).getDataVector(); + assertEquals(testRowCountPowerTwo * 8, dataVector.getValueCapacity()); + + // offset vector of inner vector should have + // 2 (outer array cardinality) * row count number of values. + offsetVector = ((RepeatedValueVector) vector).getOffsetVector(); + assertEquals(testRowCountPowerTwo * 2, offsetVector.getValueCapacity()); + v.clear(); + + // MAX ROW COUNT + colSize.allocateVector(v, ValueVector.MAX_ROW_COUNT - 1); + + // offset vector of delegate vector i.e. outer array should have row count number of values. + offsetVector = ((RepeatedListVector) v).getOffsetVector(); + assertEquals(ValueVector.MAX_ROW_COUNT, offsetVector.getValueCapacity()); + + // Get inner vector of delegate vector. + vector = ((RepeatedValueVector) v).getDataVector(); + + // Data vector of inner vector should + // have 2 (outer array cardinality) * 4 (inner array cardinality) * row count number of values. + dataVector = ((RepeatedValueVector) vector).getDataVector(); + assertEquals(ValueVector.MAX_ROW_COUNT*8, dataVector.getValueCapacity()); + + // offset vector of inner vector should have + // 2 (outer array cardinality) * row count number of values. + offsetVector = ((RepeatedValueVector) vector).getOffsetVector(); + assertEquals(ValueVector.MAX_ROW_COUNT*2, offsetVector.getValueCapacity()); + v.clear(); + + // MIN ROW COUNT + colSize.allocateVector(v, 0); + + // offset vector of delegate vector i.e. outer array should have 1 value. + offsetVector = ((RepeatedListVector) v).getOffsetVector(); + assertEquals(ValueVector.MIN_ROW_COUNT, offsetVector.getValueCapacity()); + + // Get inner vector of delegate vector. + vector = ((RepeatedValueVector) v).getDataVector(); + + // Data vector of inner vector should have 1 value + dataVector = ((RepeatedValueVector) vector).getDataVector(); + assertEquals(ValueVector.MIN_ROW_COUNT, dataVector.getValueCapacity()); + + // offset vector of inner vector should have + // 2 (outer array cardinality) * 1. + offsetVector = ((RepeatedValueVector) vector).getOffsetVector(); + assertEquals(ValueVector.MIN_ROW_COUNT*2, offsetVector.getValueCapacity()); v.clear(); } } + + @Test + public void testSizerRepeatedRepeatedList() throws Exception { + List inputJsonBatches = Lists.newArrayList(); + StringBuilder batchString = new StringBuilder(); + + StringBuilder newString = new StringBuilder(); + newString.append("[ [[1,2,3,4], [5,6,7,8]], [[1,2,3,4], [5,6,7,8]] ]"); + + numRows = 9; + batchString.append("["); + for (int i = 0; i < numRows; i++) { + batchString.append("{\"c\" : " + newString); + batchString.append("},"); + } + batchString.append("{\"c\" : " + newString); + batchString.append("}"); + + batchString.append("]"); + inputJsonBatches.add(batchString.toString()); + + // Create a dummy scanBatch to figure out the size. + RecordBatch scanBatch = new ScanBatch(new MockPhysicalOperator(), + fragContext, getReaderListForJsonBatches(inputJsonBatches, fragContext)); + + VectorAccessible va = new BatchIterator(scanBatch).iterator().next(); + RecordBatchSizer sizer = new RecordBatchSizer(va); + + assertEquals(1, sizer.columns().size()); + RecordBatchSizer.ColumnSize column = sizer.columns().get("c"); + assertNotNull(column); + + /** + * stdDataSize:8*10*10*10, stdNetSize:8*10*10*10 + 8*10*10 + 8*10 + 4, + * dataSizePerEntry:16*8, netSizePerEntry:16*8 + 16*4 + 4*2 + 4*2, + * totalDataSize:16*8*10, totalNetSize:netSizePerEntry*10, valueCount:10, + * elementCount:10, estElementCountPerArray:1, isVariableWidth:false + */ + assertEquals(8000, column.getStdDataSizePerEntry()); + assertEquals(8884, column.getStdNetSizePerEntry()); + assertEquals(128, column.getDataSizePerEntry()); + assertEquals(156, column.getNetSizePerEntry()); + assertEquals(1280, column.getTotalDataSize()); + assertEquals(1560, column.getTotalNetSize()); + assertEquals(10, column.getValueCount()); + assertEquals(20, column.getElementCount()); + assertEquals(2, column.getCardinality(), 0.01); + assertEquals(false, column.isVariableWidth()); + + final int testRowCount = 1000; + final int testRowCountPowerTwo = 2048; + + for (VectorWrapper vw : va) { + ValueVector v = vw.getValueVector(); + v.clear(); + + RecordBatchSizer.ColumnSize colSize = sizer.getColumn(v.getField().getName()); + + // Allocates to nearest power of two + colSize.allocateVector(v, testRowCount); + + // offset vector of delegate vector i.e. outer array should have row count number of values. + UInt4Vector offsetVector = ((RepeatedListVector) v).getOffsetVector(); + assertEquals((Integer.highestOneBit(testRowCount) << 1), offsetVector.getValueCapacity()); + + // Get data vector of delegate vector. This is repeated list again + ValueVector dataVector = ((RepeatedListVector) v).getDataVector(); + + // offset vector of delegate vector of the inner repeated list + // This should have row count * 2 number of values. + offsetVector = ((RepeatedListVector) dataVector).getOffsetVector(); + assertEquals((Integer.highestOneBit(testRowCount*2) << 1), offsetVector.getValueCapacity()); + + // Data vector of inner vector should have row count * 2 number of values - 1 (for offset vector adjustment). + ValueVector innerDataVector = ((RepeatedValueVector) dataVector).getDataVector(); + assertEquals((Integer.highestOneBit((testRowCount*2) << 1) - 1), dataVector.getValueCapacity()); + + // offset vector of inner vector should have + // 2 (outer array cardinality) * 2 (inner array cardinality) * row count number of values. + offsetVector = ((RepeatedValueVector) innerDataVector).getOffsetVector(); + assertEquals((Integer.highestOneBit(testRowCount*4) << 1), offsetVector.getValueCapacity()); + + // Data vector of inner vector should + // have 2 (outer array cardinality) * 2 (inner array cardinality) * row count number of values. + dataVector = ((RepeatedValueVector) innerDataVector).getDataVector(); + assertEquals(Integer.highestOneBit(testRowCount << 1) * 16, dataVector.getValueCapacity()); + + v.clear(); + + // Allocates the same as value passed since it is already power of two. + // -1 is done for adjustment needed for offset vector. + colSize.allocateVector(v, testRowCountPowerTwo - 1); + + // offset vector of delegate vector i.e. outer array should have row count number of values. + offsetVector = ((RepeatedListVector) v).getOffsetVector(); + assertEquals(testRowCountPowerTwo, offsetVector.getValueCapacity()); + + // Get data vector of delegate vector. This is repeated list again + dataVector = ((RepeatedListVector) v).getDataVector(); + + // offset vector of delegate vector of the inner repeated list + // This should have row count * 2 number of values. + offsetVector = ((RepeatedListVector) dataVector).getOffsetVector(); + assertEquals(testRowCountPowerTwo*2, offsetVector.getValueCapacity()); + + // Data vector of inner vector should have row count * 2 number of values - 1 (for offset vector adjustment). + innerDataVector = ((RepeatedValueVector) dataVector).getDataVector(); + assertEquals(testRowCountPowerTwo*2 - 1, dataVector.getValueCapacity()); + + // offset vector of inner vector should have + // 2 (outer array cardinality) * 2 (inner array cardinality) * row count number of values. + offsetVector = ((RepeatedValueVector) innerDataVector).getOffsetVector(); + assertEquals(testRowCountPowerTwo*4, offsetVector.getValueCapacity()); + + // Data vector of inner vector should + // have 2 (outer array cardinality) * 2 (inner array cardinality) * row count number of values. + dataVector = ((RepeatedValueVector) innerDataVector).getDataVector(); + assertEquals(testRowCountPowerTwo * 16, dataVector.getValueCapacity()); + + v.clear(); + + // MAX ROW COUNT + colSize.allocateVector(v, ValueVector.MAX_ROW_COUNT - 1); + + // offset vector of delegate vector i.e. outer array should have row count number of values. + offsetVector = ((RepeatedListVector) v).getOffsetVector(); + assertEquals(ValueVector.MAX_ROW_COUNT, offsetVector.getValueCapacity()); + + // Get data vector of delegate vector. This is repeated list again + dataVector = ((RepeatedListVector) v).getDataVector(); + + // offset vector of delegate vector of the inner repeated list + // This should have row count * 2 number of values. + offsetVector = ((RepeatedListVector) dataVector).getOffsetVector(); + assertEquals(ValueVector.MAX_ROW_COUNT*2, offsetVector.getValueCapacity()); + + // Data vector of inner vector should have row count * 2 number of values - 1 (for offset vector adjustment). + innerDataVector = ((RepeatedValueVector) dataVector).getDataVector(); + assertEquals(ValueVector.MAX_ROW_COUNT*2 - 1, dataVector.getValueCapacity()); + + // offset vector of inner vector should have + // 2 (outer array cardinality) * 2 (inner array cardinality) * row count number of values. + offsetVector = ((RepeatedValueVector) innerDataVector).getOffsetVector(); + assertEquals(ValueVector.MAX_ROW_COUNT*4, offsetVector.getValueCapacity()); + + // Data vector of inner vector should + // have 2 (outer array cardinality) * 2 (inner array cardinality) * row count number of values. + dataVector = ((RepeatedValueVector) innerDataVector).getDataVector(); + assertEquals(ValueVector.MAX_ROW_COUNT*16, dataVector.getValueCapacity()); + + v.clear(); + + // MIN ROW COUNT + colSize.allocateVector(v, 0); + + // offset vector of delegate vector i.e. outer array should have 1 value. + offsetVector = ((RepeatedListVector) v).getOffsetVector(); + assertEquals(ValueVector.MIN_ROW_COUNT, offsetVector.getValueCapacity()); + + // Get data vector of delegate vector. This is repeated list again + dataVector = ((RepeatedListVector) v).getDataVector(); + + // offset vector of delegate vector of the inner repeated list + offsetVector = ((RepeatedListVector) dataVector).getOffsetVector(); + assertEquals(ValueVector.MIN_ROW_COUNT, offsetVector.getValueCapacity()); + + // offset vector of inner vector should have + // 2 (outer array cardinality) * 1. + offsetVector = ((RepeatedValueVector) innerDataVector).getOffsetVector(); + assertEquals(ValueVector.MIN_ROW_COUNT*2, offsetVector.getValueCapacity()); + + // Data vector of inner vector should 1 value. + dataVector = ((RepeatedValueVector) innerDataVector).getDataVector(); + assertEquals(ValueVector.MIN_ROW_COUNT, dataVector.getValueCapacity()); + + v.clear(); + + } + } + } \ No newline at end of file From 4aadfa8de5d3d46fca1babfa33ef620653c891f2 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 13 Mar 2018 17:39:50 -0700 Subject: [PATCH 12/44] DRILL-6239: Add build and license badges to README.md closes #1165 --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 2892f8aa907..6f1bf8c2354 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # Apache Drill +[![Build Status](https://travis-ci.org/apache/drill.svg?branch=master)](https://travis-ci.org/apache/drill) +[![Artifact](https://img.shields.io/maven-central/v/org.apache.drill/distribution.svg)](https://search.maven.org/#search%7Cgav%7C1%7Cg%3A%22org.apache.drill%22%20AND%20a%3A%22distribution%22) +[![License](https://img.shields.io/badge/license-Apache--2.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0) + Apache Drill is a distributed MPP query layer that supports SQL and alternative query languages against NoSQL and Hadoop data storage systems. It was inspired in part by [Google's Dremel](http://research.google.com/pubs/pub36632.html). ## Quickstart From 35956648493bee79ef7a8fac8c60a0e857fdf70c Mon Sep 17 00:00:00 2001 From: dvjyothsna Date: Wed, 14 Mar 2018 16:36:42 -0700 Subject: [PATCH 13/44] DRILL-6243: Added alert box to confirm shutdown of drillbit after clicking shutdown button closes #1169 --- .../src/main/resources/rest/index.ftl | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/exec/java-exec/src/main/resources/rest/index.ftl b/exec/java-exec/src/main/resources/rest/index.ftl index e2924fabcb6..0886fae03e2 100644 --- a/exec/java-exec/src/main/resources/rest/index.ftl +++ b/exec/java-exec/src/main/resources/rest/index.ftl @@ -272,17 +272,22 @@ } <#if model.shouldShowAdminInfo() || !model.isAuthEnabled()> function shutdown(button) { - var requestPath = "/gracefulShutdown"; - var url = getRequestUrl(requestPath); - var result = $.ajax({ - type: 'POST', - url: url, - contentType : 'text/plain', - complete: function(data) { - alert(data.responseJSON["response"]); - button.prop('disabled',true).css('opacity',0.5); - } - }); + if (confirm("Are you sure you want to shutdown Drillbit running on " + location.host + " node?")) { + var requestPath = "/gracefulShutdown"; + var url = getRequestUrl(requestPath); + var result = $.ajax({ + type: 'POST', + url: url, + contentType : 'text/plain', + error: function (request, textStatus, errorThrown) { + alert(errorThrown); + }, + success: function(data) { + alert(data["response"]); + button.prop('disabled',true).css('opacity',0.5); + } + }); + } } function getRequestUrl(requestPath) { From 8663e8a56caae10623c7135292d00df49fddf419 Mon Sep 17 00:00:00 2001 From: Arina Ielchiieva Date: Tue, 20 Mar 2018 20:26:42 +0200 Subject: [PATCH 14/44] DRILL-6248: Added limit push down support for system tables 1. PojoRecordReader started returning data in batches instead of returing all in one batch. Default batch size is 4000. 2. SystemTableScan supports limit push down while extrating data in record reader based on given max records to read. 3. Profiles and profiles_json tables apply limit push down while extracting data from store accessing profiles by range. closes #1183 --- .../exec/physical/base/AbstractGroupScan.java | 13 +- .../drill/exec/physical/base/GroupScan.java | 38 +++--- .../exec/store/parquet/ParquetGroupScan.java | 2 +- .../store/pojo/AbstractPojoRecordReader.java | 12 +- .../store/pojo/DynamicPojoRecordReader.java | 21 +++- .../exec/store/pojo/PojoRecordReader.java | 6 + .../exec/store/sys/ProfileInfoIterator.java | 33 ++--- .../drill/exec/store/sys/ProfileIterator.java | 116 +++++++++++++----- .../exec/store/sys/ProfileJsonIterator.java | 34 +++-- .../drill/exec/store/sys/SystemTable.java | 36 +++--- .../store/sys/SystemTableBatchCreator.java | 4 +- .../exec/store/sys/SystemTablePlugin.java | 10 +- .../drill/exec/store/sys/SystemTableScan.java | 69 ++++++++--- .../drill/exec/store/sys/TestSystemTable.java | 16 ++- 14 files changed, 265 insertions(+), 145 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java index ac42766116d..b2ddf68b959 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractGroupScan.java @@ -1,4 +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 @@ -30,10 +30,8 @@ import org.apache.drill.exec.planner.physical.PlannerSettings; import com.fasterxml.jackson.annotation.JsonIgnore; -import com.google.common.collect.Iterators; public abstract class AbstractGroupScan extends AbstractBase implements GroupScan { -// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractGroupScan.class); public AbstractGroupScan(String userName) { super(userName); @@ -45,7 +43,7 @@ public AbstractGroupScan(AbstractGroupScan that) { @Override public Iterator iterator() { - return Iterators.emptyIterator(); + return Collections.emptyIterator(); } @Override @@ -135,7 +133,6 @@ public List getPartitionColumns() { /** * Default is not to support limit pushdown. - * @return */ @Override @JsonIgnore @@ -144,12 +141,12 @@ public boolean supportsLimitPushdown() { } /** - * By default, return null to indicate rowcount based prune is not supported. - * Each groupscan subclass should override, if it supports rowcount based prune. + * By default, return null to indicate row count based prune is not supported. + * Each group scan subclass should override, if it supports row count based prune. */ @Override @JsonIgnore - public GroupScan applyLimit(long maxRecords) { + public GroupScan applyLimit(int maxRecords) { return null; } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java index d42680aef26..fc63c7763ba 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/GroupScan.java @@ -1,4 +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 @@ -40,16 +40,16 @@ public interface GroupScan extends Scan, HasAffinity{ * 2) NULL is interpreted as ALL_COLUMNS. * How to handle skipAll query is up to each storage plugin, with different policy in corresponding RecordReader. */ - public static final List ALL_COLUMNS = ImmutableList.of(SchemaPath.STAR_COLUMN); + List ALL_COLUMNS = ImmutableList.of(SchemaPath.STAR_COLUMN); - public static final long NO_COLUMN_STATS = -1; + long NO_COLUMN_STATS = -1; - public abstract void applyAssignments(List endpoints) throws PhysicalOperatorSetupException; + void applyAssignments(List endpoints) throws PhysicalOperatorSetupException; - public abstract SubScan getSpecificScan(int minorFragmentId) throws ExecutionSetupException; + SubScan getSpecificScan(int minorFragmentId) throws ExecutionSetupException; @JsonIgnore - public int getMaxParallelizationWidth(); + int getMaxParallelizationWidth(); /** * At minimum, the GroupScan requires these many fragments to run. @@ -57,7 +57,7 @@ public interface GroupScan extends Scan, HasAffinity{ * @return the minimum number of fragments that should run */ @JsonIgnore - public int getMinParallelizationWidth(); + int getMinParallelizationWidth(); /** * Check if GroupScan enforces width to be maximum parallelization width. @@ -69,50 +69,50 @@ public interface GroupScan extends Scan, HasAffinity{ */ @JsonIgnore @Deprecated - public boolean enforceWidth(); + boolean enforceWidth(); /** * Returns a signature of the {@link GroupScan} which should usually be composed of * all its attributes which could describe it uniquely. */ @JsonIgnore - public abstract String getDigest(); + String getDigest(); @JsonIgnore - public ScanStats getScanStats(PlannerSettings settings); + ScanStats getScanStats(PlannerSettings settings); /** * Returns a clone of GroupScan instance, except that the new GroupScan will use the provided list of columns . */ - public GroupScan clone(List columns); + GroupScan clone(List columns); /** * GroupScan should check the list of columns, and see if it could support all the columns in the list. */ - public boolean canPushdownProjects(List columns); + boolean canPushdownProjects(List columns); /** * Return the number of non-null value in the specified column. Raise exception, if groupscan does not * have exact column row count. */ - public long getColumnValueCount(SchemaPath column); + long getColumnValueCount(SchemaPath column); /** * Whether or not this GroupScan supports pushdown of partition filters (directories for filesystems) */ - public boolean supportsPartitionFilterPushdown(); + boolean supportsPartitionFilterPushdown(); /** * Returns a list of columns that can be used for partition pruning * */ @JsonIgnore - public List getPartitionColumns(); + List getPartitionColumns(); /** * Whether or not this GroupScan supports limit pushdown */ - public boolean supportsLimitPushdown(); + boolean supportsLimitPushdown(); /** * Apply rowcount based prune for "LIMIT n" query. @@ -120,18 +120,18 @@ public interface GroupScan extends Scan, HasAffinity{ * @return a new instance of group scan if the prune is successful. * null when either if row-based prune is not supported, or if prune is not successful. */ - public GroupScan applyLimit(long maxRecords); + GroupScan applyLimit(int maxRecords); /** * Return true if this GroupScan can return its selection as a list of file names (retrieved by getFiles()). */ @JsonIgnore - public boolean hasFiles(); + boolean hasFiles(); /** * Returns a collection of file names associated with this GroupScan. This should be called after checking * hasFiles(). If this GroupScan cannot provide file names, it returns null. */ - public Collection getFiles(); + Collection getFiles(); } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java index aa001f97cef..21dab5c2688 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java @@ -1189,7 +1189,7 @@ public boolean supportsLimitPushdown() { } @Override - public GroupScan applyLimit(long maxRecords) { + public GroupScan applyLimit(int maxRecords) { Preconditions.checkArgument(rowGroupInfos.size() >= 0); maxRecords = Math.max(maxRecords, 1); // Make sure it request at least 1 row -> 1 rowGroup. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/AbstractPojoRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/AbstractPojoRecordReader.java index c2f213db446..a85d7fb6ec1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/AbstractPojoRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/AbstractPojoRecordReader.java @@ -41,15 +41,23 @@ public abstract class AbstractPojoRecordReader extends AbstractRecordReader i private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractPojoRecordReader.class); private static final ControlsInjector injector = ControlsInjectorFactory.getInjector(AbstractPojoRecordReader.class); + public static final int DEFAULT_RECORDS_PER_BATCH = 4000; + @JsonProperty private final int recordsPerBatch; @JsonProperty protected final List records; + protected List writers; private Iterator currentIterator; private OperatorContext operatorContext; protected AbstractPojoRecordReader(List records) { + this(records, DEFAULT_RECORDS_PER_BATCH); + } + + protected AbstractPojoRecordReader(List records, int recordsPerBatch) { this.records = records; + this.recordsPerBatch = Math.min(recordsPerBatch, DEFAULT_RECORDS_PER_BATCH); } @Override @@ -65,7 +73,7 @@ public int next() { injector.injectPause(operatorContext.getExecutionControls(), "read-next", logger); int recordCount = 0; - while (currentIterator.hasNext()) { + while (currentIterator.hasNext() && recordCount < recordsPerBatch) { if (!allocated) { allocate(); allocated = true; @@ -88,7 +96,7 @@ public int next() { @Override public void allocate(Map vectorMap) throws OutOfMemoryException { for (final ValueVector v : vectorMap.values()) { - AllocationHelper.allocate(v, Character.MAX_VALUE, 50, 10); + AllocationHelper.allocate(v, recordsPerBatch, 50, 10); } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java index 167c7219ea3..fef45568875 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/DynamicPojoRecordReader.java @@ -45,12 +45,16 @@ public class DynamicPojoRecordReader extends AbstractPojoRecordReader> { @JsonProperty - private final LinkedHashMap> schema; + private LinkedHashMap> schema; public DynamicPojoRecordReader(LinkedHashMap> schema, List> records) { super(records); - Preconditions.checkState(schema != null && !schema.isEmpty(), "Undefined schema is not allowed."); - this.schema = schema; + validateAndSetSchema(schema); + } + + public DynamicPojoRecordReader(LinkedHashMap> schema, List> records, int maxRecordsToRead) { + super(records, maxRecordsToRead); + validateAndSetSchema(schema); } /** @@ -80,12 +84,16 @@ public String toString() { "}"; } + private void validateAndSetSchema(LinkedHashMap> schema) { + Preconditions.checkState(schema != null && !schema.isEmpty(), "Undefined schema is not allowed."); + this.schema = schema; + } + /** * An utility class that converts from {@link com.fasterxml.jackson.databind.JsonNode} * to DynamicPojoRecordReader during physical plan fragment deserialization. */ - public static class Converter extends StdConverter - { + public static class Converter extends StdConverter { private static final TypeReference>> schemaType = new TypeReference>>() {}; @@ -105,7 +113,8 @@ public DynamicPojoRecordReader convert(JsonNode value) { for (Class fieldType : schema.values()) { records.add(mapper.convertValue(recordsIterator.next(), fieldType)); } - return new DynamicPojoRecordReader(schema, Collections.singletonList(records)); + int maxRecordsToRead = value.get("recordsPerBatch").asInt(); + return new DynamicPojoRecordReader(schema, Collections.singletonList(records), maxRecordsToRead); } } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoRecordReader.java index c3b6883a843..3546c73bfe7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoRecordReader.java @@ -43,6 +43,12 @@ public PojoRecordReader(Class pojoClass, List records) { this.fields = new ArrayList<>(); } + public PojoRecordReader(Class pojoClass, List records, int maxRecordToRead) { + super(records, maxRecordToRead); + this.pojoClass = pojoClass; + this.fields = new ArrayList<>(); + } + /** * Creates writers based on pojo field class types. Ignores static fields. * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileInfoIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileInfoIterator.java index eef6604375f..09cc715fbf3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileInfoIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileInfoIterator.java @@ -1,4 +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 @@ -37,24 +37,25 @@ public class ProfileInfoIterator extends ProfileIterator { private final Iterator itr; - public ProfileInfoIterator(ExecutorFragmentContext context) { - super(context); - itr = iterateProfileInfo(); + public ProfileInfoIterator(ExecutorFragmentContext context, int maxRecords) { + super(context, maxRecords); + this.itr = iterateProfileInfo(); + } + + @Override + protected Iterator> getProfiles(int skip, int take) { + return profileStoreContext + .getCompletedProfileStore() + .getRange(skip, take); } //Returns an iterator for authorized profiles private Iterator iterateProfileInfo() { try { //Transform authorized profiles to iterator for ProfileInfo - return transform( - getAuthorizedProfiles( - profileStoreContext - .getCompletedProfileStore() - .getAll(), - queryingUsername, isAdmin)); - + return transform(getAuthorizedProfiles(queryingUsername, isAdmin)); } catch (Exception e) { - logger.error(e.getMessage()); + logger.error(e.getMessage(), e); return Iterators.singletonIterator(ProfileInfo.getDefault()); } } @@ -109,7 +110,7 @@ public void remove() { } public static class ProfileInfo { - private static final String UnknownValue = "N/A"; + private static final String UNKNOWN_VALUE = "N/A"; private static final ProfileInfo DEFAULT = new ProfileInfo(); @@ -144,14 +145,16 @@ public ProfileInfo(String query_id, Timestamp time, String foreman, long fragmen } private ProfileInfo() { - this(UnknownValue, new Timestamp(0), UnknownValue, 0L, UnknownValue, UnknownValue, 0L, 0L, 0L, UnknownValue, UnknownValue); + this(UNKNOWN_VALUE, new Timestamp(0), UNKNOWN_VALUE, 0L, + UNKNOWN_VALUE, UNKNOWN_VALUE, 0L, 0L, + 0L, UNKNOWN_VALUE, UNKNOWN_VALUE); } /** * If unable to get ProfileInfo, use this default instance instead. * @return the default instance */ - public static final ProfileInfo getDefault() { + public static ProfileInfo getDefault() { return DEFAULT; } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileIterator.java index 6112eb1f83a..78d46d5028e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileIterator.java @@ -1,4 +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 @@ -17,6 +17,7 @@ */ package org.apache.drill.exec.store.sys; +import java.util.Collections; import java.util.Iterator; import java.util.LinkedList; import java.util.List; @@ -33,47 +34,76 @@ * Base class for Profile Iterators */ public abstract class ProfileIterator implements Iterator { + + private static final int DEFAULT_NUMBER_OF_PROFILES_TO_FETCH = 4000; + protected final QueryProfileStoreContext profileStoreContext; protected final String queryingUsername; protected final boolean isAdmin; - public ProfileIterator(ExecutorFragmentContext context) { - //Grab profile Store Context - profileStoreContext = context.getProfileStoreContext(); + private final int maxRecords; - queryingUsername = context.getQueryUserName(); - isAdmin = hasAdminPrivileges(context); + protected ProfileIterator(ExecutorFragmentContext context, int maxRecords) { + this.profileStoreContext = context.getProfileStoreContext(); + this.queryingUsername = context.getQueryUserName(); + this.isAdmin = hasAdminPrivileges(context); + this.maxRecords = maxRecords; } - protected boolean hasAdminPrivileges(ExecutorFragmentContext context) { - OptionManager options = context.getOptions(); - if (context.isUserAuthenticationEnabled() && - !ImpersonationUtil.hasAdminPrivileges( - context.getQueryUserName(), - ExecConstants.ADMIN_USERS_VALIDATOR.getAdminUsers(options), - ExecConstants.ADMIN_USER_GROUPS_VALIDATOR.getAdminUserGroups(options))) { - return false; + //Returns an iterator for authorized profiles + protected Iterator> getAuthorizedProfiles(String username, boolean isAdministrator) { + if (maxRecords == 0) { + return Collections.emptyIterator(); } - //Passed checks - return true; - } - - //Returns an iterator for authorized profiles - protected Iterator> getAuthorizedProfiles ( - Iterator> allProfiles, String username, boolean isAdministrator) { if (isAdministrator) { - return allProfiles; + return getProfiles(0, maxRecords); } - List> authorizedProfiles = new LinkedList>(); - while (allProfiles.hasNext()) { - Entry profileKVPair = allProfiles.next(); - //Check if user matches - if (profileKVPair.getValue().getUser().equals(username)) { - authorizedProfiles.add(profileKVPair); + + /* + For non-administrators getting profiles by range might not return exact number of requested profiles + since some extracted profiles may belong to different users. + In order not to extract all profiles, proceed extracting profiles based on max between default and given maxRecords + until number of authorized user's profiles equals to the provided limit. + Using max between default and given maxRecords will be helpful in case maxRecords number is low (ex: 1). + Reading profiles in a bulk will be much faster. + */ + List> authorizedProfiles = new LinkedList<>(); + int skip = 0; + int take = Math.max(maxRecords, DEFAULT_NUMBER_OF_PROFILES_TO_FETCH); + + while (skip < Integer.MAX_VALUE) { + Iterator> profiles = getProfiles(skip, take); + int fetchedProfilesCount = 0; + while (profiles.hasNext()) { + fetchedProfilesCount++; + Entry profileKVPair = profiles.next(); + // check if user matches + if (profileKVPair.getValue().getUser().equals(username)) { + authorizedProfiles.add(profileKVPair); + // if we have all needed authorized profiles, return iterator + if (authorizedProfiles.size() == maxRecords) { + return authorizedProfiles.iterator(); + } + } + } + + // if returned number of profiles is less then given range then there are no more profiles in the store + // return all found authorized profiles + if (fetchedProfilesCount != take) { + return authorizedProfiles.iterator(); + } + + try { + // since we request profiles in batches, define number of profiles to skip + // if we hit integer overflow return all found authorized profiles + skip = Math.addExact(skip, take); + } catch (ArithmeticException e) { + return authorizedProfiles.iterator(); } } + return authorizedProfiles.iterator(); } @@ -84,4 +114,34 @@ protected long computeDuration(long startTime, long endTime) { return 0; } } + + /** + * Returns profiles based of given range. + * + * @param skip number of profiles to skip + * @param take number of profiles to return + * @return profiles iterator + */ + protected abstract Iterator> getProfiles(int skip, int take); + + /** + * Checks is current user has admin privileges. + * + * @param context fragment context + * @return true if user is admin, false otherwise + */ + private boolean hasAdminPrivileges(ExecutorFragmentContext context) { + OptionManager options = context.getOptions(); + if (context.isUserAuthenticationEnabled() && + !ImpersonationUtil.hasAdminPrivileges( + context.getQueryUserName(), + ExecConstants.ADMIN_USERS_VALIDATOR.getAdminUsers(options), + ExecConstants.ADMIN_USER_GROUPS_VALIDATOR.getAdminUserGroups(options))) { + return false; + } + + //Passed checks + return true; + } + } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileJsonIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileJsonIterator.java index 67f11652d5a..9d9f236ace4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileJsonIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ProfileJsonIterator.java @@ -1,4 +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 @@ -40,28 +40,26 @@ public class ProfileJsonIterator extends ProfileIterator { private final InstanceSerializer profileSerializer; private final Iterator itr; - public ProfileJsonIterator(ExecutorFragmentContext context) { - super(context); + public ProfileJsonIterator(ExecutorFragmentContext context, int maxRecords) { + super(context, maxRecords); //Holding a serializer (for JSON extract) - profileSerializer = profileStoreContext. - getProfileStoreConfig().getSerializer(); + this.profileSerializer = profileStoreContext.getProfileStoreConfig().getSerializer(); + this.itr = iterateProfileInfoJson(); + } - itr = iterateProfileInfoJson(); + @Override + protected Iterator> getProfiles(int skip, int take) { + return profileStoreContext.getCompletedProfileStore().getRange(skip, take); } //Returns an iterator for authorized profiles private Iterator iterateProfileInfoJson() { try { //Transform authorized profiles to iterator for ProfileInfoJson - return transformJson( - getAuthorizedProfiles( - profileStoreContext - .getCompletedProfileStore() - .getAll(), - queryingUsername, isAdmin)); + return transformJson(getAuthorizedProfiles(queryingUsername, isAdmin)); } catch (Exception e) { - logger.error(e.getMessage()); + logger.debug(e.getMessage(), e); return Iterators.singletonIterator(ProfileJson.getDefault()); } } @@ -80,11 +78,11 @@ public ProfileJson apply(@Nullable Entry inp //Constructing ProfileInfo final String queryID = input.getKey(); - String profileJson = null; + String profileJson; try { profileJson = new String(profileSerializer.serialize(input.getValue())); } catch (IOException e) { - logger.debug("Failed to serialize profile for: " + queryID); + logger.debug("Failed to serialize profile for: " + queryID, e); profileJson = "{ 'message' : 'error (unable to serialize profile: "+ queryID +")' }"; } @@ -112,7 +110,7 @@ public void remove() { } public static class ProfileJson { - private static final String UnknownValue = "N/A"; + private static final String UNKNOWN_VALUE = "N/A"; private static final ProfileJson DEFAULT = new ProfileJson(); @@ -125,14 +123,14 @@ public ProfileJson(String query_id, String profileJson) { } private ProfileJson() { - this(UnknownValue, UnknownValue); + this(UNKNOWN_VALUE, UNKNOWN_VALUE); } /** * If unable to get ProfileInfo, use this default instance instead. * @return the default instance */ - public static final ProfileJson getDefault() { + public static ProfileJson getDefault() { return DEFAULT; } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTable.java index a49ff9a3f1f..8882f2db2d9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTable.java @@ -1,4 +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 @@ -26,91 +26,91 @@ * An enumeration of all tables in Drill's system ("sys") schema. *

* OPTION, DRILLBITS and VERSION are local tables available on every Drillbit. - * MEMORY and THREADS are distributed tables with one record on every - * Drillbit. + * MEMORY and THREADS are distributed tables with one record on every Drillbit. + * PROFILES and PROFILES_JSON are stored in local / distributed storage. *

*/ public enum SystemTable { OPTION("options", false, OptionValueWrapper.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new OptionIterator(context, OptionIterator.Mode.SYS_SESS_PUBLIC); } }, OPTION_VAL("options_val", false, ExtendedOptionIterator.ExtendedOptionValueWrapper.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new ExtendedOptionIterator(context, false); } }, INTERNAL_OPTIONS("internal_options", false, OptionValueWrapper.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new OptionIterator(context, OptionIterator.Mode.SYS_SESS_INTERNAL); } }, INTERNAL_OPTIONS_VAL("internal_options_val", false, ExtendedOptionIterator.ExtendedOptionValueWrapper.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new ExtendedOptionIterator(context, true); } }, BOOT("boot", false, OptionValueWrapper.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new OptionIterator(context, OptionIterator.Mode.BOOT); } }, DRILLBITS("drillbits", false,DrillbitIterator.DrillbitInstance.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new DrillbitIterator(context); } }, VERSION("version", false, VersionIterator.VersionInfo.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new VersionIterator(); } }, MEMORY("memory", true, MemoryIterator.MemoryInfo.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new MemoryIterator(context); } }, CONNECTIONS("connections", true, BitToUserConnectionIterator.ConnectionInfo.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new BitToUserConnectionIterator(context); } }, PROFILES("profiles", false, ProfileInfoIterator.ProfileInfo.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { - return new ProfileInfoIterator(context); + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { + return new ProfileInfoIterator(context, maxRecords); } }, PROFILES_JSON("profiles_json", false, ProfileJsonIterator.ProfileJson.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { - return new ProfileJsonIterator(context); + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { + return new ProfileJsonIterator(context, maxRecords); } }, THREADS("threads", true, ThreadsIterator.ThreadsInfo.class) { @Override - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { return new ThreadsIterator(context); } }; @@ -125,7 +125,7 @@ public Iterator getIterator(final ExecutorFragmentContext context) { this.pojoClass = pojoClass; } - public Iterator getIterator(final ExecutorFragmentContext context) { + public Iterator getIterator(final ExecutorFragmentContext context, final int maxRecords) { throw new UnsupportedOperationException(tableName + " must override this method."); } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableBatchCreator.java index c0ef0d0ec8f..facf084ed36 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableBatchCreator.java @@ -43,8 +43,8 @@ public ScanBatch getBatch(final ExecutorFragmentContext context, final SystemTab final List children) throws ExecutionSetupException { final SystemTable table = scan.getTable(); - final Iterator iterator = table.getIterator(context); - final RecordReader reader = new PojoRecordReader(table.getPojoClass(), ImmutableList.copyOf(iterator)); + final Iterator iterator = table.getIterator(context, scan.getMaxRecordsToRead()); + final RecordReader reader = new PojoRecordReader(table.getPojoClass(), ImmutableList.copyOf(iterator), scan.getMaxRecordsToRead()); return new ScanBatch(scan, context, Collections.singletonList(reader)); } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePlugin.java index 948aa0fb7de..21ed028a84e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePlugin.java @@ -1,4 +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 @@ -17,7 +17,6 @@ */ package org.apache.drill.exec.store.sys; -import java.io.IOException; import java.util.List; import java.util.Set; @@ -68,13 +67,12 @@ public DrillbitContext getContext() { } @Override - public void registerSchemas(SchemaConfig schemaConfig, SchemaPlus parent) throws IOException { + public void registerSchemas(SchemaConfig schemaConfig, SchemaPlus parent) { parent.add(schema.getName(), schema); } @Override - public AbstractGroupScan getPhysicalScan(String userName, JSONOptions selection, List columns) - throws IOException { + public AbstractGroupScan getPhysicalScan(String userName, JSONOptions selection, List columns) { SystemTable table = selection.getWith(context.getLpPersistence(), SystemTable.class); return new SystemTableScan(table, this); } @@ -87,7 +85,7 @@ private class SystemSchema extends AbstractSchema { private final Set tableNames; public SystemSchema() { - super(ImmutableList.of(), SYS_SCHEMA_NAME); + super(ImmutableList.of(), SYS_SCHEMA_NAME); Set names = Sets.newHashSet(); for (SystemTable t : SystemTable.values()) { names.add(t.getTableName()); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableScan.java index b77ed2347f1..5f8eb30626e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTableScan.java @@ -1,4 +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 @@ -17,7 +17,6 @@ */ package org.apache.drill.exec.store.sys; -import java.io.IOException; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -31,7 +30,6 @@ import org.apache.drill.common.exceptions.ExecutionSetupException; import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.physical.EndpointAffinity; -import org.apache.drill.exec.physical.PhysicalOperatorSetupException; import org.apache.drill.exec.physical.base.AbstractGroupScan; import org.apache.drill.exec.physical.base.GroupScan; import org.apache.drill.exec.physical.base.PhysicalOperator; @@ -48,20 +46,23 @@ public class SystemTableScan extends AbstractGroupScan implements SubScan { private final SystemTable table; private final SystemTablePlugin plugin; + private int maxRecordsToRead; @JsonCreator - public SystemTableScan( // - @JsonProperty("table") SystemTable table, // - @JacksonInject StoragePluginRegistry engineRegistry // - ) throws IOException, ExecutionSetupException { - super((String)null); - this.table = table; - this.plugin = (SystemTablePlugin) engineRegistry.getPlugin(SystemTablePluginConfig.INSTANCE); + public SystemTableScan(@JsonProperty("table") SystemTable table, + @JsonProperty("maxRecordsToRead") int maxRecordsToRead, + @JacksonInject StoragePluginRegistry engineRegistry) throws ExecutionSetupException { + this(table, maxRecordsToRead, (SystemTablePlugin) engineRegistry.getPlugin(SystemTablePluginConfig.INSTANCE)); } public SystemTableScan(SystemTable table, SystemTablePlugin plugin) { - super((String)null); + this(table, Integer.MAX_VALUE, plugin); + } + + public SystemTableScan(SystemTable table, int maxRecordsToRead, SystemTablePlugin plugin) { + super((String) null); this.table = table; + this.maxRecordsToRead = maxRecordsToRead; this.plugin = plugin; } @@ -75,16 +76,16 @@ public ScanStats getScanStats() { } @Override - public PhysicalOperator getNewWithChildren(List children) throws ExecutionSetupException { - return new SystemTableScan(table, plugin); + public PhysicalOperator getNewWithChildren(List children) { + return new SystemTableScan(table, maxRecordsToRead, plugin); } @Override - public void applyAssignments(List endpoints) throws PhysicalOperatorSetupException { + public void applyAssignments(List endpoints) { } @Override - public SubScan getSpecificScan(int minorFragmentId) throws ExecutionSetupException { + public SubScan getSpecificScan(int minorFragmentId) { return this; } @@ -110,10 +111,23 @@ public long getMaxAllocation() { return maxAllocation; } + /** + * Example: SystemTableScan [table=OPTION, distributed=false, maxRecordsToRead=1] + * + * @return string representation of system table scan + */ @Override public String getDigest() { - return "SystemTableScan [table=" + table.name() + - ", distributed=" + table.isDistributed() + "]"; + StringBuilder builder = new StringBuilder(); + builder.append("SystemTableScan ["); + builder.append("table=").append(table.name()).append(", "); + builder.append("distributed=").append(table.isDistributed()); + if (maxRecordsToRead != Integer.MAX_VALUE) { + builder.append(", maxRecordsToRead=").append(maxRecordsToRead); + } + builder.append("]"); + + return builder.toString(); } @Override @@ -152,10 +166,31 @@ public GroupScan clone(List columns) { return this; } + public GroupScan clone(SystemTableScan systemTableScan, int maxRecordsToRead) { + return new SystemTableScan(systemTableScan.getTable(), maxRecordsToRead, systemTableScan.getPlugin()); + } + + @Override + public boolean supportsLimitPushdown() { + return true; + } + + @Override + public GroupScan applyLimit(int maxRecords) { + if (this.maxRecordsToRead == maxRecords) { + return null; + } + return clone(this, maxRecords); + } + public SystemTable getTable() { return table; } + public int getMaxRecordsToRead() { + return maxRecordsToRead; + } + @JsonIgnore public SystemTablePlugin getPlugin() { return plugin; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestSystemTable.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestSystemTable.java index 62f5f4fbe83..4dd09f7f00d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestSystemTable.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestSystemTable.java @@ -1,4 +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 @@ -17,18 +17,17 @@ */ package org.apache.drill.exec.store.sys; -import org.apache.drill.test.BaseTestQuery; +import org.apache.drill.PlanTestBase; import org.apache.drill.categories.UnlikelyTest; import org.apache.drill.exec.ExecConstants; import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -public class TestSystemTable extends BaseTestQuery { -// private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(TestSystemTable.class); +public class TestSystemTable extends PlanTestBase { @BeforeClass - public static void setupMultiNodeCluster() throws Exception { + public static void setupMultiNodeCluster() { updateTestCluster(3, null); } @@ -84,4 +83,11 @@ public void profilesTable() throws Exception { public void profilesJsonTable() throws Exception { test("select * from sys.profiles_json"); } + + @Test + public void testProfilesLimitPushDown() throws Exception { + String query = "select * from sys.profiles limit 10"; + String numFilesPattern = "maxRecordsToRead=10"; + testPlanMatchingPatterns(query, new String[] {numFilesPattern}, new String[] {}); + } } From 051a96dae42c70e633ba3f6af9817836544e075b Mon Sep 17 00:00:00 2001 From: Sorabh Hamirwasia Date: Fri, 16 Mar 2018 16:57:12 -0700 Subject: [PATCH 15/44] DRILL-6262: IndexOutOfBoundException in RecordBatchSize for empty variableWidthVector closes #1175 --- .../drill/exec/record/RecordBatchSizer.java | 9 ++-- .../exec/record/TestRecordBatchSizer.java | 43 +++++++++++++++++-- .../templates/RepeatedValueVectors.java | 2 +- .../templates/VariableLengthVectors.java | 8 +++- 4 files changed, 50 insertions(+), 12 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java index bfe0ef1c302..1586ccc9ad2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchSizer.java @@ -321,10 +321,8 @@ public ColumnSize(ValueVector v, String prefix) { // Calculate pure data size. if (isVariableWidth) { - UInt4Vector offsetVector = ((RepeatedValueVector) v).getOffsetVector(); - int innerValueCount = offsetVector.getAccessor().get(valueCount); VariableWidthVector dataVector = ((VariableWidthVector) ((RepeatedValueVector) v).getDataVector()); - totalDataSize = dataVector.getOffsetVector().getAccessor().get(innerValueCount); + totalDataSize = dataVector.getCurrentSizeInBytes(); } else { ValueVector dataVector = ((RepeatedValueVector) v).getDataVector(); totalDataSize = dataVector.getPayloadByteCount(elementCount); @@ -343,7 +341,7 @@ public ColumnSize(ValueVector v, String prefix) { // Calculate pure data size. if (isVariableWidth) { VariableWidthVector variableWidthVector = ((VariableWidthVector) ((NullableVector) v).getValuesVector()); - totalDataSize = variableWidthVector.getOffsetVector().getAccessor().get(valueCount); + totalDataSize = variableWidthVector.getCurrentSizeInBytes(); } else { // Another special case. if (v instanceof UntypedNullVector) { @@ -362,8 +360,7 @@ public ColumnSize(ValueVector v, String prefix) { // Calculate pure data size. if (isVariableWidth) { - UInt4Vector offsetVector = ((VariableWidthVector)v).getOffsetVector(); - totalDataSize = offsetVector.getAccessor().get(valueCount); + totalDataSize = ((VariableWidthVector) v).getCurrentSizeInBytes(); } else { totalDataSize = v.getPayloadByteCount(valueCount); } diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordBatchSizer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordBatchSizer.java index f32dba3e7d0..ccb9c1940a3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordBatchSizer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordBatchSizer.java @@ -17,9 +17,6 @@ */ package org.apache.drill.exec.record; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; - import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.RecordBatchSizer.ColumnSize; import org.apache.drill.exec.vector.NullableVector; @@ -36,6 +33,10 @@ import org.apache.drill.test.rowSet.schema.SchemaBuilder; import org.junit.Test; +import static junit.framework.TestCase.fail; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + public class TestRecordBatchSizer extends SubOperatorTest { private final int testRowCount = 1000; private final int testRowCountPowerTwo = 2048; @@ -804,4 +805,38 @@ public void testSizerNestedMap() { } -} \ No newline at end of file + /** + * Test to verify that record batch sizer handles the actual empty vectors correctly. RowSetBuilder by default + * allocates Drillbuf of 10bytes for each vector type which makes their capacity >0 and not ==0 which will be in + * case of empty vectors. + */ + @Test + public void testEmptyVariableWidthVector() { + final BatchSchema schema = new SchemaBuilder() + .add("key", MinorType.INT) + .add("value", MinorType.VARCHAR) + .build(); + + final RowSetBuilder builder = fixture.rowSetBuilder(schema); + final RowSet rows = builder.build(); + + // Release the initial bytes allocated by RowSetBuilder + VectorAccessibleUtilities.clear(rows.container()); + + try { + // Create RecordBatchSizer for this empty container and it should not fail + final RecordBatchSizer sizer = new RecordBatchSizer(rows.container()); + int totalDataSize = 0; + + for (ColumnSize colSize : sizer.columns().values()) { + totalDataSize += colSize.getTotalDataSize(); + } + // Verify that the totalDataSize for all the columns is zero + assertEquals(0, totalDataSize); + } catch (Exception ex) { + fail(); + } finally { + rows.clear(); + } + } +} diff --git a/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java b/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java index c20ee893cec..418898bf9e8 100644 --- a/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java +++ b/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java @@ -228,7 +228,7 @@ public void allocateNew() { @Override protected SerializedField.Builder getMetadataBuilder() { return super.getMetadataBuilder() - .setVarByteLength(values.getVarByteLength()); + .setVarByteLength(values.getCurrentSizeInBytes()); } @Override diff --git a/exec/vector/src/main/codegen/templates/VariableLengthVectors.java b/exec/vector/src/main/codegen/templates/VariableLengthVectors.java index 3dec3f8ed5f..516eb5241e9 100644 --- a/exec/vector/src/main/codegen/templates/VariableLengthVectors.java +++ b/exec/vector/src/main/codegen/templates/VariableLengthVectors.java @@ -111,9 +111,15 @@ public int getByteCapacity() { return data.capacity(); } + /** + * Return the number of bytes contained in the current var len byte vector. + * TODO: Remove getVarByteLength with it's implementation after all client's are moved to using getCurrentSizeInBytes. + * It's kept as is to preserve backward compatibility + * @return + */ @Override public int getCurrentSizeInBytes() { - return offsetVector.getAccessor().get(getAccessor().getValueCount()); + return getVarByteLength(); } /** From a8c46445a6febd21d19ca1338003d65df072dc18 Mon Sep 17 00:00:00 2001 From: Vlad Rozov Date: Tue, 20 Mar 2018 19:24:11 -0700 Subject: [PATCH 16/44] DRILL-6280: Cleanup execution of BuildTimeScan during maven build closes #1177 --- common/pom.xml | 16 +++---------- .../drill/common/scanner/BuildTimeScan.java | 8 +++---- exec/java-exec/pom.xml | 24 +------------------ logical/pom.xml | 24 +------------------ pom.xml | 20 ++++++++++++++++ 5 files changed, 29 insertions(+), 63 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 31cce2112c6..bf32e267640 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -113,20 +113,10 @@ org.codehaus.mojo exec-maven-plugin - 1.2.1 - - - process-classes - - java - - - - org.apache.drill.common.scanner.BuildTimeScan - - ${project.build.outputDirectory} - + + ${project.basedir}/src/test/resources/ + diff --git a/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java b/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java index 28f37049937..7f2aaa01bcd 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java +++ b/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java @@ -45,8 +45,8 @@ public class BuildTimeScan { private static final String REGISTRY_FILE = "META-INF/drill-module-scan/registry.json"; private static final ObjectMapper mapper = new ObjectMapper().enable(INDENT_OUTPUT); - private static final ObjectReader reader = mapper.reader(ScanResult.class); - private static final ObjectWriter writer = mapper.writerWithType(ScanResult.class); + private static final ObjectReader reader = mapper.readerFor(ScanResult.class); + private static final ObjectWriter writer = mapper.writerFor(ScanResult.class); /** * @return paths that have the prescanned registry file in them @@ -118,10 +118,10 @@ private static void save(ScanResult scanResult, File file) { */ public static void main(String[] args) throws Exception { if (args.length != 1) { - throw new IllegalArgumentException("Usage: java {cp} " + ClassPathScanner.class.getName() + " path/to/scan"); + throw new IllegalArgumentException("Usage: java {cp} " + BuildTimeScan.class.getName() + " path/to/scan"); } String basePath = args[0]; - System.out.println("Scanning: " + basePath); + logger.info("Scanning: {}", basePath); File registryFile = new File(basePath, REGISTRY_FILE); File dir = registryFile.getParentFile(); if ((!dir.exists() && !dir.mkdirs()) || !dir.isDirectory()) { diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index 205f3ed552b..f2d2ebd2c65 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -828,31 +828,9 @@ - + org.codehaus.mojo exec-maven-plugin - 1.2.1 - - - org.apache.drill - drill-common - ${project.version} - tests - - - - - process-classes - java - - - - org.apache.drill.common.scanner.BuildTimeScan - true - - ${project.build.outputDirectory} - - org.apache.maven.plugins diff --git a/logical/pom.xml b/logical/pom.xml index 1cd9f0268c3..429baad1c26 100644 --- a/logical/pom.xml +++ b/logical/pom.xml @@ -109,31 +109,9 @@ - + org.codehaus.mojo exec-maven-plugin - 1.2.1 - - - org.apache.drill - drill-common - ${project.version} - tests - - - - - process-classes - java - - - - org.apache.drill.common.scanner.BuildTimeScan - true - - ${project.build.outputDirectory} - - maven-surefire-plugin diff --git a/pom.xml b/pom.xml index b46bc6f8fac..8c1c682ef0e 100644 --- a/pom.xml +++ b/pom.xml @@ -451,6 +451,26 @@ maven-enforcer-plugin 1.3.1 + + org.codehaus.mojo + exec-maven-plugin + 1.6.0 + + + process-classes + + java + + + + + org.apache.drill.common.scanner.BuildTimeScan + test + + ${project.build.outputDirectory} + + + org.apache.maven.plugins maven-surefire-plugin From 36aa757911b3953b1edc864e585015e06b1d5dfd Mon Sep 17 00:00:00 2001 From: Sorabh Hamirwasia Date: Wed, 21 Mar 2018 15:53:25 -0700 Subject: [PATCH 17/44] DRILL-6283: WebServer stores SPNEGO client principal without taking any conversion rule closes #1180 --- .../org/apache/drill/exec/ExecConstants.java | 5 ++ .../drill/exec/server/BootStrapContext.java | 17 ++---- .../rest/auth/DrillSpnegoLoginService.java | 16 +++-- .../exec/server/rest/auth/SpnegoConfig.java | 14 +++++ .../exec/rpc/data/TestBitBitKerberos.java | 28 ++++----- .../user/security/TestUserBitKerberos.java | 4 +- .../TestUserBitKerberosEncryption.java | 60 +++++++++---------- .../rest/spnego/TestSpnegoAuthentication.java | 20 +++---- 8 files changed, 93 insertions(+), 71 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java index 05652548638..34aec1b985b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java @@ -176,6 +176,11 @@ private ExecConstants() { public static final String USE_LOGIN_PRINCIPAL = "drill.exec.security.bit.auth.use_login_principal"; public static final String USER_ENCRYPTION_SASL_ENABLED = "drill.exec.security.user.encryption.sasl.enabled"; public static final String USER_ENCRYPTION_SASL_MAX_WRAPPED_SIZE = "drill.exec.security.user.encryption.sasl.max_wrapped_size"; + private static final String SERVICE_LOGIN_PREFIX = "drill.exec.security.auth"; + public static final String SERVICE_PRINCIPAL = SERVICE_LOGIN_PREFIX + ".principal"; + public static final String SERVICE_KEYTAB_LOCATION = SERVICE_LOGIN_PREFIX + ".keytab"; + public static final String KERBEROS_NAME_MAPPING = SERVICE_LOGIN_PREFIX + ".auth_to_local"; + public static final String USER_SSL_ENABLED = "drill.exec.security.user.encryption.ssl.enabled"; public static final String BIT_ENCRYPTION_SASL_ENABLED = "drill.exec.security.bit.encryption.sasl.enabled"; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java index 5a0e14d4fc7..466dc1462e4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/BootStrapContext.java @@ -60,11 +60,6 @@ public class BootStrapContext implements AutoCloseable { private static final String customHostName = System.getenv("DRILL_HOST_NAME"); private static final String processUserName = System.getProperty("user.name"); - private static final String SERVICE_LOGIN_PREFIX = "drill.exec.security.auth"; - public static final String SERVICE_PRINCIPAL = SERVICE_LOGIN_PREFIX + ".principal"; - public static final String SERVICE_KEYTAB_LOCATION = SERVICE_LOGIN_PREFIX + ".keytab"; - public static final String KERBEROS_NAME_MAPPING = SERVICE_LOGIN_PREFIX + ".auth_to_local"; - private final DrillConfig config; private final CaseInsensitiveMap definitions; private final AuthenticatorProvider authProvider; @@ -121,32 +116,32 @@ protected void afterExecute(final Runnable r, final Throwable t) { private void login(final DrillConfig config) throws DrillbitStartupException { try { - if (config.hasPath(SERVICE_PRINCIPAL)) { + if (config.hasPath(ExecConstants.SERVICE_PRINCIPAL)) { // providing a service principal => Kerberos mechanism final Configuration loginConf = new Configuration(); loginConf.set(CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION, UserGroupInformation.AuthenticationMethod.KERBEROS.toString()); // set optional user name mapping - if (config.hasPath(KERBEROS_NAME_MAPPING)) { + if (config.hasPath(ExecConstants.KERBEROS_NAME_MAPPING)) { loginConf.set(CommonConfigurationKeys.HADOOP_SECURITY_AUTH_TO_LOCAL, - config.getString(KERBEROS_NAME_MAPPING)); + config.getString(ExecConstants.KERBEROS_NAME_MAPPING)); } UserGroupInformation.setConfiguration(loginConf); // service principal canonicalization - final String principal = config.getString(SERVICE_PRINCIPAL); + final String principal = config.getString(ExecConstants.SERVICE_PRINCIPAL); final String parts[] = KerberosUtil.splitPrincipalIntoParts(principal); if (parts.length != 3) { throw new DrillbitStartupException( String.format("Invalid %s, Drill service principal must be of format: primary/instance@REALM", - SERVICE_PRINCIPAL)); + ExecConstants.SERVICE_PRINCIPAL)); } parts[1] = KerberosUtil.canonicalizeInstanceName(parts[1], hostName); final String canonicalizedPrincipal = KerberosUtil.getPrincipalFromParts(parts[0], parts[1], parts[2]); - final String keytab = config.getString(SERVICE_KEYTAB_LOCATION); + final String keytab = config.getString(ExecConstants.SERVICE_KEYTAB_LOCATION); // login to KDC (AS) // Note that this call must happen before any call to UserGroupInformation#getLoginUser, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java index e7fbc168601..470d3e88b8f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java @@ -25,6 +25,7 @@ import org.apache.drill.exec.server.DrillbitContext; import org.apache.drill.exec.server.options.SystemOptionManager; import org.apache.drill.exec.util.ImpersonationUtil; +import org.apache.hadoop.security.HadoopKerberosName; import org.apache.hadoop.security.UserGroupInformation; import org.eclipse.jetty.security.DefaultIdentityService; import org.eclipse.jetty.security.SpnegoLoginService; @@ -38,6 +39,7 @@ import org.ietf.jgss.Oid; import javax.security.auth.Subject; +import java.io.IOException; import java.lang.reflect.Field; import java.security.Principal; import java.security.PrivilegedExceptionAction; @@ -121,15 +123,19 @@ private UserIdentity spnegoLogin(Object credentials) { } if (gContext.isEstablished()) { - String clientName = gContext.getSrcName().toString(); - String role = clientName.substring(clientName.indexOf(64) + 1); + final String clientName = gContext.getSrcName().toString(); + final String realm = clientName.substring(clientName.indexOf(64) + 1); + // Get the client user short name + final String userShortName = new HadoopKerberosName(clientName).getShortName(); + + logger.debug("Client Name: {}, realm: {} and shortName: {}", clientName, realm, userShortName); final SystemOptionManager sysOptions = drillContext.getOptionManager(); - final boolean isAdmin = ImpersonationUtil.hasAdminPrivileges(role, + final boolean isAdmin = ImpersonationUtil.hasAdminPrivileges(userShortName, ExecConstants.ADMIN_USERS_VALIDATOR.getAdminUsers(sysOptions), ExecConstants.ADMIN_USER_GROUPS_VALIDATOR.getAdminUserGroups(sysOptions)); - final Principal user = new DrillUserPrincipal(clientName, isAdmin); + final Principal user = new DrillUserPrincipal(userShortName, isAdmin); final Subject subject = new Subject(); subject.getPrincipals().add(user); @@ -142,6 +148,8 @@ private UserIdentity spnegoLogin(Object credentials) { } } catch (GSSException gsse) { logger.warn("Caught GSSException trying to authenticate the client", gsse); + } catch (IOException ex) { + logger.warn("Caught IOException trying to get shortName of client user", ex); } return null; } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoConfig.java index a64d7de0ff3..d8d61ea199b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoConfig.java @@ -34,6 +34,9 @@ public class SpnegoConfig { private final String keytab; + // Optional parameter + private final String clientNameMapping; + public SpnegoConfig(DrillConfig config) { keytab = config.hasPath(ExecConstants.HTTP_SPNEGO_KEYTAB) ? @@ -43,6 +46,11 @@ public SpnegoConfig(DrillConfig config) { principal = config.hasPath(ExecConstants.HTTP_SPNEGO_PRINCIPAL) ? config.getString(ExecConstants.HTTP_SPNEGO_PRINCIPAL) : null; + + // set optional user name mapping + clientNameMapping = config.hasPath(ExecConstants.KERBEROS_NAME_MAPPING) ? + config.getString(ExecConstants.KERBEROS_NAME_MAPPING) : + null; } //Reads the SPNEGO principal from the config file @@ -96,12 +104,18 @@ private UserGroupInformation loginAndReturnUgi() throws DrillException { newConfig.set(CommonConfigurationKeys.HADOOP_SECURITY_AUTHENTICATION, UserGroupInformation.AuthenticationMethod.KERBEROS.toString()); + if (clientNameMapping != null) { + newConfig.set(CommonConfigurationKeys.HADOOP_SECURITY_AUTH_TO_LOCAL, clientNameMapping); + } + UserGroupInformation.setConfiguration(newConfig); ugi = UserGroupInformation.loginUserFromKeytabAndReturnUGI(principal, keytab); // Reset the original configuration for static UGI UserGroupInformation.setConfiguration(new Configuration()); } else { + // Let's not overwrite the rules here since it might be possible that CUSTOM security is configured for + // JDBC/ODBC with default rules. If Kerberos was enabled then the correct rules must already be set ugi = UserGroupInformation.loginUserFromKeytabAndReturnUGI(principal, keytab); } } catch (Exception e) { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java index b4b54c6a807..838b47bbc5e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitBitKerberos.java @@ -107,9 +107,9 @@ public static void setupTest() throws Exception { ConfigValueFactory.fromAnyRef("kerberos")) .withValue(ExecConstants.USE_LOGIN_PRINCIPAL, ConfigValueFactory.fromAnyRef(true)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString()))); // Ignore the compile time warning caused by the code below. @@ -198,9 +198,9 @@ public void success() throws Exception { ConfigValueFactory.fromAnyRef("kerberos")) .withValue(ExecConstants.USE_LOGIN_PRINCIPAL, ConfigValueFactory.fromAnyRef(true)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString()))); final ScanResult result = ClassPathScanner.fromPrescan(newConfig); @@ -256,9 +256,9 @@ public void successEncryption() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USE_LOGIN_PRINCIPAL, ConfigValueFactory.fromAnyRef(true)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString()))); final ScanResult result = ClassPathScanner.fromPrescan(newConfig); @@ -315,9 +315,9 @@ public void successEncryptionChunkMode() ConfigValueFactory.fromAnyRef(100000)) .withValue(ExecConstants.USE_LOGIN_PRINCIPAL, ConfigValueFactory.fromAnyRef(true)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString()))); final ScanResult result = ClassPathScanner.fromPrescan(newConfig); @@ -371,9 +371,9 @@ public void failureEncryptionOnlyPlainMechanism() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USE_LOGIN_PRINCIPAL, ConfigValueFactory.fromAnyRef(true)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString()))); updateTestCluster(1, newConfig); @@ -405,9 +405,9 @@ public void localQuerySuccessWithWrongBitAuthConfig() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -448,9 +448,9 @@ public void queryFailureWithWrongBitAuthConfig() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java index 55f959cabf8..a2a6eaf2e73 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java @@ -66,9 +66,9 @@ public static void setupTest() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos")))); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java index 640eb407c7c..9c743add3f5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java @@ -70,9 +70,9 @@ public static void setupTest() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -117,9 +117,9 @@ public void successKeytabWithoutChunking() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -166,9 +166,9 @@ public void testConnectionCounters() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -212,9 +212,9 @@ public void successTicketWithoutChunking() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -255,9 +255,9 @@ public void successKeytabWithChunking() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -294,9 +294,9 @@ public void successKeytabWithChunkingDefaultChunkSize() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -337,9 +337,9 @@ public void successEncryptionAllChannelChunkMode() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -394,9 +394,9 @@ public void successEncryptionAllChannel() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -450,9 +450,9 @@ public void testEncryptedConnectionCountersAllChannel() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -500,9 +500,9 @@ public void failurePlainMech() { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -531,9 +531,9 @@ public void encryptionEnabledWithOnlyPlainMech() { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain"))) @@ -567,9 +567,9 @@ public void failureOldClientEncryptionEnabled() { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) @@ -603,9 +603,9 @@ public void successOldClientEncryptionDisabled() { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos")))); @@ -631,9 +631,9 @@ public void clientNeedsEncryptionWithNoServerSupport() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos")))); @@ -664,9 +664,9 @@ public void clientNeedsEncryptionWithServerSupport() throws Exception { ConfigValueFactory.fromAnyRef(true)) .withValue(ExecConstants.USER_AUTHENTICATOR_IMPL, ConfigValueFactory.fromAnyRef(UserAuthenticatorTestImpl.TYPE)) - .withValue(BootStrapContext.SERVICE_PRINCIPAL, + .withValue(ExecConstants.SERVICE_PRINCIPAL, ConfigValueFactory.fromAnyRef(krbHelper.SERVER_PRINCIPAL)) - .withValue(BootStrapContext.SERVICE_KEYTAB_LOCATION, + .withValue(ExecConstants.SERVICE_KEYTAB_LOCATION, ConfigValueFactory.fromAnyRef(krbHelper.serverKeytab.toString())) .withValue(ExecConstants.AUTHENTICATION_MECHANISMS, ConfigValueFactory.fromIterable(Lists.newArrayList("plain", "kerberos"))) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java index 14253e229a7..65ea561460d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java @@ -253,7 +253,7 @@ public void testDrillSpnegoLoginService() throws Exception { // Create client subject using it's principal and keytab final Subject clientSubject = JaasKrbUtil.loginUsingKeytab(spnegoHelper.CLIENT_PRINCIPAL, - spnegoHelper.clientKeytab.getAbsoluteFile()); + spnegoHelper.clientKeytab.getAbsoluteFile()); // Generate a SPNEGO token for the peer SERVER_PRINCIPAL from this CLIENT_PRINCIPAL final String token = Subject.doAs(clientSubject, new PrivilegedExceptionAction() { @@ -284,19 +284,19 @@ public String run() throws Exception { // Create a DrillbitContext with service principal and keytab for DrillSpnegoLoginService final DrillConfig newConfig = new DrillConfig(DrillConfig.create() - .withValue(ExecConstants.HTTP_AUTHENTICATION_MECHANISMS, - ConfigValueFactory.fromIterable(Lists.newArrayList("spnego"))) - .withValue(ExecConstants.HTTP_SPNEGO_PRINCIPAL, - ConfigValueFactory.fromAnyRef(spnegoHelper.SERVER_PRINCIPAL)) - .withValue(ExecConstants.HTTP_SPNEGO_KEYTAB, - ConfigValueFactory.fromAnyRef(spnegoHelper.serverKeytab.toString()))); + .withValue(ExecConstants.HTTP_AUTHENTICATION_MECHANISMS, + ConfigValueFactory.fromIterable(Lists.newArrayList("spnego"))) + .withValue(ExecConstants.HTTP_SPNEGO_PRINCIPAL, + ConfigValueFactory.fromAnyRef(spnegoHelper.SERVER_PRINCIPAL)) + .withValue(ExecConstants.HTTP_SPNEGO_KEYTAB, + ConfigValueFactory.fromAnyRef(spnegoHelper.serverKeytab.toString()))); final SystemOptionManager optionManager = Mockito.mock(SystemOptionManager.class); Mockito.when(optionManager.getOption(ExecConstants.ADMIN_USERS_VALIDATOR)) - .thenReturn(ExecConstants.ADMIN_USERS_VALIDATOR.DEFAULT_ADMIN_USERS); + .thenReturn(ExecConstants.ADMIN_USERS_VALIDATOR.DEFAULT_ADMIN_USERS); Mockito.when(optionManager.getOption(ExecConstants.ADMIN_USER_GROUPS_VALIDATOR)) - .thenReturn(ExecConstants.ADMIN_USER_GROUPS_VALIDATOR.DEFAULT_ADMIN_USER_GROUPS); + .thenReturn(ExecConstants.ADMIN_USER_GROUPS_VALIDATOR.DEFAULT_ADMIN_USER_GROUPS); final DrillbitContext drillbitContext = Mockito.mock(DrillbitContext.class); Mockito.when(drillbitContext.getConfig()).thenReturn(newConfig); @@ -309,7 +309,7 @@ public String run() throws Exception { // Validate the UserIdentity of authenticated client assertTrue(user != null); - assertTrue(user.getUserPrincipal().getName().equals(spnegoHelper.CLIENT_PRINCIPAL)); + assertTrue(user.getUserPrincipal().getName().equals(spnegoHelper.CLIENT_SHORT_NAME)); assertTrue(user.isUserInRole("authenticated", null)); } From 435fa8044889f3879967a6412015cf92f3e46a31 Mon Sep 17 00:00:00 2001 From: Arina Ielchiieva Date: Fri, 23 Mar 2018 13:33:40 +0200 Subject: [PATCH 18/44] DRILL-6290: Refactor TestInfoSchemaFilterPushDown tests to use PlanTestBase utility methods closes #1186 --- .../ischema/TestInfoSchemaFilterPushDown.java | 50 +++++++++---------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/TestInfoSchemaFilterPushDown.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/TestInfoSchemaFilterPushDown.java index 7c66c7bf77a..84d9b070cdc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/TestInfoSchemaFilterPushDown.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/TestInfoSchemaFilterPushDown.java @@ -1,4 +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 @@ -17,9 +17,6 @@ */ package org.apache.drill.exec.store.ischema; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; - import org.apache.drill.PlanTestBase; import org.junit.Test; @@ -28,7 +25,7 @@ public class TestInfoSchemaFilterPushDown extends PlanTestBase { @Test public void testFilterPushdown_Equal() throws Exception { final String query = "SELECT * FROM INFORMATION_SCHEMA.`TABLES` WHERE TABLE_SCHEMA='INFORMATION_SCHEMA'"; - final String scan = "Scan(groupscan=[TABLES, filter=equal(Field=TABLE_SCHEMA,Literal=INFORMATION_SCHEMA)])"; + final String scan = "Scan.*groupscan=\\[TABLES, filter=equal\\(Field=TABLE_SCHEMA,Literal=INFORMATION_SCHEMA\\)\\]"; testHelper(query, scan, false); } @@ -36,7 +33,7 @@ public void testFilterPushdown_Equal() throws Exception { @Test public void testFilterPushdown_NonEqual() throws Exception { final String query = "SELECT * FROM INFORMATION_SCHEMA.`TABLES` WHERE TABLE_SCHEMA <> 'INFORMATION_SCHEMA'"; - final String scan = "Scan(groupscan=[TABLES, filter=not_equal(Field=TABLE_SCHEMA,Literal=INFORMATION_SCHEMA)])"; + final String scan = "Scan.*groupscan=\\[TABLES, filter=not_equal\\(Field=TABLE_SCHEMA,Literal=INFORMATION_SCHEMA\\)\\]"; testHelper(query, scan, false); } @@ -44,7 +41,7 @@ public void testFilterPushdown_NonEqual() throws Exception { @Test public void testFilterPushdown_Like() throws Exception { final String query = "SELECT * FROM INFORMATION_SCHEMA.`TABLES` WHERE TABLE_SCHEMA LIKE '%SCH%'"; - final String scan = "Scan(groupscan=[TABLES, filter=like(Field=TABLE_SCHEMA,Literal=%SCH%)])"; + final String scan = "Scan.*groupscan=\\[TABLES, filter=like\\(Field=TABLE_SCHEMA,Literal=%SCH%\\)\\]"; testHelper(query, scan, false); } @@ -52,7 +49,7 @@ public void testFilterPushdown_Like() throws Exception { @Test public void testFilterPushdown_LikeWithEscape() throws Exception { final String query = "SELECT * FROM INFORMATION_SCHEMA.`TABLES` WHERE TABLE_SCHEMA LIKE '%\\\\SCH%' ESCAPE '\\'"; - final String scan = "Scan(groupscan=[TABLES, filter=like(Field=TABLE_SCHEMA,Literal=%\\\\SCH%,Literal=\\)])"; + final String scan = "Scan.*groupscan=\\[TABLES, filter=like\\(Field=TABLE_SCHEMA,Literal=%\\\\\\\\SCH%,Literal=\\\\\\)\\]"; testHelper(query, scan, false); } @@ -62,8 +59,8 @@ public void testFilterPushdown_And() throws Exception { final String query = "SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE " + "TABLE_SCHEMA = 'sys' AND " + "TABLE_NAME <> 'version'"; - final String scan = "Scan(groupscan=[COLUMNS, filter=booleanand(equal(Field=TABLE_SCHEMA,Literal=sys)," + - "not_equal(Field=TABLE_NAME,Literal=version))])"; + final String scan = "Scan.*groupscan=\\[COLUMNS, filter=booleanand\\(equal\\(Field=TABLE_SCHEMA,Literal=sys\\)," + + "not_equal\\(Field=TABLE_NAME,Literal=version\\)\\)\\]"; testHelper(query, scan, false); } @@ -74,8 +71,8 @@ public void testFilterPushdown_Or() throws Exception { "TABLE_SCHEMA = 'sys' OR " + "TABLE_NAME <> 'version' OR " + "TABLE_SCHEMA like '%sdfgjk%'"; - final String scan = "Scan(groupscan=[COLUMNS, filter=booleanor(equal(Field=TABLE_SCHEMA,Literal=sys)," + - "not_equal(Field=TABLE_NAME,Literal=version),like(Field=TABLE_SCHEMA,Literal=%sdfgjk%))])"; + final String scan = "Scan.*groupscan=\\[COLUMNS, filter=booleanor\\(equal\\(Field=TABLE_SCHEMA,Literal=sys\\)," + + "not_equal\\(Field=TABLE_NAME,Literal=version\\),like\\(Field=TABLE_SCHEMA,Literal=%sdfgjk%\\)\\)\\]"; testHelper(query, scan, false); } @@ -83,21 +80,21 @@ public void testFilterPushdown_Or() throws Exception { @Test public void testFilterPushDownWithProject_Equal() throws Exception { final String query = "SELECT COLUMN_NAME from INFORMATION_SCHEMA.`COLUMNS` WHERE TABLE_SCHEMA = 'INFORMATION_SCHEMA'"; - final String scan = "Scan(groupscan=[COLUMNS, filter=equal(Field=TABLE_SCHEMA,Literal=INFORMATION_SCHEMA)])"; + final String scan = "Scan.*groupscan=\\[COLUMNS, filter=equal\\(Field=TABLE_SCHEMA,Literal=INFORMATION_SCHEMA\\)\\]"; testHelper(query, scan, false); } @Test public void testFilterPushDownWithProject_NotEqual() throws Exception { final String query = "SELECT COLUMN_NAME from INFORMATION_SCHEMA.`COLUMNS` WHERE TABLE_NAME <> 'TABLES'"; - final String scan = "Scan(groupscan=[COLUMNS, filter=not_equal(Field=TABLE_NAME,Literal=TABLES)])"; + final String scan = "Scan.*groupscan=\\[COLUMNS, filter=not_equal\\(Field=TABLE_NAME,Literal=TABLES\\)\\]"; testHelper(query, scan, false); } @Test public void testFilterPushDownWithProject_Like() throws Exception { final String query = "SELECT COLUMN_NAME from INFORMATION_SCHEMA.`COLUMNS` WHERE TABLE_NAME LIKE '%BL%'"; - final String scan = "Scan(groupscan=[COLUMNS, filter=like(Field=TABLE_NAME,Literal=%BL%)])"; + final String scan = "Scan.*groupscan=\\[COLUMNS, filter=like\\(Field=TABLE_NAME,Literal=%BL%\\)\\]"; testHelper(query, scan, false); } @@ -108,25 +105,26 @@ public void testPartialFilterPushDownWithProject() throws Exception { "TABLE_NAME = 'version' AND " + "COLUMN_NAME like 'commit%s' AND " + "IS_NULLABLE = 'YES'"; // this is not expected to pushdown into scan - final String scan = "Scan(groupscan=[COLUMNS, " + - "filter=booleanand(equal(Field=TABLE_SCHEMA,Literal=sys),equal(Field=TABLE_NAME,Literal=version)," + - "like(Field=COLUMN_NAME,Literal=commit%s))]"; + final String scan = "Scan.*groupscan=\\[COLUMNS, " + + "filter=booleanand\\(equal\\(Field=TABLE_SCHEMA,Literal=sys\\),equal\\(Field=TABLE_NAME,Literal=version\\)," + + "like\\(Field=COLUMN_NAME,Literal=commit%s\\)\\)\\]"; testHelper(query, scan, true); } private void testHelper(final String query, String filterInScan, boolean filterPrelExpected) throws Exception { - final String plan = getPlanInString("EXPLAIN PLAN FOR " + query, OPTIQ_FORMAT); - - if (!filterPrelExpected) { - // If filter prel is not expected, make sure it is not in plan - assertFalse(plan.contains("Filter(")); + String[] expectedPatterns; + String[] excludedPatterns; + if (filterPrelExpected) { + expectedPatterns = new String[] {filterInScan, "Filter"}; + excludedPatterns = new String[] {}; } else { - assertTrue(plan.contains("Filter(")); + expectedPatterns = new String[] {filterInScan}; + excludedPatterns = new String[] {"Filter"}; } - // Check for filter pushed into scan. - assertTrue(plan.contains(filterInScan)); + // check plan + testPlanMatchingPatterns(query, expectedPatterns, excludedPatterns); // run the query test(query); From f1cfaaf3aa08b25910918255fbf8daf67278d5c9 Mon Sep 17 00:00:00 2001 From: Vlad Rozov Date: Thu, 22 Mar 2018 15:47:31 -0700 Subject: [PATCH 19/44] DRILL-6288: Upgrade org.javassist:javassist and org.reflections:reflections closes #1185 --- contrib/storage-hbase/pom.xml | 1 - exec/jdbc-all/pom.xml | 2 +- pom.xml | 16 +++++----------- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml index 98c140c5fca..329eba33b57 100644 --- a/contrib/storage-hbase/pom.xml +++ b/contrib/storage-hbase/pom.xml @@ -36,7 +36,6 @@ org.javassist javassist - 3.20.0-GA test diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml index d4b6a4ee827..a10c37a204a 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -559,7 +559,7 @@ This is likely due to you adding new dependencies to a java-exec and not updating the excludes in this module. This is important as it minimizes the size of the dependency of Drill application users. - 32000000 + 33000000 15000000 ${project.build.directory}/drill-jdbc-all-${project.version}.jar diff --git a/pom.xml b/pom.xml index 8c1c682ef0e..2d951adb468 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ org.apache apache 18 - + org.apache.drill @@ -46,7 +46,7 @@ 1.1 1.0.0-RC2 3.0.0 - + 2.4 4.11 1.3 @@ -60,10 +60,10 @@ 1.1.3 1.0 2.3.26-incubating - 3.16.1-GA + 3.22.0-GA 0.6.6 - 0.9.8 - + 0.9.10 + 4096 4096 @@ -786,12 +786,6 @@ org.reflections reflections ${reflections.version} - - - javassist - javassist - - org.javassist From bfc86f1719bc348a74886e8f29e49bed6fdfe8df Mon Sep 17 00:00:00 2001 From: Volodymyr Vysotskyi Date: Thu, 29 Mar 2018 18:51:08 +0300 Subject: [PATCH 20/44] DRILL-6300: Refresh protobuf C++ source files close apache/drill#1194 --- contrib/native/client/readme.linux | 12 +- .../client/src/protobuf/Coordination.pb.cc | 98 ++++++- .../client/src/protobuf/Coordination.pb.h | 89 ++++++- .../client/src/protobuf/UserBitShared.pb.cc | 239 ++++++++++-------- .../client/src/protobuf/UserBitShared.pb.h | 24 +- 5 files changed, 326 insertions(+), 136 deletions(-) diff --git a/contrib/native/client/readme.linux b/contrib/native/client/readme.linux index 34c791b6f6b..92fe5194b10 100644 --- a/contrib/native/client/readme.linux +++ b/contrib/native/client/readme.linux @@ -47,7 +47,7 @@ Install Prerequisites $> sudo yum install cppunit-devel 3.2) Download Zookeeper from : - - http://apache.mirror.quintex.com/zookeeper/zookeeper-3.4.6/ + - https://archive.apache.org/dist/zookeeper/zookeeper-3.4.6/ - untar and then follow instructions in ZOOKEEPER_DIR/src/c/README to build and install the client libs 3.3) run autoreconf @@ -57,7 +57,7 @@ Install Prerequisites $> ./configure --enable-debug --with-syncapi --enable-static --enable-shared $> make && sudo make install -4) Install boost. The minumim version required is 1.53, which will probably have to be built from source +4) Install boost. The minimum version required is 1.53, which will probably have to be built from source # Remove any previous boost $> sudo yum -y erase boost @@ -69,7 +69,9 @@ Install Prerequisites #install the binary rpms #(Note: the "rpm" utility does not clean up old versions very well.) $> sudo yum -y install ~/rpmbuild/RPMS/x86_64/* - +OR + # Build boost for Drill using instruction from readme.boost. + # Uncomment set(Boost_NAMESPACE drill_boost) line in client/CMakeLists.txt OR Download and build using boost build. See this link for how to build: http://www.boost.org/doc/libs/1_53_0/more/getting_started/unix-variants.html#prepare-to-use-a-boost-library-binary @@ -117,12 +119,12 @@ Build drill client Test ---- Run query submitter from the command line - $> querySubmitter query='select * from dfs.`/Users/pchandra/work/data/tpc-h/customer.parquet`' type=sql connectStr=local=10.250.0.146:31010 api=async logLevel=trace user=yourUserName password=yourPassWord + $> querySubmitter query='SELECT * FROM cp.`employee.json` LIMIT 20' type=sql connectStr=local=10.250.0.146:31010 api=async logLevel=trace user=yourUserName password=yourPassWord Valgrind -------- Examples to run Valgrind and see the log in Valkyrie - $> valgrind --leak-check=yes --xml=yes --xml-file=qs-vg-log-a.xml querySubmitter query='select LINEITEM from dfs.`/Users/pchandra/work/data/tpc-h/customer.parquet`' type=sql connectStr=local=10.250.0.146:31010 api=async logLevel=trace + $> valgrind --leak-check=yes --xml=yes --xml-file=qs-vg-log-a.xml querySubmitter query='SELECT * FROM cp.`employee.json` LIMIT 20' type=sql connectStr=local=10.250.0.146:31010 api=async logLevel=trace $> valkyrie -l qs-vg-log-a.xml diff --git a/contrib/native/client/src/protobuf/Coordination.pb.cc b/contrib/native/client/src/protobuf/Coordination.pb.cc index 923481b985e..14b3103fccf 100644 --- a/contrib/native/client/src/protobuf/Coordination.pb.cc +++ b/contrib/native/client/src/protobuf/Coordination.pb.cc @@ -23,6 +23,7 @@ namespace { const ::google::protobuf::Descriptor* DrillbitEndpoint_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* DrillbitEndpoint_reflection_ = NULL; +const ::google::protobuf::EnumDescriptor* DrillbitEndpoint_State_descriptor_ = NULL; const ::google::protobuf::Descriptor* DrillServiceInstance_descriptor_ = NULL; const ::google::protobuf::internal::GeneratedMessageReflection* DrillServiceInstance_reflection_ = NULL; @@ -40,13 +41,14 @@ void protobuf_AssignDesc_Coordination_2eproto() { "Coordination.proto"); GOOGLE_CHECK(file != NULL); DrillbitEndpoint_descriptor_ = file->message_type(0); - static const int DrillbitEndpoint_offsets_[6] = { + static const int DrillbitEndpoint_offsets_[7] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillbitEndpoint, address_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillbitEndpoint, user_port_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillbitEndpoint, control_port_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillbitEndpoint, data_port_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillbitEndpoint, roles_), GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillbitEndpoint, version_), + GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillbitEndpoint, state_), }; DrillbitEndpoint_reflection_ = new ::google::protobuf::internal::GeneratedMessageReflection( @@ -59,6 +61,7 @@ void protobuf_AssignDesc_Coordination_2eproto() { ::google::protobuf::DescriptorPool::generated_pool(), ::google::protobuf::MessageFactory::generated_factory(), sizeof(DrillbitEndpoint)); + DrillbitEndpoint_State_descriptor_ = DrillbitEndpoint_descriptor_->enum_type(0); DrillServiceInstance_descriptor_ = file->message_type(1); static const int DrillServiceInstance_offsets_[3] = { GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(DrillServiceInstance, id_), @@ -133,19 +136,21 @@ void protobuf_AddDesc_Coordination_2eproto() { GOOGLE_PROTOBUF_VERIFY_VERSION; ::google::protobuf::DescriptorPool::InternalAddGeneratedFile( - "\n\022Coordination.proto\022\004exec\"\214\001\n\020DrillbitE" + "\n\022Coordination.proto\022\004exec\"\367\001\n\020DrillbitE" "ndpoint\022\017\n\007address\030\001 \001(\t\022\021\n\tuser_port\030\002 " "\001(\005\022\024\n\014control_port\030\003 \001(\005\022\021\n\tdata_port\030\004" " \001(\005\022\032\n\005roles\030\005 \001(\0132\013.exec.Roles\022\017\n\007vers" - "ion\030\006 \001(\t\"i\n\024DrillServiceInstance\022\n\n\002id\030" - "\001 \001(\t\022\033\n\023registrationTimeUTC\030\002 \001(\003\022(\n\010en" - "dpoint\030\003 \001(\0132\026.exec.DrillbitEndpoint\"\227\001\n" - "\005Roles\022\027\n\tsql_query\030\001 \001(\010:\004true\022\032\n\014logic" - "al_plan\030\002 \001(\010:\004true\022\033\n\rphysical_plan\030\003 \001" - "(\010:\004true\022\033\n\rjava_executor\030\004 \001(\010:\004true\022\037\n" - "\021distributed_cache\030\005 \001(\010:\004trueB3\n\033org.ap" - "ache.drill.exec.protoB\022CoordinationProto" - "sH\001", 483); + "ion\030\006 \001(\t\022+\n\005state\030\007 \001(\0162\034.exec.Drillbit" + "Endpoint.State\"<\n\005State\022\013\n\007STARTUP\020\000\022\n\n\006" + "ONLINE\020\001\022\r\n\tQUIESCENT\020\002\022\013\n\007OFFLINE\020\003\"i\n\024" + "DrillServiceInstance\022\n\n\002id\030\001 \001(\t\022\033\n\023regi" + "strationTimeUTC\030\002 \001(\003\022(\n\010endpoint\030\003 \001(\0132" + "\026.exec.DrillbitEndpoint\"\227\001\n\005Roles\022\027\n\tsql" + "_query\030\001 \001(\010:\004true\022\032\n\014logical_plan\030\002 \001(\010" + ":\004true\022\033\n\rphysical_plan\030\003 \001(\010:\004true\022\033\n\rj" + "ava_executor\030\004 \001(\010:\004true\022\037\n\021distributed_" + "cache\030\005 \001(\010:\004trueB3\n\033org.apache.drill.ex" + "ec.protoB\022CoordinationProtosH\001", 590); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "Coordination.proto", &protobuf_RegisterTypes); DrillbitEndpoint::default_instance_ = new DrillbitEndpoint(); @@ -166,6 +171,31 @@ struct StaticDescriptorInitializer_Coordination_2eproto { // =================================================================== +const ::google::protobuf::EnumDescriptor* DrillbitEndpoint_State_descriptor() { + protobuf_AssignDescriptorsOnce(); + return DrillbitEndpoint_State_descriptor_; +} +bool DrillbitEndpoint_State_IsValid(int value) { + switch(value) { + case 0: + case 1: + case 2: + case 3: + return true; + default: + return false; + } +} + +#ifndef _MSC_VER +const DrillbitEndpoint_State DrillbitEndpoint::STARTUP; +const DrillbitEndpoint_State DrillbitEndpoint::ONLINE; +const DrillbitEndpoint_State DrillbitEndpoint::QUIESCENT; +const DrillbitEndpoint_State DrillbitEndpoint::OFFLINE; +const DrillbitEndpoint_State DrillbitEndpoint::State_MIN; +const DrillbitEndpoint_State DrillbitEndpoint::State_MAX; +const int DrillbitEndpoint::State_ARRAYSIZE; +#endif // _MSC_VER #ifndef _MSC_VER const int DrillbitEndpoint::kAddressFieldNumber; const int DrillbitEndpoint::kUserPortFieldNumber; @@ -173,6 +203,7 @@ const int DrillbitEndpoint::kControlPortFieldNumber; const int DrillbitEndpoint::kDataPortFieldNumber; const int DrillbitEndpoint::kRolesFieldNumber; const int DrillbitEndpoint::kVersionFieldNumber; +const int DrillbitEndpoint::kStateFieldNumber; #endif // !_MSC_VER DrillbitEndpoint::DrillbitEndpoint() @@ -198,6 +229,7 @@ void DrillbitEndpoint::SharedCtor() { data_port_ = 0; roles_ = NULL; version_ = const_cast< ::std::string*>(&::google::protobuf::internal::kEmptyString); + state_ = 0; ::memset(_has_bits_, 0, sizeof(_has_bits_)); } @@ -256,6 +288,7 @@ void DrillbitEndpoint::Clear() { version_->clear(); } } + state_ = 0; } ::memset(_has_bits_, 0, sizeof(_has_bits_)); mutable_unknown_fields()->Clear(); @@ -358,6 +391,27 @@ bool DrillbitEndpoint::MergePartialFromCodedStream( } else { goto handle_uninterpreted; } + if (input->ExpectTag(56)) goto parse_state; + break; + } + + // optional .exec.DrillbitEndpoint.State state = 7; + case 7: { + if (::google::protobuf::internal::WireFormatLite::GetTagWireType(tag) == + ::google::protobuf::internal::WireFormatLite::WIRETYPE_VARINT) { + parse_state: + int value; + DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive< + int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>( + input, &value))); + if (::exec::DrillbitEndpoint_State_IsValid(value)) { + set_state(static_cast< ::exec::DrillbitEndpoint_State >(value)); + } else { + mutable_unknown_fields()->AddVarint(7, value); + } + } else { + goto handle_uninterpreted; + } if (input->ExpectAtEnd()) return true; break; } @@ -419,6 +473,12 @@ void DrillbitEndpoint::SerializeWithCachedSizes( 6, this->version(), output); } + // optional .exec.DrillbitEndpoint.State state = 7; + if (has_state()) { + ::google::protobuf::internal::WireFormatLite::WriteEnum( + 7, this->state(), output); + } + if (!unknown_fields().empty()) { ::google::protobuf::internal::WireFormat::SerializeUnknownFields( unknown_fields(), output); @@ -469,6 +529,12 @@ ::google::protobuf::uint8* DrillbitEndpoint::SerializeWithCachedSizesToArray( 6, this->version(), target); } + // optional .exec.DrillbitEndpoint.State state = 7; + if (has_state()) { + target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray( + 7, this->state(), target); + } + if (!unknown_fields().empty()) { target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray( unknown_fields(), target); @@ -522,6 +588,12 @@ int DrillbitEndpoint::ByteSize() const { this->version()); } + // optional .exec.DrillbitEndpoint.State state = 7; + if (has_state()) { + total_size += 1 + + ::google::protobuf::internal::WireFormatLite::EnumSize(this->state()); + } + } if (!unknown_fields().empty()) { total_size += @@ -567,6 +639,9 @@ void DrillbitEndpoint::MergeFrom(const DrillbitEndpoint& from) { if (from.has_version()) { set_version(from.version()); } + if (from.has_state()) { + set_state(from.state()); + } } mutable_unknown_fields()->MergeFrom(from.unknown_fields()); } @@ -596,6 +671,7 @@ void DrillbitEndpoint::Swap(DrillbitEndpoint* other) { std::swap(data_port_, other->data_port_); std::swap(roles_, other->roles_); std::swap(version_, other->version_); + std::swap(state_, other->state_); std::swap(_has_bits_[0], other->_has_bits_[0]); _unknown_fields_.Swap(&other->_unknown_fields_); std::swap(_cached_size_, other->_cached_size_); diff --git a/contrib/native/client/src/protobuf/Coordination.pb.h b/contrib/native/client/src/protobuf/Coordination.pb.h index 14d6d28c7b0..e52c70c403d 100644 --- a/contrib/native/client/src/protobuf/Coordination.pb.h +++ b/contrib/native/client/src/protobuf/Coordination.pb.h @@ -23,6 +23,7 @@ #include #include #include +#include #include // @@protoc_insertion_point(includes) @@ -37,6 +38,27 @@ class DrillbitEndpoint; class DrillServiceInstance; class Roles; +enum DrillbitEndpoint_State { + DrillbitEndpoint_State_STARTUP = 0, + DrillbitEndpoint_State_ONLINE = 1, + DrillbitEndpoint_State_QUIESCENT = 2, + DrillbitEndpoint_State_OFFLINE = 3 +}; +bool DrillbitEndpoint_State_IsValid(int value); +const DrillbitEndpoint_State DrillbitEndpoint_State_State_MIN = DrillbitEndpoint_State_STARTUP; +const DrillbitEndpoint_State DrillbitEndpoint_State_State_MAX = DrillbitEndpoint_State_OFFLINE; +const int DrillbitEndpoint_State_State_ARRAYSIZE = DrillbitEndpoint_State_State_MAX + 1; + +const ::google::protobuf::EnumDescriptor* DrillbitEndpoint_State_descriptor(); +inline const ::std::string& DrillbitEndpoint_State_Name(DrillbitEndpoint_State value) { + return ::google::protobuf::internal::NameOfEnum( + DrillbitEndpoint_State_descriptor(), value); +} +inline bool DrillbitEndpoint_State_Parse( + const ::std::string& name, DrillbitEndpoint_State* value) { + return ::google::protobuf::internal::ParseNamedEnum( + DrillbitEndpoint_State_descriptor(), name, value); +} // =================================================================== class DrillbitEndpoint : public ::google::protobuf::Message { @@ -91,6 +113,32 @@ class DrillbitEndpoint : public ::google::protobuf::Message { // nested types ---------------------------------------------------- + typedef DrillbitEndpoint_State State; + static const State STARTUP = DrillbitEndpoint_State_STARTUP; + static const State ONLINE = DrillbitEndpoint_State_ONLINE; + static const State QUIESCENT = DrillbitEndpoint_State_QUIESCENT; + static const State OFFLINE = DrillbitEndpoint_State_OFFLINE; + static inline bool State_IsValid(int value) { + return DrillbitEndpoint_State_IsValid(value); + } + static const State State_MIN = + DrillbitEndpoint_State_State_MIN; + static const State State_MAX = + DrillbitEndpoint_State_State_MAX; + static const int State_ARRAYSIZE = + DrillbitEndpoint_State_State_ARRAYSIZE; + static inline const ::google::protobuf::EnumDescriptor* + State_descriptor() { + return DrillbitEndpoint_State_descriptor(); + } + static inline const ::std::string& State_Name(State value) { + return DrillbitEndpoint_State_Name(value); + } + static inline bool State_Parse(const ::std::string& name, + State* value) { + return DrillbitEndpoint_State_Parse(name, value); + } + // accessors ------------------------------------------------------- // optional string address = 1; @@ -147,6 +195,13 @@ class DrillbitEndpoint : public ::google::protobuf::Message { inline ::std::string* release_version(); inline void set_allocated_version(::std::string* version); + // optional .exec.DrillbitEndpoint.State state = 7; + inline bool has_state() const; + inline void clear_state(); + static const int kStateFieldNumber = 7; + inline ::exec::DrillbitEndpoint_State state() const; + inline void set_state(::exec::DrillbitEndpoint_State value); + // @@protoc_insertion_point(class_scope:exec.DrillbitEndpoint) private: inline void set_has_address(); @@ -161,6 +216,8 @@ class DrillbitEndpoint : public ::google::protobuf::Message { inline void clear_has_roles(); inline void set_has_version(); inline void clear_has_version(); + inline void set_has_state(); + inline void clear_has_state(); ::google::protobuf::UnknownFieldSet _unknown_fields_; @@ -168,11 +225,12 @@ class DrillbitEndpoint : public ::google::protobuf::Message { ::google::protobuf::int32 user_port_; ::google::protobuf::int32 control_port_; ::exec::Roles* roles_; - ::std::string* version_; ::google::protobuf::int32 data_port_; + int state_; + ::std::string* version_; mutable int _cached_size_; - ::google::protobuf::uint32 _has_bits_[(6 + 31) / 32]; + ::google::protobuf::uint32 _has_bits_[(7 + 31) / 32]; friend void protobuf_AddDesc_Coordination_2eproto(); friend void protobuf_AssignDesc_Coordination_2eproto(); @@ -663,6 +721,29 @@ inline void DrillbitEndpoint::set_allocated_version(::std::string* version) { } } +// optional .exec.DrillbitEndpoint.State state = 7; +inline bool DrillbitEndpoint::has_state() const { + return (_has_bits_[0] & 0x00000040u) != 0; +} +inline void DrillbitEndpoint::set_has_state() { + _has_bits_[0] |= 0x00000040u; +} +inline void DrillbitEndpoint::clear_has_state() { + _has_bits_[0] &= ~0x00000040u; +} +inline void DrillbitEndpoint::clear_state() { + state_ = 0; + clear_has_state(); +} +inline ::exec::DrillbitEndpoint_State DrillbitEndpoint::state() const { + return static_cast< ::exec::DrillbitEndpoint_State >(state_); +} +inline void DrillbitEndpoint::set_state(::exec::DrillbitEndpoint_State value) { + assert(::exec::DrillbitEndpoint_State_IsValid(value)); + set_has_state(); + state_ = value; +} + // ------------------------------------------------------------------- // DrillServiceInstance @@ -920,6 +1001,10 @@ inline void Roles::set_distributed_cache(bool value) { namespace google { namespace protobuf { +template <> +inline const EnumDescriptor* GetEnumDescriptor< ::exec::DrillbitEndpoint_State>() { + return ::exec::DrillbitEndpoint_State_descriptor(); +} } // namespace google } // namespace protobuf diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.cc b/contrib/native/client/src/protobuf/UserBitShared.pb.cc index 189eda20915..4350082e26f 100644 --- a/contrib/native/client/src/protobuf/UserBitShared.pb.cc +++ b/contrib/native/client/src/protobuf/UserBitShared.pb.cc @@ -650,126 +650,129 @@ void protobuf_AddDesc_UserBitShared_2eproto() { "s.proto\032\022Coordination.proto\032\017SchemaDef.p" "roto\"$\n\017UserCredentials\022\021\n\tuser_name\030\001 \001" "(\t\"\'\n\007QueryId\022\r\n\005part1\030\001 \001(\020\022\r\n\005part2\030\002 " - "\001(\020\"\255\003\n\014DrillPBError\022\020\n\010error_id\030\001 \001(\t\022(" + "\001(\020\"\355\003\n\014DrillPBError\022\020\n\010error_id\030\001 \001(\t\022(" "\n\010endpoint\030\002 \001(\0132\026.exec.DrillbitEndpoint" "\0227\n\nerror_type\030\003 \001(\0162#.exec.shared.Drill" "PBError.ErrorType\022\017\n\007message\030\004 \001(\t\0220\n\tex" "ception\030\005 \001(\0132\035.exec.shared.ExceptionWra" "pper\0220\n\rparsing_error\030\006 \003(\0132\031.exec.share" - "d.ParsingError\"\262\001\n\tErrorType\022\016\n\nCONNECTI" + "d.ParsingError\"\362\001\n\tErrorType\022\016\n\nCONNECTI" "ON\020\000\022\r\n\tDATA_READ\020\001\022\016\n\nDATA_WRITE\020\002\022\014\n\010F" "UNCTION\020\003\022\t\n\005PARSE\020\004\022\016\n\nPERMISSION\020\005\022\010\n\004" "PLAN\020\006\022\014\n\010RESOURCE\020\007\022\n\n\006SYSTEM\020\010\022\031\n\025UNSU" - "PPORTED_OPERATION\020\t\022\016\n\nVALIDATION\020\n\"\246\001\n\020" - "ExceptionWrapper\022\027\n\017exception_class\030\001 \001(" - "\t\022\017\n\007message\030\002 \001(\t\022:\n\013stack_trace\030\003 \003(\0132" - "%.exec.shared.StackTraceElementWrapper\022," - "\n\005cause\030\004 \001(\0132\035.exec.shared.ExceptionWra" - "pper\"\205\001\n\030StackTraceElementWrapper\022\022\n\ncla" - "ss_name\030\001 \001(\t\022\021\n\tfile_name\030\002 \001(\t\022\023\n\013line" - "_number\030\003 \001(\005\022\023\n\013method_name\030\004 \001(\t\022\030\n\020is" - "_native_method\030\005 \001(\010\"\\\n\014ParsingError\022\024\n\014" - "start_column\030\002 \001(\005\022\021\n\tstart_row\030\003 \001(\005\022\022\n" - "\nend_column\030\004 \001(\005\022\017\n\007end_row\030\005 \001(\005\"~\n\016Re" - "cordBatchDef\022\024\n\014record_count\030\001 \001(\005\022+\n\005fi" - "eld\030\002 \003(\0132\034.exec.shared.SerializedField\022" - ")\n!carries_two_byte_selection_vector\030\003 \001" - "(\010\"\205\001\n\010NamePart\022(\n\004type\030\001 \001(\0162\032.exec.sha" - "red.NamePart.Type\022\014\n\004name\030\002 \001(\t\022$\n\005child" - "\030\003 \001(\0132\025.exec.shared.NamePart\"\033\n\004Type\022\010\n" - "\004NAME\020\000\022\t\n\005ARRAY\020\001\"\324\001\n\017SerializedField\022%" - "\n\nmajor_type\030\001 \001(\0132\021.common.MajorType\022(\n" - "\tname_part\030\002 \001(\0132\025.exec.shared.NamePart\022" - "+\n\005child\030\003 \003(\0132\034.exec.shared.SerializedF" - "ield\022\023\n\013value_count\030\004 \001(\005\022\027\n\017var_byte_le" - "ngth\030\005 \001(\005\022\025\n\rbuffer_length\030\007 \001(\005\"7\n\nNod" - "eStatus\022\017\n\007node_id\030\001 \001(\005\022\030\n\020memory_footp" - "rint\030\002 \001(\003\"\225\002\n\013QueryResult\0228\n\013query_stat" - "e\030\001 \001(\0162#.exec.shared.QueryResult.QueryS" - "tate\022&\n\010query_id\030\002 \001(\0132\024.exec.shared.Que" - "ryId\022(\n\005error\030\003 \003(\0132\031.exec.shared.DrillP" - "BError\"z\n\nQueryState\022\014\n\010STARTING\020\000\022\013\n\007RU" - "NNING\020\001\022\r\n\tCOMPLETED\020\002\022\014\n\010CANCELED\020\003\022\n\n\006" - "FAILED\020\004\022\032\n\026CANCELLATION_REQUESTED\020\005\022\014\n\010" - "ENQUEUED\020\006\"p\n\tQueryData\022&\n\010query_id\030\001 \001(" - "\0132\024.exec.shared.QueryId\022\021\n\trow_count\030\002 \001" - "(\005\022(\n\003def\030\003 \001(\0132\033.exec.shared.RecordBatc" - "hDef\"\330\001\n\tQueryInfo\022\r\n\005query\030\001 \001(\t\022\r\n\005sta" - "rt\030\002 \001(\003\0222\n\005state\030\003 \001(\0162#.exec.shared.Qu" - "eryResult.QueryState\022\017\n\004user\030\004 \001(\t:\001-\022\'\n" - "\007foreman\030\005 \001(\0132\026.exec.DrillbitEndpoint\022\024" - "\n\014options_json\030\006 \001(\t\022\022\n\ntotal_cost\030\007 \001(\001" - "\022\025\n\nqueue_name\030\010 \001(\t:\001-\"\242\004\n\014QueryProfile" - "\022 \n\002id\030\001 \001(\0132\024.exec.shared.QueryId\022$\n\004ty" - "pe\030\002 \001(\0162\026.exec.shared.QueryType\022\r\n\005star" - "t\030\003 \001(\003\022\013\n\003end\030\004 \001(\003\022\r\n\005query\030\005 \001(\t\022\014\n\004p" - "lan\030\006 \001(\t\022\'\n\007foreman\030\007 \001(\0132\026.exec.Drillb" - "itEndpoint\0222\n\005state\030\010 \001(\0162#.exec.shared." - "QueryResult.QueryState\022\027\n\017total_fragment" - "s\030\t \001(\005\022\032\n\022finished_fragments\030\n \001(\005\022;\n\020f" - "ragment_profile\030\013 \003(\0132!.exec.shared.Majo" - "rFragmentProfile\022\017\n\004user\030\014 \001(\t:\001-\022\r\n\005err" - "or\030\r \001(\t\022\024\n\014verboseError\030\016 \001(\t\022\020\n\010error_" - "id\030\017 \001(\t\022\022\n\nerror_node\030\020 \001(\t\022\024\n\014options_" - "json\030\021 \001(\t\022\017\n\007planEnd\030\022 \001(\003\022\024\n\014queueWait" - "End\030\023 \001(\003\022\022\n\ntotal_cost\030\024 \001(\001\022\025\n\nqueue_n" - "ame\030\025 \001(\t:\001-\"t\n\024MajorFragmentProfile\022\031\n\021" - "major_fragment_id\030\001 \001(\005\022A\n\026minor_fragmen" - "t_profile\030\002 \003(\0132!.exec.shared.MinorFragm" - "entProfile\"\350\002\n\024MinorFragmentProfile\022)\n\005s" - "tate\030\001 \001(\0162\032.exec.shared.FragmentState\022(" - "\n\005error\030\002 \001(\0132\031.exec.shared.DrillPBError" - "\022\031\n\021minor_fragment_id\030\003 \001(\005\0226\n\020operator_" - "profile\030\004 \003(\0132\034.exec.shared.OperatorProf" - "ile\022\022\n\nstart_time\030\005 \001(\003\022\020\n\010end_time\030\006 \001(" - "\003\022\023\n\013memory_used\030\007 \001(\003\022\027\n\017max_memory_use" - "d\030\010 \001(\003\022(\n\010endpoint\030\t \001(\0132\026.exec.Drillbi" - "tEndpoint\022\023\n\013last_update\030\n \001(\003\022\025\n\rlast_p" - "rogress\030\013 \001(\003\"\377\001\n\017OperatorProfile\0221\n\rinp" - "ut_profile\030\001 \003(\0132\032.exec.shared.StreamPro" - "file\022\023\n\013operator_id\030\003 \001(\005\022\025\n\roperator_ty" - "pe\030\004 \001(\005\022\023\n\013setup_nanos\030\005 \001(\003\022\025\n\rprocess" - "_nanos\030\006 \001(\003\022#\n\033peak_local_memory_alloca" - "ted\030\007 \001(\003\022(\n\006metric\030\010 \003(\0132\030.exec.shared." - "MetricValue\022\022\n\nwait_nanos\030\t \001(\003\"B\n\rStrea" - "mProfile\022\017\n\007records\030\001 \001(\003\022\017\n\007batches\030\002 \001" - "(\003\022\017\n\007schemas\030\003 \001(\003\"J\n\013MetricValue\022\021\n\tme" - "tric_id\030\001 \001(\005\022\022\n\nlong_value\030\002 \001(\003\022\024\n\014dou" - "ble_value\030\003 \001(\001\")\n\010Registry\022\035\n\003jar\030\001 \003(\013" - "2\020.exec.shared.Jar\"/\n\003Jar\022\014\n\004name\030\001 \001(\t\022" - "\032\n\022function_signature\030\002 \003(\t\"W\n\013SaslMessa" - "ge\022\021\n\tmechanism\030\001 \001(\t\022\014\n\004data\030\002 \001(\014\022\'\n\006s" - "tatus\030\003 \001(\0162\027.exec.shared.SaslStatus*5\n\n" - "RpcChannel\022\017\n\013BIT_CONTROL\020\000\022\014\n\010BIT_DATA\020" - "\001\022\010\n\004USER\020\002*V\n\tQueryType\022\007\n\003SQL\020\001\022\013\n\007LOG" - "ICAL\020\002\022\014\n\010PHYSICAL\020\003\022\r\n\tEXECUTION\020\004\022\026\n\022P" - "REPARED_STATEMENT\020\005*\207\001\n\rFragmentState\022\013\n" - "\007SENDING\020\000\022\027\n\023AWAITING_ALLOCATION\020\001\022\013\n\007R" - "UNNING\020\002\022\014\n\010FINISHED\020\003\022\r\n\tCANCELLED\020\004\022\n\n" - "\006FAILED\020\005\022\032\n\026CANCELLATION_REQUESTED\020\006*\360\005" - "\n\020CoreOperatorType\022\021\n\rSINGLE_SENDER\020\000\022\024\n" - "\020BROADCAST_SENDER\020\001\022\n\n\006FILTER\020\002\022\022\n\016HASH_" - "AGGREGATE\020\003\022\r\n\tHASH_JOIN\020\004\022\016\n\nMERGE_JOIN" - "\020\005\022\031\n\025HASH_PARTITION_SENDER\020\006\022\t\n\005LIMIT\020\007" - "\022\024\n\020MERGING_RECEIVER\020\010\022\034\n\030ORDERED_PARTIT" - "ION_SENDER\020\t\022\013\n\007PROJECT\020\n\022\026\n\022UNORDERED_R" - "ECEIVER\020\013\022\020\n\014RANGE_SENDER\020\014\022\n\n\006SCREEN\020\r\022" - "\034\n\030SELECTION_VECTOR_REMOVER\020\016\022\027\n\023STREAMI" - "NG_AGGREGATE\020\017\022\016\n\nTOP_N_SORT\020\020\022\021\n\rEXTERN" - "AL_SORT\020\021\022\t\n\005TRACE\020\022\022\t\n\005UNION\020\023\022\014\n\010OLD_S" - "ORT\020\024\022\032\n\026PARQUET_ROW_GROUP_SCAN\020\025\022\021\n\rHIV" - "E_SUB_SCAN\020\026\022\025\n\021SYSTEM_TABLE_SCAN\020\027\022\021\n\rM" - "OCK_SUB_SCAN\020\030\022\022\n\016PARQUET_WRITER\020\031\022\023\n\017DI" - "RECT_SUB_SCAN\020\032\022\017\n\013TEXT_WRITER\020\033\022\021\n\rTEXT" - "_SUB_SCAN\020\034\022\021\n\rJSON_SUB_SCAN\020\035\022\030\n\024INFO_S" - "CHEMA_SUB_SCAN\020\036\022\023\n\017COMPLEX_TO_JSON\020\037\022\025\n" - "\021PRODUCER_CONSUMER\020 \022\022\n\016HBASE_SUB_SCAN\020!" - "\022\n\n\006WINDOW\020\"\022\024\n\020NESTED_LOOP_JOIN\020#\022\021\n\rAV" - "RO_SUB_SCAN\020$\022\021\n\rPCAP_SUB_SCAN\020%*g\n\nSasl" - "Status\022\020\n\014SASL_UNKNOWN\020\000\022\016\n\nSASL_START\020\001" - "\022\024\n\020SASL_IN_PROGRESS\020\002\022\020\n\014SASL_SUCCESS\020\003" - "\022\017\n\013SASL_FAILED\020\004B.\n\033org.apache.drill.ex" - "ec.protoB\rUserBitSharedH\001", 4945); + "PPORTED_OPERATION\020\t\022\016\n\nVALIDATION\020\n\022\023\n\017E" + "XECUTION_ERROR\020\013\022\022\n\016INTERNAL_ERROR\020\014\022\025\n\021" + "UNSPECIFIED_ERROR\020\r\"\246\001\n\020ExceptionWrapper" + "\022\027\n\017exception_class\030\001 \001(\t\022\017\n\007message\030\002 \001" + "(\t\022:\n\013stack_trace\030\003 \003(\0132%.exec.shared.St" + "ackTraceElementWrapper\022,\n\005cause\030\004 \001(\0132\035." + "exec.shared.ExceptionWrapper\"\205\001\n\030StackTr" + "aceElementWrapper\022\022\n\nclass_name\030\001 \001(\t\022\021\n" + "\tfile_name\030\002 \001(\t\022\023\n\013line_number\030\003 \001(\005\022\023\n" + "\013method_name\030\004 \001(\t\022\030\n\020is_native_method\030\005" + " \001(\010\"\\\n\014ParsingError\022\024\n\014start_column\030\002 \001" + "(\005\022\021\n\tstart_row\030\003 \001(\005\022\022\n\nend_column\030\004 \001(" + "\005\022\017\n\007end_row\030\005 \001(\005\"~\n\016RecordBatchDef\022\024\n\014" + "record_count\030\001 \001(\005\022+\n\005field\030\002 \003(\0132\034.exec" + ".shared.SerializedField\022)\n!carries_two_b" + "yte_selection_vector\030\003 \001(\010\"\205\001\n\010NamePart\022" + "(\n\004type\030\001 \001(\0162\032.exec.shared.NamePart.Typ" + "e\022\014\n\004name\030\002 \001(\t\022$\n\005child\030\003 \001(\0132\025.exec.sh" + "ared.NamePart\"\033\n\004Type\022\010\n\004NAME\020\000\022\t\n\005ARRAY" + "\020\001\"\324\001\n\017SerializedField\022%\n\nmajor_type\030\001 \001" + "(\0132\021.common.MajorType\022(\n\tname_part\030\002 \001(\013" + "2\025.exec.shared.NamePart\022+\n\005child\030\003 \003(\0132\034" + ".exec.shared.SerializedField\022\023\n\013value_co" + "unt\030\004 \001(\005\022\027\n\017var_byte_length\030\005 \001(\005\022\025\n\rbu" + "ffer_length\030\007 \001(\005\"7\n\nNodeStatus\022\017\n\007node_" + "id\030\001 \001(\005\022\030\n\020memory_footprint\030\002 \001(\003\"\263\002\n\013Q" + "ueryResult\0228\n\013query_state\030\001 \001(\0162#.exec.s" + "hared.QueryResult.QueryState\022&\n\010query_id" + "\030\002 \001(\0132\024.exec.shared.QueryId\022(\n\005error\030\003 " + "\003(\0132\031.exec.shared.DrillPBError\"\227\001\n\nQuery" + "State\022\014\n\010STARTING\020\000\022\013\n\007RUNNING\020\001\022\r\n\tCOMP" + "LETED\020\002\022\014\n\010CANCELED\020\003\022\n\n\006FAILED\020\004\022\032\n\026CAN" + "CELLATION_REQUESTED\020\005\022\014\n\010ENQUEUED\020\006\022\r\n\tP" + "REPARING\020\007\022\014\n\010PLANNING\020\010\"p\n\tQueryData\022&\n" + "\010query_id\030\001 \001(\0132\024.exec.shared.QueryId\022\021\n" + "\trow_count\030\002 \001(\005\022(\n\003def\030\003 \001(\0132\033.exec.sha" + "red.RecordBatchDef\"\330\001\n\tQueryInfo\022\r\n\005quer" + "y\030\001 \001(\t\022\r\n\005start\030\002 \001(\003\0222\n\005state\030\003 \001(\0162#." + "exec.shared.QueryResult.QueryState\022\017\n\004us" + "er\030\004 \001(\t:\001-\022\'\n\007foreman\030\005 \001(\0132\026.exec.Dril" + "lbitEndpoint\022\024\n\014options_json\030\006 \001(\t\022\022\n\nto" + "tal_cost\030\007 \001(\001\022\025\n\nqueue_name\030\010 \001(\t:\001-\"\242\004" + "\n\014QueryProfile\022 \n\002id\030\001 \001(\0132\024.exec.shared" + ".QueryId\022$\n\004type\030\002 \001(\0162\026.exec.shared.Que" + "ryType\022\r\n\005start\030\003 \001(\003\022\013\n\003end\030\004 \001(\003\022\r\n\005qu" + "ery\030\005 \001(\t\022\014\n\004plan\030\006 \001(\t\022\'\n\007foreman\030\007 \001(\013" + "2\026.exec.DrillbitEndpoint\0222\n\005state\030\010 \001(\0162" + "#.exec.shared.QueryResult.QueryState\022\027\n\017" + "total_fragments\030\t \001(\005\022\032\n\022finished_fragme" + "nts\030\n \001(\005\022;\n\020fragment_profile\030\013 \003(\0132!.ex" + "ec.shared.MajorFragmentProfile\022\017\n\004user\030\014" + " \001(\t:\001-\022\r\n\005error\030\r \001(\t\022\024\n\014verboseError\030\016" + " \001(\t\022\020\n\010error_id\030\017 \001(\t\022\022\n\nerror_node\030\020 \001" + "(\t\022\024\n\014options_json\030\021 \001(\t\022\017\n\007planEnd\030\022 \001(" + "\003\022\024\n\014queueWaitEnd\030\023 \001(\003\022\022\n\ntotal_cost\030\024 " + "\001(\001\022\025\n\nqueue_name\030\025 \001(\t:\001-\"t\n\024MajorFragm" + "entProfile\022\031\n\021major_fragment_id\030\001 \001(\005\022A\n" + "\026minor_fragment_profile\030\002 \003(\0132!.exec.sha" + "red.MinorFragmentProfile\"\350\002\n\024MinorFragme" + "ntProfile\022)\n\005state\030\001 \001(\0162\032.exec.shared.F" + "ragmentState\022(\n\005error\030\002 \001(\0132\031.exec.share" + "d.DrillPBError\022\031\n\021minor_fragment_id\030\003 \001(" + "\005\0226\n\020operator_profile\030\004 \003(\0132\034.exec.share" + "d.OperatorProfile\022\022\n\nstart_time\030\005 \001(\003\022\020\n" + "\010end_time\030\006 \001(\003\022\023\n\013memory_used\030\007 \001(\003\022\027\n\017" + "max_memory_used\030\010 \001(\003\022(\n\010endpoint\030\t \001(\0132" + "\026.exec.DrillbitEndpoint\022\023\n\013last_update\030\n" + " \001(\003\022\025\n\rlast_progress\030\013 \001(\003\"\377\001\n\017Operator" + "Profile\0221\n\rinput_profile\030\001 \003(\0132\032.exec.sh" + "ared.StreamProfile\022\023\n\013operator_id\030\003 \001(\005\022" + "\025\n\roperator_type\030\004 \001(\005\022\023\n\013setup_nanos\030\005 " + "\001(\003\022\025\n\rprocess_nanos\030\006 \001(\003\022#\n\033peak_local" + "_memory_allocated\030\007 \001(\003\022(\n\006metric\030\010 \003(\0132" + "\030.exec.shared.MetricValue\022\022\n\nwait_nanos\030" + "\t \001(\003\"B\n\rStreamProfile\022\017\n\007records\030\001 \001(\003\022" + "\017\n\007batches\030\002 \001(\003\022\017\n\007schemas\030\003 \001(\003\"J\n\013Met" + "ricValue\022\021\n\tmetric_id\030\001 \001(\005\022\022\n\nlong_valu" + "e\030\002 \001(\003\022\024\n\014double_value\030\003 \001(\001\")\n\010Registr" + "y\022\035\n\003jar\030\001 \003(\0132\020.exec.shared.Jar\"/\n\003Jar\022" + "\014\n\004name\030\001 \001(\t\022\032\n\022function_signature\030\002 \003(" + "\t\"W\n\013SaslMessage\022\021\n\tmechanism\030\001 \001(\t\022\014\n\004d" + "ata\030\002 \001(\014\022\'\n\006status\030\003 \001(\0162\027.exec.shared." + "SaslStatus*5\n\nRpcChannel\022\017\n\013BIT_CONTROL\020" + "\000\022\014\n\010BIT_DATA\020\001\022\010\n\004USER\020\002*V\n\tQueryType\022\007" + "\n\003SQL\020\001\022\013\n\007LOGICAL\020\002\022\014\n\010PHYSICAL\020\003\022\r\n\tEX" + "ECUTION\020\004\022\026\n\022PREPARED_STATEMENT\020\005*\207\001\n\rFr" + "agmentState\022\013\n\007SENDING\020\000\022\027\n\023AWAITING_ALL" + "OCATION\020\001\022\013\n\007RUNNING\020\002\022\014\n\010FINISHED\020\003\022\r\n\t" + "CANCELLED\020\004\022\n\n\006FAILED\020\005\022\032\n\026CANCELLATION_" + "REQUESTED\020\006*\227\006\n\020CoreOperatorType\022\021\n\rSING" + "LE_SENDER\020\000\022\024\n\020BROADCAST_SENDER\020\001\022\n\n\006FIL" + "TER\020\002\022\022\n\016HASH_AGGREGATE\020\003\022\r\n\tHASH_JOIN\020\004" + "\022\016\n\nMERGE_JOIN\020\005\022\031\n\025HASH_PARTITION_SENDE" + "R\020\006\022\t\n\005LIMIT\020\007\022\024\n\020MERGING_RECEIVER\020\010\022\034\n\030" + "ORDERED_PARTITION_SENDER\020\t\022\013\n\007PROJECT\020\n\022" + "\026\n\022UNORDERED_RECEIVER\020\013\022\020\n\014RANGE_SENDER\020" + "\014\022\n\n\006SCREEN\020\r\022\034\n\030SELECTION_VECTOR_REMOVE" + "R\020\016\022\027\n\023STREAMING_AGGREGATE\020\017\022\016\n\nTOP_N_SO" + "RT\020\020\022\021\n\rEXTERNAL_SORT\020\021\022\t\n\005TRACE\020\022\022\t\n\005UN" + "ION\020\023\022\014\n\010OLD_SORT\020\024\022\032\n\026PARQUET_ROW_GROUP" + "_SCAN\020\025\022\021\n\rHIVE_SUB_SCAN\020\026\022\025\n\021SYSTEM_TAB" + "LE_SCAN\020\027\022\021\n\rMOCK_SUB_SCAN\020\030\022\022\n\016PARQUET_" + "WRITER\020\031\022\023\n\017DIRECT_SUB_SCAN\020\032\022\017\n\013TEXT_WR" + "ITER\020\033\022\021\n\rTEXT_SUB_SCAN\020\034\022\021\n\rJSON_SUB_SC" + "AN\020\035\022\030\n\024INFO_SCHEMA_SUB_SCAN\020\036\022\023\n\017COMPLE" + "X_TO_JSON\020\037\022\025\n\021PRODUCER_CONSUMER\020 \022\022\n\016HB" + "ASE_SUB_SCAN\020!\022\n\n\006WINDOW\020\"\022\024\n\020NESTED_LOO" + "P_JOIN\020#\022\021\n\rAVRO_SUB_SCAN\020$\022\021\n\rPCAP_SUB_" + "SCAN\020%\022\022\n\016KAFKA_SUB_SCAN\020&\022\021\n\rKUDU_SUB_S" + "CAN\020\'*g\n\nSaslStatus\022\020\n\014SASL_UNKNOWN\020\000\022\016\n" + "\nSASL_START\020\001\022\024\n\020SASL_IN_PROGRESS\020\002\022\020\n\014S" + "ASL_SUCCESS\020\003\022\017\n\013SASL_FAILED\020\004B.\n\033org.ap" + "ache.drill.exec.protoB\rUserBitSharedH\001", 5078); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "UserBitShared.proto", &protobuf_RegisterTypes); UserCredentials::default_instance_ = new UserCredentials(); @@ -928,6 +931,8 @@ bool CoreOperatorType_IsValid(int value) { case 35: case 36: case 37: + case 38: + case 39: return true; default: return false; @@ -1440,6 +1445,9 @@ bool DrillPBError_ErrorType_IsValid(int value) { case 8: case 9: case 10: + case 11: + case 12: + case 13: return true; default: return false; @@ -1458,6 +1466,9 @@ const DrillPBError_ErrorType DrillPBError::RESOURCE; const DrillPBError_ErrorType DrillPBError::SYSTEM; const DrillPBError_ErrorType DrillPBError::UNSUPPORTED_OPERATION; const DrillPBError_ErrorType DrillPBError::VALIDATION; +const DrillPBError_ErrorType DrillPBError::EXECUTION_ERROR; +const DrillPBError_ErrorType DrillPBError::INTERNAL_ERROR; +const DrillPBError_ErrorType DrillPBError::UNSPECIFIED_ERROR; const DrillPBError_ErrorType DrillPBError::ErrorType_MIN; const DrillPBError_ErrorType DrillPBError::ErrorType_MAX; const int DrillPBError::ErrorType_ARRAYSIZE; @@ -4334,6 +4345,8 @@ bool QueryResult_QueryState_IsValid(int value) { case 4: case 5: case 6: + case 7: + case 8: return true; default: return false; @@ -4348,6 +4361,8 @@ const QueryResult_QueryState QueryResult::CANCELED; const QueryResult_QueryState QueryResult::FAILED; const QueryResult_QueryState QueryResult::CANCELLATION_REQUESTED; const QueryResult_QueryState QueryResult::ENQUEUED; +const QueryResult_QueryState QueryResult::PREPARING; +const QueryResult_QueryState QueryResult::PLANNING; const QueryResult_QueryState QueryResult::QueryState_MIN; const QueryResult_QueryState QueryResult::QueryState_MAX; const int QueryResult::QueryState_ARRAYSIZE; diff --git a/contrib/native/client/src/protobuf/UserBitShared.pb.h b/contrib/native/client/src/protobuf/UserBitShared.pb.h index c62bbf0b793..5a49bf50ddb 100644 --- a/contrib/native/client/src/protobuf/UserBitShared.pb.h +++ b/contrib/native/client/src/protobuf/UserBitShared.pb.h @@ -72,11 +72,14 @@ enum DrillPBError_ErrorType { DrillPBError_ErrorType_RESOURCE = 7, DrillPBError_ErrorType_SYSTEM = 8, DrillPBError_ErrorType_UNSUPPORTED_OPERATION = 9, - DrillPBError_ErrorType_VALIDATION = 10 + DrillPBError_ErrorType_VALIDATION = 10, + DrillPBError_ErrorType_EXECUTION_ERROR = 11, + DrillPBError_ErrorType_INTERNAL_ERROR = 12, + DrillPBError_ErrorType_UNSPECIFIED_ERROR = 13 }; bool DrillPBError_ErrorType_IsValid(int value); const DrillPBError_ErrorType DrillPBError_ErrorType_ErrorType_MIN = DrillPBError_ErrorType_CONNECTION; -const DrillPBError_ErrorType DrillPBError_ErrorType_ErrorType_MAX = DrillPBError_ErrorType_VALIDATION; +const DrillPBError_ErrorType DrillPBError_ErrorType_ErrorType_MAX = DrillPBError_ErrorType_UNSPECIFIED_ERROR; const int DrillPBError_ErrorType_ErrorType_ARRAYSIZE = DrillPBError_ErrorType_ErrorType_MAX + 1; const ::google::protobuf::EnumDescriptor* DrillPBError_ErrorType_descriptor(); @@ -115,11 +118,13 @@ enum QueryResult_QueryState { QueryResult_QueryState_CANCELED = 3, QueryResult_QueryState_FAILED = 4, QueryResult_QueryState_CANCELLATION_REQUESTED = 5, - QueryResult_QueryState_ENQUEUED = 6 + QueryResult_QueryState_ENQUEUED = 6, + QueryResult_QueryState_PREPARING = 7, + QueryResult_QueryState_PLANNING = 8 }; bool QueryResult_QueryState_IsValid(int value); const QueryResult_QueryState QueryResult_QueryState_QueryState_MIN = QueryResult_QueryState_STARTING; -const QueryResult_QueryState QueryResult_QueryState_QueryState_MAX = QueryResult_QueryState_ENQUEUED; +const QueryResult_QueryState QueryResult_QueryState_QueryState_MAX = QueryResult_QueryState_PLANNING; const int QueryResult_QueryState_QueryState_ARRAYSIZE = QueryResult_QueryState_QueryState_MAX + 1; const ::google::protobuf::EnumDescriptor* QueryResult_QueryState_descriptor(); @@ -236,11 +241,13 @@ enum CoreOperatorType { WINDOW = 34, NESTED_LOOP_JOIN = 35, AVRO_SUB_SCAN = 36, - PCAP_SUB_SCAN = 37 + PCAP_SUB_SCAN = 37, + KAFKA_SUB_SCAN = 38, + KUDU_SUB_SCAN = 39 }; bool CoreOperatorType_IsValid(int value); const CoreOperatorType CoreOperatorType_MIN = SINGLE_SENDER; -const CoreOperatorType CoreOperatorType_MAX = PCAP_SUB_SCAN; +const CoreOperatorType CoreOperatorType_MAX = KUDU_SUB_SCAN; const int CoreOperatorType_ARRAYSIZE = CoreOperatorType_MAX + 1; const ::google::protobuf::EnumDescriptor* CoreOperatorType_descriptor(); @@ -520,6 +527,9 @@ class DrillPBError : public ::google::protobuf::Message { static const ErrorType SYSTEM = DrillPBError_ErrorType_SYSTEM; static const ErrorType UNSUPPORTED_OPERATION = DrillPBError_ErrorType_UNSUPPORTED_OPERATION; static const ErrorType VALIDATION = DrillPBError_ErrorType_VALIDATION; + static const ErrorType EXECUTION_ERROR = DrillPBError_ErrorType_EXECUTION_ERROR; + static const ErrorType INTERNAL_ERROR = DrillPBError_ErrorType_INTERNAL_ERROR; + static const ErrorType UNSPECIFIED_ERROR = DrillPBError_ErrorType_UNSPECIFIED_ERROR; static inline bool ErrorType_IsValid(int value) { return DrillPBError_ErrorType_IsValid(value); } @@ -1543,6 +1553,8 @@ class QueryResult : public ::google::protobuf::Message { static const QueryState FAILED = QueryResult_QueryState_FAILED; static const QueryState CANCELLATION_REQUESTED = QueryResult_QueryState_CANCELLATION_REQUESTED; static const QueryState ENQUEUED = QueryResult_QueryState_ENQUEUED; + static const QueryState PREPARING = QueryResult_QueryState_PREPARING; + static const QueryState PLANNING = QueryResult_QueryState_PLANNING; static inline bool QueryState_IsValid(int value) { return QueryResult_QueryState_IsValid(value); } From ea643bfebeff8991d4e43fa8762773076087d0df Mon Sep 17 00:00:00 2001 From: Salim Achouche Date: Wed, 28 Mar 2018 12:08:25 -0700 Subject: [PATCH 21/44] DRILL-6299: Fixed a filter pushed down issue when a column doesn't have stats close apache/drill#1192 --- .../exec/expr/stat/ParquetIsPredicates.java | 17 ++++++----------- .../exec/expr/stat/ParquetPredicatesHelper.java | 9 +++++++++ 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java index c6f9b2fa60b..a58ce7c23e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java @@ -62,7 +62,7 @@ public IsNullPredicate(LogicalExpression expr) { public boolean canDrop(RangeExprEvaluator evaluator) { Statistics exprStat = expr.accept(evaluator, null); - if (exprStat == null) { + if (!ParquetPredicatesHelper.hasStats(exprStat)) { return false; } @@ -87,8 +87,7 @@ public IsNotNullPredicate(LogicalExpression expr) { public boolean canDrop(RangeExprEvaluator evaluator) { Statistics exprStat = expr.accept(evaluator, null); - if (exprStat == null || - exprStat.isEmpty()) { + if (!ParquetPredicatesHelper.hasStats(exprStat)) { return false; } @@ -113,8 +112,7 @@ public IsTruePredicate(LogicalExpression expr) { public boolean canDrop(RangeExprEvaluator evaluator) { Statistics exprStat = expr.accept(evaluator, null); - if (exprStat == null || - exprStat.isEmpty()) { + if (!ParquetPredicatesHelper.hasStats(exprStat)) { return false; } @@ -140,8 +138,7 @@ public IsFalsePredicate(LogicalExpression expr) { public boolean canDrop(RangeExprEvaluator evaluator) { Statistics exprStat = expr.accept(evaluator, null); - if (exprStat == null || - exprStat.isEmpty()) { + if (!ParquetPredicatesHelper.hasStats(exprStat)) { return false; } @@ -167,8 +164,7 @@ public IsNotTruePredicate(LogicalExpression expr) { public boolean canDrop(RangeExprEvaluator evaluator) { Statistics exprStat = expr.accept(evaluator, null); - if (exprStat == null || - exprStat.isEmpty()) { + if (!ParquetPredicatesHelper.hasStats(exprStat)) { return false; } @@ -193,8 +189,7 @@ public IsNotFalsePredicate(LogicalExpression expr) { public boolean canDrop(RangeExprEvaluator evaluator) { Statistics exprStat = expr.accept(evaluator, null); - if (exprStat == null || - exprStat.isEmpty()) { + if (!ParquetPredicatesHelper.hasStats(exprStat)) { return false; } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetPredicatesHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetPredicatesHelper.java index ac82d65aea8..e43acd30bf2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetPredicatesHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetPredicatesHelper.java @@ -22,8 +22,17 @@ /** * Parquet predicates class helper for filter pushdown. */ +@SuppressWarnings("rawtypes") public class ParquetPredicatesHelper { + /** + * @param stat statistics object + * @return true if the input stat object has valid statistics; false otherwise + */ + public static boolean hasStats(Statistics stat) { + return stat != null && !stat.isEmpty(); + } + /** * Checks that column chunk's statistics has only nulls * From 7088bfe4bd6e2379ba21b0c48f7280a77d2c3b83 Mon Sep 17 00:00:00 2001 From: Pushpendra Jaiswal Date: Tue, 27 Mar 2018 13:16:23 +0530 Subject: [PATCH 22/44] DRILL-5937: drill-module.conf : Changed timeout to 30 seconds, ExecConstant.java : Changed comment DRILL-5937: ExecConstant.java : removed comment DRILL-5937: CheckStyle fix close apache/drill#1190 --- .../src/main/java/org/apache/drill/exec/ExecConstants.java | 4 ---- exec/java-exec/src/main/resources/drill-module.conf | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java index 34aec1b985b..77fa2118713 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ExecConstants.java @@ -561,10 +561,6 @@ private ExecConstants() { public static final String CODE_GEN_EXP_IN_METHOD_SIZE = "exec.java.compiler.exp_in_method_size"; public static final LongValidator CODE_GEN_EXP_IN_METHOD_SIZE_VALIDATOR = new LongValidator(CODE_GEN_EXP_IN_METHOD_SIZE); - /** - * Timeout for create prepare statement request. If the request exceeds this timeout, then request is timed out. - * Default value is 10mins. - */ public static final String CREATE_PREPARE_STATEMENT_TIMEOUT_MILLIS = "prepare.statement.create_timeout_ms"; public static final OptionValidator CREATE_PREPARE_STATEMENT_TIMEOUT_MILLIS_VALIDATOR = new PositiveLongValidator(CREATE_PREPARE_STATEMENT_TIMEOUT_MILLIS, Integer.MAX_VALUE); diff --git a/exec/java-exec/src/main/resources/drill-module.conf b/exec/java-exec/src/main/resources/drill-module.conf index a227e0ddf7b..9af09bc8f46 100644 --- a/exec/java-exec/src/main/resources/drill-module.conf +++ b/exec/java-exec/src/main/resources/drill-module.conf @@ -514,7 +514,7 @@ drill.exec.options: { # it is dynamically computed based on cpu_load_average planner.width.max_per_node: 0, planner.width.max_per_query: 1000, - prepare.statement.create_timeout_ms: 10000, + prepare.statement.create_timeout_ms: 30000, security.admin.user_groups: "%drill_process_user_groups%", security.admin.users: "%drill_process_user%", store.format: "parquet", From 67710bba7cdbc05428df7390bad8639b099769fc Mon Sep 17 00:00:00 2001 From: Padma Penumarthy Date: Wed, 21 Mar 2018 13:39:43 -0700 Subject: [PATCH 23/44] DRILL-6254: IllegalArgumentException: the requested size must be non-negative close apache/drill#1179 --- .../drill/exec/physical/impl/flatten/FlattenRecordBatch.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java index 9dd1770ab08..7509809a29f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java @@ -237,7 +237,10 @@ protected IterOutcome doWork() { private void handleRemainder() { int remainingRecordCount = flattener.getFlattenField().getAccessor().getInnerValueCount() - remainderIndex; - if (!doAlloc(remainingRecordCount)) { + + // remainingRecordCount can be much higher than number of rows we will have in outgoing batch. + // Do memory allocation only for number of rows we are going to have in the batch. + if (!doAlloc(Math.min(remainingRecordCount, flattenMemoryManager.getOutputRowCount()))) { outOfMemory = true; return; } From 7f645565cd68b1780e643bc20a43951610704008 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 20 Mar 2018 23:00:22 -0700 Subject: [PATCH 24/44] DRILL-6278: Removed temp codegen directory in testing framework. close apache/drill#1178 --- .../drill/exec/physical/impl/TopN/TopNBatchTest.java | 6 +----- .../java/org/apache/drill/test/BaseDirTestWatcher.java | 10 ---------- .../test/java/org/apache/drill/test/BaseTestQuery.java | 1 - .../java/org/apache/drill/test/ClusterFixture.java | 1 - 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java index 486086913d2..14f2ee89c02 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TopNBatchTest.java @@ -63,8 +63,6 @@ public class TopNBatchTest extends PopUnitTestBase { @Test public void priorityQueueOrderingTest() throws Exception { Properties properties = new Properties(); - properties.setProperty(ClassBuilder.CODE_DIR_OPTION, dirTestWatcher.getDir().getAbsolutePath()); - DrillConfig drillConfig = DrillConfig.create(properties); FieldReference expr = FieldReference.getWithQuotedRef("colA"); @@ -158,9 +156,7 @@ public void priorityQueueOrderingTest() throws Exception { */ @Test public void sortOneKeyAscending() throws Throwable { - ClusterFixtureBuilder builder = ClusterFixture.builder(dirTestWatcher) - .configProperty(ClassBuilder.CODE_DIR_OPTION, dirTestWatcher.getDir().getAbsolutePath()) - .configProperty(CodeCompiler.ENABLE_SAVE_CODE_FOR_DEBUG_TOPN, true); + ClusterFixtureBuilder builder = ClusterFixture.builder(dirTestWatcher); try (ClusterFixture cluster = builder.build(); ClientFixture client = cluster.clientFixture()) { TestBuilder testBuilder = new TestBuilder(new ClusterFixture.FixtureTestServices(client)); diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java b/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java index d36423b6d3a..b5958696341 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java @@ -53,7 +53,6 @@ public enum DirType { TEST_TMP // Corresponds to the directory that should be mapped to dfs.tmp } - private File codegenDir; private File tmpDir; private File storeDir; private File dfsTestTmpParentDir; @@ -79,7 +78,6 @@ public BaseDirTestWatcher(boolean deleteDirAtEnd) { protected void starting(Description description) { super.starting(description); - codegenDir = makeSubDir(Paths.get("codegen")); rootDir = makeSubDir(Paths.get("root")); tmpDir = makeSubDir(Paths.get("tmp")); storeDir = makeSubDir(Paths.get("store")); @@ -134,14 +132,6 @@ public File getRootDir() { return rootDir; } - /** - * Gets the temp directory that should be used to save generated code files. - * @return The temp directory that should be used to save generated code files. - */ - public File getCodegenDir() { - return codegenDir; - } - /** * This methods creates a new directory which can be mapped to dfs.tmp. */ diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java b/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java index c3ecaf118e7..10cd94c62fc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/BaseTestQuery.java @@ -160,7 +160,6 @@ protected static Properties cloneDefaultTestConfigProperties() { props.put(propName, TEST_CONFIGURATIONS.getProperty(propName)); } - props.setProperty(ClassBuilder.CODE_DIR_OPTION, dirTestWatcher.getCodegenDir().getAbsolutePath()); props.setProperty(ExecConstants.DRILL_TMP_DIR, dirTestWatcher.getTmpDir().getAbsolutePath()); props.setProperty(ExecConstants.SYS_STORE_PROVIDER_LOCAL_PATH, dirTestWatcher.getStoreDir().getAbsolutePath()); diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java index 6dbdacd1bc1..d212014f9bb 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixture.java @@ -516,7 +516,6 @@ public static ClusterFixtureBuilder builder(BaseDirTestWatcher dirTestWatcher) { .sessionOption(ExecConstants.MAX_WIDTH_PER_NODE_KEY, MAX_WIDTH_PER_NODE); Properties props = new Properties(); props.putAll(ClusterFixture.TEST_CONFIGURATIONS); - props.setProperty(ClassBuilder.CODE_DIR_OPTION, dirTestWatcher.getCodegenDir().getAbsolutePath()); props.setProperty(ExecConstants.DRILL_TMP_DIR, dirTestWatcher.getTmpDir().getAbsolutePath()); props.setProperty(ExecConstants.SYS_STORE_PROVIDER_LOCAL_PATH, dirTestWatcher.getStoreDir().getAbsolutePath()); From 03b245ef4d028458fc6cc3588682d5ae9cc3bb33 Mon Sep 17 00:00:00 2001 From: vladimir tkach Date: Mon, 26 Mar 2018 20:02:37 +0300 Subject: [PATCH 25/44] DRILL-6256: Remove references to java 7 from readme and other files close apache/drill#1172 --- INSTALL.md | 10 +++++----- distribution/src/resources/README.md | 2 +- distribution/src/resources/drill-config.sh | 9 ++++----- exec/java-exec/src/main/sh/drill-config.sh | 2 +- exec/java-exec/src/main/sh/runbit | 4 ++-- pom.xml | 2 +- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 7c656117320..72268e9e04b 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -3,15 +3,15 @@ ## Prerequisites Currently, the Apache Drill build process is known to work on Linux, Windows and OSX. To build, you need to have the following software installed on your system to successfully complete a build. - * Java 7 + * Java 8 * Maven 3.x ## Confirm settings # java -version - java version "1.7.0_09" - Java(TM) SE Runtime Environment (build 1.7.0_09-b05) - Java HotSpot(TM) 64-Bit Server VM (build 23.5-b02, mixed mode) - + java version "1.8.0_161" + Java(TM) SE Runtime Environment (build 1.8.0_161-b12) + Java HotSpot(TM) 64-Bit Server VM (build 25.161-b12, mixed mode) + # mvn --version Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800) diff --git a/distribution/src/resources/README.md b/distribution/src/resources/README.md index 40feb295ff9..bb1cd0768be 100644 --- a/distribution/src/resources/README.md +++ b/distribution/src/resources/README.md @@ -3,7 +3,7 @@ ## Prerequisites * Linux, Windows or OSX - * Oracle JDK 7 (JDK, not JRE) + * Oracle/OpenJDK 8 (JDK, not JRE) Additional requirements when running in clustered mode: * Hadoop 2.3+ distribution of Hadoop (such as Apache or MapR) diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh index 55d032d98da..e3eaa64650d 100644 --- a/distribution/src/resources/drill-config.sh +++ b/distribution/src/resources/drill-config.sh @@ -123,10 +123,10 @@ if [ ! -e "$JAVA" ]; then fatal_error "Java not found at JAVA_HOME=$JAVA_HOME." fi -# Ensure that Java version is at least 1.7 +# Ensure that Java version is at least 1.8 "$JAVA" -version 2>&1 | grep "version" | egrep -e "1\.4|1\.5|1\.6|1\.7" > /dev/null if [ $? -eq 0 ]; then - fatal_error "Java 1.8 or later is required to run Apache Drill." + fatal_error "Java 1.8 is required to run Apache Drill." fi # Check if a file exists and has relevant lines for execution @@ -214,9 +214,8 @@ fi export SQLLINE_JAVA_OPTS=${SQLLINE_JAVA_OPTS:-""} -# Class unloading is disabled by default in Java 7 -# http://hg.openjdk.java.net/jdk7u/jdk7u60/hotspot/file/tip/src/share/vm/runtime/globals.hpp#l1622 -export SERVER_GC_OPTS="$SERVER_GC_OPTS -XX:+CMSClassUnloadingEnabled -XX:+UseG1GC" + +export SERVER_GC_OPTS="$SERVER_GC_OPTS -XX:+UseG1GC" # No GC options by default for SQLLine export CLIENT_GC_OPTS=${CLIENT_GC_OPTS:-""} diff --git a/exec/java-exec/src/main/sh/drill-config.sh b/exec/java-exec/src/main/sh/drill-config.sh index 20102fccc6e..fa62da88936 100644 --- a/exec/java-exec/src/main/sh/drill-config.sh +++ b/exec/java-exec/src/main/sh/drill-config.sh @@ -88,7 +88,7 @@ if [ -z "$JAVA_HOME" ]; then +======================================================================+ | Error: JAVA_HOME is not set and Java could not be found | +----------------------------------------------------------------------+ -| Drill requires Java 1.7 or later. | +| Drill requires Java 1.8 | +======================================================================+ EOF exit 1 diff --git a/exec/java-exec/src/main/sh/runbit b/exec/java-exec/src/main/sh/runbit index 4c4aa21ba5d..0e4af4d674a 100755 --- a/exec/java-exec/src/main/sh/runbit +++ b/exec/java-exec/src/main/sh/runbit @@ -29,9 +29,9 @@ else exit 1 fi -$JAVA -version 2>&1 | grep "version" | egrep -e "1.7" > /dev/null +$JAVA -version 2>&1 | grep "version" | egrep -e "1.8" > /dev/null if [ $? -ne 0 ]; then - echo "Java 1.7 is required to run Apache Drill." + echo "Java 1.8 is required to run Apache Drill." exit 1 fi diff --git a/pom.xml b/pom.xml index 2d951adb468..f07beaf8347 100644 --- a/pom.xml +++ b/pom.xml @@ -357,7 +357,7 @@ [3.0.4,4) - [1.7,1.9) + [1.8,1.9) From a264e7feb1d02ffd5762bb1f652ea22d17aa5243 Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 30 Jan 2018 15:55:41 -0800 Subject: [PATCH 26/44] DRILL-6125: Fix possible memory leak when query is cancelled or finished. close apache/drill#1105 --- .../drill/exec/physical/impl/RootExec.java | 23 ++- .../PartitionSenderRootExec.java | 32 ++-- .../exec/work/fragment/FragmentExecutor.java | 179 +++++++++++++----- 3 files changed, 160 insertions(+), 74 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java index 5e366fb43e4..ddeb3e8e08e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java @@ -20,19 +20,28 @@ import org.apache.drill.exec.proto.ExecProtos.FragmentHandle; /** - * A FragmentRoot is a node which is the last processing node in a query plan. FragmentTerminals include Exchange - * output nodes and storage nodes. They are there driving force behind the completion of a query. + *

Functionality

+ *

+ * A FragmentRoot is a node which is the last processing node in a query plan. FragmentTerminals include Exchange + * output nodes and storage nodes. They are there driving force behind the completion of a query. + *

+ *

Assumptions

+ *

+ * All implementations of {@link RootExec} assume that all their methods are called by the same thread. + *

*/ public interface RootExec extends AutoCloseable { /** * Do the next batch of work. - * @return Whether or not additional batches of work are necessary. False means that this fragment is done. + * @return Whether or not additional batches of work are necessary. False means that this fragment is done. */ - public boolean next(); + boolean next(); /** - * Inform sender that receiving fragment is finished and doesn't need any more data - * @param handle + * Inform sender that receiving fragment is finished and doesn't need any more data. This can be called multiple + * times (once for each downstream receiver). If all receivers are finished then a subsequent call to {@link #next()} + * will return false. + * @param handle The handle pointing to the downstream receiver that does not need anymore data. */ - public void receivingFragmentFinished(FragmentHandle handle); + void receivingFragmentFinished(FragmentHandle handle); } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java index 25be50a06b1..7e762381856 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderRootExec.java @@ -65,14 +65,13 @@ public class PartitionSenderRootExec extends BaseRootExec { private PartitionerDecorator partitioner; private ExchangeFragmentContext context; - private boolean ok = true; private final int outGoingBatchCount; private final HashPartitionSender popConfig; private final double cost; private final AtomicIntegerArray remainingReceivers; private final AtomicInteger remaingReceiverCount; - private volatile boolean done = false; + private boolean done = false; private boolean first = true; private boolean closeIncoming; @@ -146,11 +145,8 @@ public PartitionSenderRootExec(RootFragmentContext context, @Override public boolean innerNext() { - if (!ok) { - return false; - } - IterOutcome out; + if (!done) { out = next(incoming); } else { @@ -252,13 +248,11 @@ protected void createPartitioner() throws SchemaChangeException { startIndex, endIndex); } - synchronized (this) { - partitioner = new PartitionerDecorator(subPartitioners, stats, context); - for (int index = 0; index < terminations.size(); index++) { - partitioner.getOutgoingBatches(terminations.buffer[index]).terminate(); - } - terminations.clear(); + partitioner = new PartitionerDecorator(subPartitioners, stats, context); + for (int index = 0; index < terminations.size(); index++) { + partitioner.getOutgoingBatches(terminations.buffer[index]).terminate(); } + terminations.clear(); success = true; } finally { @@ -328,12 +322,10 @@ private void updateAggregateStats() { public void receivingFragmentFinished(FragmentHandle handle) { final int id = handle.getMinorFragmentId(); if (remainingReceivers.compareAndSet(id, 0, 1)) { - synchronized (this) { - if (partitioner == null) { - terminations.add(id); - } else { - partitioner.getOutgoingBatches(id).terminate(); - } + if (partitioner == null) { + terminations.add(id); + } else { + partitioner.getOutgoingBatches(id).terminate(); } int remaining = remaingReceiverCount.decrementAndGet(); @@ -347,7 +339,7 @@ public void receivingFragmentFinished(FragmentHandle handle) { public void close() throws Exception { logger.debug("Partition sender stopping."); super.close(); - ok = false; + if (partitioner != null) { updateAggregateStats(); partitioner.clear(); @@ -358,7 +350,7 @@ public void close() throws Exception { } } - public void sendEmptyBatch(boolean isLast) { + private void sendEmptyBatch(boolean isLast) { BatchSchema schema = incoming.getSchema(); if (schema == null) { // If the incoming batch has no schema (possible when there are no input records), diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java index 4f43dc16893..efdb96a763c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java @@ -19,7 +19,9 @@ import java.io.IOException; import java.security.PrivilegedExceptionAction; +import java.util.Queue; import java.util.Set; +import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; @@ -31,7 +33,6 @@ import org.apache.drill.exec.exception.OutOfMemoryException; import org.apache.drill.exec.ops.ExecutorFragmentContext; import org.apache.drill.exec.ops.FragmentContext; -import org.apache.drill.exec.ops.FragmentContextImpl; import org.apache.drill.exec.physical.base.FragmentRoot; import org.apache.drill.exec.physical.impl.ImplCreator; import org.apache.drill.exec.physical.impl.RootExec; @@ -49,14 +50,58 @@ import org.apache.hadoop.security.UserGroupInformation; /** - * Responsible for running a single fragment on a single Drillbit. Listens/responds to status request - * and cancellation messages. + *

Overview

+ *

+ * Responsible for running a single fragment on a single Drillbit. Listens/responds to status request and cancellation messages. + *

+ *

Theory of Operation

+ *

+ * The {@link FragmentExecutor} runs a fragment's {@link RootExec} in the {@link FragmentExecutor#run()} method in a single thread. While a fragment is running + * it may be subject to termination requests. The {@link FragmentExecutor} is reponsible for gracefully handling termination requests for the {@link RootExec}. There + * are two types of termination messages: + *

    + *
  1. Cancellation Request: This signals that the fragment and therefore the {@link RootExec} need to terminate immediately.
    2. + *
  2. Receiver Finished: This signals that a downstream receiver no longer needs anymore data. A fragment may recieve multiple receiver finished requests + * (one for each downstream receiver). The {@link RootExec} will only terminate once it has recieved {@link FragmentExecutor.EventType#RECEIVER_FINISHED} messages + * for all downstream receivers.
    3. + *
+ *

+ *

+ * The {@link FragmentExecutor} processes termination requests appropriately for the {@link RootExec}. A Cancellation Request is signalled when + * {@link FragmentExecutor#cancel()} is called. A Receiver Finished event is signalled when {@link FragmentExecutor#receivingFragmentFinished(FragmentHandle)} is + * called. The way in which these signals are handled is the following: + *

+ *

Cancellation Request

+ *

+ * There are two ways in which a cancellation request can be handled when {@link FragmentExecutor#cancel()} is called. + *

    + *
  1. The Cancellation Request is recieved before the {@link RootExec} for the fragment is even started. In this case we can cleanup resources allocated for the fragment + * and never start a {@link RootExec}
    2. + *
  2. The Cancellation Request is recieve after the {@link RootExec} for the fragment is started. In this the cancellation request is sent to the + * {@link FragmentEventProcessor}. If this is not the first cancellation request it is ignored. If this is the first cancellation request the {@link RootExec} for this + * fragment is terminated by interrupting it. Then the {@link FragmentExecutor#run()} thread proceeds to cleanup resources normally
    3. + *
+ *

+ *

Receiver Finished

+ *

+ * When {@link FragmentExecutor#receivingFragmentFinished(FragmentHandle)} is called, the message is passed to the {@link FragmentEventProcessor} if we + * did not already recieve a Cancellation request. Then the finished message is queued in {@link FragmentExecutor#receiverFinishedQueue}. The {@link FragmentExecutor#run()} polls + * {@link FragmentExecutor#receiverFinishedQueue} and singlas the {@link RootExec} with {@link RootExec#receivingFragmentFinished(FragmentHandle)} appropriately. + *

+ *

Possible Design Flaws / Poorly Defined Behavoir

+ *

+ * There are still a few aspects of the {@link FragmentExecutor} design that are not clear. + *

    + *
  1. If we get a Receiver Finished message for one downstream receiver, will we eventually get one from every downstream receiver?
    2. + *
  2. What happens when we process a Receiver Finished message for some (but not all) downstream receivers and then we cancel the fragment?
    3. + *
  3. What happens when we process a Receiver Finished message for some (but not all) downstream receivers and then we run out of data from the upstream?
    4. + *
+ *

*/ public class FragmentExecutor implements Runnable { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(FragmentExecutor.class); private static final ControlsInjector injector = ControlsInjectorFactory.getInjector(FragmentExecutor.class); - private final AtomicBoolean hasCloseoutThread = new AtomicBoolean(false); private final String fragmentName; private final ExecutorFragmentContext fragmentContext; private final FragmentStatusReporter statusReporter; @@ -66,6 +111,11 @@ public class FragmentExecutor implements Runnable { private volatile RootExec root; private final AtomicReference fragmentState = new AtomicReference<>(FragmentState.AWAITING_ALLOCATION); + /** + * Holds all of the messages sent by downstream receivers that have finished. The {@link FragmentExecutor#run()} thread reads from this queue and passes the + * finished messages to the fragment's {@link RootExec} via the {@link RootExec#receivingFragmentFinished(FragmentHandle)} method. + */ + private final Queue receiverFinishedQueue = new ConcurrentLinkedQueue<>(); private final FragmentEventProcessor eventProcessor = new FragmentEventProcessor(); // Thread that is currently executing the Fragment. Value is null if the fragment hasn't started running or finished @@ -135,12 +185,16 @@ public FragmentStatus getStatus() { } /** + *

* Cancel the execution of this fragment is in an appropriate state. Messages come from external. - * NOTE that this will be called from threads *other* than the one running this runnable(), + *

+ *

+ * Note: This will be called from threads Other than the one running this runnable(), * so we need to be careful about the state transitions that can result. + *

*/ public void cancel() { - final boolean thisIsOnlyThread = hasCloseoutThread.compareAndSet(false, true); + final boolean thisIsOnlyThread = myThreadRef.compareAndSet(null, Thread.currentThread()); if (thisIsOnlyThread) { eventProcessor.cancelAndFinish(); @@ -182,13 +236,12 @@ public void receivingFragmentFinished(final FragmentHandle handle) { @SuppressWarnings("resource") @Override public void run() { - // if a cancel thread has already entered this executor, we have not reason to continue. - if (!hasCloseoutThread.compareAndSet(false, true)) { + final Thread myThread = Thread.currentThread(); + + if (!myThreadRef.compareAndSet(null, myThread)) { return; } - final Thread myThread = Thread.currentThread(); - myThreadRef.set(myThread); final String originalThreadName = myThread.getName(); final FragmentHandle fragmentHandle = fragmentContext.getHandle(); final ClusterCoordinator clusterCoordinator = fragmentContext.getClusterCoordinator(); @@ -203,10 +256,10 @@ public void run() { final FragmentRoot rootOperator = this.rootOperator != null ? this.rootOperator : fragmentContext.getPlanReader().readFragmentRoot(fragment.getFragmentJson()); - root = ImplCreator.getExec(fragmentContext, rootOperator); - if (root == null) { - return; - } + root = ImplCreator.getExec(fragmentContext, rootOperator); + if (root == null) { + return; + } clusterCoordinator.addDrillbitStatusListener(drillbitStatusListener); updateState(FragmentState.RUNNING); @@ -227,11 +280,19 @@ public void run() { @Override public Void run() throws Exception { injector.injectChecked(fragmentContext.getExecutionControls(), "fragment-execution", IOException.class); - /* - * Run the query until root.next returns false OR we no longer need to continue. - */ - while (shouldContinue() && root.next()) { - // loop + + while (shouldContinue()) { + // Fragment is not cancelled + + for (FragmentHandle fragmentHandle; (fragmentHandle = receiverFinishedQueue.poll()) != null;) { + // See if we have any finished requests. If so execute them. + root.receivingFragmentFinished(fragmentHandle); + } + + if (!root.next()) { + // Fragment has processed all of its data + break; + } } return null; @@ -245,19 +306,17 @@ public Void run() throws Exception { // we have a heap out of memory error. The JVM in unstable, exit. CatastrophicFailure.exit(e, "Unable to handle out of memory condition in FragmentExecutor.", -2); } + } catch (InterruptedException e) { + // Swallow interrupted exceptions since we intentionally interrupt the root when cancelling a query + logger.trace("Interruped root: {}", e); } catch (Throwable t) { fail(t); } finally { - // no longer allow this thread to be interrupted. We synchronize here to make sure that cancel can't set an - // interruption after we have moved beyond this block. - synchronized (myThreadRef) { - myThreadRef.set(null); - Thread.interrupted(); - } - - // Make sure the event processor is started at least once - eventProcessor.start(); + // Don't process any more termination requests, we are done. + eventProcessor.terminate(); + // Clear the interrupt flag if it is set. + Thread.interrupted(); // here we could be in FAILED, RUNNING, or CANCELLATION_REQUESTED // FAILED state will be because of any Exception in execution loop root.next() @@ -475,6 +534,7 @@ private class FragmentEvent { * This is especially important as fragments can take longer to start */ private class FragmentEventProcessor extends EventProcessor { + private AtomicBoolean terminate = new AtomicBoolean(false); void cancel() { sendEvent(new FragmentEvent(EventType.CANCEL, null)); @@ -488,47 +548,72 @@ void receiverFinished(FragmentHandle handle) { sendEvent(new FragmentEvent(EventType.RECEIVER_FINISHED, handle)); } + /** + * Tell the {@link FragmentEventProcessor} not to process anymore events. This keeps stray cancellation requests + * from being processed after the root has finished running and interrupts in the root thread have been cleared. + */ + public void terminate() { + terminate.set(true); + } + @Override protected void processEvent(FragmentEvent event) { + if (event.type.equals(EventType.RECEIVER_FINISHED)) { + // Finish request + if (terminate.get()) { + // We have already recieved a cancellation or we have terminated the event processor. Do not process anymore finish requests. + return; + } + } else { + // Cancel request + if (!terminate.compareAndSet(false, true)) { + // We have already received a cancellation or we have terminated the event processor. Do not process anymore cancellation requests. + // This prevents the root thread from being interrupted at an inappropriate time. + return; + } + } + switch (event.type) { case CANCEL: - /* - * We set the cancel requested flag but the actual cancellation is managed by the run() loop, if called. - */ + // We set the cancel requested flag but the actual cancellation is managed by the run() loop, if called. updateState(FragmentState.CANCELLATION_REQUESTED); - - /* - * Interrupt the thread so that it exits from any blocking operation it could be executing currently. We - * synchronize here to ensure we don't accidentally create a race condition where we interrupt the close out - * procedure of the main thread. - */ - synchronized (myThreadRef) { - final Thread myThread = myThreadRef.get(); - if (myThread != null) { - logger.debug("Interrupting fragment thread {}", myThread.getName()); - myThread.interrupt(); - } - } + // The root was started so we have to interrupt it in case it is performing a blocking operation. + killThread(); break; - case CANCEL_AND_FINISH: + // In this case the root was never started so we do not have to interrupt the thread. updateState(FragmentState.CANCELLATION_REQUESTED); + // The FragmentExecutor#run() loop will not execute in this case so we have to cleanup resources here cleanup(FragmentState.FINISHED); break; - case RECEIVER_FINISHED: assert event.handle != null : "RECEIVER_FINISHED event must have a handle"; if (root != null) { logger.info("Applying request for early sender termination for {} -> {}.", QueryIdHelper.getQueryIdentifier(getContext().getHandle()), QueryIdHelper.getFragmentId(event.handle)); - root.receivingFragmentFinished(event.handle); + + receiverFinishedQueue.add(event.handle); } else { logger.warn("Dropping request for early fragment termination for path {} -> {} as no root exec exists.", QueryIdHelper.getFragmentId(getContext().getHandle()), QueryIdHelper.getFragmentId(event.handle)); } + // Note we do not terminate the event processor in this case since we can recieve multiple RECEIVER_FINISHED + // events. One for each downstream receiver. break; } } + + /* + * Interrupt the thread so that it exits from any blocking operation it could be executing currently. We + * synchronize here to ensure we don't accidentally create a race condition where we interrupt the close out + * procedure of the main thread. + */ + private void killThread() { + // myThreadRef must contain a non-null reference at this point + final Thread myThread = myThreadRef.get(); + logger.debug("Interrupting fragment thread {}", myThread.getName()); + myThread.interrupt(); + } } } From 4ee5625d57bd73d3d82b45f687a8574ea6660f8e Mon Sep 17 00:00:00 2001 From: Arina Ielchiieva Date: Tue, 13 Mar 2018 19:54:25 +0200 Subject: [PATCH 27/44] DRILL-6259: Support parquet filter push down for complex types close apache/drill#1173 --- .../sig/ConstantExpressionIdentifier.java | 6 + .../exec/expr/ExpressionTreeMaterializer.java | 3 +- .../exec/expr/stat/ParquetIsPredicates.java | 23 ++++ .../exec/expr/stat/RangeExprEvaluator.java | 27 ++-- .../exec/planner/common/DrillRelOptUtil.java | 14 +- .../DrillPushFilterPastProjectRule.java | 14 +- .../store/parquet/ParquetFilterBuilder.java | 80 ++++------- .../store/parquet/ParquetPushDownFilter.java | 13 +- .../stat/ParquetMetaStatCollector.java | 29 ++-- ...tParquetFilterPushDownForComplexTypes.java | 124 ++++++++++++++++++ .../resources/parquet/users/users_1.parquet | Bin 0 -> 657 bytes .../resources/parquet/users/users_2.parquet | Bin 0 -> 641 bytes .../resources/parquet/users/users_3.parquet | Bin 0 -> 588 bytes .../resources/parquet/users/users_4.parquet | Bin 0 -> 653 bytes .../resources/parquet/users/users_5.parquet | Bin 0 -> 583 bytes .../resources/parquet/users/users_6.parquet | Bin 0 -> 627 bytes .../resources/parquet/users/users_7.parquet | Bin 0 -> 662 bytes .../drill/common/expression/SchemaPath.java | 29 ++-- .../common/expression}/TypedFieldExpr.java | 17 +-- .../visitors/AbstractExprVisitor.java | 6 +- .../expression/visitors/AggregateChecker.java | 5 + .../expression/visitors/ConstantChecker.java | 5 + .../expression/visitors/ExprVisitor.java | 54 ++++---- .../visitors/ExpressionValidator.java | 5 + 24 files changed, 312 insertions(+), 142 deletions(-) create mode 100644 exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetFilterPushDownForComplexTypes.java create mode 100644 exec/java-exec/src/test/resources/parquet/users/users_1.parquet create mode 100644 exec/java-exec/src/test/resources/parquet/users/users_2.parquet create mode 100644 exec/java-exec/src/test/resources/parquet/users/users_3.parquet create mode 100644 exec/java-exec/src/test/resources/parquet/users/users_4.parquet create mode 100644 exec/java-exec/src/test/resources/parquet/users/users_5.parquet create mode 100644 exec/java-exec/src/test/resources/parquet/users/users_6.parquet create mode 100644 exec/java-exec/src/test/resources/parquet/users/users_7.parquet rename {exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat => logical/src/main/java/org/apache/drill/common/expression}/TypedFieldExpr.java (80%) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java index 1e71773cbea..1a0b7d539ab 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/ConstantExpressionIdentifier.java @@ -31,6 +31,7 @@ import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; @@ -231,4 +232,9 @@ public Boolean visitConvertExpression(ConvertExpression e, public Boolean visitParameter(ValueExpressions.ParameterExpression e, IdentityHashMap value) throws RuntimeException { return false; } + + @Override + public Boolean visitTypedFieldExpr(TypedFieldExpr e, IdentityHashMap value) throws RuntimeException { + return false; + } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java index 23df2623ac1..f1b50c95d73 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ExpressionTreeMaterializer.java @@ -44,6 +44,7 @@ import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; @@ -78,7 +79,6 @@ import org.apache.drill.exec.expr.fn.DrillFuncHolder; import org.apache.drill.exec.expr.fn.ExceptionFunction; import org.apache.drill.exec.expr.fn.FunctionLookupContext; -import org.apache.drill.exec.expr.stat.TypedFieldExpr; import org.apache.drill.exec.record.TypedFieldId; import org.apache.drill.exec.record.VectorAccessible; import org.apache.drill.exec.resolver.FunctionResolver; @@ -323,7 +323,6 @@ public LogicalExpression visitSchemaPath(SchemaPath path, FunctionLookupContext } else { logger.warn("Unable to find value vector of path {}, returning null-int instance.", path); return new TypedFieldExpr(path, Types.OPTIONAL_INT); - // return NullExpression.INSTANCE; } } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java index a58ce7c23e8..bb8f3acb63f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java @@ -18,6 +18,8 @@ import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.LogicalExpressionBase; +import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.parquet.column.statistics.Statistics; @@ -29,6 +31,7 @@ * IS predicates for parquet filter pushdown. */ public class ParquetIsPredicates { + public static abstract class ParquetIsPredicate extends LogicalExpressionBase implements ParquetFilterPredicate { protected final LogicalExpression expr; @@ -54,12 +57,22 @@ public T accept(ExprVisitor visitor, V valu * IS NULL predicate. */ public static class IsNullPredicate extends ParquetIsPredicate { + private final boolean isArray; + public IsNullPredicate(LogicalExpression expr) { super(expr); + this.isArray = isArray(expr); } @Override public boolean canDrop(RangeExprEvaluator evaluator) { + + // for arrays we are not able to define exact number of nulls + // [1,2,3] vs [1,2] -> in second case 3 is absent and thus it's null but statistics shows no nulls + if (isArray) { + return false; + } + Statistics exprStat = expr.accept(evaluator, null); if (!ParquetPredicatesHelper.hasStats(exprStat)) { @@ -73,6 +86,16 @@ public boolean canDrop(RangeExprEvaluator evaluator) { return false; } } + + private boolean isArray(LogicalExpression expression) { + if (expression instanceof TypedFieldExpr) { + TypedFieldExpr typedFieldExpr = (TypedFieldExpr) expression; + SchemaPath schemaPath = typedFieldExpr.getPath(); + return schemaPath.isArray(); + } + return false; + } + } /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/RangeExprEvaluator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/RangeExprEvaluator.java index 2d241dc7960..2cc6a70f13c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/RangeExprEvaluator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/RangeExprEvaluator.java @@ -17,11 +17,11 @@ */ package org.apache.drill.exec.expr.stat; -import com.google.common.base.Preconditions; import org.apache.drill.common.exceptions.DrillRuntimeException; import org.apache.drill.common.expression.FunctionHolderExpression; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.expression.fn.CastFunctions; import org.apache.drill.common.expression.fn.FuncHolder; @@ -70,17 +70,20 @@ public long getRowCount() { @Override public Statistics visitUnknown(LogicalExpression e, Void value) throws RuntimeException { - if (e instanceof TypedFieldExpr) { - TypedFieldExpr fieldExpr = (TypedFieldExpr) e; - final ColumnStatistics columnStatistics = columnStatMap.get(fieldExpr.getPath()); - if (columnStatistics != null) { - return columnStatistics.getStatistics(); - } else if (fieldExpr.getMajorType().equals(Types.OPTIONAL_INT)) { - // field does not exist. - IntStatistics intStatistics = new IntStatistics(); - intStatistics.setNumNulls(rowCount); // all values are nulls - return intStatistics; - } + // do nothing for the unknown expression + return null; + } + + @Override + public Statistics visitTypedFieldExpr(TypedFieldExpr typedFieldExpr, Void value) throws RuntimeException { + final ColumnStatistics columnStatistics = columnStatMap.get(typedFieldExpr.getPath()); + if (columnStatistics != null) { + return columnStatistics.getStatistics(); + } else if (typedFieldExpr.getMajorType().equals(Types.OPTIONAL_INT)) { + // field does not exist. + IntStatistics intStatistics = new IntStatistics(); + intStatistics.setNumNulls(rowCount); // all values are nulls + return intStatistics; } return null; } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java index d5c8d94e1c9..dff83f61908 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java @@ -18,6 +18,7 @@ package org.apache.drill.exec.planner.common; import java.util.AbstractList; +import java.util.Collection; import java.util.List; import com.google.common.collect.Lists; @@ -178,22 +179,20 @@ private static boolean containIdentity(List exps, } /** - * Travesal RexNode to find the item/flattern operator. Continue search if RexNode has a + * Travesal RexNode to find at least one operator in the given collection. Continue search if RexNode has a * RexInputRef which refers to a RexNode in project expressions. * * @param node : RexNode to search * @param projExprs : the list of project expressions. Empty list means there is No project operator underneath. + * @param operators collection of operators to find * @return : Return null if there is NONE; return the first appearance of item/flatten RexCall. */ - public static RexCall findItemOrFlatten( - final RexNode node, - final List projExprs) { + public static RexCall findOperators(final RexNode node, final List projExprs, final Collection operators) { try { RexVisitor visitor = new RexVisitorImpl(true) { public Void visitCall(RexCall call) { - if ("item".equals(call.getOperator().getName().toLowerCase()) || - "flatten".equals(call.getOperator().getName().toLowerCase())) { + if (operators.contains(call.getOperator().getName().toLowerCase())) { throw new Util.FoundOne(call); /* throw exception to interrupt tree walk (this is similar to other utility methods in RexUtil.java */ } @@ -208,8 +207,7 @@ public Void visitInputRef(RexInputRef inputRef) { RexNode n = projExprs.get(index); if (n instanceof RexCall) { RexCall r = (RexCall) n; - if ("item".equals(r.getOperator().getName().toLowerCase()) || - "flatten".equals(r.getOperator().getName().toLowerCase())) { + if (operators.contains(r.getOperator().getName().toLowerCase())) { throw new Util.FoundOne(r); } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java index d24abccea6b..7b978bee622 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java @@ -30,13 +30,23 @@ import org.apache.calcite.util.Pair; import org.apache.drill.exec.planner.common.DrillRelOptUtil; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; public class DrillPushFilterPastProjectRule extends RelOptRule { public final static RelOptRule INSTANCE = new DrillPushFilterPastProjectRule(); - protected DrillPushFilterPastProjectRule() { + private static final Collection BANNED_OPERATORS; + + static { + BANNED_OPERATORS = new ArrayList<>(2); + BANNED_OPERATORS.add("flatten"); + BANNED_OPERATORS.add("item"); + } + + private DrillPushFilterPastProjectRule() { super( operand( LogicalFilter.class, @@ -60,7 +70,7 @@ public void onMatch(RelOptRuleCall call) { for (final RexNode pred : predList) { - if (DrillRelOptUtil.findItemOrFlatten(pred, projRel.getProjects()) == null) { + if (DrillRelOptUtil.findOperators(pred, projRel.getProjects(), BANNED_OPERATORS) == null) { qualifiedPredList.add(pred); } else { unqualifiedPredList.add(pred); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java index a9e55ddc3ec..2d245a1e9cd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java @@ -19,8 +19,7 @@ import org.apache.drill.common.expression.BooleanOperator; import org.apache.drill.common.expression.FunctionHolderExpression; import org.apache.drill.common.expression.LogicalExpression; -import org.apache.drill.common.expression.PathSegment; -import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.expression.fn.CastFunctions; import org.apache.drill.common.expression.fn.FuncHolder; @@ -41,7 +40,6 @@ import org.apache.drill.exec.expr.stat.ParquetBooleanPredicates; import org.apache.drill.exec.expr.stat.ParquetComparisonPredicates; import org.apache.drill.exec.expr.stat.ParquetIsPredicates; -import org.apache.drill.exec.expr.stat.TypedFieldExpr; import org.apache.drill.exec.ops.UdfUtilities; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,11 +60,12 @@ public class ParquetFilterBuilder extends AbstractExprVisitor constantBoundaries, UdfUtilities udfUtilities) { - final LogicalExpression predicate = expr.accept(new ParquetFilterBuilder(udfUtilities), constantBoundaries); - return predicate; + return expr.accept(new ParquetFilterBuilder(udfUtilities), constantBoundaries); } private ParquetFilterBuilder(UdfUtilities udfUtilities) { @@ -75,18 +74,15 @@ private ParquetFilterBuilder(UdfUtilities udfUtilities) { @Override public LogicalExpression visitUnknown(LogicalExpression e, Set value) { - if (e instanceof TypedFieldExpr && - ! containsArraySeg(((TypedFieldExpr) e).getPath()) && - e.getMajorType().getMode() != TypeProtos.DataMode.REPEATED) { - // A filter is not qualified for push down, if - // 1. it contains an array segment : a.b[1], a.b[1].c.d - // 2. it's repeated type. - return e; - } - + // for the unknown expression, do nothing return null; } + @Override + public LogicalExpression visitTypedFieldExpr(TypedFieldExpr typedFieldExpr, Set value) throws RuntimeException { + return typedFieldExpr; + } + @Override public LogicalExpression visitIntConstant(ValueExpressions.IntExpression intExpr, Set value) throws RuntimeException { @@ -161,18 +157,6 @@ public LogicalExpression visitBooleanOperator(BooleanOperator op, Set newArgs = new ArrayList(); - for (LogicalExpression arg : funcHolderExpr.args) { - final LogicalExpression newArg = arg.accept(this, value); - if (newArg == null) { - return null; - } - newArgs.add(newArg); + List newArgs = generateNewExpressions(funcHolderExpr.args, value); + if (newArgs == null) { + return null; } return funcHolderExpr.copy(newArgs); @@ -244,15 +224,22 @@ public LogicalExpression visitFunctionHolderExpression(FunctionHolderExpression } } - private LogicalExpression handleCompareFunction(FunctionHolderExpression functionHolderExpression, Set value) { - List newArgs = new ArrayList(); - - for (LogicalExpression arg : functionHolderExpression.args) { - LogicalExpression newArg = arg.accept(this, value); + private List generateNewExpressions(List expressions, Set value) { + List newExpressions = new ArrayList<>(); + for (LogicalExpression arg : expressions) { + final LogicalExpression newArg = arg.accept(this, value); if (newArg == null) { return null; } - newArgs.add(newArg); + newExpressions.add(newArg); + } + return newExpressions; + } + + private LogicalExpression handleCompareFunction(FunctionHolderExpression functionHolderExpression, Set value) { + List newArgs = generateNewExpressions(functionHolderExpression.args, value); + if (newArgs == null) { + return null; } String funcName = ((DrillSimpleFuncHolder) functionHolderExpression.getHolder()).getRegisteredNames()[0]; @@ -306,19 +293,6 @@ private LogicalExpression handleIsFunction(FunctionHolderExpression functionHold } } - private LogicalExpression handleCastFunction(FunctionHolderExpression functionHolderExpression, Set value) { - for (LogicalExpression arg : functionHolderExpression.args) { - LogicalExpression newArg = arg.accept(this, value); - if (newArg == null) { - return null; - } - } - - String funcName = ((DrillSimpleFuncHolder) functionHolderExpression.getHolder()).getRegisteredNames()[0]; - - return null; - } - private static boolean isCompareFunction(String funcName) { return COMPARE_FUNCTIONS_SET.contains(funcName); } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java index 1ec10d8fc83..42571505010 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java @@ -1,4 +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 @@ -39,6 +39,8 @@ import org.apache.drill.exec.planner.physical.ScanPrel; import org.apache.drill.exec.store.StoragePluginOptimizerRule; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.concurrent.TimeUnit; @@ -46,6 +48,13 @@ public abstract class ParquetPushDownFilter extends StoragePluginOptimizerRule { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ParquetPushDownFilter.class); + private static final Collection BANNED_OPERATORS; + + static { + BANNED_OPERATORS = new ArrayList<>(1); + BANNED_OPERATORS.add("flatten"); + } + public static RelOptRule getFilterOnProject(OptimizerRulesContext optimizerRulesContext) { return new ParquetPushDownFilter( RelOptHelper.some(FilterPrel.class, RelOptHelper.some(ProjectPrel.class, RelOptHelper.any(ScanPrel.class))), @@ -127,7 +136,7 @@ protected void doOnMatch(RelOptRuleCall call, FilterPrel filter, ProjectPrel pro final List qualifiedPredList = Lists.newArrayList(); for (final RexNode pred : predList) { - if (DrillRelOptUtil.findItemOrFlatten(pred, ImmutableList.of()) == null) { + if (DrillRelOptUtil.findOperators(pred, ImmutableList.of(), BANNED_OPERATORS) == null) { qualifiedPredList.add(pred); } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ParquetMetaStatCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ParquetMetaStatCollector.java index 4991a226652..a8c12187e7f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ParquetMetaStatCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ParquetMetaStatCollector.java @@ -41,11 +41,11 @@ import java.util.concurrent.TimeUnit; public class ParquetMetaStatCollector implements ColumnStatCollector{ - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ParquetMetaStatCollector.class); + private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ParquetMetaStatCollector.class); - private final Metadata.ParquetTableMetadataBase parquetTableMetadata; - private final List columnMetadataList; - final Map implicitColValues; + private final Metadata.ParquetTableMetadataBase parquetTableMetadata; + private final List columnMetadataList; + private final Map implicitColValues; public ParquetMetaStatCollector(Metadata.ParquetTableMetadataBase parquetTableMetadata, List columnMetadataList, Map implicitColValues) { @@ -82,11 +82,11 @@ public Map collectColStat(Set fields) columnMetadataMap.put(schemaPath, columnMetadata); } - for (final SchemaPath schemaPath : fields) { + for (final SchemaPath field : fields) { final PrimitiveType.PrimitiveTypeName primitiveType; final OriginalType originalType; - final Metadata.ColumnMetadata columnMetadata = columnMetadataMap.get(schemaPath); + final Metadata.ColumnMetadata columnMetadata = columnMetadataMap.get(field.getUnIndexed()); if (columnMetadata != null) { final Object min = columnMetadata.getMinValue(); @@ -95,7 +95,6 @@ public Map collectColStat(Set fields) primitiveType = this.parquetTableMetadata.getPrimitiveType(columnMetadata.getName()); originalType = this.parquetTableMetadata.getOriginalType(columnMetadata.getName()); - final Integer repetitionLevel = this.parquetTableMetadata.getRepetitionLevel(columnMetadata.getName()); int precision = 0; int scale = 0; // ColumnTypeMetadata_v3 stores information about scale and precision @@ -106,16 +105,16 @@ public Map collectColStat(Set fields) precision = columnTypeInfo.precision; } - statMap.put(schemaPath, getStat(min, max, numNull, primitiveType, originalType, repetitionLevel, scale, precision)); + statMap.put(field, getStat(min, max, numNull, primitiveType, originalType, scale, precision)); } else { - final String columnName = schemaPath.getRootSegment().getPath(); + final String columnName = field.getRootSegment().getPath(); if (implicitColValues.containsKey(columnName)) { TypeProtos.MajorType type = Types.required(TypeProtos.MinorType.VARCHAR); Statistics stat = new BinaryStatistics(); stat.setNumNulls(0); byte[] val = implicitColValues.get(columnName).getBytes(); stat.setMinMaxFromBytes(val, val); - statMap.put(schemaPath, new ColumnStatistics(stat, type)); + statMap.put(field, new ColumnStatistics(stat, type)); } } } @@ -128,7 +127,7 @@ public Map collectColStat(Set fields) } /** - * Builds column statistics using given primitiveType, originalType, repetitionLevel, scale, + * Builds column statistics using given primitiveType, originalType, scale, * precision, numNull, min and max values. * * @param min min value for statistics @@ -136,24 +135,18 @@ public Map collectColStat(Set fields) * @param numNull num_nulls for statistics * @param primitiveType type that determines statistics class * @param originalType type that determines statistics class - * @param repetitionLevel field repetition level * @param scale scale value (used for DECIMAL type) * @param precision precision value (used for DECIMAL type) * @return column statistics */ private ColumnStatistics getStat(Object min, Object max, Long numNull, PrimitiveType.PrimitiveTypeName primitiveType, OriginalType originalType, - Integer repetitionLevel, int scale, int precision) { + int scale, int precision) { Statistics stat = Statistics.getStatsBasedOnType(primitiveType); Statistics convertedStat = stat; TypeProtos.MajorType type = ParquetGroupScan.getType(primitiveType, originalType, scale, precision); - // Change to repeated if repetitionLevel > 0 - if (repetitionLevel != null && repetitionLevel > 0) { - type = Types.withScaleAndPrecision(type.getMinorType(), TypeProtos.DataMode.REPEATED, scale, precision); - } - if (numNull != null) { stat.setNumNulls(numNull); } diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetFilterPushDownForComplexTypes.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetFilterPushDownForComplexTypes.java new file mode 100644 index 00000000000..5cbe5cf8e2f --- /dev/null +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetFilterPushDownForComplexTypes.java @@ -0,0 +1,124 @@ +/* + * 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 org.apache.drill.exec.store.parquet; + +import org.apache.drill.PlanTestBase; +import org.apache.drill.exec.util.StoragePluginTestUtils; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.nio.file.Paths; + +import static org.junit.Assert.assertEquals; + +public class TestParquetFilterPushDownForComplexTypes extends PlanTestBase { + + private static final String TABLE_PATH = "parquet/users"; + private static final String TABLE_NAME = String.format("%s.`%s`", StoragePluginTestUtils.DFS_PLUGIN_NAME, TABLE_PATH); + + @BeforeClass + public static void copyData() { + /* + Parquet schema: + message complex_users { + required group user { + required int32 id; + optional int32 age; + repeated int32 hobby_ids; + optional boolean active; + } + } + + Data set: + users_1.parquet + {"id":1,"age":25,"hobby_ids":[1,2,3],"active":true} + {"id":2,"age":28,"hobby_ids":[1,2,5],"active":true} + + users_2.parquet + {"id":3,"age":31,"hobby_ids":[1,2,3],"active":true} + {"id":4,"age":32,"hobby_ids":[4,10,18],"active":false} + + users_3.parquet + {"id":5,"hobby_ids":[11,12,13,14,15]} + + users_4.parquet + {"id":6,"age":41,"hobby_ids":[20,21,22],"active":true} + {"id":7,"hobby_ids":[20,21,22,24]} + + users_5.parquet + {"id":8,"age":41,"hobby_ids":[],"active":false} + + users_6.parquet + {"id":9,"age":20,"hobby_ids":[],"active":false} + {"id":10,"age":21,"hobby_ids":[26,28,29]} + + users_7.parquet + {"id":11,"age":23,"hobby_ids":[10,11,12],"active":true} + {"id":12,"age":35,"hobby_ids":[22,23,24],"active":false} + {"id":13,"age":25,"hobby_ids":[14,22,26]} + + */ + dirTestWatcher.copyResourceToRoot(Paths.get(TABLE_PATH)); + } + + @Test + public void testPushDownArray() throws Exception { + testParquetFilterPushDown("t.`user`.hobby_ids[0] = 1", 3, 2); + testParquetFilterPushDown("t.`user`.hobby_ids[0] = 100", 0, 1); + testParquetFilterPushDown("t.`user`.hobby_ids[0] <> 1", 8, 6); + testParquetFilterPushDown("t.`user`.hobby_ids[2] > 20", 5, 3); + testParquetFilterPushDown("t.`user`.hobby_ids[0] between 10 and 20", 5, 4); + testParquetFilterPushDown("t.`user`.hobby_ids[4] = 15", 1, 3); + testParquetFilterPushDown("t.`user`.hobby_ids[2] is not null", 11, 6); + testParquetFilterPushDown("t.`user`.hobby_ids[3] is null", 11, 7); + } + + @Test + public void testPushDownComplexIntColumn() throws Exception { + testParquetFilterPushDown("t.`user`.age = 31", 1, 2); + testParquetFilterPushDown("t.`user`.age = 1", 0, 1); + testParquetFilterPushDown("t.`user`.age <> 20", 10, 6); + testParquetFilterPushDown("t.`user`.age > 30", 5, 4); + testParquetFilterPushDown("t.`user`.age between 20 and 30", 6, 3); + testParquetFilterPushDown("t.`user`.age is not null", 11, 6); + testParquetFilterPushDown("t.`user`.age is null", 2, 2); + } + + @Test + public void testPushDownComplexBooleanColumn() throws Exception { + testParquetFilterPushDown("t.`user`.active is true", 5, 4); + testParquetFilterPushDown("t.`user`.active is not true", 8, 6); + testParquetFilterPushDown("t.`user`.active is false", 4, 4); + testParquetFilterPushDown("t.`user`.active is not false", 9, 6); + testParquetFilterPushDown("t.`user`.active is not null", 9, 6); + testParquetFilterPushDown("t.`user`.active is null", 4, 4); + } + + + private void testParquetFilterPushDown(String predicate, int expectedRowCount, int expectRowGroupsNumber) throws Exception { + String query = String.format("select * from %s t where %s", TABLE_NAME, predicate); + + int actualRowCount = testSql(query); + assertEquals("Expected and actual row count should match", expectedRowCount, actualRowCount); + + String expectRowGroupsNumberPattern = "numRowGroups=" + expectRowGroupsNumber; + testPlanMatchingPatterns(query, new String[] {expectRowGroupsNumberPattern}, new String[] {}); + } + +} + diff --git a/exec/java-exec/src/test/resources/parquet/users/users_1.parquet b/exec/java-exec/src/test/resources/parquet/users/users_1.parquet new file mode 100644 index 0000000000000000000000000000000000000000..9d9d511b3b47f7cd678fd1f4f2615d0c1d07b3aa GIT binary patch literal 657 zcmZ8f%}T>S7~CXlj8H`nyKEqb9Bfd~kfyY>Ac)X|f``&$50xal)j(=BZT)!*AHWCk z;#>GY&PK7RkZiu}eBaFMu)~W{ixIZZ_D>i^;V{P&)FgxmYGCDfi7xaOaF2OEjds=O zVOLNWYt^WmEKC1t0E9mCufa*z92S5r4H6BWum-wpWg8s&Q00P|qyti2GlwvFZ4{ z7qA7yPO@eGqzI?3=UxYn2j(Vm+@p#J1Pl-#@loKM{R_+W;1jGkOEA`R9s6%k3s#d8 zJ_*K{+(@rJ`C(L&HvN@c8^nBrzZ-ah4+9h%p}9I83UN5lA9(mOVW@86_iUAq0Uw~@ z3^D#BS+l_3EKZ5*iG$}dU#c>k&7~^B`(&oXwt7i)#zb5_B<15uEl+2q|Ae^n`Muu? z`(flCrK`M)6;}Ac7YYypUab;pmo33!9tW=FcnmK(gyS zn0QjBR-s8xznq`1UweJtt8v2j`F@2n0GGSIWQ-6ZnT=gw5d%yK=RWtph)zxnP?hWm zdrqVPwrw5*EYQ2WTj9F^4tL;th^k~3_FsB47oC}6j&L_wJ6MJeZHbo(nU*E3g50(^ z^~T-3;dC+^>zDp=uCqC(q=6uVxl1@bCX%Mg04nX|P8-DJ_Wg7)c{kq(I;HdaCl>M4d+K_0(0f9xD9Wh48Zys zT2Z;O@<@klB7Yl%epkF%xWbhMi$8-bTC6ELDW-2;DsSLIT!d@dk>4XM2*n2#jCj60 zc+S#=&Z?8C(&OqwGSPBNza(b3L|)F4>~X0Vr;{vr!kp9TLr|->t5HxMEYqaDmL o>v-6TqFO^m?RrBcDvm}iU2BbE)f}})0~OVWC*&O;{2D*sCk_){wg3PC literal 0 HcmV?d00001 diff --git a/exec/java-exec/src/test/resources/parquet/users/users_3.parquet b/exec/java-exec/src/test/resources/parquet/users/users_3.parquet new file mode 100644 index 0000000000000000000000000000000000000000..1c1aa8e16886b222739acb691da58e6296d77dae GIT binary patch literal 588 zcmaJ(x`!-{Ft& z=Q&H8T0NLBlgG@w_l60>`;kKsQHatecn5S^JwXWVvI+=^SLoGAeK#Z%MfWijMN~wq zPx@_A10WL__?J+p)pN)tzZ|A~KDO#%(0s#Uo zb)XJRrT6CmnhpzsDr{te?eTMX{Uj{6Tem~QbOSM>|4VhwurR-_AFSoxIk%$kHbr>A@!ic=!`I17u{C12d- zg|ULGrqhYxSY69DTG2Ain9&Jb-{o!`*tX*_yW8NUU*R~kZ9yM3Q8n4l~}YA3zP*5Hpt0LsHKE}^8i+C z`G|f5KhQtuNA=tRwWgBi`uaZ3IdkNTuj8H~wWs!ul|&M$C^2$}h>Q#oH4bsYCG(mLBVI7M=cQRGdI3P;rawiuVTL z-$f?$o0s}ByTaxN=bD?Z!c&Iwo${YR?6>t#fhT(vfcRiq%$3R98!cDxBz=&y?ueM=favcn_kq2P_MT(8s$Ts@_-fdbq zC#K@?_C)zQ`qii!=FTab+7opCSw_)$(DIf#oLl}5nEMB8U>~$TuBd1_q6v!q&d@hfO$W0Au_@Kl*%J AM*si- literal 0 HcmV?d00001 diff --git a/exec/java-exec/src/test/resources/parquet/users/users_6.parquet b/exec/java-exec/src/test/resources/parquet/users/users_6.parquet new file mode 100644 index 0000000000000000000000000000000000000000..c12105a0f6d18813015b4750c727d438814641a9 GIT binary patch literal 627 zcmZ8f&1%9x5T3-4#?p#~?y@N<dkV?Tv0j3lv3J}#y zA1|Z%Y>|rXWW5yGlBm!|aoH0C0X1N1!eyhfQurcdr?K+ud^-J{Bz%c3xY5ICm23o1 z&9uyC$FNYj28LPBg;0RtiVo?}F?#=UF)h3kRqP$l5)Eh_#I#PQQ*2> ho4egsn}^(Y<3M;p?DJ0Cji=mgMR)L}01WVV`vG?eUI73A literal 0 HcmV?d00001 diff --git a/exec/java-exec/src/test/resources/parquet/users/users_7.parquet b/exec/java-exec/src/test/resources/parquet/users/users_7.parquet new file mode 100644 index 0000000000000000000000000000000000000000..00f8016b4917222776eb86868d891fec2ddd6c86 GIT binary patch literal 662 zcmZ8f%SyvQ6rD+8jIV-)87GoOK@AF8(v+4K+z2idT!>3Il5{2-XsxELkNUIp@wL=SLSU!GscOU$_9C@B-zmF~*d$f>R!_=4~=EYSBC;v|Of6?~>wvW~K+DqVa$|=i}Q( ztJ!ZxjooyX4|Sv6i@ULj2fZk2b#&BkcXXoTDC?P4FN<|I>u0Hs+Jimz#u+=uANc`( CqG0a; literal 0 HcmV?d00001 diff --git a/logical/src/main/java/org/apache/drill/common/expression/SchemaPath.java b/logical/src/main/java/org/apache/drill/common/expression/SchemaPath.java index 583046a76dc..9ea57b133d5 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/SchemaPath.java +++ b/logical/src/main/java/org/apache/drill/common/expression/SchemaPath.java @@ -90,19 +90,25 @@ public SchemaPath(String simpleName, ExpressionPosition pos) { } public NamePart getAsNamePart() { - return getNamePart(rootSegment); + return getNamePart(rootSegment, false); } - private static NamePart getNamePart(PathSegment s) { + private static NamePart getNamePart(PathSegment s, boolean skipArraySegment) { if (s == null) { return null; } NamePart.Builder b = NamePart.newBuilder(); if (s.getChild() != null) { - b.setChild(getNamePart(s.getChild())); + NamePart namePart = getNamePart(s.getChild(), skipArraySegment); + if (namePart != null) { + b.setChild(namePart); + } } if (s.isArray()) { + if (skipArraySegment) { + return null; + } if (s.getArraySegment().hasIndex()) { throw new IllegalStateException("You cannot convert a indexed schema path to a NamePart. NameParts can only reference Vectors, not individual records or values."); } @@ -128,6 +134,18 @@ public static SchemaPath create(NamePart namePart) { return new SchemaPath((NameSegment) getPathSegment(namePart)); } + /** + * Returns schema path with for arrays without index. + * Is used to find column statistics in parquet metadata. + * Example: a.b.c[0] -> a.b.c + * + * @return un-indexed schema path + */ + public SchemaPath getUnIndexed() { + NamePart namePart = getNamePart(rootSegment, true); + return create(namePart); + } + /** * Parses input string using the same rules which are used for the field in the query. * If a string contains dot outside back-ticks, or there are no backticks in the string, @@ -255,11 +273,6 @@ public SchemaPath getChild(String childPath) { return new SchemaPath(newRoot); } - public SchemaPath getUnindexedArrayChild() { - NameSegment newRoot = rootSegment.cloneWithNewChild(new ArraySegment(null)); - return new SchemaPath(newRoot); - } - public SchemaPath getChild(int index) { NameSegment newRoot = rootSegment.cloneWithNewChild(new ArraySegment(index)); return new SchemaPath(newRoot); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/TypedFieldExpr.java b/logical/src/main/java/org/apache/drill/common/expression/TypedFieldExpr.java similarity index 80% rename from exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/TypedFieldExpr.java rename to logical/src/main/java/org/apache/drill/common/expression/TypedFieldExpr.java index 42879298ef9..93c7a3c477c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/TypedFieldExpr.java +++ b/logical/src/main/java/org/apache/drill/common/expression/TypedFieldExpr.java @@ -1,4 +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 @@ -15,20 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.drill.exec.expr.stat; +package org.apache.drill.common.expression; -import com.google.common.collect.Iterators; -import org.apache.drill.common.expression.LogicalExpression; -import org.apache.drill.common.expression.LogicalExpressionBase; -import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.common.expression.visitors.ExprVisitor; import org.apache.drill.common.types.TypeProtos; +import java.util.Collections; import java.util.Iterator; public class TypedFieldExpr extends LogicalExpressionBase { - TypeProtos.MajorType type; - SchemaPath path; + private final TypeProtos.MajorType type; + private final SchemaPath path; public TypedFieldExpr(SchemaPath path, TypeProtos.MajorType type) { super(path.getPosition()); @@ -38,12 +35,12 @@ public TypedFieldExpr(SchemaPath path, TypeProtos.MajorType type) { @Override public T accept(ExprVisitor visitor, V value) throws E { - return visitor.visitUnknown(this, value); + return visitor.visitTypedFieldExpr(this, value); } @Override public Iterator iterator() { - return Iterators.emptyIterator(); + return Collections.emptyIterator(); } @Override diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/AbstractExprVisitor.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/AbstractExprVisitor.java index 189e33db017..5356813eb54 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/AbstractExprVisitor.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/AbstractExprVisitor.java @@ -26,6 +26,7 @@ import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; import org.apache.drill.common.expression.ValueExpressions.DateExpression; @@ -45,7 +46,6 @@ import org.apache.drill.common.expression.ValueExpressions.TimeStampExpression; public abstract class AbstractExprVisitor implements ExprVisitor { - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(AbstractExprVisitor.class); @Override public T visitFunctionCall(FunctionCall call, VAL value) throws EXCEP { @@ -178,4 +178,8 @@ public T visitParameter(ParameterExpression e, VAL value) throws EXCEP { return visitUnknown(e, value); } + @Override + public T visitTypedFieldExpr(TypedFieldExpr e, VAL value) throws EXCEP { + return visitUnknown(e, value); + } } diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/AggregateChecker.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/AggregateChecker.java index 9a3cdccca18..f6fe89dac4e 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/AggregateChecker.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/AggregateChecker.java @@ -28,6 +28,7 @@ import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; @@ -209,4 +210,8 @@ public Boolean visitParameter(ValueExpressions.ParameterExpression e, ErrorColle return false; } + @Override + public Boolean visitTypedFieldExpr(TypedFieldExpr e, ErrorCollector value) throws RuntimeException { + return false; + } } diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/ConstantChecker.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/ConstantChecker.java index 67fe12faae0..0468bc2196d 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/ConstantChecker.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/ConstantChecker.java @@ -28,6 +28,7 @@ import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; @@ -213,4 +214,8 @@ public Boolean visitParameter(ValueExpressions.ParameterExpression e, ErrorColle return false; } + @Override + public Boolean visitTypedFieldExpr(TypedFieldExpr e, ErrorCollector value) throws RuntimeException { + return false; + } } diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/ExprVisitor.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/ExprVisitor.java index 7c59f3c113f..e6198ae6bc9 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/ExprVisitor.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/ExprVisitor.java @@ -26,6 +26,7 @@ import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; import org.apache.drill.common.expression.ValueExpressions.DateExpression; @@ -45,30 +46,31 @@ import org.apache.drill.common.expression.ValueExpressions.TimeStampExpression; public interface ExprVisitor { - public T visitFunctionCall(FunctionCall call, VAL value) throws EXCEP; - public T visitFunctionHolderExpression(FunctionHolderExpression holder, VAL value) throws EXCEP; - public T visitIfExpression(IfExpression ifExpr, VAL value) throws EXCEP; - public T visitBooleanOperator(BooleanOperator call, VAL value) throws EXCEP; - public T visitSchemaPath(SchemaPath path, VAL value) throws EXCEP; - public T visitIntConstant(IntExpression intExpr, VAL value) throws EXCEP; - public T visitFloatConstant(FloatExpression fExpr, VAL value) throws EXCEP; - public T visitLongConstant(LongExpression intExpr, VAL value) throws EXCEP; - public T visitDateConstant(DateExpression intExpr, VAL value) throws EXCEP; - public T visitTimeConstant(TimeExpression intExpr, VAL value) throws EXCEP; - public T visitTimeStampConstant(TimeStampExpression intExpr, VAL value) throws EXCEP; - public T visitIntervalYearConstant(IntervalYearExpression intExpr, VAL value) throws EXCEP; - public T visitIntervalDayConstant(IntervalDayExpression intExpr, VAL value) throws EXCEP; - public T visitDecimal9Constant(Decimal9Expression decExpr, VAL value) throws EXCEP; - public T visitDecimal18Constant(Decimal18Expression decExpr, VAL value) throws EXCEP; - public T visitDecimal28Constant(Decimal28Expression decExpr, VAL value) throws EXCEP; - public T visitDecimal38Constant(Decimal38Expression decExpr, VAL value) throws EXCEP; - public T visitDoubleConstant(DoubleExpression dExpr, VAL value) throws EXCEP; - public T visitBooleanConstant(BooleanExpression e, VAL value) throws EXCEP; - public T visitQuotedStringConstant(QuotedString e, VAL value) throws EXCEP; - public T visitNullConstant(TypedNullConstant e, VAL value) throws EXCEP; - public T visitNullExpression(NullExpression e, VAL value) throws EXCEP; - public T visitUnknown(LogicalExpression e, VAL value) throws EXCEP; - public T visitCastExpression(CastExpression e, VAL value) throws EXCEP; - public T visitConvertExpression(ConvertExpression e, VAL value) throws EXCEP; - public T visitParameter(ParameterExpression e, VAL value) throws EXCEP; + T visitFunctionCall(FunctionCall call, VAL value) throws EXCEP; + T visitFunctionHolderExpression(FunctionHolderExpression holder, VAL value) throws EXCEP; + T visitIfExpression(IfExpression ifExpr, VAL value) throws EXCEP; + T visitBooleanOperator(BooleanOperator call, VAL value) throws EXCEP; + T visitSchemaPath(SchemaPath path, VAL value) throws EXCEP; + T visitIntConstant(IntExpression intExpr, VAL value) throws EXCEP; + T visitFloatConstant(FloatExpression fExpr, VAL value) throws EXCEP; + T visitLongConstant(LongExpression intExpr, VAL value) throws EXCEP; + T visitDateConstant(DateExpression intExpr, VAL value) throws EXCEP; + T visitTimeConstant(TimeExpression intExpr, VAL value) throws EXCEP; + T visitTimeStampConstant(TimeStampExpression intExpr, VAL value) throws EXCEP; + T visitIntervalYearConstant(IntervalYearExpression intExpr, VAL value) throws EXCEP; + T visitIntervalDayConstant(IntervalDayExpression intExpr, VAL value) throws EXCEP; + T visitDecimal9Constant(Decimal9Expression decExpr, VAL value) throws EXCEP; + T visitDecimal18Constant(Decimal18Expression decExpr, VAL value) throws EXCEP; + T visitDecimal28Constant(Decimal28Expression decExpr, VAL value) throws EXCEP; + T visitDecimal38Constant(Decimal38Expression decExpr, VAL value) throws EXCEP; + T visitDoubleConstant(DoubleExpression dExpr, VAL value) throws EXCEP; + T visitBooleanConstant(BooleanExpression e, VAL value) throws EXCEP; + T visitQuotedStringConstant(QuotedString e, VAL value) throws EXCEP; + T visitNullConstant(TypedNullConstant e, VAL value) throws EXCEP; + T visitNullExpression(NullExpression e, VAL value) throws EXCEP; + T visitUnknown(LogicalExpression e, VAL value) throws EXCEP; + T visitCastExpression(CastExpression e, VAL value) throws EXCEP; + T visitConvertExpression(ConvertExpression e, VAL value) throws EXCEP; + T visitParameter(ParameterExpression e, VAL value) throws EXCEP; + T visitTypedFieldExpr(TypedFieldExpr e, VAL value) throws EXCEP; } diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidator.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidator.java index e8cbc2bf816..c32825abb14 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidator.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidator.java @@ -28,6 +28,7 @@ import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.common.expression.NullExpression; import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.common.expression.TypedFieldExpr; import org.apache.drill.common.expression.TypedNullConstant; import org.apache.drill.common.expression.ValueExpressions; import org.apache.drill.common.expression.ValueExpressions.BooleanExpression; @@ -236,4 +237,8 @@ public Void visitParameter(ValueExpressions.ParameterExpression e, ErrorCollecto return null; } + @Override + public Void visitTypedFieldExpr(TypedFieldExpr e, ErrorCollector value) throws RuntimeException { + return null; + } } From f5b82239ad823a972e32ea732237a2e8c4346db3 Mon Sep 17 00:00:00 2001 From: Kunal Khatua Date: Mon, 26 Mar 2018 23:30:31 -0700 Subject: [PATCH 28/44] DRILL-6103: lsb_release: command not found close apache/drill#1191 Thanks to Sanel Zukan for providing a small patch that checks for /etc/fedora-release path. This is more common, than lsb_release command on Linux distros. --- distribution/src/resources/drill-config.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh index e3eaa64650d..c2f3d704c77 100644 --- a/distribution/src/resources/drill-config.sh +++ b/distribution/src/resources/drill-config.sh @@ -421,8 +421,7 @@ CP="$CP:$DRILL_HOME/jars/classb/*" if [[ "$OSTYPE" == "linux-gnu" ]]; then # Linux # check for Fedora. netty-tcnative has a Fedora variant - linuxvariant=$(lsb_release -i | cut -d: -f2 | sed s/'^\t'//) - if [[ "$linuxvariant" == "Fedora" ]]; then + if [[ -f "/etc/fedora-release" ]]; then CP="$CP:$DRILL_HOME/jars/3rdparty/fedora/*" else CP="$CP:$DRILL_HOME/jars/3rdparty/linux/*" From 9a6cb59b9b7a5b127e5f60309ce2f506ede9652a Mon Sep 17 00:00:00 2001 From: Timothy Farkas Date: Tue, 13 Mar 2018 17:24:28 -0700 Subject: [PATCH 29/44] DRILL-6234: Improved documentation for VariableWidthVector mutators, and added simple unit tests demonstrating mutator behavior. close apache/drill#1164 --- exec/vector/pom.xml | 7 +- .../templates/VariableLengthVectors.java | 61 ++++++++ .../apache/drill/exec/vector/ValueVector.java | 3 +- .../exec/vector/VariableLengthVectorTest.java | 141 ++++++++++++++++++ 4 files changed, 210 insertions(+), 2 deletions(-) create mode 100644 exec/vector/src/test/java/org/apache/drill/exec/vector/VariableLengthVectorTest.java diff --git a/exec/vector/pom.xml b/exec/vector/pom.xml index 018430509ac..21e138d11c9 100644 --- a/exec/vector/pom.xml +++ b/exec/vector/pom.xml @@ -65,7 +65,12 @@ 0.7.1 - + + org.apache.drill + drill-common + ${project.version} + tests + diff --git a/exec/vector/src/main/codegen/templates/VariableLengthVectors.java b/exec/vector/src/main/codegen/templates/VariableLengthVectors.java index 516eb5241e9..ab995cd5746 100644 --- a/exec/vector/src/main/codegen/templates/VariableLengthVectors.java +++ b/exec/vector/src/main/codegen/templates/VariableLengthVectors.java @@ -512,6 +512,8 @@ public boolean isNull(int index){ } /** + *

Overview

+ *

* Mutable${minor.class} implements a vector of variable width values. Elements in the vector * are accessed by position from the logical start of the vector. A fixed width offsetVector * is used to convert an element's position to it's offset from the start of the (0-based) @@ -520,6 +522,46 @@ public boolean isNull(int index){ * The equivalent Java primitive is '${minor.javaType!type.javaType}' * * NB: this class is automatically generated from ValueVectorTypes.tdd using FreeMarker. + *

+ *

Contract

+ *

+ *

    + *
  1. + * Supported Writes: {@link VariableWidthVector}s do not support random writes. In contrast {@link org.apache.drill.exec.vector.FixedWidthVector}s do + * allow random writes but special care is needed. + *
    2. + *
  2. + * Writing Values: All set methods must be called with a consecutive sequence of indices. With a few exceptions: + *
      + *
    1. You can update the last index you just set.
      2. + *
    2. You can reset a previous index (call it Idx), but you must assume all the data after Idx is corrupt. Also + * note that the memory consumed by data that came after Idx is not released.
      3. + *
    + *
    3. + *
  3. + * Setting Value Count: Vectors aren't explicitly aware of how many values they contain. So you must keep track of the + * number of values you've written to the vector and once you are done writing to the vector you must call {@link Mutator#setValueCount(int)}. + * It is possible to trim the vector by setting the value count to be less than the number of values currently contained in the vector. Note the extra memory consumed in + * the data buffer is not freed when this is done. + *
    4. + *
  4. + * Memory Allocation: When setting a value at an index you must do one of the following to ensure you do not get an {@link IndexOutOfBoundsException}. + *
      + *
    1. + * Allocate the exact amount of memory you need when using the {@link Mutator#set(int, byte[])} methods. If you do not + * manually allocate sufficient memory an {@link IndexOutOfBoundsException} can be thrown when the data buffer runs out of space. + *
      2. + *
    2. + * Or you can use the {@link Mutator#setSafe(int, byte[])} methods, which will automatically grow your data buffer to + * fit your data. + *
      3. + *
    + *
    5. + *
  5. + * Immutability: Once a vector has been populated with data and {@link #setValueCount(int)} has been called, it should be considered immutable. + *
    6. + *
+ *

*/ public final class Mutator extends BaseValueVector.BaseMutator implements VariableWidthVector.VariableWidthMutator { @@ -703,6 +745,25 @@ protected void set(int index, ${minor.class}Holder holder) { data.setBytes(currentOffset, holder.buffer, holder.start, length); } + /** + *

Notes on Usage

+ *

+ * For {@link VariableWidthVector}s this method can be used in the following cases: + *

    + *
  • Setting the actual number of elements currently contained in the vector.
    • + *
  • Trimming the vector to have fewer elements than it current does.
    • + *
+ *

+ *

Caveats

+ *

+ * It is important to note that for {@link org.apache.drill.exec.vector.FixedWidthVector}s this method can also be used to expand the vector. + * However, {@link VariableWidthVector} do not support this usage and this method will throw an {@link IndexOutOfBoundsException} if you attempt + * to use it in this way. Expansion of valueCounts is not supported mainly because there is no benefit, since you would still have to rely on the setSafe + * methods to appropriatly expand the data buffer and populate the vector anyway (since by definition we do not know the width of elements). See DRILL-6234 for details. + *

+ *

Method Documentation

+ * {@inheritDoc} + */ @Override public void setValueCount(int valueCount) { final int currentByteCapacity = getByteCapacity(); diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueVector.java index f873cc66bff..26598101c4a 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueVector.java @@ -293,7 +293,8 @@ interface Accessor { */ interface Mutator { /** - * Sets the number of values that is stored in this vector to the given value count. + * Sets the number of values that is stored in this vector to the given value count. WARNING! Once the + * valueCount is set, the vector should be considered immutable. * * @param valueCount value count to set. */ diff --git a/exec/vector/src/test/java/org/apache/drill/exec/vector/VariableLengthVectorTest.java b/exec/vector/src/test/java/org/apache/drill/exec/vector/VariableLengthVectorTest.java new file mode 100644 index 00000000000..eaee597b37b --- /dev/null +++ b/exec/vector/src/test/java/org/apache/drill/exec/vector/VariableLengthVectorTest.java @@ -0,0 +1,141 @@ +/** + * 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 org.apache.drill.exec.vector; + +import org.apache.drill.common.types.TypeProtos; +import org.apache.drill.common.types.Types; +import org.apache.drill.exec.memory.RootAllocator; +import org.apache.drill.exec.record.MaterializedField; +import org.junit.Assert; +import org.junit.Test; + +/** + * This test uses {@link VarCharVector} to test the template code in VariableLengthVector. + */ +public class VariableLengthVectorTest +{ + /** + * If the vector contains 1000 records, setting a value count of 1000 should work. + */ + @Test + public void testSettingSameValueCount() + { + try (RootAllocator allocator = new RootAllocator(10_000_000)) { + final MaterializedField field = MaterializedField.create("stringCol", Types.required(TypeProtos.MinorType.VARCHAR)); + final VarCharVector vector = new VarCharVector(field, allocator); + + vector.allocateNew(); + + try { + final int size = 1000; + final VarCharVector.Mutator mutator = vector.getMutator(); + final VarCharVector.Accessor accessor = vector.getAccessor(); + + setSafeIndexStrings("", 0, size, mutator); + + mutator.setValueCount(size); + Assert.assertEquals(size, accessor.getValueCount()); + checkIndexStrings("", 0, size, accessor); + } finally { + vector.clear(); + } + } + } + + /** + * Test truncating data. If you have 10000 records, reduce the vector to 1000 records. + */ + @Test + public void testTrunicateVectorSetValueCount() + { + try (RootAllocator allocator = new RootAllocator(10_000_000)) { + final MaterializedField field = MaterializedField.create("stringCol", Types.required(TypeProtos.MinorType.VARCHAR)); + final VarCharVector vector = new VarCharVector(field, allocator); + + vector.allocateNew(); + + try { + final int size = 1000; + final int fluffSize = 10000; + final VarCharVector.Mutator mutator = vector.getMutator(); + final VarCharVector.Accessor accessor = vector.getAccessor(); + + setSafeIndexStrings("", 0, size, mutator); + setSafeIndexStrings("first cut ", size, fluffSize, mutator); + + mutator.setValueCount(fluffSize); + Assert.assertEquals(fluffSize, accessor.getValueCount()); + + checkIndexStrings("", 0, size, accessor); + + } finally { + vector.clear(); + } + } + } + + /** + * Set 10000 values. Then go back and set new values starting at the 1001 the record. + */ + @Test + public void testSetBackTracking() + { + try (RootAllocator allocator = new RootAllocator(10_000_000)) { + final MaterializedField field = MaterializedField.create("stringCol", Types.required(TypeProtos.MinorType.VARCHAR)); + final VarCharVector vector = new VarCharVector(field, allocator); + + vector.allocateNew(); + + try { + final int size = 1000; + final int fluffSize = 10000; + final VarCharVector.Mutator mutator = vector.getMutator(); + final VarCharVector.Accessor accessor = vector.getAccessor(); + + setSafeIndexStrings("", 0, size, mutator); + setSafeIndexStrings("first cut ", size, fluffSize, mutator); + setSafeIndexStrings("redone cut ", size, fluffSize, mutator); + + mutator.setValueCount(fluffSize); + Assert.assertEquals(fluffSize, accessor.getValueCount()); + + checkIndexStrings("", 0, size, accessor); + checkIndexStrings("redone cut ", size, fluffSize, accessor); + + } finally { + vector.clear(); + } + } + } + + public static void setSafeIndexStrings(String prefix, int offset, int size, VarCharVector.Mutator mutator) + { + for (int index = offset; index < size; index++) { + final String indexString = prefix + "String num " + index; + mutator.setSafe(index, indexString.getBytes()); + } + } + + public static void checkIndexStrings(String prefix, int offset, int size, VarCharVector.Accessor accessor) + { + for (int index = offset; index < size; index++) { + final String indexString = prefix + "String num " + index; + Assert.assertArrayEquals(indexString.getBytes(), accessor.get(index)); + } + } +} From cc440af0397d0ec8b52227db9b7e09513b5ff157 Mon Sep 17 00:00:00 2001 From: Kunal Khatua Date: Sun, 25 Mar 2018 22:05:06 -0700 Subject: [PATCH 30/44] DRILL-6279: Indicate operators that spilled in-memory data to disk on Web UI As part of this coomit added Bootstrap's Glyphicons. closes #1197 --- .../server/rest/profile/OperatorWrapper.java | 89 +++++++++++++++++- .../server/rest/profile/TableBuilder.java | 14 ++- .../main/resources/rest/profile/profile.ftl | 12 ++- .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20127 bytes .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 45404 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23424 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 0 -> 18028 bytes 7 files changed, 109 insertions(+), 6 deletions(-) create mode 100644 exec/java-exec/src/main/resources/rest/static/fonts/glyphicons-halflings-regular.eot create mode 100644 exec/java-exec/src/main/resources/rest/static/fonts/glyphicons-halflings-regular.ttf create mode 100644 exec/java-exec/src/main/resources/rest/static/fonts/glyphicons-halflings-regular.woff create mode 100644 exec/java-exec/src/main/resources/rest/static/fonts/glyphicons-halflings-regular.woff2 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java index afccbb7c52b..3a60c71f08c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java @@ -17,6 +17,7 @@ */ package org.apache.drill.exec.server.rest.profile; +import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -38,7 +39,17 @@ * Wrapper class for profiles of ALL operator instances of the same operator type within a major fragment. */ public class OperatorWrapper { + @SuppressWarnings("unused") + private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(OperatorWrapper.class); + + private static final String HTML_ATTRIB_SPILLS = "spills"; + private static final String HTML_ATTRIB_CLASS = "class"; + private static final String HTML_ATTRIB_STYLE = "style"; + private static final String HTML_ATTRIB_TITLE = "title"; + private static final DecimalFormat DECIMAL_FORMATTER = new DecimalFormat("#.##"); private static final String UNKNOWN_OPERATOR = "UNKNOWN_OPERATOR"; + //Negative valued constant used for denoting invalid index to indicate absence of metric + private static final int NO_SPILL_METRIC_INDEX = Integer.MIN_VALUE; private final int major; private final List, String>> opsAndHosts; // [(operatorProfile --> minorFragment number,host), ...] private final OperatorProfile firstProfile; @@ -146,6 +157,11 @@ public void addSummary(TableBuilder tb, HashMap majorFragmentBusyT tb.appendCell(path, null, null, opTblBgColor); tb.appendCell(operatorName); + //Check if spill information is available + int spillCycleMetricIndex = getSpillCycleMetricIndex(operatorType); + boolean isSpillableOp = (spillCycleMetricIndex != NO_SPILL_METRIC_INDEX); + boolean hasSpilledToDisk = false; + //Get MajorFragment Busy+Wait Time Tally long majorBusyNanos = majorFragmentBusyTally.get(new OperatorPathBuilder().setMajor(major).build()); @@ -153,6 +169,8 @@ public void addSummary(TableBuilder tb, HashMap majorFragmentBusyT double processSum = 0.0; double waitSum = 0.0; double memSum = 0.0; + double spillCycleSum = 0.0; + long spillCycleMax = 0L; long recordSum = 0L; //Construct list for sorting purposes (using legacy Comparators) @@ -168,6 +186,22 @@ public void addSummary(TableBuilder tb, HashMap majorFragmentBusyT recordSum += sp.getRecords(); } opList.add(ip.getLeft()); + + //Capture Spill Info + //Check to ensure index < #metrics (old profiles have less metrics); else reset isSpillableOp + if (isSpillableOp) { + //NOTE: We get non-zero value for non-existent metrics, so we can't use getMetric(index) + //profile.getMetric(spillCycleMetricIndex).getLongValue(); + //Forced to iterate list + for (MetricValue metricVal : profile.getMetricList()) { + if (metricVal.getMetricId() == spillCycleMetricIndex) { + long spillCycles = metricVal.getLongValue(); + spillCycleMax = Math.max(spillCycles, spillCycleMax); + spillCycleSum += spillCycles; + hasSpilledToDisk = (spillCycleSum > 0.0); + } + } + } } final ImmutablePair longSetup = Collections.max(opList, Comparators.setupTime); @@ -190,8 +224,59 @@ public void addSummary(TableBuilder tb, HashMap majorFragmentBusyT tb.appendFormattedInteger(recordSum); final ImmutablePair peakMem = Collections.max(opList, Comparators.operatorPeakMemory); - tb.appendBytes(Math.round(memSum / size)); - tb.appendBytes(peakMem.getLeft().getPeakLocalMemoryAllocated()); + + //Inject spill-to-disk attributes + Map avgSpillMap = null; + Map maxSpillMap = null; + if (hasSpilledToDisk) { + avgSpillMap = new HashMap<>(); + //Average SpillCycle + double avgSpillCycle = spillCycleSum/size; + avgSpillMap.put(HTML_ATTRIB_TITLE, DECIMAL_FORMATTER.format(avgSpillCycle) + " spills on average"); + avgSpillMap.put(HTML_ATTRIB_STYLE, "cursor:help;" + spillCycleMax); + avgSpillMap.put(HTML_ATTRIB_CLASS, "spill-tag"); //JScript will inject Icon + avgSpillMap.put(HTML_ATTRIB_SPILLS, DECIMAL_FORMATTER.format(avgSpillCycle)); //JScript will inject Count + maxSpillMap = new HashMap<>(); + maxSpillMap.put(HTML_ATTRIB_TITLE, "Most # spills: " + spillCycleMax); + maxSpillMap.put(HTML_ATTRIB_STYLE, "cursor:help;" + spillCycleMax); + maxSpillMap.put(HTML_ATTRIB_CLASS, "spill-tag"); //JScript will inject Icon + maxSpillMap.put(HTML_ATTRIB_SPILLS, String.valueOf(spillCycleMax)); //JScript will inject Count + } + + tb.appendBytes(Math.round(memSum / size), avgSpillMap); + tb.appendBytes(peakMem.getLeft().getPeakLocalMemoryAllocated(), maxSpillMap); + } + + /** + * Returns index of Spill Count/Cycle metric + * @param operatorType + * @return index of spill metric + */ + private int getSpillCycleMetricIndex(CoreOperatorType operatorType) { + String metricName; + + switch (operatorType) { + case EXTERNAL_SORT: + metricName = "SPILL_COUNT"; + break; + case HASH_AGGREGATE: + case HASH_JOIN: + metricName = "SPILL_CYCLE"; + break; + default: + return NO_SPILL_METRIC_INDEX; + } + + int metricIndex = 0; //Default + String[] metricNames = OperatorMetricRegistry.getMetricNames(operatorType.getNumber()); + for (String name : metricNames) { + if (name.equalsIgnoreCase(metricName)) { + return metricIndex; + } + metricIndex++; + } + //Backward compatibility with rendering older profiles. Ideally we should never touch this if an expected metric is not there + return NO_SPILL_METRIC_INDEX; } public String getMetricsTable() { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java index 3833f510d55..0b652545f85 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java @@ -201,7 +201,7 @@ public void appendInteger(final long l, final String link, final String tooltip) } public void appendBytes(final long l) { - appendBytes(l, null); + appendBytes(l, null, null, null); } public void appendBytes(final long l, final String link) { @@ -209,8 +209,18 @@ public void appendBytes(final long l, final String link) { } public void appendBytes(final long l, final String link, final String tooltip) { + appendBytes(l, link, tooltip, null); + } + + public void appendBytes(final long l, Map attributeMap) { + appendBytes(l, null, null, attributeMap); + } + + public void appendBytes(final long l, final String link, final String tooltip, Map attributeMap) { //Embedding dataTable's data-order attribute - Map attributeMap = new HashMap(); + if (attributeMap == null) { + attributeMap = new HashMap<>(); + } attributeMap.put("data-order", String.valueOf(l)); appendCell(bytePrint(l), link, tooltip, null, attributeMap); } diff --git a/exec/java-exec/src/main/resources/rest/profile/profile.ftl b/exec/java-exec/src/main/resources/rest/profile/profile.ftl index 7f4474c0b4b..671a57bbc1d 100644 --- a/exec/java-exec/src/main/resources/rest/profile/profile.ftl +++ b/exec/java-exec/src/main/resources/rest/profile/profile.ftl @@ -372,6 +372,16 @@ table.sortable thead .sorting_desc { background-image: url("/static/img/black-de
- From a05494537494efe7d9489e1468245e1ca7b16708 Mon Sep 17 00:00:00 2001 From: Vlad Rozov Date: Thu, 22 Mar 2018 06:54:56 -0700 Subject: [PATCH 32/44] DRILL-6287: apache-release profile should be disabled by default closes #1182 --- pom.xml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index f07beaf8347..b9d395d0715 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,7 @@ 4096 4096 + -Xdoclint:none @@ -1234,12 +1235,6 @@ apache-release - - [1.8,) - - - -Xdoclint:none - @@ -1274,7 +1269,9 @@ true false - src/main/resources/assemblies/source-assembly.xml + + src/main/resources/assemblies/source-assembly.xml + apache-drill-${project.version}-src gnu From 67669a000c19a39510118f20366f3a189809200a Mon Sep 17 00:00:00 2001 From: dvjyothsna Date: Fri, 23 Mar 2018 17:13:46 -0700 Subject: [PATCH 33/44] DRILL-6271: Updated copyright range in NOTICE closes #1188 --- NOTICE | 2 +- distribution/src/resources/NOTICE | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NOTICE b/NOTICE index abdcb91e95e..21b3e3409af 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Drill -Copyright 2013-2014 The Apache Software Foundation +Copyright 2013-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). diff --git a/distribution/src/resources/NOTICE b/distribution/src/resources/NOTICE index bd17b619d91..8a85d07a32a 100644 --- a/distribution/src/resources/NOTICE +++ b/distribution/src/resources/NOTICE @@ -1,5 +1,5 @@ Apache Drill -Copyright 2013-2014 The Apache Software Foundation +Copyright 2013-2018 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). From 127e4150b9495c465f8c37a534dfd50512013765 Mon Sep 17 00:00:00 2001 From: Rahul Raj Date: Wed, 14 Mar 2018 12:05:45 +0530 Subject: [PATCH 34/44] DRILL-6016: Fix for Error reading INT96 created by Apache Spark closes #1166 --- .../columnreaders/ColumnReaderFactory.java | 7 ++- .../ParquetFixedWidthDictionaryReaders.java | 27 ++++++++++++ .../impl/writer/TestParquetWriter.java | 40 ++++++++++++------ ...k-generated-int96-timestamp.snappy.parquet | Bin 0 -> 2896 bytes .../testInt96DictChange/q1.tsv | 12 ------ 5 files changed, 59 insertions(+), 27 deletions(-) create mode 100644 exec/java-exec/src/test/resources/parquet/spark-generated-int96-timestamp.snappy.parquet delete mode 100644 exec/java-exec/src/test/resources/testframework/testParquetReader/testInt96DictChange/q1.tsv diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReaderFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReaderFactory.java index 09cdc5d5a35..ba5f1decf80 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReaderFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReaderFactory.java @@ -156,8 +156,13 @@ static ColumnReader createFixedColumnReader(ParquetRecordReader recordReader, case DOUBLE: return new ParquetFixedWidthDictionaryReaders.DictionaryFloat8Reader(recordReader, allocateSize, descriptor, columnChunkMetaData, fixedLength, (Float8Vector) v, schemaElement); case FIXED_LEN_BYTE_ARRAY: - case INT96: return new ParquetFixedWidthDictionaryReaders.DictionaryFixedBinaryReader(recordReader, allocateSize, descriptor, columnChunkMetaData, fixedLength, (VarBinaryVector) v, schemaElement); + case INT96: + if (recordReader.getFragmentContext().getOptions().getOption(ExecConstants.PARQUET_READER_INT96_AS_TIMESTAMP).bool_val) { + return new ParquetFixedWidthDictionaryReaders.DictionaryBinaryAsTimeStampReader(recordReader, allocateSize, descriptor, columnChunkMetaData, fixedLength, (TimeStampVector) v, schemaElement); + } else { + return new ParquetFixedWidthDictionaryReaders.DictionaryFixedBinaryReader(recordReader, allocateSize, descriptor, columnChunkMetaData, fixedLength, (VarBinaryVector) v, schemaElement); + } default: throw new ExecutionSetupException("Unsupported dictionary column type " + descriptor.getType().name() ); } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java index 5fbac204e1d..50330465b0f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java @@ -34,6 +34,8 @@ import org.apache.parquet.hadoop.metadata.ColumnChunkMetaData; import org.apache.parquet.io.api.Binary; +import static org.apache.drill.exec.store.parquet.ParquetReaderUtility.NanoTimeUtils.getDateTimeValueFromBinary; + public class ParquetFixedWidthDictionaryReaders { static class DictionaryIntReader extends FixedByteAlignedReader { @@ -294,6 +296,31 @@ protected void readField(long recordsToReadInThisPass) { } } + static class DictionaryBinaryAsTimeStampReader extends FixedByteAlignedReader { + DictionaryBinaryAsTimeStampReader(ParquetRecordReader parentReader, int allocateSize, ColumnDescriptor descriptor, + ColumnChunkMetaData columnChunkMetaData, boolean fixedLength, TimeStampVector v, + SchemaElement schemaElement) throws ExecutionSetupException { + super(parentReader, allocateSize, descriptor, columnChunkMetaData, fixedLength, v, schemaElement); + } + + // this method is called by its superclass during a read loop + @Override + protected void readField(long recordsToReadInThisPass) { + + recordsReadInThisIteration = Math.min(pageReader.currentPageCount + - pageReader.valuesRead, recordsToReadInThisPass - valuesReadInCurrentPass); + + for (int i = 0; i < recordsReadInThisIteration; i++){ + try { + Binary binaryTimeStampValue = pageReader.dictionaryValueReader.readBytes(); + valueVec.getMutator().setSafe(valuesReadInCurrentPass + i, getDateTimeValueFromBinary(binaryTimeStampValue, true)); + } catch ( Exception ex) { + throw ex; + } + } + } + } + static class DictionaryFloat4Reader extends FixedByteAlignedReader { DictionaryFloat4Reader(ParquetRecordReader parentReader, int allocateSize, ColumnDescriptor descriptor, ColumnChunkMetaData columnChunkMetaData, boolean fixedLength, Float4Vector v, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java index e3fc83314c1..c359e69b6dd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestParquetWriter.java @@ -39,7 +39,6 @@ import org.apache.drill.categories.ParquetTest; import org.apache.drill.categories.SlowTest; import org.apache.drill.categories.UnlikelyTest; -import org.apache.drill.common.types.TypeProtos; import org.apache.drill.common.util.DrillVersionInfo; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.fn.interp.TestConstantFolding; @@ -780,17 +779,31 @@ public void testImpalaParquetBinaryAsVarBinary_DictChange() throws Exception { Test the reading of a binary field as drill timestamp where data is in dictionary _and_ non-dictionary encoded pages */ @Test - @Ignore("relies on particular time zone, works for UTC") public void testImpalaParquetBinaryAsTimeStamp_DictChange() throws Exception { try { testBuilder() - .sqlQuery("select int96_ts from dfs.`parquet/int96_dict_change` order by int96_ts") + .sqlQuery("select min(int96_ts) date_value from dfs.`parquet/int96_dict_change`") .optionSettingQueriesForTestQuery( "alter session set `%s` = true", ExecConstants.PARQUET_READER_INT96_AS_TIMESTAMP) .ordered() - .csvBaselineFile("testframework/testParquetReader/testInt96DictChange/q1.tsv") - .baselineTypes(TypeProtos.MinorType.TIMESTAMP) - .baselineColumns("int96_ts") + .baselineColumns("date_value") + .baselineValues(new DateTime(convertToLocalTimestamp("1970-01-01 00:00:01.000"))) + .build().run(); + } finally { + resetSessionOption(ExecConstants.PARQUET_READER_INT96_AS_TIMESTAMP); + } + } + + @Test + public void testSparkParquetBinaryAsTimeStamp_DictChange() throws Exception { + try { + testBuilder() + .sqlQuery("select distinct run_date from cp.`parquet/spark-generated-int96-timestamp.snappy.parquet`") + .optionSettingQueriesForTestQuery( + "alter session set `%s` = true", ExecConstants.PARQUET_READER_INT96_AS_TIMESTAMP) + .ordered() + .baselineColumns("run_date") + .baselineValues(new DateTime(convertToLocalTimestamp("2017-12-06 16:38:43.988"))) .build().run(); } finally { resetSessionOption(ExecConstants.PARQUET_READER_INT96_AS_TIMESTAMP); @@ -842,16 +855,15 @@ public void testHiveParquetTimestampAsInt96_compare() throws Exception { Test the conversion from int96 to impala timestamp with hive data including nulls. Validate against expected values */ @Test - @Ignore("relies on particular time zone") public void testHiveParquetTimestampAsInt96_basic() throws Exception { testBuilder() - .unOrdered() - .sqlQuery("SELECT cast(convert_from(timestamp_field, 'TIMESTAMP_IMPALA') as varchar(19)) as timestamp_field " - + "from cp.`parquet/part1/hive_all_types.parquet` ") - .baselineColumns("timestamp_field") - .baselineValues("2013-07-05 17:01:00") - .baselineValues((Object)null) - .go(); + .unOrdered() + .sqlQuery("SELECT convert_from(timestamp_field, 'TIMESTAMP_IMPALA') as timestamp_field " + + "from cp.`parquet/part1/hive_all_types.parquet` ") + .baselineColumns("timestamp_field") + .baselineValues(new DateTime(convertToLocalTimestamp("2013-07-06 00:01:00"))) + .baselineValues((Object)null) + .go(); } @Test diff --git a/exec/java-exec/src/test/resources/parquet/spark-generated-int96-timestamp.snappy.parquet b/exec/java-exec/src/test/resources/parquet/spark-generated-int96-timestamp.snappy.parquet new file mode 100644 index 0000000000000000000000000000000000000000..3075cecf98071cb1a7f1037f4cad3c33df920862 GIT binary patch literal 2896 zcmbVOYj6|S6}~I&%Dd9aU4vGvKqQhPJ2sWod-r+QC>h%rki#Q}F|D0Pv9JYpDuXTC z)Cpl?%Z3oZ)Pdl<2yu9X(t%DMWRjVwUWrJ{FG1L?p-QhU}P4dA$N>N2&u%<3`-?~=p%+@5rY#I zOjR9Q79$3!s%jRtP3WrFAiA#NfXEVC5G9+~Iu)Wmg0ZIALR2Ce)@(0^34^GnSMgaI zr9|ZtKB5|`p$WYTF*TcFDkzdpEW;F6~x*;U;YpNzVMJ3B56z72nRSm+OP*g&Q zPE4WRhb>dpi13jhdXti+5v&0ev2?5#B{|_SOf_N< zHeAN)nvjsN1_=|AFl`#ddre-0QtzOMZQWXSmJ^GHMc@YD5jxCQZ3u^CPdS~ zguEu1x~bxFDnd(^i3`V(UVco{2n9VrSdG|PTV41nuVSqz%2QJ>N{Sjat!1#frP}(k zfBOi~H*F64Ag30ko0eKumj^bj&MDEL7B2r(f;1UgCk3`9R6wF?n6^ zoiULqc&M+hsj^fl+%~x8WGlUCcw0;L(T4aFj_|PEDh+HIM;}D#O!vX*%l9NkCJUlM zSdsiNBD1YDM-}9GyPCWJ5)-zW&j_v=vKwN~wZ(j~q ztcuR^)X*T3c2r(!n&NqG%{#rvdV{~&v(0y3-|f!~vooto_TKvL!AnopjhrodsrGmK zO830=Ny;%4+%J`!AAT(E-!k*1Gf{{0^nuX14wIc=zW945G%04%H>01a9u>lii@DnF zZ124Jt6|x%%-~QT!a-@v+0bxb{J{CLSMK}6nwKveAFZ6CiM@QuN7G#YpZ34asQ2En zct`bMkVL%;uS~Y?tejl9Xr>aq{TZpYTfMEs$2N80#DlLd4Hqe)jUHz7$aIF^>O7h~ zu(aalJKy*c`DP4o)#HDY#D{^(?xslO%)*o9MXw($e(96Dk-DX(sZVO9b8^$?KKv{< z{_KYOu$>4;i^?iK+c+sbLhstXyztJCYa+c13I_UKF7j?WSUh7zNAJ8Hr)LHI4-cOi zNc|$&8@%Q7@%hkE?7pGN zj;Z2}RZ~BUez_*%VY3O5zY-Pv2<8Jw<}ifuVG@%zXHk#pYp4xN2V(GLF2p9+jHaq3`% zcGk?9=znzy`_SxNS6;lbxnfZGxSj-A{@nPIucPkgc7EPqKKoAFzs7e=Mhmxk7mtR0 z5B%}X*;j?0<pjT%4Sl06&r&KsYKpPaAM%-J<{HRMYy_ZT&Thi4Sd?DPT9mgu?mI#hhlXHtYjhVttu!&=q!TIv7Zsn)V z81=eY8Y@zHEv5;jlB&fln=55iEU!m&?jjz}TINxfI+()k3gsqH z!+W?P^qO}9H;k-n97lyCMuVTf3noX?jr)sXKJ)Y}0C#g2>ocRTa#bPrB+!3Bcsi7M zuc>i=x{=xAlljpQ-_JZe#@9KV&4(WaCH})WoQFevbs7IW^#1X9dTlYk+~IsIuMwYd zIFCpyaD_rs) zG%0p4+dtJiNRhL!VE&d%=p^L(+e7}rKnb7t(Kn!EXW;rvdGv3+FT4Hc1+XQQ z>qS*^F%pzrfnuHwTwnWJ_kE225CitajU;azU8C&Z6@zF{AgGjW$gYd0I#NJ6evN&+ zt1}Y^89IB?-SO;(U&q_i-6`OgQa)rhMY`|rNJlCnUESH9=I%%=vbHUqY3Yho+`TEX zKGmK#T~`at*WKIJuY>XWo=hgSCIfx|kd8&Z$BtBN+PpdTKMWAy|9|=Wd|XH9Zfj3> zb*I`pZirxQD%17j5boWKl=OPLI3~& literal 0 HcmV?d00001 diff --git a/exec/java-exec/src/test/resources/testframework/testParquetReader/testInt96DictChange/q1.tsv b/exec/java-exec/src/test/resources/testframework/testParquetReader/testInt96DictChange/q1.tsv deleted file mode 100644 index 91b9b015fab..00000000000 --- a/exec/java-exec/src/test/resources/testframework/testParquetReader/testInt96DictChange/q1.tsv +++ /dev/null @@ -1,12 +0,0 @@ -1970-01-01 00:00:01.000 -1971-01-01 00:00:01.000 -1972-01-01 00:00:01.000 -1973-01-01 00:00:01.000 -1974-01-01 00:00:01.000 -2010-01-01 00:00:01.000 -2011-01-01 00:00:01.000 -2012-01-01 00:00:01.000 -2013-01-01 00:00:01.000 -2014-01-01 00:00:01.000 -2015-01-01 00:00:01.000 -2016-01-01 00:00:01.000 From 4f2182e41f4474ca42ae6d572a9c5d5ff274d984 Mon Sep 17 00:00:00 2001 From: Paul Rogers Date: Sat, 10 Mar 2018 23:43:36 -0800 Subject: [PATCH 35/44] DRILL-6230: Extend row set readers to handle hyper vectors closes #1161 --- .../rowSet/model/AbstractReaderBuilder.java | 45 ++ .../physical/rowSet/model/ReaderIndex.java | 28 +- .../rowSet/model/hyper/BaseReaderBuilder.java | 142 ++++-- .../model/hyper/HyperSchemaInference.java | 72 +++ .../model/single/BaseReaderBuilder.java | 81 +-- .../rowSet/model/single/DirectRowIndex.java | 40 ++ .../SingleSchemaInference.java} | 27 +- .../physical/rowSet/impl/RowSetTestUtils.java | 59 +++ .../impl/TestResultSetLoaderMapArray.java | 135 ++--- .../rowSet/impl/TestResultSetLoaderMaps.java | 193 ++++--- .../TestResultSetLoaderOmittedValues.java | 3 +- .../impl/TestResultSetLoaderOverflow.java | 173 ++++--- .../impl/TestResultSetLoaderProjection.java | 139 +---- .../impl/TestResultSetLoaderProtocol.java | 2 +- .../impl/TestResultSetLoaderTorture.java | 16 +- .../exec/record/TestVectorContainer.java | 3 +- .../drill/test/rowSet/DirectRowSet.java | 31 +- .../drill/test/rowSet/HyperRowSetImpl.java | 102 +++- .../drill/test/rowSet/IndirectRowSet.java | 14 +- .../org/apache/drill/test/rowSet/RowSet.java | 7 + .../drill/test/rowSet/RowSetComparison.java | 73 +-- .../drill/test/rowSet/RowSetPrinter.java | 18 +- .../drill/test/rowSet/RowSetReader.java | 11 +- .../drill/test/rowSet/RowSetReaderImpl.java | 24 +- .../test/rowSet/schema/UnionBuilder.java | 4 +- .../drill/test/rowSet/test/RowSetTest.java | 268 ++++++++-- .../test/rowSet/test/TestFillEmpties.java | 12 +- .../rowSet/test/TestHyperVectorReaders.java | 365 ++++++++++++++ .../test/rowSet/test/TestScalarAccessors.java | 474 ++++++++++++++---- .../main/java/io/netty/buffer/DrillBuf.java | 15 + .../codegen/templates/ColumnAccessors.java | 251 +++++----- .../exec/vector/accessor/ArrayReader.java | 40 +- .../exec/vector/accessor/ColumnReader.java | 83 +++ .../vector/accessor/ColumnReaderIndex.java | 102 +++- .../exec/vector/accessor/ObjectReader.java | 26 +- .../vector/accessor/ScalarElementReader.java | 65 --- .../exec/vector/accessor/ScalarReader.java | 13 +- .../exec/vector/accessor/TupleReader.java | 31 +- .../accessor/UnsupportedConversionError.java | 52 ++ .../drill/exec/vector/accessor/ValueType.java | 57 ++- .../vector/accessor/impl}/VectorPrinter.java | 2 +- .../exec/vector/accessor/package-info.java | 184 +++++++ .../accessor/reader/AbstractArrayReader.java | 188 ------- .../accessor/reader/AbstractObjectReader.java | 21 +- .../accessor/reader/AbstractScalarReader.java | 205 ++++++++ .../accessor/reader/AbstractTupleReader.java | 85 ++-- .../accessor/reader/ArrayReaderImpl.java | 357 +++++++++++++ .../accessor/reader/BaseElementReader.java | 187 ------- .../accessor/reader/BaseScalarReader.java | 198 +++----- .../accessor/reader/ColumnReaderFactory.java | 52 +- .../vector/accessor/reader/MapReader.java | 49 +- .../accessor/reader/NullStateReader.java | 52 ++ .../accessor/reader/NullStateReaders.java | 193 +++++++ .../accessor/reader/ObjectArrayReader.java | 159 ------ .../accessor/reader/OffsetVectorReader.java | 70 +++ ...mentReaderIndex.java => ReaderEvents.java} | 19 +- .../accessor/reader/ScalarArrayReader.java | 102 ---- .../accessor/reader/VectorAccessor.java | 5 +- .../accessor/reader/VectorAccessors.java | 344 +++++++++++++ .../vector/accessor/reader/package-info.java | 65 ++- .../accessor/writer/ColumnWriterFactory.java | 4 +- .../drill/exec/vector/complex/ListVector.java | 2 +- 62 files changed, 3976 insertions(+), 1863 deletions(-) create mode 100644 exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/AbstractReaderBuilder.java create mode 100644 exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/HyperSchemaInference.java create mode 100644 exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/DirectRowIndex.java rename exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/{SchemaInference.java => single/SingleSchemaInference.java} (67%) create mode 100644 exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/RowSetTestUtils.java create mode 100644 exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestHyperVectorReaders.java create mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ColumnReader.java delete mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ScalarElementReader.java create mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/UnsupportedConversionError.java rename exec/{java-exec/src/test/java/org/apache/drill/test/rowSet/test => vector/src/main/java/org/apache/drill/exec/vector/accessor/impl}/VectorPrinter.java (97%) delete mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractArrayReader.java create mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractScalarReader.java create mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ArrayReaderImpl.java delete mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/BaseElementReader.java create mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/NullStateReader.java create mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/NullStateReaders.java delete mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ObjectArrayReader.java create mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/OffsetVectorReader.java rename exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/{FixedWidthElementReaderIndex.java => ReaderEvents.java} (65%) delete mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ScalarArrayReader.java create mode 100644 exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/VectorAccessors.java diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/AbstractReaderBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/AbstractReaderBuilder.java new file mode 100644 index 00000000000..4bcff72ed4d --- /dev/null +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/AbstractReaderBuilder.java @@ -0,0 +1,45 @@ +/* + * 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 org.apache.drill.exec.physical.rowSet.model; + +import org.apache.drill.common.types.TypeProtos.DataMode; +import org.apache.drill.exec.record.metadata.ColumnMetadata; +import org.apache.drill.exec.vector.accessor.reader.AbstractObjectReader; +import org.apache.drill.exec.vector.accessor.reader.ArrayReaderImpl; +import org.apache.drill.exec.vector.accessor.reader.BaseScalarReader; +import org.apache.drill.exec.vector.accessor.reader.ColumnReaderFactory; +import org.apache.drill.exec.vector.accessor.reader.VectorAccessor; + +public abstract class AbstractReaderBuilder { + + protected AbstractObjectReader buildScalarReader(VectorAccessor va, ColumnMetadata schema) { + BaseScalarReader scalarReader = ColumnReaderFactory.buildColumnReader(va); + DataMode mode = va.type().getMode(); + switch (mode) { + case OPTIONAL: + return BaseScalarReader.buildOptional(schema, va, scalarReader); + case REQUIRED: + return BaseScalarReader.buildRequired(schema, va, scalarReader); + case REPEATED: + return ArrayReaderImpl.buildScalar(schema, va, scalarReader); + default: + throw new UnsupportedOperationException(mode.toString()); + } + } + +} diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/ReaderIndex.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/ReaderIndex.java index c4b04158f6a..633ce9feb63 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/ReaderIndex.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/ReaderIndex.java @@ -28,26 +28,30 @@ public abstract class ReaderIndex implements ColumnReaderIndex { - protected int rowIndex = -1; + protected int position = -1; protected final int rowCount; public ReaderIndex(int rowCount) { this.rowCount = rowCount; } - public int position() { return rowIndex; } - public void set(int index) { rowIndex = index; } + public void set(int index) { + assert position >= -1 && position <= rowCount; + position = index; + } + + @Override + public int logicalIndex() { return position; } + + @Override + public int size() { return rowCount; } + @Override public boolean next() { - if (++rowIndex < rowCount ) { + if (++position < rowCount) { return true; - } else { - rowIndex--; - return false; } + position = rowCount; + return false; } - - public int size() { return rowCount; } - - public boolean valid() { return rowIndex < rowCount; } -} \ No newline at end of file +} diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/BaseReaderBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/BaseReaderBuilder.java index ee856be7035..c636cb6ac1d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/BaseReaderBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/BaseReaderBuilder.java @@ -21,27 +21,54 @@ import java.util.List; import org.apache.drill.common.types.TypeProtos.DataMode; -import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.common.types.TypeProtos.MinorType; -import org.apache.drill.exec.physical.rowSet.model.MetadataProvider; -import org.apache.drill.exec.physical.rowSet.model.MetadataProvider.VectorDescrip; +import org.apache.drill.exec.exception.SchemaChangeException; +import org.apache.drill.exec.physical.rowSet.model.AbstractReaderBuilder; import org.apache.drill.exec.physical.rowSet.model.ReaderIndex; -import org.apache.drill.exec.record.HyperVectorWrapper; -import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.VectorWrapper; +import org.apache.drill.exec.record.metadata.ColumnMetadata; +import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.selection.SelectionVector4; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; import org.apache.drill.exec.vector.accessor.impl.AccessorUtilities; import org.apache.drill.exec.vector.accessor.reader.AbstractObjectReader; -import org.apache.drill.exec.vector.accessor.reader.ColumnReaderFactory; +import org.apache.drill.exec.vector.accessor.reader.ArrayReaderImpl; import org.apache.drill.exec.vector.accessor.reader.MapReader; -import org.apache.drill.exec.vector.accessor.reader.ObjectArrayReader; import org.apache.drill.exec.vector.accessor.reader.VectorAccessor; -import org.apache.drill.exec.vector.complex.AbstractMapVector; +import org.apache.drill.exec.vector.accessor.reader.VectorAccessors; +import org.apache.drill.exec.vector.accessor.reader.VectorAccessors.BaseHyperVectorAccessor; + +/** + * Base reader builder for a hyper-batch. The semantics of hyper-batches are + * a bit rough. When a single batch, we can walk the vector tree to get the + * information we need. But, hyper vector wrappers don't provide that same + * information, so we can't just walk them. Further, the code that builds + * hyper-batches appears perfectly happy to accept batches with differing + * schemas, something that will cause the readers to blow up because they + * must commit to a particular kind of reader for each vector. + *

+ * The solution is to build the readers in two passes. The first builds a + * metadata model for each batch and merges those models. (This version + * requires strict identity in schemas; a fancier solution could handle, + * say, the addition of map members in one batch vs. another or the addition + * of union/list members across batches.) + *

+ * The metadata (by design) has the information we need, so in the second pass + * we walk the metadata hierarchy and build up readers from that, creating + * vector accessors as we go to provide a runtime path from the root vectors + * (selected by the SV4) to the inner vectors (which are not represented as + * hypervectors.) + *

+ * The hypervector wrapper mechanism provides a crude way to handle inner + * vectors, but it is awkward, and does not lend itself to the kind of caching + * we'd like for performance, so we use our own accessors for inner vectors. + * The outermost hyper vector accessors wrap a hyper vector wrapper. Inner + * accessors directly navigate at the vector level (from a vector provided by + * the outer vector accessor.) + */ -public abstract class BaseReaderBuilder { +public abstract class BaseReaderBuilder extends AbstractReaderBuilder { /** * Read-only row index into the hyper row set with batch and index @@ -58,13 +85,13 @@ public HyperRowIndex(SelectionVector4 sv4) { } @Override - public int vectorIndex() { - return AccessorUtilities.sv4Index(sv4.get(rowIndex)); + public int offset() { + return AccessorUtilities.sv4Index(sv4.get(position)); } @Override - public int batchIndex( ) { - return AccessorUtilities.sv4Batch(sv4.get(rowIndex)); + public int hyperVectorIndex( ) { + return AccessorUtilities.sv4Batch(sv4.get(position)); } } @@ -72,14 +99,18 @@ public int batchIndex( ) { * Vector accessor used by the column accessors to obtain the vector for * each column value. That is, position 0 might be batch 4, index 3, * while position 1 might be batch 1, index 7, and so on. + *

+ * Must be here: the reader layer is in the vector package + * and does not have visibility to java-exec classes. */ - public static class HyperVectorAccessor implements VectorAccessor { + public static class HyperVectorAccessor extends BaseHyperVectorAccessor { private final ValueVector[] vectors; private ColumnReaderIndex rowIndex; public HyperVectorAccessor(VectorWrapper vw) { + super(vw.getField().getType()); vectors = vw.getValueVectors(); } @@ -88,61 +119,70 @@ public void bind(ColumnReaderIndex index) { rowIndex = index; } + @SuppressWarnings("unchecked") @Override - public ValueVector vector() { - return vectors[rowIndex.batchIndex()]; + public T vector() { + return (T) vectors[rowIndex.hyperVectorIndex()]; } } + protected List buildContainerChildren( + VectorContainer container) throws SchemaChangeException { + TupleMetadata schema = new HyperSchemaInference().infer(container); + return buildContainerChildren(container, schema); + } - protected AbstractObjectReader[] buildContainerChildren( - VectorContainer container, MetadataProvider mdProvider) { + protected List buildContainerChildren( + VectorContainer container, TupleMetadata schema) { List readers = new ArrayList<>(); for (int i = 0; i < container.getNumberOfColumns(); i++) { VectorWrapper vw = container.getValueVector(i); - VectorDescrip descrip = new VectorDescrip(mdProvider, i, vw.getField()); - readers.add(buildVectorReader(vw, descrip)); + VectorAccessor va = new HyperVectorAccessor(vw); + readers.add(buildVectorReader(va, schema.metadata(i))); } - return readers.toArray(new AbstractObjectReader[readers.size()]); + return readers; } - @SuppressWarnings("unchecked") - private AbstractObjectReader buildVectorReader(VectorWrapper vw, VectorDescrip descrip) { - MajorType type = vw.getField().getType(); - if (type.getMinorType() == MinorType.MAP) { - if (type.getMode() == DataMode.REPEATED) { - return buildMapArrayReader((HyperVectorWrapper) vw, descrip); - } else { - return buildMapReader((HyperVectorWrapper) vw, descrip); - } - } else { - return buildPrimitiveReader(vw, descrip); + protected AbstractObjectReader buildVectorReader(VectorAccessor va, ColumnMetadata metadata) { + switch(metadata.type()) { + case MAP: + return buildMap(va, metadata.mode(), metadata); + default: + return buildScalarReader(va, metadata); } } - private AbstractObjectReader buildMapArrayReader(HyperVectorWrapper vectors, VectorDescrip descrip) { - AbstractObjectReader mapReader = MapReader.build(descrip.metadata, buildMap(vectors, descrip)); - return ObjectArrayReader.build(new HyperVectorAccessor(vectors), mapReader); - } + private AbstractObjectReader buildMap(VectorAccessor va, DataMode mode, ColumnMetadata metadata) { - private AbstractObjectReader buildMapReader(HyperVectorWrapper vectors, VectorDescrip descrip) { - return MapReader.build(descrip.metadata, buildMap(vectors, descrip)); - } + boolean isArray = mode == DataMode.REPEATED; + + // Map type - private AbstractObjectReader buildPrimitiveReader(VectorWrapper vw, VectorDescrip descrip) { - return ColumnReaderFactory.buildColumnReader( - vw.getField().getType(), new HyperVectorAccessor(vw)); + AbstractObjectReader mapReader = MapReader.build( + metadata, + isArray ? null : va, + buildMapMembers(va, metadata.mapSchema())); + + // Single map + + if (! isArray) { + return mapReader; + } + + // Repeated map + + return ArrayReaderImpl.buildTuple(metadata, va, mapReader); } - private List buildMap(HyperVectorWrapper vectors, VectorDescrip descrip) { + protected List buildMapMembers(VectorAccessor va, TupleMetadata mapSchema) { List readers = new ArrayList<>(); - MetadataProvider provider = descrip.parent.childProvider(descrip.metadata); - MaterializedField mapField = vectors.getField(); - for (int i = 0; i < mapField.getChildren().size(); i++) { - HyperVectorWrapper child = (HyperVectorWrapper) vectors.getChildWrapper(new int[] {i}); - VectorDescrip childDescrip = new VectorDescrip(provider, i, child.getField()); - readers.add(buildVectorReader(child, childDescrip)); - i++; + for (int i = 0; i < mapSchema.size(); i++) { + ColumnMetadata member = mapSchema.metadata(i); + // Does not use the hyper-vector mechanism. + + readers.add(buildVectorReader( + new VectorAccessors.MapMemberHyperVectorAccessor(va, i, member.majorType()), + member)); } return readers; } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/HyperSchemaInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/HyperSchemaInference.java new file mode 100644 index 00000000000..3e148665586 --- /dev/null +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/HyperSchemaInference.java @@ -0,0 +1,72 @@ +/* + * 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 org.apache.drill.exec.physical.rowSet.model.hyper; + +import org.apache.drill.exec.exception.SchemaChangeException; +import org.apache.drill.exec.record.VectorContainer; +import org.apache.drill.exec.record.VectorWrapper; +import org.apache.drill.exec.record.metadata.ColumnMetadata; +import org.apache.drill.exec.record.metadata.MetadataUtils; +import org.apache.drill.exec.record.metadata.TupleMetadata; +import org.apache.drill.exec.record.metadata.TupleSchema; +import org.apache.drill.exec.record.metadata.VariantMetadata; +import org.apache.drill.exec.vector.ValueVector; + +/** + * Infer the schema for a hyperbatch. Scans each vector of each batch + * to ensure that the vectors are compatible. (They should be.) + *

+ * This code should be extended to handle merges. For example, batch + * 1 may have a union with type INT. Batch 2 might have a union with + * VARCHAR. The combined schema should have (INT, VARCHAR). The same + * is true with (non-repeated) lists. There may be other cases. + */ + +public class HyperSchemaInference { + + public TupleMetadata infer(VectorContainer container) throws SchemaChangeException { + TupleSchema schema = new TupleSchema(); + for (int i = 0; i < container.getNumberOfColumns(); i++) { + VectorWrapper vw = container.getValueVector(i); + schema.addColumn(buildColumn(vw)); + } + return schema; + } + + private ColumnMetadata buildColumn(VectorWrapper vw) throws SchemaChangeException { + ColumnMetadata commonSchema = null; + for (ValueVector vector : vw.getValueVectors()) { + ColumnMetadata mapSchema = MetadataUtils.fromField(vector.getField()); + if (commonSchema == null) { + commonSchema = mapSchema; + } else if (! commonSchema.isEquivalent(mapSchema)) { + throw new SchemaChangeException("Maps are not consistent"); + } + } + + // Special handling of lists and unions + + if (commonSchema.isVariant()) { + VariantMetadata variantSchema = commonSchema.variantSchema(); + if (variantSchema.size() == 1) { + variantSchema.becomeSimple(); + } + } + return commonSchema; + } +} diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/BaseReaderBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/BaseReaderBuilder.java index 80ad19f89fe..4539dbb51dc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/BaseReaderBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/BaseReaderBuilder.java @@ -22,68 +22,81 @@ import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.exec.physical.rowSet.model.AbstractReaderBuilder; import org.apache.drill.exec.physical.rowSet.model.MetadataProvider; import org.apache.drill.exec.physical.rowSet.model.MetadataProvider.VectorDescrip; import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.reader.AbstractObjectReader; -import org.apache.drill.exec.vector.accessor.reader.ColumnReaderFactory; +import org.apache.drill.exec.vector.accessor.reader.AbstractScalarReader; +import org.apache.drill.exec.vector.accessor.reader.ArrayReaderImpl; import org.apache.drill.exec.vector.accessor.reader.MapReader; -import org.apache.drill.exec.vector.accessor.reader.ObjectArrayReader; +import org.apache.drill.exec.vector.accessor.reader.VectorAccessor; +import org.apache.drill.exec.vector.accessor.reader.VectorAccessors.SingleVectorAccessor; import org.apache.drill.exec.vector.complex.AbstractMapVector; -import org.apache.drill.exec.vector.complex.MapVector; -import org.apache.drill.exec.vector.complex.RepeatedMapVector; -public abstract class BaseReaderBuilder { +public abstract class BaseReaderBuilder extends AbstractReaderBuilder { protected List buildContainerChildren( VectorContainer container, MetadataProvider mdProvider) { - List writers = new ArrayList<>(); + List readers = new ArrayList<>(); for (int i = 0; i < container.getNumberOfColumns(); i++) { - @SuppressWarnings("resource") ValueVector vector = container.getValueVector(i).getValueVector(); VectorDescrip descrip = new VectorDescrip(mdProvider, i, vector.getField()); - writers.add(buildVectorReader(vector, descrip)); + readers.add(buildVectorReader(vector, descrip)); } - return writers; + return readers; } - private AbstractObjectReader buildVectorReader(ValueVector vector, VectorDescrip descrip) { - MajorType type = vector.getField().getType(); - if (type.getMinorType() == MinorType.MAP) { - if (type.getMode() == DataMode.REPEATED) { - return buildMapArrayReader((RepeatedMapVector) vector, descrip); - } else { - return buildMapReader((MapVector) vector, descrip); - } - } else { - return buildPrimitiveReader(vector, descrip); + protected AbstractObjectReader buildVectorReader(ValueVector vector, VectorDescrip descrip) { + VectorAccessor va = new SingleVectorAccessor(vector); + MajorType type = va.type(); + + switch(type.getMinorType()) { + case MAP: + return buildMap((AbstractMapVector) vector, va, type.getMode(), descrip); + case LATE: + + // Occurs for a list with no type: a list of nulls. + + return AbstractScalarReader.nullReader(descrip.metadata); + default: + return buildScalarReader(va, descrip.metadata); } } - private AbstractObjectReader buildMapArrayReader(RepeatedMapVector vector, VectorDescrip descrip) { - AbstractObjectReader mapReader = MapReader.build(descrip.metadata, buildMap(vector, descrip)); - return ObjectArrayReader.build(vector, mapReader); - } + private AbstractObjectReader buildMap(AbstractMapVector vector, VectorAccessor va, DataMode mode, VectorDescrip descrip) { - private AbstractObjectReader buildMapReader(MapVector vector, VectorDescrip descrip) { - return MapReader.build(descrip.metadata, buildMap(vector, descrip)); - } + boolean isArray = mode == DataMode.REPEATED; - private AbstractObjectReader buildPrimitiveReader(ValueVector vector, VectorDescrip descrip) { - return ColumnReaderFactory.buildColumnReader(vector); + // Map type + + AbstractObjectReader mapReader = MapReader.build( + descrip.metadata, + isArray ? null : va, + buildMapMembers(vector, + descrip.parent.childProvider(descrip.metadata))); + + // Single map + + if (! isArray) { + return mapReader; + } + + // Repeated map + + return ArrayReaderImpl.buildTuple(descrip.metadata, va, mapReader); } - private List buildMap(AbstractMapVector vector, VectorDescrip descrip) { + protected List buildMapMembers(AbstractMapVector mapVector, MetadataProvider provider) { List readers = new ArrayList<>(); - MetadataProvider provider = descrip.parent.childProvider(descrip.metadata); int i = 0; - for (ValueVector child : vector) { - VectorDescrip childDescrip = new VectorDescrip(provider, i, child.getField()); - readers.add(buildVectorReader(child, childDescrip)); + for (ValueVector vector : mapVector) { + VectorDescrip descrip = new VectorDescrip(provider, i, vector.getField()); + readers.add(buildVectorReader(vector, descrip)); i++; } return readers; } + } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/DirectRowIndex.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/DirectRowIndex.java new file mode 100644 index 00000000000..c50487f7c83 --- /dev/null +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/DirectRowIndex.java @@ -0,0 +1,40 @@ +/* + * 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 org.apache.drill.exec.physical.rowSet.model.single; + +import org.apache.drill.exec.physical.rowSet.model.ReaderIndex; + +/** + * Reader index that points directly to each row in the row set. + * This index starts with pointing to the -1st row, so that the + * reader can require a next() for every row, including + * the first. (This is the JDBC RecordSet convention.) + */ + +public class DirectRowIndex extends ReaderIndex { + + public DirectRowIndex(int rowCount) { + super(rowCount); + } + + @Override + public int offset() { return position; } + + @Override + public int hyperVectorIndex() { return 0; } +} diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/SchemaInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/SingleSchemaInference.java similarity index 67% rename from exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/SchemaInference.java rename to exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/SingleSchemaInference.java index 9096ec26b03..b05cb8369e0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/SchemaInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/single/SingleSchemaInference.java @@ -15,47 +15,50 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.drill.exec.physical.rowSet.model; +package org.apache.drill.exec.physical.rowSet.model.single; import java.util.ArrayList; import java.util.List; -import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.VectorContainer; +import org.apache.drill.exec.record.metadata.AbstractColumnMetadata; import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.record.metadata.MetadataUtils; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.record.metadata.TupleSchema; +import org.apache.drill.exec.vector.ValueVector; +import org.apache.drill.exec.vector.complex.AbstractMapVector; /** * Produce a metadata schema from a vector container. Used when given a * record batch without metadata. */ -public class SchemaInference { +public class SingleSchemaInference { public TupleMetadata infer(VectorContainer container) { List columns = new ArrayList<>(); for (int i = 0; i < container.getNumberOfColumns(); i++) { - MaterializedField field = container.getValueVector(i).getField(); - columns.add(inferVector(field)); + columns.add(inferVector(container.getValueVector(i).getValueVector())); } return MetadataUtils.fromColumns(columns); } - private ColumnMetadata inferVector(MaterializedField field) { - if (field.getType().getMinorType() == MinorType.MAP) { - return MetadataUtils.newMap(field, inferMapSchema(field)); - } else { + private AbstractColumnMetadata inferVector(ValueVector vector) { + MaterializedField field = vector.getField(); + switch (field.getType().getMinorType()) { + case MAP: + return MetadataUtils.newMap(field, inferMapSchema((AbstractMapVector) vector)); + default: return MetadataUtils.fromField(field); } } - private TupleSchema inferMapSchema(MaterializedField field) { + private TupleSchema inferMapSchema(AbstractMapVector vector) { List columns = new ArrayList<>(); - for (MaterializedField child : field.getChildren()) { - columns.add(inferVector(child)); + for (int i = 0; i < vector.getField().getChildren().size(); i++) { + columns.add(inferVector(vector.getChildByOrdinal(i))); } return MetadataUtils.fromColumns(columns); } diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/RowSetTestUtils.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/RowSetTestUtils.java new file mode 100644 index 00000000000..c0e8f72b5bd --- /dev/null +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/RowSetTestUtils.java @@ -0,0 +1,59 @@ +/* + * 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 org.apache.drill.exec.physical.rowSet.impl; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.drill.common.expression.SchemaPath; + +import com.google.common.collect.Lists; + +public class RowSetTestUtils { + + private RowSetTestUtils() { } + + public static List projectList(String... names) { + List selected = new ArrayList<>(); + for (String name: names) { + + // Parse from string does not handle wildcards. + + if (name.equals(SchemaPath.DYNAMIC_STAR)) { + selected.add(SchemaPath.STAR_COLUMN); + } else { + selected.add(SchemaPath.parseFromString(name)); + } + } + return selected; + } + + public static List projectCols(SchemaPath... cols) { + List selected = new ArrayList<>(); + for (SchemaPath col: cols) { + selected.add(col); + } + return selected; + } + + public static List projectAll() { + return Lists.newArrayList( + new SchemaPath[] {SchemaPath.getSimplePath(SchemaPath.DYNAMIC_STAR)}); + } + +} diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMapArray.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMapArray.java index b2e3668b158..a3f17545c7c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMapArray.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMapArray.java @@ -17,7 +17,8 @@ */ package org.apache.drill.exec.physical.rowSet.impl; -import static org.apache.drill.test.rowSet.RowSetUtilities.objArray; +import static org.apache.drill.test.rowSet.RowSetUtilities.mapArray; +import static org.apache.drill.test.rowSet.RowSetUtilities.mapValue; import static org.apache.drill.test.rowSet.RowSetUtilities.strArray; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,15 +30,16 @@ import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.physical.rowSet.ResultSetLoader; import org.apache.drill.exec.physical.rowSet.RowSetLoader; +import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ArrayReader; import org.apache.drill.exec.vector.accessor.ArrayWriter; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.TupleReader; import org.apache.drill.exec.vector.accessor.TupleWriter; +import org.apache.drill.exec.vector.complex.RepeatedMapVector; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; @@ -57,6 +59,7 @@ public class TestResultSetLoaderMapArray extends SubOperatorTest { + @SuppressWarnings("resource") @Test public void testBasics() { TupleMetadata schema = new SchemaBuilder() @@ -85,28 +88,32 @@ public void testBasics() { rsLoader.startBatch(); rootWriter - .addRow(10, objArray( - objArray(110, "d1.1"), - objArray(120, "d2.2"))) - .addRow(20, objArray()) - .addRow(30, objArray( - objArray(310, "d3.1"), - objArray(320, "d3.2"), - objArray(330, "d3.3"))) + .addRow(10, mapArray( + mapValue(110, "d1.1"), + mapValue(120, "d2.2"))) + .addRow(20, mapArray()) + .addRow(30, mapArray( + mapValue(310, "d3.1"), + mapValue(320, "d3.2"), + mapValue(330, "d3.3"))) ; // Verify the first batch RowSet actual = fixture.wrap(rsLoader.harvest()); + RepeatedMapVector mapVector = (RepeatedMapVector) actual.container().getValueVector(1).getValueVector(); + MaterializedField mapField = mapVector.getField(); + assertEquals(2, mapField.getChildren().size()); + SingleRowSet expected = fixture.rowSetBuilder(schema) - .addRow(10, objArray( - objArray(110, "d1.1"), - objArray(120, "d2.2"))) - .addRow(20, objArray()) - .addRow(30, objArray( - objArray(310, "d3.1"), - objArray(320, "d3.2"), - objArray(330, "d3.3"))) + .addRow(10, mapArray( + mapValue(110, "d1.1"), + mapValue(120, "d2.2"))) + .addRow(20, mapArray()) + .addRow(30, mapArray( + mapValue(310, "d3.1"), + mapValue(320, "d3.2"), + mapValue(330, "d3.3"))) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -115,26 +122,30 @@ public void testBasics() { rsLoader.startBatch(); rootWriter - .addRow(40, objArray( - objArray(410, "d4.1"), - objArray(420, "d4.2"))); + .addRow(40, mapArray( + mapValue(410, "d4.1"), + mapValue(420, "d4.2"))); TupleWriter mapWriter = rootWriter.array("m").tuple(); mapWriter.addColumn(SchemaBuilder.columnSchema("e", MinorType.VARCHAR, DataMode.OPTIONAL)); rootWriter - .addRow(50, objArray( - objArray(510, "d5.1", "e5.1"), - objArray(520, "d5.2", null))) - .addRow(60, objArray( - objArray(610, "d6.1", "e6.1"), - objArray(620, "d6.2", null), - objArray(630, "d6.3", "e6.3"))) + .addRow(50, mapArray( + mapValue(510, "d5.1", "e5.1"), + mapValue(520, "d5.2", null))) + .addRow(60, mapArray( + mapValue(610, "d6.1", "e6.1"), + mapValue(620, "d6.2", null), + mapValue(630, "d6.3", "e6.3"))) ; // Verify the second batch actual = fixture.wrap(rsLoader.harvest()); + mapVector = (RepeatedMapVector) actual.container().getValueVector(1).getValueVector(); + mapField = mapVector.getField(); + assertEquals(3, mapField.getChildren().size()); + TupleMetadata expectedSchema = new SchemaBuilder() .add("a", MinorType.INT) .addMapArray("m") @@ -144,16 +155,16 @@ public void testBasics() { .resumeSchema() .buildSchema(); expected = fixture.rowSetBuilder(expectedSchema) - .addRow(40, objArray( - objArray(410, "d4.1", null), - objArray(420, "d4.2", null))) - .addRow(50, objArray( - objArray(510, "d5.1", "e5.1"), - objArray(520, "d5.2", null))) - .addRow(60, objArray( - objArray(610, "d6.1", "e6.1"), - objArray(620, "d6.2", null), - objArray(630, "d6.3", "e6.3"))) + .addRow(40, mapArray( + mapValue(410, "d4.1", null), + mapValue(420, "d4.2", null))) + .addRow(50, mapArray( + mapValue(510, "d5.1", "e5.1"), + mapValue(520, "d5.2", null))) + .addRow(60, mapArray( + mapValue(610, "d6.1", "e6.1"), + mapValue(620, "d6.2", null), + mapValue(630, "d6.3", "e6.3"))) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -181,28 +192,28 @@ public void testNestedArray() { rsLoader.startBatch(); rootWriter - .addRow(10, objArray( - objArray(110, strArray("d1.1.1", "d1.1.2")), - objArray(120, strArray("d1.2.1", "d1.2.2")))) - .addRow(20, objArray()) - .addRow(30, objArray( - objArray(310, strArray("d3.1.1", "d3.2.2")), - objArray(320, strArray()), - objArray(330, strArray("d3.3.1", "d1.2.2")))) + .addRow(10, mapArray( + mapValue(110, strArray("d1.1.1", "d1.1.2")), + mapValue(120, strArray("d1.2.1", "d1.2.2")))) + .addRow(20, mapArray()) + .addRow(30, mapArray( + mapValue(310, strArray("d3.1.1", "d3.2.2")), + mapValue(320, strArray()), + mapValue(330, strArray("d3.3.1", "d1.2.2")))) ; // Verify the batch RowSet actual = fixture.wrap(rsLoader.harvest()); SingleRowSet expected = fixture.rowSetBuilder(schema) - .addRow(10, objArray( - objArray(110, strArray("d1.1.1", "d1.1.2")), - objArray(120, strArray("d1.2.1", "d1.2.2")))) - .addRow(20, objArray()) - .addRow(30, objArray( - objArray(310, strArray("d3.1.1", "d3.2.2")), - objArray(320, strArray()), - objArray(330, strArray("d3.3.1", "d1.2.2")))) + .addRow(10, mapArray( + mapValue(110, strArray("d1.1.1", "d1.1.2")), + mapValue(120, strArray("d1.2.1", "d1.2.2")))) + .addRow(20, mapArray()) + .addRow(30, mapArray( + mapValue(310, strArray("d3.1.1", "d3.2.2")), + mapValue(320, strArray()), + mapValue(330, strArray("d3.3.1", "d1.2.2")))) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -270,21 +281,23 @@ public void testDoubleNestedArray() { ArrayReader a2Reader = m1Reader.array("m2"); TupleReader m2Reader = a2Reader.tuple(); ScalarReader cReader = m2Reader.scalar("c"); - ScalarElementReader dReader = m2Reader.elements("d"); + ArrayReader dArray = m2Reader.array("d"); + ScalarReader dReader = dArray.scalar(); for (int i = 0; i < 5; i++) { - reader.next(); + assertTrue(reader.next()); assertEquals(i, aReader.getInt()); for (int j = 0; j < 4; j++) { - a1Reader.setPosn(j); + assertTrue(a1Reader.next()); int a1Key = i + 10 + j; assertEquals(a1Key, bReader.getInt()); for (int k = 0; k < 3; k++) { - a2Reader.setPosn(k); + assertTrue(a2Reader.next()); int a2Key = a1Key * 10 + k; assertEquals(a2Key, cReader.getInt()); for (int l = 0; l < 2; l++) { - assertEquals("d-" + (a2Key * 10 + l), dReader.getString(l)); + assertTrue(dArray.next()); + assertEquals("d-" + (a2Key * 10 + l), dReader.getString()); } } } @@ -357,7 +370,7 @@ public void testOverwriteRow() { assertEquals(rowId * 100, reader.scalar("a").getInt()); assertEquals(10, maReader.size()); for (int i = 0; i < 10; i++) { - maReader.setPosn(i); + assert(maReader.next()); assertEquals(rowId * 1000 + i, mReader.scalar("b").getInt()); assertTrue(Arrays.equals(value, mReader.scalar("c").getBytes())); } @@ -426,7 +439,7 @@ public void testOmittedValues() { } assertEquals(entryCount, maReader.size()); for (int j = 0; j < entryCount; j++) { - maReader.setPosn(j); + assertTrue(maReader.next()); if (j % entrySkip == 0) { assertTrue(mReader.scalar(0).isNull()); assertTrue(mReader.scalar(1).isNull()); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMaps.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMaps.java index 11f449b7fab..10dbbe13c3e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMaps.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderMaps.java @@ -18,6 +18,7 @@ package org.apache.drill.exec.physical.rowSet.impl; import static org.apache.drill.test.rowSet.RowSetUtilities.intArray; +import static org.apache.drill.test.rowSet.RowSetUtilities.mapValue; import static org.apache.drill.test.rowSet.RowSetUtilities.objArray; import static org.apache.drill.test.rowSet.RowSetUtilities.strArray; import static org.junit.Assert.assertEquals; @@ -32,11 +33,13 @@ import org.apache.drill.exec.physical.rowSet.RowSetLoader; import org.apache.drill.exec.record.BatchSchema; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; +import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.TupleReader; import org.apache.drill.exec.vector.accessor.TupleWriter; +import org.apache.drill.exec.vector.complex.MapVector; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; @@ -45,6 +48,7 @@ import org.apache.drill.test.rowSet.schema.SchemaBuilder; import org.junit.Test; + /** * Test (non-array) map support in the result set loader and related classes. */ @@ -104,7 +108,7 @@ public void testBasics() { // Write another using the test-time conveniences - rootWriter.addRow(20, objArray(210, "barney"), "bam-bam"); + rootWriter.addRow(20, mapValue(210, "barney"), "bam-bam"); // Harvest the batch @@ -115,8 +119,8 @@ public void testBasics() { // Validate data SingleRowSet expected = fixture.rowSetBuilder(schema) - .addRow(10, objArray(110, "fred"), "pebbles") - .addRow(20, objArray(210, "barney"), "bam-bam") + .addRow(10, mapValue(110, "fred"), "pebbles") + .addRow(20, mapValue(210, "barney"), "bam-bam") .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -146,8 +150,8 @@ public void testMapEvolution() { rsLoader.startBatch(); rootWriter - .addRow(10, objArray("fred")) - .addRow(20, objArray("barney")); + .addRow(10, mapValue("fred")) + .addRow(20, mapValue("barney")); RowSet actual = fixture.wrap(rsLoader.harvest()); assertEquals(3, rsLoader.schemaVersion()); @@ -156,8 +160,8 @@ public void testMapEvolution() { // Validate first batch SingleRowSet expected = fixture.rowSetBuilder(schema) - .addRow(10, objArray("fred")) - .addRow(20, objArray("barney")) + .addRow(10, mapValue("fred")) + .addRow(20, mapValue("barney")) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -172,10 +176,10 @@ public void testMapEvolution() { rsLoader.startBatch(); mapWriter.addColumn(SchemaBuilder.columnSchema("d", MinorType.BIGINT, DataMode.REQUIRED)); - rootWriter.addRow(30, objArray("wilma", 130, 130_000L)); + rootWriter.addRow(30, mapValue("wilma", 130, 130_000L)); mapWriter.addColumn(SchemaBuilder.columnSchema("e", MinorType.VARCHAR, DataMode.REQUIRED)); - rootWriter.addRow(40, objArray("betty", 140, 140_000L, "bam-bam")); + rootWriter.addRow(40, mapValue("betty", 140, 140_000L, "bam-bam")); actual = fixture.wrap(rsLoader.harvest()); assertEquals(6, rsLoader.schemaVersion()); @@ -193,8 +197,8 @@ public void testMapEvolution() { .resumeSchema() .buildSchema(); expected = fixture.rowSetBuilder(expectedSchema) - .addRow(30, objArray("wilma", 130, 130_000L, "")) - .addRow(40, objArray("betty", 140, 140_000L, "bam-bam")) + .addRow(30, mapValue("wilma", 130, 130_000L, "")) + .addRow(40, mapValue("betty", 140, 140_000L, "bam-bam")) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -229,16 +233,25 @@ public void testMapAddition() { // Add a column to the map with the same name as the top-level column. // Verifies that the name spaces are independent. - mapWriter.addColumn(SchemaBuilder.columnSchema("a", MinorType.VARCHAR, DataMode.REQUIRED)); + int colIndex = mapWriter.addColumn(SchemaBuilder.columnSchema("a", MinorType.VARCHAR, DataMode.REQUIRED)); + assertEquals(0, colIndex); + + // Ensure metadata was added + + assertTrue(mapWriter.schema().size() == 1); rootWriter - .addRow(20, objArray("fred")) - .addRow(30, objArray("barney")); + .addRow(20, mapValue("fred")) + .addRow(30, mapValue("barney")); RowSet actual = fixture.wrap(rsLoader.harvest()); assertEquals(3, rsLoader.schemaVersion()); assertEquals(3, actual.rowCount()); + MapVector mapVector = (MapVector) actual.container().getValueVector(1).getValueVector(); + MaterializedField mapField = mapVector.getField(); + assertEquals(1, mapField.getChildren().size()); + // Validate first batch TupleMetadata expectedSchema = new SchemaBuilder() @@ -248,9 +261,9 @@ public void testMapAddition() { .resumeSchema() .buildSchema(); SingleRowSet expected = fixture.rowSetBuilder(expectedSchema) - .addRow(10, objArray("")) - .addRow(20, objArray("fred")) - .addRow(30, objArray("barney")) + .addRow(10, mapValue("")) + .addRow(20, mapValue("fred")) + .addRow(30, mapValue("barney")) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -285,8 +298,8 @@ public void testEmptyMapAddition() { TupleWriter mapWriter = rootWriter.tuple(mapIndex); rootWriter - .addRow(20, objArray()) - .addRow(30, objArray()); + .addRow(20, mapValue()) + .addRow(30, mapValue()); RowSet actual = fixture.wrap(rsLoader.harvest()); assertEquals(2, rsLoader.schemaVersion()); @@ -300,9 +313,9 @@ public void testEmptyMapAddition() { .resumeSchema() .buildSchema(); SingleRowSet expected = fixture.rowSetBuilder(expectedSchema) - .addRow(10, objArray()) - .addRow(20, objArray()) - .addRow(30, objArray()) + .addRow(10, mapValue()) + .addRow(20, mapValue()) + .addRow(30, mapValue()) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -313,8 +326,8 @@ public void testEmptyMapAddition() { mapWriter.addColumn(SchemaBuilder.columnSchema("a", MinorType.VARCHAR, DataMode.REQUIRED)); rootWriter - .addRow(40, objArray("fred")) - .addRow(50, objArray("barney")); + .addRow(40, mapValue("fred")) + .addRow(50, mapValue("barney")); actual = fixture.wrap(rsLoader.harvest()); assertEquals(3, rsLoader.schemaVersion()); @@ -329,8 +342,8 @@ public void testEmptyMapAddition() { .resumeSchema() .buildSchema(); expected = fixture.rowSetBuilder(expectedSchema) - .addRow(40, objArray("fred")) - .addRow(50, objArray("barney")) + .addRow(40, mapValue("fred")) + .addRow(50, mapValue("barney")) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -371,7 +384,7 @@ public void testNestedMapsRequired() { RowSet actual = fixture.wrap(rsLoader.harvest()); assertEquals(5, rsLoader.schemaVersion()); SingleRowSet expected = fixture.rowSetBuilder(schema) - .addRow(10, objArray("b1", objArray("c1"))) + .addRow(10, mapValue("b1", mapValue("c1"))) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -379,21 +392,21 @@ public void testNestedMapsRequired() { // Now add columns in the second batch. rsLoader.startBatch(); - rootWriter.addRow(20, objArray("b2", objArray("c2"))); + rootWriter.addRow(20, mapValue("b2", mapValue("c2"))); TupleWriter m1Writer = rootWriter.tuple("m1"); m1Writer.addColumn(SchemaBuilder.columnSchema("d", MinorType.VARCHAR, DataMode.REQUIRED)); TupleWriter m2Writer = m1Writer.tuple("m2"); m2Writer.addColumn(SchemaBuilder.columnSchema("e", MinorType.VARCHAR, DataMode.REQUIRED)); - rootWriter.addRow(30, objArray("b3", objArray("c3", "e3"), "d3")); + rootWriter.addRow(30, mapValue("b3", mapValue("c3", "e3"), "d3")); // And another set while the write proceeds. m1Writer.addColumn(SchemaBuilder.columnSchema("f", MinorType.VARCHAR, DataMode.REQUIRED)); m2Writer.addColumn(SchemaBuilder.columnSchema("g", MinorType.VARCHAR, DataMode.REQUIRED)); - rootWriter.addRow(40, objArray("b4", objArray("c4", "e4", "g4"), "d4", "e4")); + rootWriter.addRow(40, mapValue("b4", mapValue("c4", "e4", "g4"), "d4", "e4")); // Validate second batch @@ -414,9 +427,9 @@ public void testNestedMapsRequired() { .resumeSchema() .buildSchema(); expected = fixture.rowSetBuilder(expectedSchema) - .addRow(20, objArray("b2", objArray("c2", "", "" ), "", "" )) - .addRow(30, objArray("b3", objArray("c3", "e3", "" ), "d3", "" )) - .addRow(40, objArray("b4", objArray("c4", "e4", "g4"), "d4", "e4")) + .addRow(20, mapValue("b2", mapValue("c2", "", "" ), "", "" )) + .addRow(30, mapValue("b3", mapValue("c3", "e3", "" ), "d3", "" )) + .addRow(40, mapValue("b4", mapValue("c4", "e4", "g4"), "d4", "e4")) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -447,13 +460,13 @@ public void testNestedMapsNullable() { RowSetLoader rootWriter = rsLoader.writer(); rsLoader.startBatch(); - rootWriter.addRow(10, objArray("b1", objArray("c1"))); + rootWriter.addRow(10, mapValue("b1", mapValue("c1"))); // Validate first batch RowSet actual = fixture.wrap(rsLoader.harvest()); SingleRowSet expected = fixture.rowSetBuilder(schema) - .addRow(10, objArray("b1", objArray("c1"))) + .addRow(10, mapValue("b1", mapValue("c1"))) .build(); // actual.print(); // expected.print(); @@ -463,21 +476,21 @@ public void testNestedMapsNullable() { // Now add columns in the second batch. rsLoader.startBatch(); - rootWriter.addRow(20, objArray("b2", objArray("c2"))); + rootWriter.addRow(20, mapValue("b2", mapValue("c2"))); TupleWriter m1Writer = rootWriter.tuple("m1"); m1Writer.addColumn(SchemaBuilder.columnSchema("d", MinorType.VARCHAR, DataMode.OPTIONAL)); TupleWriter m2Writer = m1Writer.tuple("m2"); m2Writer.addColumn(SchemaBuilder.columnSchema("e", MinorType.VARCHAR, DataMode.OPTIONAL)); - rootWriter.addRow(30, objArray("b3", objArray("c3", "e3"), "d3")); + rootWriter.addRow(30, mapValue("b3", mapValue("c3", "e3"), "d3")); // And another set while the write proceeds. m1Writer.addColumn(SchemaBuilder.columnSchema("f", MinorType.VARCHAR, DataMode.OPTIONAL)); m2Writer.addColumn(SchemaBuilder.columnSchema("g", MinorType.VARCHAR, DataMode.OPTIONAL)); - rootWriter.addRow(40, objArray("b4", objArray("c4", "e4", "g4"), "d4", "e4")); + rootWriter.addRow(40, mapValue("b4", mapValue("c4", "e4", "g4"), "d4", "e4")); // Validate second batch @@ -496,9 +509,9 @@ public void testNestedMapsNullable() { .resumeSchema() .buildSchema(); expected = fixture.rowSetBuilder(expectedSchema) - .addRow(20, objArray("b2", objArray("c2", null, null), null, null)) - .addRow(30, objArray("b3", objArray("c3", "e3", null), "d3", null)) - .addRow(40, objArray("b4", objArray("c4", "e4", "g4"), "d4", "e4")) + .addRow(20, mapValue("b2", mapValue("c2", null, null), null, null)) + .addRow(30, mapValue("b3", mapValue("c3", "e3", null), "d3", null)) + .addRow(40, mapValue("b4", mapValue("c4", "e4", "g4"), "d4", "e4")) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -532,20 +545,20 @@ public void testMapWithArray() { rsLoader.startBatch(); rootWriter - .addRow(10, objArray(intArray(110, 120, 130), - strArray("d1.1", "d1.2", "d1.3", "d1.4"))) - .addRow(20, objArray(intArray(210), strArray())) - .addRow(30, objArray(intArray(), strArray("d3.1"))) + .addRow(10, mapValue(intArray(110, 120, 130), + strArray("d1.1", "d1.2", "d1.3", "d1.4"))) + .addRow(20, mapValue(intArray(210), strArray())) + .addRow(30, mapValue(intArray(), strArray("d3.1"))) ; // Validate first batch RowSet actual = fixture.wrap(rsLoader.harvest()); SingleRowSet expected = fixture.rowSetBuilder(schema) - .addRow(10, objArray(intArray(110, 120, 130), - strArray("d1.1", "d1.2", "d1.3", "d1.4"))) - .addRow(20, objArray(intArray(210), strArray())) - .addRow(30, objArray(intArray(), strArray("d3.1"))) + .addRow(10, mapValue(intArray(110, 120, 130), + strArray("d1.1", "d1.2", "d1.3", "d1.4"))) + .addRow(20, mapValue(intArray(210), strArray())) + .addRow(30, mapValue(intArray(), strArray("d3.1"))) .build(); new RowSetComparison(expected).verifyAndClearAll(actual); @@ -554,15 +567,15 @@ public void testMapWithArray() { rsLoader.startBatch(); rootWriter - .addRow(40, objArray(intArray(410, 420), strArray("d4.1", "d4.2"))) - .addRow(50, objArray(intArray(510), strArray("d5.1"))) + .addRow(40, mapValue(intArray(410, 420), strArray("d4.1", "d4.2"))) + .addRow(50, mapValue(intArray(510), strArray("d5.1"))) ; TupleWriter mapWriter = rootWriter.tuple("m"); mapWriter.addColumn(SchemaBuilder.columnSchema("e", MinorType.VARCHAR, DataMode.REPEATED)); rootWriter - .addRow(60, objArray(intArray(610, 620), strArray("d6.1", "d6.2"), strArray("e6.1", "e6.2"))) - .addRow(70, objArray(intArray(710), strArray(), strArray("e7.1", "e7.2"))) + .addRow(60, mapValue(intArray(610, 620), strArray("d6.1", "d6.2"), strArray("e6.1", "e6.2"))) + .addRow(70, mapValue(intArray(710), strArray(), strArray("e7.1", "e7.2"))) ; // Validate first batch. The new array should have been back-filled with @@ -571,10 +584,10 @@ public void testMapWithArray() { actual = fixture.wrap(rsLoader.harvest()); // System.out.println(actual.schema().toString()); expected = fixture.rowSetBuilder(actual.schema()) - .addRow(40, objArray(intArray(410, 420), strArray("d4.1", "d4.2"), strArray())) - .addRow(50, objArray(intArray(510), strArray("d5.1"), strArray())) - .addRow(60, objArray(intArray(610, 620), strArray("d6.1", "d6.2"), strArray("e6.1", "e6.2"))) - .addRow(70, objArray(intArray(710), strArray(), strArray("e7.1", "e7.2"))) + .addRow(40, mapValue(intArray(410, 420), strArray("d4.1", "d4.2"), strArray())) + .addRow(50, mapValue(intArray(510), strArray("d5.1"), strArray())) + .addRow(60, mapValue(intArray(610, 620), strArray("d6.1", "d6.2"), strArray("e6.1", "e6.2"))) + .addRow(70, mapValue(intArray(710), strArray(), strArray("e7.1", "e7.2"))) .build(); // expected.print(); @@ -614,7 +627,7 @@ public void testMapWithOverflow() { int count = 0; rsLoader.startBatch(); while (! rootWriter.isFull()) { - rootWriter.addRow(count, objArray(count * 10, objArray(count * 100, value, count * 1000))); + rootWriter.addRow(count, mapValue(count * 10, mapValue(count * 100, value, count * 1000))); count++; } @@ -810,4 +823,68 @@ public void testOverwriteRow() { result.clear(); rsLoader.close(); } + + /** + * Verify that map name spaces (and implementations) are + * independent. + */ + + @Test + public void testNameSpace() { + TupleMetadata schema = new SchemaBuilder() + .add("a", MinorType.INT) + .addMap("m") + .add("a", MinorType.INT) + .addMap("m") + .add("a", MinorType.INT) + .resumeMap() + .resumeSchema() + .buildSchema(); + ResultSetLoaderImpl.ResultSetOptions options = new OptionBuilder() + .setSchema(schema) + .build(); + ResultSetLoader rsLoader = new ResultSetLoaderImpl(fixture.allocator(), options); + RowSetLoader rootWriter = rsLoader.writer(); + + rsLoader.startBatch(); + + // Write a row the way that clients will do. + + ScalarWriter a1Writer = rootWriter.scalar("a"); + TupleWriter m1Writer = rootWriter.tuple("m"); + ScalarWriter a2Writer = m1Writer.scalar("a"); + TupleWriter m2Writer = m1Writer.tuple("m"); + ScalarWriter a3Writer = m2Writer.scalar("a"); + + rootWriter.start(); + a1Writer.setInt(11); + a2Writer.setInt(12); + a3Writer.setInt(13); + rootWriter.save(); + + rootWriter.start(); + a1Writer.setInt(21); + a2Writer.setInt(22); + a3Writer.setInt(23); + rootWriter.save(); + + // Try simplified test format + + rootWriter.addRow(31, + mapValue(32, + mapValue(33))); + + // Verify + + RowSet actual = fixture.wrap(rsLoader.harvest()); + + SingleRowSet expected = fixture.rowSetBuilder(schema) + .addRow(11, mapValue(12, mapValue(13))) + .addRow(21, mapValue(22, mapValue(23))) + .addRow(31, mapValue(32, mapValue(33))) + .build(); + + new RowSetComparison(expected).verifyAndClearAll(actual); + rsLoader.close(); + } } diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOmittedValues.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOmittedValues.java index 5fd65a9b04d..a2015fea651 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOmittedValues.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOmittedValues.java @@ -38,6 +38,7 @@ import org.apache.drill.test.rowSet.schema.SchemaBuilder; import org.junit.Test; + public class TestResultSetLoaderOmittedValues extends SubOperatorTest { /** @@ -140,7 +141,7 @@ public void testOmittedValuesAtEnd() { .add("a", MinorType.INT) .add("b", MinorType.VARCHAR) .addNullable("c", MinorType.VARCHAR) - .add("3", MinorType.INT) + .add("d", MinorType.INT) .addNullable("e", MinorType.INT) .addArray("f", MinorType.VARCHAR) .build(); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOverflow.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOverflow.java index bb82131273d..2a33f04a29b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOverflow.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderOverflow.java @@ -32,7 +32,8 @@ import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; +import org.apache.drill.exec.vector.accessor.ArrayReader; +import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet; @@ -308,12 +309,14 @@ public void testSizeLimitOnArray() { RowSet result = fixture.wrap(rsLoader.harvest()); assertEquals(expectedCount, result.rowCount()); RowSetReader reader = result.reader(); - reader.set(expectedCount - 1); - ScalarElementReader arrayReader = reader.column(0).elements(); + reader.setPosn(expectedCount - 1); + ArrayReader arrayReader = reader.array(0); + ScalarReader strReader = arrayReader.scalar(); assertEquals(valuesPerArray, arrayReader.size()); for (int i = 0; i < valuesPerArray; i++) { + assertTrue(arrayReader.next()); String cellValue = strValue + (count - 1) + "." + i; - assertEquals(cellValue, arrayReader.getString(i)); + assertEquals(cellValue, strReader.getString()); } result.clear(); @@ -331,11 +334,13 @@ public void testSizeLimitOnArray() { assertEquals(1, result.rowCount()); reader = result.reader(); reader.next(); - arrayReader = reader.column(0).elements(); + arrayReader = reader.array(0); + strReader = arrayReader.scalar(); assertEquals(valuesPerArray, arrayReader.size()); for (int i = 0; i < valuesPerArray; i++) { + assertTrue(arrayReader.next()); String cellValue = strValue + (count) + "." + i; - assertEquals(cellValue, arrayReader.getString(i)); + assertEquals(cellValue, strReader.getString()); } result.clear(); @@ -427,38 +432,48 @@ public void testArrayOverflowWithOtherArrays() { RowSet result = fixture.wrap(rsLoader.harvest()); assertEquals(count - 1, result.rowCount()); - RowSetReader reader = result.reader(); - ScalarElementReader aReader = reader.array("a").elements(); - ScalarElementReader bReader = reader.array("b").elements(); - ScalarElementReader cReader = reader.array("c").elements(); - ScalarElementReader dReader = reader.array("d").elements(); - - while (reader.next()) { - int rowId = reader.rowIndex(); - assertEquals(aCount, aReader.size()); - for (int i = 0; i < aCount; i++) { - assertEquals(rowId * aCount + i, aReader.getInt(i)); - } - assertEquals(bCount, bReader.size()); - for (int i = 0; i < bCount; i++) { - String cellValue = strValue + (rowId * bCount + i); - assertEquals(cellValue, bReader.getString(i)); - } - if (rowId < cCutoff) { - assertEquals(cCount, cReader.size()); - for (int i = 0; i < cCount; i++) { - assertEquals(rowId * cCount + i, cReader.getInt(i)); + { + RowSetReader reader = result.reader(); + ArrayReader aArray = reader.array("a"); + ScalarReader aReader = aArray.scalar(); + ArrayReader bArray = reader.array("b"); + ScalarReader bReader = bArray.scalar(); + ArrayReader cArray = reader.array("c"); + ScalarReader cReader = cArray.scalar(); + ArrayReader dArray = reader.array("d"); + ScalarReader dReader = dArray.scalar(); + + while (reader.next()) { + int rowId = reader.offset(); + assertEquals(aCount, aArray.size()); + for (int i = 0; i < aCount; i++) { + assertTrue(aArray.next()); + assertEquals(rowId * aCount + i, aReader.getInt()); } - assertEquals(dCount, dReader.size()); - for (int i = 0; i < dCount; i++) { - assertEquals(rowId * dCount + i, dReader.getInt(i)); + assertEquals(bCount, bArray.size()); + for (int i = 0; i < bCount; i++) { + assertTrue(bArray.next()); + String cellValue = strValue + (rowId * bCount + i); + assertEquals(cellValue, bReader.getString()); + } + if (rowId < cCutoff) { + assertEquals(cCount, cArray.size()); + for (int i = 0; i < cCount; i++) { + assertTrue(cArray.next()); + assertEquals(rowId * cCount + i, cReader.getInt()); + } + assertEquals(dCount, dArray.size()); + for (int i = 0; i < dCount; i++) { + assertTrue(dArray.next()); + assertEquals(rowId * dCount + i, dReader.getInt()); + } + } else { + assertEquals(0, cArray.size()); + assertEquals(0, dArray.size()); } - } else { - assertEquals(0, cReader.size()); - assertEquals(0, dReader.size()); } + result.clear(); } - result.clear(); int firstCount = count - 1; // One row is in the batch. Write more, skipping over the @@ -490,41 +505,51 @@ public void testArrayOverflowWithOtherArrays() { result = fixture.wrap(rsLoader.harvest()); assertEquals(6, result.rowCount()); - reader = result.reader(); - aReader = reader.array("a").elements(); - bReader = reader.array("b").elements(); - cReader = reader.array("c").elements(); - dReader = reader.array("d").elements(); - - int j = 0; - while (reader.next()) { - int rowId = firstCount + reader.rowIndex(); - assertEquals(aCount, aReader.size()); - for (int i = 0; i < aCount; i++) { - assertEquals("Index " + i, rowId * aCount + i, aReader.getInt(i)); - } - assertEquals(bCount, bReader.size()); - for (int i = 0; i < bCount; i++) { - String cellValue = strValue + (rowId * bCount + i); - assertEquals(cellValue, bReader.getString(i)); - } - if (j > 4) { - assertEquals(cCount, cReader.size()); - for (int i = 0; i < cCount; i++) { - assertEquals(rowId * cCount + i, cReader.getInt(i)); + { + RowSetReader reader = result.reader(); + ArrayReader aArray = reader.array("a"); + ScalarReader aReader = aArray.scalar(); + ArrayReader bArray = reader.array("b"); + ScalarReader bReader = bArray.scalar(); + ArrayReader cArray = reader.array("c"); + ScalarReader cReader = cArray.scalar(); + ArrayReader dArray = reader.array("d"); + ScalarReader dReader = dArray.scalar(); + + int j = 0; + while (reader.next()) { + int rowId = firstCount + reader.offset(); + assertEquals(aCount, aArray.size()); + for (int i = 0; i < aCount; i++) { + assertTrue(aArray.next()); + assertEquals("Index " + i, rowId * aCount + i, aReader.getInt()); } - } else { - assertEquals(0, cReader.size()); - } - if (j == 0 || j > 4) { - assertEquals(dCount, dReader.size()); - for (int i = 0; i < dCount; i++) { - assertEquals(rowId * dCount + i, dReader.getInt(i)); + assertEquals(bCount, bArray.size()); + for (int i = 0; i < bCount; i++) { + assertTrue(bArray.next()); + String cellValue = strValue + (rowId * bCount + i); + assertEquals(cellValue, bReader.getString()); } - } else { - assertEquals(0, dReader.size()); + if (j > 4) { + assertEquals(cCount, cArray.size()); + for (int i = 0; i < cCount; i++) { + assertTrue(cArray.next()); + assertEquals(rowId * cCount + i, cReader.getInt()); + } + } else { + assertEquals(0, cArray.size()); + } + if (j == 0 || j > 4) { + assertEquals(dCount, dArray.size()); + for (int i = 0; i < dCount; i++) { + assertTrue(dArray.next()); + assertEquals(rowId * dCount + i, dReader.getInt()); + } + } else { + assertEquals(0, dArray.size()); + } + j++; } - j++; } result.clear(); @@ -602,17 +627,19 @@ public void testMissingArrayValues() { RowSet result = fixture.wrap(rsLoader.harvest()); assertEquals(rowId - 1, result.rowCount()); RowSetReader reader = result.reader(); - ScalarElementReader cReader = reader.array("c").elements(); + ArrayReader cArray = reader.array("c"); + ScalarReader cReader = cArray.scalar(); while (reader.next()) { - assertEquals(reader.rowIndex(), reader.scalar("a").getInt()); + assertEquals(reader.offset(), reader.scalar("a").getInt()); assertTrue(Arrays.equals(value, reader.scalar("b").getBytes())); - if (reader.rowIndex() < blankAfter) { - assertEquals(3, cReader.size()); + if (reader.offset() < blankAfter) { + assertEquals(3, cArray.size()); for (int i = 0; i < 3; i++) { - assertEquals(reader.rowIndex() * 3 + i, cReader.getInt(i)); + assertTrue(cArray.next()); + assertEquals(reader.offset() * 3 + i, cReader.getInt()); } } else { - assertEquals(0, cReader.size()); + assertEquals(0, cArray.size()); } } result.clear(); @@ -655,7 +682,7 @@ public void testOverflowWithNullables() { RowSetReader reader = result.reader(); while (reader.next()) { - assertEquals(reader.rowIndex(), reader.scalar(0).getInt()); + assertEquals(reader.offset(), reader.scalar(0).getInt()); assertTrue(reader.scalar(1).isNull()); assertTrue(Arrays.equals(value, reader.scalar(2).getBytes())); assertTrue(reader.scalar(3).isNull()); diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProjection.java index b69e797c82f..95aa2b7567c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProjection.java @@ -17,13 +17,12 @@ */ package org.apache.drill.exec.physical.rowSet.impl; +import static org.apache.drill.test.rowSet.RowSetUtilities.mapValue; import static org.apache.drill.test.rowSet.RowSetUtilities.objArray; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -44,103 +43,12 @@ import org.apache.drill.test.rowSet.schema.SchemaBuilder; import org.junit.Test; -import com.google.common.collect.Lists; - /** * Test of the basics of the projection mechanism. */ public class TestResultSetLoaderProjection extends SubOperatorTest { - @Test - public void testProjectionMap() { - - // Null map means everything is projected - - { - ProjectionSet projSet = ProjectionSetImpl.parse(null); - assertTrue(projSet instanceof NullProjectionSet); - assertTrue(projSet.isProjected("foo")); - } - - // Empty list means everything is projected - - { - ProjectionSet projSet = ProjectionSetImpl.parse(new ArrayList()); - assertTrue(projSet instanceof NullProjectionSet); - assertTrue(projSet.isProjected("foo")); - } - - // Simple non-map columns - - { - List projCols = new ArrayList<>(); - projCols.add(SchemaPath.getSimplePath("foo")); - projCols.add(SchemaPath.getSimplePath("bar")); - ProjectionSet projSet = ProjectionSetImpl.parse(projCols); - assertTrue(projSet instanceof ProjectionSetImpl); - assertTrue(projSet.isProjected("foo")); - assertTrue(projSet.isProjected("bar")); - assertFalse(projSet.isProjected("mumble")); - } - - // Whole-map projection (note, fully projected maps are - // identical to projected simple columns at this level of - // abstraction.) - - { - List projCols = new ArrayList<>(); - projCols.add(SchemaPath.getSimplePath("map")); - ProjectionSet projSet = ProjectionSetImpl.parse(projCols); - assertTrue(projSet instanceof ProjectionSetImpl); - assertTrue(projSet.isProjected("map")); - assertFalse(projSet.isProjected("another")); - ProjectionSet mapProj = projSet.mapProjection("map"); - assertNotNull(mapProj); - assertTrue(mapProj instanceof NullProjectionSet); - assertTrue(mapProj.isProjected("foo")); - assertNotNull(projSet.mapProjection("another")); - assertFalse(projSet.mapProjection("another").isProjected("anyCol")); - } - - // Selected map projection, multiple levels, full projection - // at leaf level. - - { - List projCols = new ArrayList<>(); - projCols.add(SchemaPath.getCompoundPath("map", "a")); - projCols.add(SchemaPath.getCompoundPath("map", "b")); - projCols.add(SchemaPath.getCompoundPath("map", "map2", "x")); - ProjectionSet projSet = ProjectionSetImpl.parse(projCols); - assertTrue(projSet instanceof ProjectionSetImpl); - assertTrue(projSet.isProjected("map")); - - // Map: an explicit map at top level - - ProjectionSet mapProj = projSet.mapProjection("map"); - assertTrue(mapProj instanceof ProjectionSetImpl); - assertTrue(mapProj.isProjected("a")); - assertTrue(mapProj.isProjected("b")); - assertTrue(mapProj.isProjected("map2")); - assertFalse(projSet.isProjected("bogus")); - - // Map b: an implied nested map - - ProjectionSet bMapProj = mapProj.mapProjection("b"); - assertNotNull(bMapProj); - assertTrue(bMapProj instanceof NullProjectionSet); - assertTrue(bMapProj.isProjected("foo")); - - // Map2, an nested map, has an explicit projection - - ProjectionSet map2Proj = mapProj.mapProjection("map2"); - assertNotNull(map2Proj); - assertTrue(map2Proj instanceof ProjectionSetImpl); - assertTrue(map2Proj.isProjected("x")); - assertFalse(map2Proj.isProjected("bogus")); - } - } - /** * Test imposing a selection mask between the client and the underlying * vector container. @@ -148,10 +56,7 @@ public void testProjectionMap() { @Test public void testProjectionStatic() { - List selection = Lists.newArrayList( - SchemaPath.getSimplePath("c"), - SchemaPath.getSimplePath("b"), - SchemaPath.getSimplePath("e")); + List selection = RowSetTestUtils.projectList("c", "b", "e"); TupleMetadata schema = new SchemaBuilder() .add("a", MinorType.INT) .add("b", MinorType.INT) @@ -169,10 +74,7 @@ public void testProjectionStatic() { @Test public void testProjectionDynamic() { - List selection = Lists.newArrayList( - SchemaPath.getSimplePath("c"), - SchemaPath.getSimplePath("b"), - SchemaPath.getSimplePath("e")); + List selection = RowSetTestUtils.projectList("c", "b", "e"); ResultSetOptions options = new OptionBuilder() .setProjection(selection) .build(); @@ -241,9 +143,7 @@ private void doProjectionTest(ResultSetLoader rsLoader) { @Test public void testMapProjection() { - List selection = Lists.newArrayList( - SchemaPath.getSimplePath("m1"), - SchemaPath.getCompoundPath("m2", "d")); + List selection = RowSetTestUtils.projectList("m1", "m2.d"); TupleMetadata schema = new SchemaBuilder() .addMap("m1") .add("a", MinorType.INT) @@ -293,22 +193,9 @@ public void testMapProjection() { rsLoader.startBatch(); rootWriter.start(); - rootWriter.tuple("m1").scalar("a").setInt(1); - rootWriter.tuple("m1").scalar("b").setInt(2); - rootWriter.tuple("m2").scalar("c").setInt(3); - rootWriter.tuple("m2").scalar("d").setInt(4); - rootWriter.tuple("m3").scalar("e").setInt(5); - rootWriter.tuple("m3").scalar("f").setInt(6); - rootWriter.save(); - - rootWriter.start(); - rootWriter.tuple("m1").scalar("a").setInt(11); - rootWriter.tuple("m1").scalar("b").setInt(12); - rootWriter.tuple("m2").scalar("c").setInt(13); - rootWriter.tuple("m2").scalar("d").setInt(14); - rootWriter.tuple("m3").scalar("e").setInt(15); - rootWriter.tuple("m3").scalar("f").setInt(16); - rootWriter.save(); + rootWriter + .addRow(mapValue( 1, 2), mapValue( 3, 4), mapValue( 5, 6)) + .addRow(mapValue(11, 12), mapValue(13, 14), mapValue(15, 16)); // Verify. Only the projected columns appear in the result set. @@ -322,8 +209,8 @@ public void testMapProjection() { .resumeSchema() .build(); SingleRowSet expected = fixture.rowSetBuilder(expectedSchema) - .addRow(objArray(1, 2), objArray(4)) - .addRow(objArray(11, 12), objArray(14)) + .addRow(mapValue( 1, 2), mapValue( 4)) + .addRow(mapValue(11, 12), mapValue(14)) .build(); new RowSetComparison(expected) .verifyAndClearAll(fixture.wrap(rsLoader.harvest())); @@ -338,9 +225,7 @@ public void testMapProjection() { @Test public void testMapArrayProjection() { - List selection = Lists.newArrayList( - SchemaPath.getSimplePath("m1"), - SchemaPath.getCompoundPath("m2", "d")); + List selection = RowSetTestUtils.projectList("m1", "m2.d"); TupleMetadata schema = new SchemaBuilder() .addMapArray("m1") .add("a", MinorType.INT) @@ -408,9 +293,7 @@ public void testMapArrayProjection() { @Test public void testProjectWithOverflow() { - List selection = Lists.newArrayList( - SchemaPath.getSimplePath("small"), - SchemaPath.getSimplePath("dummy")); + List selection = RowSetTestUtils.projectList("small", "dummy"); TupleMetadata schema = new SchemaBuilder() .add("big", MinorType.VARCHAR) .add("small", MinorType.VARCHAR) diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProtocol.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProtocol.java index 352ab349045..c4024667822 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProtocol.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderProtocol.java @@ -433,7 +433,7 @@ public void testCaseInsensitiveSchema() { assertEquals(5, schema.size()); assertEquals(4, schema.index("e")); assertEquals(4, schema.index("E")); - rootWriter.array(4).set("e1", "e2", "e3"); + rootWriter.array(4).setObject(strArray("e1", "e2", "e3")); rootWriter.save(); // Verify. No reason to expect problems, but might as well check. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderTorture.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderTorture.java index cc2a83ee894..07100eddc14 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderTorture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/rowSet/impl/TestResultSetLoaderTorture.java @@ -29,7 +29,6 @@ import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ArrayReader; import org.apache.drill.exec.vector.accessor.ArrayWriter; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.TupleReader; @@ -256,7 +255,8 @@ private static class BatchReader { ScalarReader n2Reader; ScalarReader s2Reader; ScalarReader n3Reader; - ScalarElementReader s3Reader; + ArrayReader s3Array; + ScalarReader s3Reader; ReadState readState; public BatchReader(TestSetup setup, RowSetReader reader, ReadState readState) { @@ -272,7 +272,8 @@ public BatchReader(TestSetup setup, RowSetReader reader, ReadState readState) { s2Reader = m2Reader.scalar("s2"); TupleReader m3Reader = m2Reader.tuple("m3"); n3Reader = m3Reader.scalar("n3"); - s3Reader = m3Reader.array("s3").elements(); + s3Array = m3Reader.array("s3"); + s3Reader = s3Array.scalar(); } public void verify() { @@ -312,7 +313,7 @@ private void verifyRow() { private void verifyM2Array() { for (int i = 0; i < setup.m2Count; i++) { - a2Reader.setPosn(i); + assert(a2Reader.next()); // n2: usual int @@ -321,7 +322,7 @@ private void verifyM2Array() { if (readState.innerCount % setup.s2Cycle == 0) { // Skipped values should be null assertTrue( - String.format("Row %d, entry %d", rootReader.rowIndex(), i), + String.format("Row %d, entry %d", rootReader.offset(), i), s2Reader.isNull()); } else if (readState.innerCount % setup.s2Cycle % setup.nullCycle == 0) { assertTrue(s2Reader.isNull()); @@ -338,10 +339,11 @@ private void verifyM2Array() { // s3: a repeated VarChar if (readState.innerCount % setup.s3Cycle == 0) { - assertEquals(0, s3Reader.size()); + assertEquals(0, s3Array.size()); } else { for (int j = 0; j < setup.s3Count; j++) { - assertEquals(setup.s3Value + (readState.innerCount * setup.s3Count + j), s3Reader.getString(j)); + assertTrue(s3Array.next()); + assertEquals(setup.s3Value + (readState.innerCount * setup.s3Count + j), s3Reader.getString()); } } readState.innerCount++; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java index a511a0a4b94..0882a1caeba 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestVectorContainer.java @@ -28,6 +28,7 @@ import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.schema.SchemaBuilder; import org.apache.drill.test.rowSet.RowSetComparison; +import org.apache.drill.test.rowSet.schema.SchemaBuilder; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -72,7 +73,7 @@ public void testContainerMerge() { .addRow(30, "wilma") .build(); - // Simulated "implicit" coumns: row number and file name + // Simulated "implicit" columns: row number and file name BatchSchema rightSchema = new SchemaBuilder() .add("x", MinorType.SMALLINT) diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/DirectRowSet.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/DirectRowSet.java index 9262706b9b2..0e63c0e489a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/DirectRowSet.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/DirectRowSet.java @@ -20,17 +20,17 @@ import com.google.common.collect.Sets; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.physical.rowSet.model.MetadataProvider.MetadataRetrieval; -import org.apache.drill.exec.physical.rowSet.model.ReaderIndex; -import org.apache.drill.exec.physical.rowSet.model.SchemaInference; import org.apache.drill.exec.physical.rowSet.model.single.BaseWriterBuilder; import org.apache.drill.exec.physical.rowSet.model.single.BuildVectorsFromMetadata; +import org.apache.drill.exec.physical.rowSet.model.single.DirectRowIndex; +import org.apache.drill.exec.physical.rowSet.model.single.SingleSchemaInference; import org.apache.drill.exec.physical.rowSet.model.single.VectorAllocator; import org.apache.drill.exec.record.BatchSchema; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; -import org.apache.drill.exec.record.VectorAccessible; -import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.metadata.MetadataUtils; import org.apache.drill.exec.record.metadata.TupleMetadata; +import org.apache.drill.exec.record.VectorAccessible; +import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.selection.SelectionVector2; import org.apache.drill.test.rowSet.RowSet.ExtendableRowSet; import org.apache.drill.test.rowSet.RowSetWriterImpl.WriterIndexImpl; @@ -44,26 +44,6 @@ public class DirectRowSet extends AbstractSingleRowSet implements ExtendableRowSet { - /** - * Reader index that points directly to each row in the row set. - * This index starts with pointing to the -1st row, so that the - * reader can require a next() for every row, including - * the first. (This is the JDBC RecordSet convention.) - */ - - private static class DirectRowIndex extends ReaderIndex { - - public DirectRowIndex(int rowCount) { - super(rowCount); - } - - @Override - public int vectorIndex() { return rowIndex; } - - @Override - public int batchIndex() { return 0; } - } - public static class RowSetWriterBuilder extends BaseWriterBuilder { public RowSetWriter buildWriter(DirectRowSet rowSet) { @@ -94,7 +74,7 @@ public static DirectRowSet fromSchema(BufferAllocator allocator, TupleMetadata s } public static DirectRowSet fromContainer(VectorContainer container) { - return new DirectRowSet(container, new SchemaInference().infer(container)); + return new DirectRowSet(container, new SingleSchemaInference().infer(container)); } public static DirectRowSet fromVectorAccessible(BufferAllocator allocator, VectorAccessible va) { @@ -151,7 +131,6 @@ public SingleRowSet toIndirect(Set skipIndices) { return new IndirectRowSet(this, skipIndices); } - @Override public SelectionVector2 getSv2() { return null; } } diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/HyperRowSetImpl.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/HyperRowSetImpl.java index 70b8a207c1d..542421ee6db 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/HyperRowSetImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/HyperRowSetImpl.java @@ -17,11 +17,16 @@ */ package org.apache.drill.test.rowSet; -import org.apache.drill.exec.physical.rowSet.model.MetadataProvider.MetadataRetrieval; -import org.apache.drill.exec.physical.rowSet.model.SchemaInference; +import java.util.ArrayList; +import java.util.List; + +import org.apache.drill.exec.exception.SchemaChangeException; +import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.physical.rowSet.model.hyper.BaseReaderBuilder; +import org.apache.drill.exec.physical.rowSet.model.hyper.HyperSchemaInference; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; import org.apache.drill.exec.record.metadata.TupleMetadata; +import org.apache.drill.exec.record.ExpandableHyperContainer; import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.selection.SelectionVector4; import org.apache.drill.test.rowSet.RowSet.HyperRowSet; @@ -45,8 +50,67 @@ public RowSetReader buildReader(HyperRowSet rowSet, SelectionVector4 sv4) { TupleMetadata schema = rowSet.schema(); HyperRowIndex rowIndex = new HyperRowIndex(sv4); return new RowSetReaderImpl(schema, rowIndex, - buildContainerChildren(rowSet.container(), - new MetadataRetrieval(schema))); + buildContainerChildren(rowSet.container(), schema)); + } + } + + public static class HyperRowSetBuilderImpl implements HyperRowSetBuilder { + + private final BufferAllocator allocator; + private final List batches = new ArrayList<>(); + private int totalRowCount; + + public HyperRowSetBuilderImpl(BufferAllocator allocator) { + this.allocator = allocator; + } + + @Override + public void addBatch(SingleRowSet rowSet) { + if (rowSet.rowCount() == 0) { + return; + } + if (rowSet.indirectionType() != SelectionVectorMode.NONE) { + throw new IllegalArgumentException("Batches must not have a selection vector."); + } + batches.add(rowSet.container()); + totalRowCount += rowSet.rowCount(); + } + + @Override + public void addBatch(VectorContainer container) { + if (container.getRecordCount() == 0) { + return; + } + if (container.getSchema().getSelectionVectorMode() != SelectionVectorMode.NONE) { + throw new IllegalArgumentException("Batches must not have a selection vector."); + } + batches.add(container); + totalRowCount += container.getRecordCount(); + } + + @SuppressWarnings("resource") + @Override + public HyperRowSet build() throws SchemaChangeException { + SelectionVector4 sv4 = new SelectionVector4(allocator, totalRowCount); + ExpandableHyperContainer hyperContainer = new ExpandableHyperContainer(); + for (VectorContainer container : batches) { + hyperContainer.addBatch(container); + } + + // TODO: This has a bug. If the hyperset has two batches with unions, + // and the first union contains only VARCHAR, while the second contains + // only INT, the combined schema should be (VARCHAR, INT). Same is true + // of lists. But, this code looks at only the first container. + // + // This is only a theoretical bug as Drill does not support unions + // completely, but must be fixed if we want complete union support. + // + // Actually, the problem is more fundamental. The extendable hyper + // container, which creates the metadata schema, does not handle the + // case either. + + TupleMetadata schema = new HyperSchemaInference().infer(hyperContainer); + return new HyperRowSetImpl(schema, hyperContainer, sv4); } } @@ -56,13 +120,37 @@ public RowSetReader buildReader(HyperRowSet rowSet, SelectionVector4 sv4) { private final SelectionVector4 sv4; - public HyperRowSetImpl(VectorContainer container, SelectionVector4 sv4) { - super(container, new SchemaInference().infer(container)); + public HyperRowSetImpl(TupleMetadata schema, VectorContainer container, SelectionVector4 sv4) { + super(container, schema); this.sv4 = sv4; } + public HyperRowSetImpl(VectorContainer container, SelectionVector4 sv4) throws SchemaChangeException { + this(new HyperSchemaInference().infer(container), container, sv4); + } + + public static HyperRowSetBuilder builder(BufferAllocator allocator) { + return new HyperRowSetBuilderImpl(allocator); + } + public static HyperRowSet fromContainer(VectorContainer container, SelectionVector4 sv4) { - return new HyperRowSetImpl(container, sv4); + try { + return new HyperRowSetImpl(container, sv4); + } catch (SchemaChangeException e) { + throw new UnsupportedOperationException(e); + } + } + + public static HyperRowSet fromRowSets(BufferAllocator allocator, SingleRowSet...rowSets) { + HyperRowSetBuilder builder = builder(allocator); + for (SingleRowSet rowSet : rowSets) { + builder.addBatch(rowSet); + } + try { + return builder.build(); + } catch (SchemaChangeException e) { + throw new IllegalArgumentException("Incompatible schemas", e); + } } @Override diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/IndirectRowSet.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/IndirectRowSet.java index 42d97dbc76a..a2bc5e87412 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/IndirectRowSet.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/IndirectRowSet.java @@ -20,10 +20,10 @@ import com.google.common.collect.Sets; import org.apache.drill.exec.exception.OutOfMemoryException; import org.apache.drill.exec.memory.BufferAllocator; -import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.physical.rowSet.model.ReaderIndex; -import org.apache.drill.exec.physical.rowSet.model.SchemaInference; +import org.apache.drill.exec.physical.rowSet.model.single.SingleSchemaInference; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; +import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.selection.SelectionVector2; @@ -38,8 +38,8 @@ public class IndirectRowSet extends AbstractSingleRowSet { /** * Reader index that points to each row indirectly through the - * selection vector. The {@link #vectorIndex()} method points to the - * actual data row, while the {@link #position()} method gives + * selection vector. The {@link #physicalIndex()} method points to the + * actual data row, while the {@link #logicalIndex()} method gives * the position relative to the indirection vector. That is, * the position increases monotonically, but the index jumps * around as specified by the indirection vector. @@ -55,16 +55,16 @@ public IndirectRowIndex(SelectionVector2 sv2) { } @Override - public int vectorIndex() { return sv2.getIndex(rowIndex); } + public int offset() { return sv2.getIndex(position); } @Override - public int batchIndex() { return 0; } + public int hyperVectorIndex() { return 0; } } private final SelectionVector2 sv2; private IndirectRowSet(VectorContainer container, SelectionVector2 sv2) { - super(container, new SchemaInference().infer(container)); + super(container, new SingleSchemaInference().infer(container)); this.sv2 = sv2; } diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSet.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSet.java index 53be75de7f2..63a4959f619 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSet.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSet.java @@ -17,6 +17,7 @@ */ package org.apache.drill.test.rowSet; +import org.apache.drill.exec.exception.SchemaChangeException; import org.apache.drill.exec.memory.BufferAllocator; import org.apache.drill.exec.record.BatchSchema; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; @@ -143,4 +144,10 @@ interface ExtendableRowSet extends SingleRowSet { interface HyperRowSet extends RowSet { SelectionVector4 getSv4(); } + + interface HyperRowSetBuilder { + void addBatch(SingleRowSet rowSet); + void addBatch(VectorContainer container); + HyperRowSet build() throws SchemaChangeException; + } } diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetComparison.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetComparison.java index 1cae64ff007..e098e333853 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetComparison.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetComparison.java @@ -20,15 +20,14 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import java.util.Comparator; + import org.apache.drill.exec.vector.accessor.ArrayReader; import org.apache.drill.exec.vector.accessor.ObjectReader; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.TupleReader; import org.bouncycastle.util.Arrays; -import java.util.Comparator; - /** * For testing, compare the contents of two row sets (record batches) * to verify that they are identical. Supports masks to exclude certain @@ -149,6 +148,9 @@ public RowSetComparison span(int span) { */ public void verify(RowSet actual) { + assertTrue("Schemas don't match.\n" + + "Expected: " + expected.schema().toString() + + "\nActual: " + actual.schema(), expected.schema().isEquivalent(actual.schema())); int testLength = expected.rowCount() - offset; if (span > -1) { testLength = span; @@ -165,7 +167,7 @@ public void verify(RowSet actual) { for (int i = 0; i < testLength; i++) { er.next(); ar.next(); - String label = Integer.toString(er.index() + 1); + String label = Integer.toString(er.logicalIndex() + 1); verifyRow(label, er, ar); } } @@ -276,63 +278,12 @@ private void verifyScalar(String label, ScalarReader ec, ScalarReader ac) { private void verifyArray(String label, ArrayReader ea, ArrayReader aa) { - assertEquals(label, ea.entryType(), aa.entryType()); - assertEquals(label, ea.size(), aa.size()); - switch (ea.entryType()) { - case ARRAY: - throw new UnsupportedOperationException(); - case SCALAR: - verifyScalarArray(label, ea.elements(), aa.elements()); - break; - case TUPLE: - verifyTupleArray(label, ea, aa); - break; - default: - throw new IllegalStateException( "Unexpected type: " + ea.entryType()); - } - } - - private void verifyTupleArray(String label, ArrayReader ea, ArrayReader aa) { - for (int i = 0; i < ea.size(); i++) { - verifyTuple(label + "[" + i + "]", ea.tuple(i), aa.tuple(i)); - } - } - - private void verifyScalarArray(String colLabel, ScalarElementReader ea, - ScalarElementReader aa) { - assertEquals(colLabel, ea.valueType(), aa.valueType()); - assertEquals(colLabel, ea.size(), aa.size()); - for (int i = 0; i < ea.size(); i++) { - String label = colLabel + "[" + i + "]"; - switch (ea.valueType()) { - case BYTES: { - byte expected[] = ea.getBytes(i); - byte actual[] = aa.getBytes(i); - assertEquals(label + " - byte lengths differ", expected.length, actual.length); - assertTrue(label, Arrays.areEqual(expected, actual)); - break; - } - case DOUBLE: - assertEquals(label, ea.getDouble(i), aa.getDouble(i), delta); - break; - case INTEGER: - assertEquals(label, ea.getInt(i), aa.getInt(i)); - break; - case LONG: - assertEquals(label, ea.getLong(i), aa.getLong(i)); - break; - case STRING: - assertEquals(label, ea.getString(i), aa.getString(i)); - break; - case DECIMAL: - assertEquals(label, ea.getDecimal(i), aa.getDecimal(i)); - break; - case PERIOD: - assertEquals(label, ea.getPeriod(i), aa.getPeriod(i)); - break; - default: - throw new IllegalStateException( "Unexpected type: " + ea.valueType()); - } + assertEquals(label + " - array element type", ea.entryType(), aa.entryType()); + assertEquals(label + " - array length", ea.size(), aa.size()); + int i = 0; + while (ea.next()) { + assertTrue(aa.next()); + verifyColumn(label + "[" + i++ + "]", ea.entry(), aa.entry()); } } diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetPrinter.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetPrinter.java index fe50197e3c6..82d4bbdd8fe 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetPrinter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetPrinter.java @@ -41,7 +41,7 @@ public void print() { public void print(PrintStream out) { SelectionVectorMode selectionMode = rowSet.indirectionType(); RowSetReader reader = rowSet.reader(); - int colCount = reader.schema().size(); + int colCount = reader.tupleSchema().size(); printSchema(out, selectionMode, reader); while (reader.next()) { printHeader(out, reader, selectionMode); @@ -68,12 +68,12 @@ private void printSchema(PrintStream out, SelectionVectorMode selectionMode, Row break; } out.print(": "); - TupleMetadata schema = reader.schema(); + TupleMetadata schema = reader.tupleSchema(); printTupleSchema(out, schema); out.println(); } - private void printTupleSchema(PrintStream out, TupleMetadata schema) { + public static void printTupleSchema(PrintStream out, TupleMetadata schema) { for (int i = 0; i < schema.size(); i++) { if (i > 0) { out.print(", "); @@ -81,26 +81,26 @@ private void printTupleSchema(PrintStream out, TupleMetadata schema) { ColumnMetadata colSchema = schema.metadata(i); out.print(colSchema.name()); if (colSchema.isMap()) { - out.print("("); + out.print("{"); printTupleSchema(out, colSchema.mapSchema()); - out.print(")"); + out.print("}"); } } } private void printHeader(PrintStream out, RowSetReader reader, SelectionVectorMode selectionMode) { - out.print(reader.index()); + out.print(reader.logicalIndex()); switch (selectionMode) { case FOUR_BYTE: out.print(" ("); - out.print(reader.batchIndex()); + out.print(reader.hyperVectorIndex()); out.print(", "); - out.print(reader.rowIndex()); + out.print(reader.offset()); out.print(")"); break; case TWO_BYTE: out.print(" ("); - out.print(reader.rowIndex()); + out.print(reader.offset()); out.print(")"); break; default: diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetReader.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetReader.java index 3e27529b733..4a966cd2d44 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetReader.java @@ -32,23 +32,22 @@ public interface RowSetReader extends TupleReader { int rowCount(); boolean next(); - int index(); - void set(int index); + int logicalIndex(); + void setPosn(int index); /** * Batch index: 0 for a single batch, batch for the current * row is a hyper-batch. * @return index of the batch for the current row */ - int batchIndex(); + int hyperVectorIndex(); /** * The index of the underlying row which may be indexed by an - * Sv2 or Sv4. + * SV2 or SV4. * * @return */ - int rowIndex(); - boolean valid(); + int offset(); } \ No newline at end of file diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetReaderImpl.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetReaderImpl.java index 7217187a702..63444199fdb 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetReaderImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/RowSetReaderImpl.java @@ -20,9 +20,11 @@ import java.util.List; import org.apache.drill.exec.physical.rowSet.model.ReaderIndex; +import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.accessor.reader.AbstractObjectReader; import org.apache.drill.exec.vector.accessor.reader.AbstractTupleReader; +import org.apache.drill.exec.vector.accessor.reader.NullStateReaders; /** * Reader implementation for a row set. @@ -30,11 +32,14 @@ public class RowSetReaderImpl extends AbstractTupleReader implements RowSetReader { + private final TupleMetadata schema; protected final ReaderIndex readerIndex; public RowSetReaderImpl(TupleMetadata schema, ReaderIndex index, AbstractObjectReader[] readers) { - super(schema, readers); + super(readers); + this.schema = schema; this.readerIndex = index; + bindNullState(NullStateReaders.REQUIRED_STATE_READER); bindIndex(index); } @@ -54,23 +59,26 @@ public boolean next() { } @Override - public boolean valid() { return readerIndex.valid(); } - - @Override - public int index() { return readerIndex.position(); } + public int logicalIndex() { return readerIndex.logicalIndex(); } @Override public int rowCount() { return readerIndex.size(); } @Override - public int rowIndex() { return readerIndex.vectorIndex(); } + public int offset() { return readerIndex.offset(); } @Override - public int batchIndex() { return readerIndex.batchIndex(); } + public int hyperVectorIndex() { return readerIndex.hyperVectorIndex(); } @Override - public void set(int index) { + public void setPosn(int index) { this.readerIndex.set(index); reposition(); } + + @Override + public ColumnMetadata schema() { return null; } + + @Override + public TupleMetadata tupleSchema() { return schema; } } diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/schema/UnionBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/schema/UnionBuilder.java index e47e552e561..1aa636df88f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/schema/UnionBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/schema/UnionBuilder.java @@ -17,9 +17,9 @@ */ package org.apache.drill.test.rowSet.schema; -import org.apache.drill.common.types.Types; import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.common.types.Types; import org.apache.drill.exec.record.metadata.AbstractColumnMetadata; import org.apache.drill.exec.record.metadata.VariantColumnMetadata; import org.apache.drill.exec.record.metadata.VariantSchema; @@ -33,7 +33,6 @@ public class UnionBuilder implements SchemaContainer { private final SchemaContainer parent; private final String name; private final MinorType type; - private final DataMode mode; private final VariantSchema union; public UnionBuilder(SchemaContainer parent, String name, @@ -41,7 +40,6 @@ public UnionBuilder(SchemaContainer parent, String name, this.parent = parent; this.name = name; this.type = type; - this.mode = mode; union = new VariantSchema(); } diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/RowSetTest.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/RowSetTest.java index 9ad4133cb6f..92b9266bec5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/RowSetTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/RowSetTest.java @@ -36,7 +36,6 @@ import org.apache.drill.exec.vector.accessor.ArrayReader; import org.apache.drill.exec.vector.accessor.ArrayWriter; import org.apache.drill.exec.vector.accessor.ObjectType; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.TupleReader; @@ -45,6 +44,7 @@ import org.apache.drill.exec.vector.complex.MapVector; import org.apache.drill.exec.vector.complex.RepeatedMapVector; import org.apache.drill.test.SubOperatorTest; +import org.apache.drill.test.rowSet.DirectRowSet; import org.apache.drill.test.rowSet.RowSet.ExtendableRowSet; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; import org.apache.drill.test.rowSet.RowSetComparison; @@ -60,12 +60,17 @@ * Tests basic protocol of the writers: 


  * row : tuple
  * tuple : column *
- * column : scalar obj | array obj | tuple obj
+ * column : scalar obj | array obj | tuple obj | variant obj
  * scalar obj : scalar
- * array obj : array writer
- * array writer : element
+ * array obj : array
+ * array : index --> column
  * element : column
- * tuple obj : tuple
+ * tuple obj : tuple + * tuple : name --> column (also index --> column) + * variant obj : variant + * variant : type --> column + *

+ * A list is an array of variants. Variants are tested elsewhere. */ public class RowSetTest extends SubOperatorTest { @@ -137,16 +142,21 @@ public void testScalarStructure() { assertSame(reader.column("a").scalar(), reader.scalar("a")); assertSame(reader.column(0).scalar(), reader.scalar(0)); assertEquals(ValueType.INTEGER, reader.scalar(0).valueType()); + assertTrue(schema.metadata("a").isEquivalent(reader.column("a").schema())); // Test various accessors: full and simple assertTrue(reader.next()); + assertFalse(reader.column("a").scalar().isNull()); assertEquals(10, reader.column("a").scalar().getInt()); assertTrue(reader.next()); + assertFalse(reader.scalar("a").isNull()); assertEquals(20, reader.scalar("a").getInt()); assertTrue(reader.next()); + assertFalse(reader.column(0).scalar().isNull()); assertEquals(30, reader.column(0).scalar().getInt()); assertTrue(reader.next()); + assertFalse(reader.column(0).scalar().isNull()); assertEquals(40, reader.scalar(0).getInt()); assertFalse(reader.next()); @@ -238,27 +248,50 @@ public void testScalarArrayStructure() { assertSame(reader.column(0).array(), reader.array(0)); assertEquals(ObjectType.SCALAR, reader.column("a").array().entryType()); - assertEquals(ValueType.INTEGER, reader.array(0).elements().valueType()); + assertEquals(ValueType.INTEGER, reader.array(0).scalar().valueType()); // Read and verify the rows - ScalarElementReader intReader = reader.array(0).elements(); + ArrayReader arrayReader = reader.array(0); + ScalarReader intReader = arrayReader.scalar(); assertTrue(reader.next()); - assertEquals(2, intReader.size()); - assertEquals(10, intReader.getInt(0)); - assertEquals(11, intReader.getInt(1)); + assertFalse(arrayReader.isNull()); + assertEquals(2, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertEquals(10, intReader.getInt()); + assertTrue(arrayReader.next()); + assertEquals(11, intReader.getInt()); + assertFalse(arrayReader.next()); + assertTrue(reader.next()); - assertEquals(3, intReader.size()); - assertEquals(20, intReader.getInt(0)); - assertEquals(21, intReader.getInt(1)); - assertEquals(22, intReader.getInt(2)); + assertFalse(arrayReader.isNull()); + assertEquals(3, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertEquals(20, intReader.getInt()); + assertTrue(arrayReader.next()); + assertEquals(21, intReader.getInt()); + assertTrue(arrayReader.next()); + assertEquals(22, intReader.getInt()); + assertFalse(arrayReader.next()); + assertTrue(reader.next()); - assertEquals(1, intReader.size()); - assertEquals(30, intReader.getInt(0)); + assertFalse(arrayReader.isNull()); + assertEquals(1, arrayReader.size()); + assertTrue(arrayReader.next()); + assertEquals(30, intReader.getInt()); + assertFalse(arrayReader.next()); + assertTrue(reader.next()); - assertEquals(2, intReader.size()); - assertEquals(40, intReader.getInt(0)); - assertEquals(41, intReader.getInt(1)); + assertFalse(arrayReader.isNull()); + assertEquals(2, arrayReader.size()); + assertTrue(arrayReader.next()); + assertEquals(40, intReader.getInt()); + assertTrue(arrayReader.next()); + assertEquals(41, intReader.getInt()); + assertFalse(arrayReader.next()); + assertFalse(reader.next()); // Test the above again via the writer and reader @@ -352,22 +385,47 @@ public void testMapStructure() { ScalarReader aReader = reader.column(0).scalar(); TupleReader mReader = reader.column(1).tuple(); - assertEquals(ObjectType.SCALAR, mReader.column("b").array().entryType()); - ScalarElementReader bReader = mReader.column(0).elements(); + ArrayReader bArray = mReader.column("b").array(); + assertEquals(ObjectType.SCALAR, bArray.entryType()); + ScalarReader bReader = bArray.scalar(); assertEquals(ValueType.INTEGER, bReader.valueType()); + // Row 1: (10, {[11, 12]}) + assertTrue(reader.next()); assertEquals(10, aReader.getInt()); - assertEquals(11, bReader.getInt(0)); - assertEquals(12, bReader.getInt(1)); + assertFalse(mReader.isNull()); + + assertTrue(bArray.next()); + assertFalse(bReader.isNull()); + assertEquals(11, bReader.getInt()); + assertTrue(bArray.next()); + assertFalse(bReader.isNull()); + assertEquals(12, bReader.getInt()); + assertFalse(bArray.next()); + + // Row 2: (20, {[21, 22]}) + assertTrue(reader.next()); assertEquals(20, aReader.getInt()); - assertEquals(21, bReader.getInt(0)); - assertEquals(22, bReader.getInt(1)); + assertFalse(mReader.isNull()); + + assertTrue(bArray.next()); + assertEquals(21, bReader.getInt()); + assertTrue(bArray.next()); + assertEquals(22, bReader.getInt()); + + // Row 3: (30, {[31, 32]}) + assertTrue(reader.next()); assertEquals(30, aReader.getInt()); - assertEquals(31, bReader.getInt(0)); - assertEquals(32, bReader.getInt(1)); + assertFalse(mReader.isNull()); + + assertTrue(bArray.next()); + assertEquals(31, bReader.getInt()); + assertTrue(bArray.next()); + assertEquals(32, bReader.getInt()); + assertFalse(reader.next()); // Verify that the map accessor's value count was set. @@ -472,18 +530,22 @@ public void testRepeatedMapStructure() { assertEquals(ValueType.INTEGER, bReader.valueType()); assertEquals(ValueType.INTEGER, cReader.valueType()); - // Row 1: use index accessors + // Row 1: Use iterator-like accessors assertTrue(reader.next()); assertEquals(10, aReader.getInt()); - TupleReader ixReader = maReader.tuple(0); - assertEquals(101, ixReader.scalar(0).getInt()); - assertEquals(102, ixReader.scalar(1).getInt()); - ixReader = maReader.tuple(1); - assertEquals(111, ixReader.scalar(0).getInt()); - assertEquals(112, ixReader.scalar(1).getInt()); - - // Row 2: use common accessor with explicit positioning, + assertFalse(maReader.isNull()); // Array itself is not null + + assertTrue(maReader.next()); + assertFalse(mapReader.isNull()); // Tuple 0 is not null + assertEquals(101, mapReader.scalar(0).getInt()); + assertEquals(102, mapReader.scalar(1).getInt()); + + assertTrue(maReader.next()); + assertEquals(111, mapReader.scalar(0).getInt()); + assertEquals(112, mapReader.scalar(1).getInt()); + + // Row 2: use explicit positioning, // but access scalars through the map reader. assertTrue(reader.next()); @@ -495,14 +557,16 @@ public void testRepeatedMapStructure() { assertEquals(211, mapReader.scalar(0).getInt()); assertEquals(212, mapReader.scalar(1).getInt()); - // Row 3: use common accessor for scalars + // Row 3: use scalar accessor assertTrue(reader.next()); assertEquals(30, aReader.getInt()); - maReader.setPosn(0); + + assertTrue(maReader.next()); assertEquals(301, bReader.getInt()); assertEquals(302, cReader.getInt()); - maReader.setPosn(1); + + assertTrue(maReader.next()); assertEquals(311, bReader.getInt()); assertEquals(312, cReader.getInt()); @@ -555,18 +619,28 @@ public void testTopFixedWidthArray() { SingleRowSet result = writer.done(); RowSetReader reader = result.reader(); + ArrayReader arrayReader = reader.array(1); + ScalarReader elementReader = arrayReader.scalar(); + assertTrue(reader.next()); assertEquals(10, reader.scalar(0).getInt()); - ScalarElementReader arrayReader = reader.array(1).elements(); assertEquals(2, arrayReader.size()); - assertEquals(100, arrayReader.getInt(0)); - assertEquals(110, arrayReader.getInt(1)); + + assertTrue(arrayReader.next()); + assertEquals(100, elementReader.getInt()); + assertTrue(arrayReader.next()); + assertEquals(110, elementReader.getInt()); + assertTrue(reader.next()); assertEquals(20, reader.scalar(0).getInt()); assertEquals(3, arrayReader.size()); - assertEquals(200, arrayReader.getInt(0)); - assertEquals(120, arrayReader.getInt(1)); - assertEquals(220, arrayReader.getInt(2)); + assertTrue(arrayReader.next()); + assertEquals(200, elementReader.getInt()); + assertTrue(arrayReader.next()); + assertEquals(120, elementReader.getInt()); + assertTrue(arrayReader.next()); + assertEquals(220, elementReader.getInt()); + assertTrue(reader.next()); assertEquals(30, reader.scalar(0).getInt()); assertEquals(0, arrayReader.size()); @@ -581,7 +655,6 @@ public void testTopFixedWidthArray() { new RowSetComparison(rs1) .verifyAndClearAll(rs2); } - /** * Test filling a row set up to the maximum number of rows. * Values are small enough to prevent filling to the @@ -666,4 +739,107 @@ public void testBufferBounds() { assertEquals(count, rs.rowCount()); rs.clear(); } + + /** + * The code below is not a test. Rather, it is a simple example of + * how to write a batch of data using writers, then read it using + * readers. + */ + + @Test + public void example() { + + // Step 1: Define a schema. In a real app, this + // will be provided by a reader, by an incoming batch, + // etc. + + BatchSchema schema = new SchemaBuilder() + .add("a", MinorType.VARCHAR) + .addArray("b", MinorType.INT) + .addMap("c") + .add("c1", MinorType.INT) + .add("c2", MinorType.VARCHAR) + .resumeSchema() + .build(); + + // Step 2: Create a batch. Done here because this is + // a batch-oriented test. Done automatically in the + // result set loader. + + DirectRowSet drs = DirectRowSet.fromSchema(fixture.allocator(), schema); + + // Step 3: Create the writer. + + RowSetWriter writer = drs.writer(); + + // Step 4: Populate data. Here we do it the way an app would: + // using the individual accessors. See tests above for the many + // ways this can be done depending on the need of the app. + // + // Write two rows: + // ("fred", [10, 11], {12, "wilma"}) + // ("barney", [20, 21], {22, "betty"}) + // + // This example uses Java strings for Varchar. Real code might + // use byte arrays. + + writer.scalar("a").setString("fred"); + ArrayWriter bWriter = writer.array("b"); + bWriter.scalar().setInt(10); + bWriter.scalar().setInt(11); + TupleWriter cWriter = writer.tuple("c"); + cWriter.scalar("c1").setInt(12); + cWriter.scalar("c2").setString("wilma"); + writer.save(); + + writer.scalar("a").setString("barney"); + bWriter.scalar().setInt(20); + bWriter.scalar().setInt(21); + cWriter.scalar("c1").setInt(22); + cWriter.scalar("c2").setString("betty"); + writer.save(); + + // Step 5: "Harvest" the batch. Done differently in the + // result set loader. + + SingleRowSet rowSet = writer.done(); + + // Step 5: Create a reader. + + RowSetReader reader = rowSet.reader(); + + // Step 6: Retrieve the data. Here we just print the + // values. + + while (reader.next()) { + print(reader.scalar("a").getString()); + ArrayReader bReader = reader.array("b"); + while (bReader.next()) { + print(bReader.scalar().getInt()); + } + TupleReader cReader = reader.tuple("c"); + print(cReader.scalar("c1").getInt()); + print(cReader.scalar("c2").getString()); + endRow(); + } + + // Step 7: Free memory. + + rowSet.clear(); + } + + public void print(Object obj) { + if (obj instanceof String) { + System.out.print("\""); + System.out.print(obj); + System.out.print("\""); + } else { + System.out.print(obj); + } + System.out.print(" "); + } + + public void endRow() { + System.out.println(); + } } diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestFillEmpties.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestFillEmpties.java index 490a9fd3aab..f4c00ca1fee 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestFillEmpties.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestFillEmpties.java @@ -24,17 +24,17 @@ import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.metadata.TupleMetadata; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; +import org.apache.drill.exec.vector.accessor.ArrayReader; import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.ScalarWriter; import org.apache.drill.exec.vector.accessor.ValueType; import org.apache.drill.test.SubOperatorTest; import org.apache.drill.test.rowSet.RowSet.ExtendableRowSet; import org.apache.drill.test.rowSet.RowSet.SingleRowSet; -import org.apache.drill.test.rowSet.schema.SchemaBuilder; import org.apache.drill.test.rowSet.RowSetReader; import org.apache.drill.test.rowSet.RowSetUtilities; import org.apache.drill.test.rowSet.RowSetWriter; +import org.apache.drill.test.rowSet.schema.SchemaBuilder; import org.junit.Test; /** @@ -219,16 +219,18 @@ private void dofillEmptiesRepeated(MajorType majorType) { } SingleRowSet result = writer.done(); RowSetReader reader = result.reader(); - ScalarElementReader colReader = reader.array(0).elements(); + ArrayReader aReader = reader.array(0); + ScalarReader colReader = aReader.scalar(); for (int i = 0; i < ROW_COUNT; i++) { assertTrue(reader.next()); if (i % 5 != 0) { // Empty arrays are defined to be the same as a zero-length array. - assertEquals(0, colReader.size()); + assertEquals(0, aReader.size()); } else { for (int j = 0; j < 2; j++) { - Object actual = colReader.getObject(j); + assertTrue(aReader.next()); + Object actual = colReader.getObject(); Object expected = RowSetUtilities.testDataFromInt(valueType, majorType, i + j); RowSetUtilities.assertEqualValues( majorType.toString().replace('\n', ' ') + "[" + i + "][" + j + "]", diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestHyperVectorReaders.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestHyperVectorReaders.java new file mode 100644 index 00000000000..00e72d45ed3 --- /dev/null +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestHyperVectorReaders.java @@ -0,0 +1,365 @@ +/* + * 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 org.apache.drill.test.rowSet.test; + +import static org.apache.drill.test.rowSet.RowSetUtilities.mapArray; +import static org.apache.drill.test.rowSet.RowSetUtilities.mapValue; +import static org.apache.drill.test.rowSet.RowSetUtilities.strArray; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.exec.record.metadata.TupleMetadata; +import org.apache.drill.exec.record.selection.SelectionVector4; +import org.apache.drill.test.SubOperatorTest; +import org.apache.drill.test.rowSet.HyperRowSetImpl; +import org.apache.drill.test.rowSet.RowSet.ExtendableRowSet; +import org.apache.drill.test.rowSet.RowSet.HyperRowSet; +import org.apache.drill.test.rowSet.RowSet.SingleRowSet; +import org.apache.drill.test.rowSet.RowSetBuilder; +import org.apache.drill.test.rowSet.RowSetReader; +import org.apache.drill.test.rowSet.RowSetUtilities; +import org.apache.drill.test.rowSet.RowSetWriter; +import org.apache.drill.test.rowSet.schema.SchemaBuilder; +import org.junit.Test; + +/** + * Test the reader mechanism that reads rows indexed via an SV4. + * SV4's introduce an additional level of indexing: each row may + * come from a different batch. The readers use the SV4 to find + * the root batch and vector, then must navigate downward from that + * vector for maps, repeated maps, lists, unions, repeated lists, + * nullable vectors and variable-length vectors. + *

+ * This test does not cover repeated vectors; those tests should be added. + */ + +public class TestHyperVectorReaders extends SubOperatorTest { + + /** + * Test the simplest case: a top-level required vector. Has no contained vectors. + * This test focuses on the SV4 indirection mechanism itself. + */ + + @Test + public void testRequired() { + TupleMetadata schema = new SchemaBuilder() + .add("a", MinorType.INT) + .buildSchema(); + + SingleRowSet rowSet1; + { + ExtendableRowSet rowSet = fixture.rowSet(schema); + RowSetWriter writer = rowSet.writer(); + for (int i = 0; i < 10; i++) { + writer.scalar(0).setInt(i * 10); + writer.save(); + } + rowSet1 = writer.done(); + } + + SingleRowSet rowSet2; + { + ExtendableRowSet rowSet = fixture.rowSet(schema); + RowSetWriter writer = rowSet.writer(); + for (int i = 10; i < 20; i++) { + writer.scalar(0).setInt(i * 10); + writer.save(); + } + rowSet2 = writer.done(); + } + + // Build the hyper batch + // [0, 10, 20, ... 190] + + HyperRowSet hyperSet = HyperRowSetImpl.fromRowSets(fixture.allocator(), rowSet1, rowSet2); + assertEquals(20, hyperSet.rowCount()); + + // Populate the indirection vector: + // (1, 9), (0, 9), (1, 8), (0, 8), ... (0, 0) + + SelectionVector4 sv4 = hyperSet.getSv4(); + for (int i = 0; i < 20; i++) { + int batch = i % 2; + int offset = 9 - i / 2; + sv4.set(i, batch, offset); + } + + // Sanity check. + + for (int i = 0; i < 20; i++) { + int batch = i % 2; + int offset = 9 - i / 2; + int encoded = sv4.get(i); + assertEquals(batch, SelectionVector4.getBatchIndex(encoded)); + assertEquals(offset, SelectionVector4.getRecordIndex(encoded)); + } + + // Verify reader + // Expected: [190, 90, 180, 80, ... 0] + + RowSetReader reader = hyperSet.reader(); + for (int i = 0; i < 20; i++) { + assertTrue(reader.next()); + int batch = i % 2; + int offset = 9 - i / 2; + int expected = batch * 100 + offset * 10; + assertEquals(expected, reader.scalar(0).getInt()); + } + assertFalse(reader.next()); + + // Validate using an expected result set. + + RowSetBuilder rsBuilder = fixture.rowSetBuilder(schema); + for (int i = 0; i < 20; i++) { + int batch = i % 2; + int offset = 9 - i / 2; + int expected = batch * 100 + offset * 10; + rsBuilder.addRow(expected); + } + + RowSetUtilities.verify(rsBuilder.build(), hyperSet); + } + + @Test + public void testVarWidth() { + TupleMetadata schema = new SchemaBuilder() + .add("a", MinorType.VARCHAR) + .buildSchema(); + + SingleRowSet rowSet1 = fixture.rowSetBuilder(schema) + .addSingleCol("second") + .addSingleCol("fourth") + .build(); + + SingleRowSet rowSet2 = fixture.rowSetBuilder(schema) + .addSingleCol("first") + .addSingleCol("third") + .build(); + + // Build the hyper batch + + HyperRowSet hyperSet = HyperRowSetImpl.fromRowSets(fixture.allocator(), rowSet1, rowSet2); + assertEquals(4, hyperSet.rowCount()); + SelectionVector4 sv4 = hyperSet.getSv4(); + sv4.set(0, 1, 0); + sv4.set(1, 0, 0); + sv4.set(2, 1, 1); + sv4.set(3, 0, 1); + + SingleRowSet expected = fixture.rowSetBuilder(schema) + .addRow("first") + .addRow("second") + .addRow("third") + .addRow("fourth") + .build(); + + RowSetUtilities.verify(expected, hyperSet); + } + + /** + * Test a nullable varchar. Requires multiple indirections: + *

    + *
  • From the SV4 to the nullable vector.
    • + *
  • From the nullable vector to the bits vector.
    • + *
  • From the nullable vector to the data vector.
    • + *
  • From the data vector to the offset vector.
    • + *
  • From the data vector to the values vector.
    • + *
+ * All are coordinated by the vector index and vector accessors. + * This test verifies that each of the indirections does, in fact, + * work as expected. + */ + + @Test + public void testOptional() { + TupleMetadata schema = new SchemaBuilder() + .addNullable("a", MinorType.VARCHAR) + .buildSchema(); + + SingleRowSet rowSet1 = fixture.rowSetBuilder(schema) + .addSingleCol("sixth") + .addSingleCol(null) + .addSingleCol("fourth") + .build(); + + SingleRowSet rowSet2 = fixture.rowSetBuilder(schema) + .addSingleCol(null) + .addSingleCol("first") + .addSingleCol("third") + .build(); + + // Build the hyper batch + + HyperRowSet hyperSet = HyperRowSetImpl.fromRowSets(fixture.allocator(), rowSet1, rowSet2); + assertEquals(6, hyperSet.rowCount()); + SelectionVector4 sv4 = hyperSet.getSv4(); + sv4.set(0, 1, 1); + sv4.set(1, 0, 1); + sv4.set(2, 1, 2); + sv4.set(3, 0, 2); + sv4.set(4, 1, 0); + sv4.set(5, 0, 0); + + SingleRowSet expected = fixture.rowSetBuilder(schema) + .addSingleCol("first") + .addSingleCol(null) + .addSingleCol("third") + .addSingleCol("fourth") + .addSingleCol(null) + .addSingleCol("sixth") + .build(); + + RowSetUtilities.verify(expected, hyperSet); + } + + /** + * Test an array to test the indirection from the repeated vector + * to the array offsets vector and the array values vector. (Uses + * varchar to add another level of indirection to the data offset + * and data values vectors.) + */ + + @Test + public void testRepeated() { + TupleMetadata schema = new SchemaBuilder() + .addArray("a", MinorType.VARCHAR) + .buildSchema(); + + SingleRowSet rowSet1 = fixture.rowSetBuilder(schema) + .addSingleCol(strArray("sixth", "6.1", "6.2")) + .addSingleCol(strArray("second", "2.1", "2.2", "2.3")) + .addSingleCol(strArray("fourth", "4.1")) + .build(); + + SingleRowSet rowSet2 = fixture.rowSetBuilder(schema) + .addSingleCol(strArray("fifth", "51", "5.2")) + .addSingleCol(strArray("first", "1.1", "1.2", "1.3")) + .addSingleCol(strArray("third", "3.1")) + .build(); + + // Build the hyper batch + + HyperRowSet hyperSet = HyperRowSetImpl.fromRowSets(fixture.allocator(), rowSet1, rowSet2); + assertEquals(6, hyperSet.rowCount()); + SelectionVector4 sv4 = hyperSet.getSv4(); + sv4.set(0, 1, 1); + sv4.set(1, 0, 1); + sv4.set(2, 1, 2); + sv4.set(3, 0, 2); + sv4.set(4, 1, 0); + sv4.set(5, 0, 0); + + SingleRowSet expected = fixture.rowSetBuilder(schema) + .addSingleCol(strArray("first", "1.1", "1.2", "1.3")) + .addSingleCol(strArray("second", "2.1", "2.2", "2.3")) + .addSingleCol(strArray("third", "3.1")) + .addSingleCol(strArray("fourth", "4.1")) + .addSingleCol(strArray("fifth", "51", "5.2")) + .addSingleCol(strArray("sixth", "6.1", "6.2")) + .build(); + + RowSetUtilities.verify(expected, hyperSet); + } + + /** + * Maps are an interesting case. The hyper-vector wrapper holds a mirror-image of the + * map members. So, we can reach the map members either via the vector wrappers or + * the original map vector. + */ + + @Test + public void testMap() { + TupleMetadata schema = new SchemaBuilder() + .addMap("m") + .add("a", MinorType.INT) + .add("b", MinorType.VARCHAR) + .resumeSchema() + .buildSchema(); + + SingleRowSet rowSet1 = fixture.rowSetBuilder(schema) + .addSingleCol(mapValue(2, "second")) + .addSingleCol(mapValue(4, "fourth")) + .build(); + + SingleRowSet rowSet2 = fixture.rowSetBuilder(schema) + .addSingleCol(mapValue(2, "first")) + .addSingleCol(mapValue(4, "third")) + .build(); + + // Build the hyper batch + + HyperRowSet hyperSet = HyperRowSetImpl.fromRowSets(fixture.allocator(), rowSet1, rowSet2); + assertEquals(4, hyperSet.rowCount()); + SelectionVector4 sv4 = hyperSet.getSv4(); + sv4.set(0, 1, 0); + sv4.set(1, 0, 0); + sv4.set(2, 1, 1); + sv4.set(3, 0, 1); + + SingleRowSet expected = fixture.rowSetBuilder(schema) + .addSingleCol(mapValue(2, "first")) + .addSingleCol(mapValue(2, "second")) + .addSingleCol(mapValue(4, "third")) + .addSingleCol(mapValue(4, "fourth")) + .build(); + + RowSetUtilities.verify(expected, hyperSet); + } + + @Test + public void testRepeatedMap() { + TupleMetadata schema = new SchemaBuilder() + .add("a", MinorType.INT) + .addMapArray("ma") + .add("b", MinorType.INT) + .add("c", MinorType.VARCHAR) + .resumeSchema() + .buildSchema(); + + SingleRowSet rowSet1 = fixture.rowSetBuilder(schema) + .addRow(2, mapArray(mapValue(21, "second.1"), mapValue(22, "second.2"))) + .addRow(4, mapArray(mapValue(41, "fourth.1"))) + .build(); + + SingleRowSet rowSet2 = fixture.rowSetBuilder(schema) + .addRow(1, mapArray(mapValue(11, "first.1"), mapValue(12, "first.2"))) + .addRow(3, mapArray(mapValue(31, "third.1"), mapValue(32, "third.2"), mapValue(33, "third.3"))) + .build(); + + // Build the hyper batch + + HyperRowSet hyperSet = HyperRowSetImpl.fromRowSets(fixture.allocator(), rowSet1, rowSet2); + assertEquals(4, hyperSet.rowCount()); + SelectionVector4 sv4 = hyperSet.getSv4(); + sv4.set(0, 1, 0); + sv4.set(1, 0, 0); + sv4.set(2, 1, 1); + sv4.set(3, 0, 1); + + SingleRowSet expected = fixture.rowSetBuilder(schema) + .addRow(1, mapArray(mapValue(11, "first.1"), mapValue(12, "first.2"))) + .addRow(2, mapArray(mapValue(21, "second.1"), mapValue(22, "second.2"))) + .addRow(3, mapArray(mapValue(31, "third.1"), mapValue(32, "third.2"), mapValue(33, "third.3"))) + .addRow(4, mapArray(mapValue(41, "fourth.1"))) + .build(); + + RowSetUtilities.verify(expected, hyperSet); + } +} diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestScalarAccessors.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestScalarAccessors.java index 1daeef42151..ecd1ebccd7c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestScalarAccessors.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/TestScalarAccessors.java @@ -26,7 +26,8 @@ import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.record.BatchSchema; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; +import org.apache.drill.exec.vector.DateUtilities; +import org.apache.drill.exec.vector.accessor.ArrayReader; import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.ValueType; import org.apache.drill.test.SubOperatorTest; @@ -36,6 +37,8 @@ import org.apache.drill.test.rowSet.schema.SchemaBuilder; import org.junit.Test; +import com.google.common.collect.Lists; + /** * Verify that simple scalar (non-repeated) column readers * and writers work as expected. The focus is on the generated @@ -50,6 +53,70 @@ public class TestScalarAccessors extends SubOperatorTest { + @Test + public void testUInt1RW() { + BatchSchema batchSchema = new SchemaBuilder() + .add("col", MinorType.UINT1) + .build(); + SingleRowSet rs = fixture.rowSetBuilder(batchSchema) + .addRow(0) + .addRow(0x7F) + .addRow(0xFF) + .build(); + assertEquals(3, rs.rowCount()); + + RowSetReader reader = rs.reader(); + ScalarReader colReader = reader.scalar(0); + assertEquals(ValueType.INTEGER, colReader.valueType()); + + assertTrue(reader.next()); + assertFalse(colReader.isNull()); + assertEquals(0, colReader.getInt()); + + assertTrue(reader.next()); + assertEquals(0x7F, colReader.getInt()); + assertEquals(0x7F, colReader.getObject()); + assertEquals(Integer.toString(0x7F), colReader.getAsString()); + + assertTrue(reader.next()); + assertEquals(0xFF, colReader.getInt()); + + assertFalse(reader.next()); + rs.clear(); + } + + @Test + public void testUInt2RW() { + BatchSchema batchSchema = new SchemaBuilder() + .add("col", MinorType.UINT2) + .build(); + SingleRowSet rs = fixture.rowSetBuilder(batchSchema) + .addRow(0) + .addRow(0x7FFF) + .addRow(0xFFFF) + .build(); + assertEquals(3, rs.rowCount()); + + RowSetReader reader = rs.reader(); + ScalarReader colReader = reader.scalar(0); + assertEquals(ValueType.INTEGER, colReader.valueType()); + + assertTrue(reader.next()); + assertFalse(colReader.isNull()); + assertEquals(0, colReader.getInt()); + + assertTrue(reader.next()); + assertEquals(0x7FFF, colReader.getInt()); + assertEquals(0x7FFF, colReader.getObject()); + assertEquals(Integer.toString(0x7FFF), colReader.getAsString()); + + assertTrue(reader.next()); + assertEquals(0xFFFF, colReader.getInt()); + + assertFalse(reader.next()); + rs.clear(); + } + @Test public void testTinyIntRW() { BatchSchema batchSchema = new SchemaBuilder() @@ -129,23 +196,37 @@ private void intArrayTester(MinorType type) { assertEquals(2, rs.rowCount()); RowSetReader reader = rs.reader(); - ScalarElementReader colReader = reader.elements(0); + ArrayReader arrayReader = reader.array(0); + ScalarReader colReader = arrayReader.scalar(); assertEquals(ValueType.INTEGER, colReader.valueType()); assertTrue(reader.next()); - assertEquals(0, colReader.size()); + assertEquals(0, arrayReader.size()); assertTrue(reader.next()); - assertEquals(3, colReader.size()); - assertEquals(0, colReader.getInt(0)); - assertEquals(20, colReader.getInt(1)); - assertEquals(30, colReader.getInt(2)); - assertEquals(0, colReader.getObject(0)); - assertEquals(20, colReader.getObject(1)); - assertEquals(30, colReader.getObject(2)); - assertEquals("0", colReader.getAsString(0)); - assertEquals("20", colReader.getAsString(1)); - assertEquals("30", colReader.getAsString(2)); + assertEquals(3, arrayReader.size()); + assertTrue(arrayReader.next()); + assertFalse(colReader.isNull()); + assertEquals(0, colReader.getInt()); + assertEquals(0, colReader.getObject()); + assertEquals("0", colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertFalse(colReader.isNull()); + assertEquals(20, colReader.getInt()); + assertEquals(20, colReader.getObject()); + assertEquals("20", colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertFalse(colReader.isNull()); + assertEquals(30, colReader.getInt()); + assertEquals(30, colReader.getObject()); + assertEquals("30", colReader.getAsString()); + + assertFalse(arrayReader.next()); + + assertEquals("[0, 20, 30]", arrayReader.getAsString()); + assertEquals(Lists.newArrayList(0, 20, 30), arrayReader.getObject()); assertFalse(reader.next()); rs.clear(); @@ -323,23 +404,35 @@ private void longArrayTester(MinorType type) { assertEquals(2, rs.rowCount()); RowSetReader reader = rs.reader(); - ScalarElementReader colReader = reader.elements(0); + ArrayReader arrayReader = reader.array(0); + ScalarReader colReader = arrayReader.scalar(); assertEquals(ValueType.LONG, colReader.valueType()); assertTrue(reader.next()); - assertEquals(0, colReader.size()); + assertEquals(0, arrayReader.size()); assertTrue(reader.next()); - assertEquals(3, colReader.size()); - assertEquals(0, colReader.getLong(0)); - assertEquals(20, colReader.getLong(1)); - assertEquals(30, colReader.getLong(2)); - assertEquals(0L, colReader.getObject(0)); - assertEquals(20L, colReader.getObject(1)); - assertEquals(30L, colReader.getObject(2)); - assertEquals("0", colReader.getAsString(0)); - assertEquals("20", colReader.getAsString(1)); - assertEquals("30", colReader.getAsString(2)); + assertEquals(3, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertEquals(0, colReader.getLong()); + assertEquals(0L, colReader.getObject()); + assertEquals("0", colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals(20, colReader.getLong()); + assertEquals(20L, colReader.getObject()); + assertEquals("20", colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals(30, colReader.getLong()); + assertEquals(30L, colReader.getObject()); + assertEquals("30", colReader.getAsString()); + + assertFalse(arrayReader.next()); + + assertEquals("[0, 20, 30]", arrayReader.getAsString()); + assertEquals(Lists.newArrayList(0L, 20L, 30L), arrayReader.getObject()); assertFalse(reader.next()); rs.clear(); @@ -373,7 +466,7 @@ public void testFloatRW() { assertTrue(reader.next()); assertEquals(Float.MAX_VALUE, colReader.getDouble(), 0.000001); - assertEquals((double) Float.MAX_VALUE, (double) colReader.getObject(), 0.000001); + assertEquals(Float.MAX_VALUE, (double) colReader.getObject(), 0.000001); assertTrue(reader.next()); assertEquals(Float.MIN_VALUE, colReader.getDouble(), 0.000001); @@ -433,23 +526,34 @@ private void doubleArrayTester(MinorType type) { assertEquals(2, rs.rowCount()); RowSetReader reader = rs.reader(); - ScalarElementReader colReader = reader.elements(0); + ArrayReader arrayReader = reader.array(0); + ScalarReader colReader = arrayReader.scalar(); assertEquals(ValueType.DOUBLE, colReader.valueType()); assertTrue(reader.next()); - assertEquals(0, colReader.size()); + assertEquals(0, arrayReader.size()); assertTrue(reader.next()); - assertEquals(3, colReader.size()); - assertEquals(0, colReader.getDouble(0), 0.00001); - assertEquals(20.5, colReader.getDouble(1), 0.00001); - assertEquals(30.0, colReader.getDouble(2), 0.00001); - assertEquals(0, (double) colReader.getObject(0), 0.00001); - assertEquals(20.5, (double) colReader.getObject(1), 0.00001); - assertEquals(30.0, (double) colReader.getObject(2), 0.00001); - assertEquals("0.0", colReader.getAsString(0)); - assertEquals("20.5", colReader.getAsString(1)); - assertEquals("30.0", colReader.getAsString(2)); + assertEquals(3, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertEquals(0, colReader.getDouble(), 0.00001); + assertEquals(0, (double) colReader.getObject(), 0.00001); + assertEquals("0.0", colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals(20.5, colReader.getDouble(), 0.00001); + assertEquals(20.5, (double) colReader.getObject(), 0.00001); + assertEquals("20.5", colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals(30.0, colReader.getDouble(), 0.00001); + assertEquals(30.0, (double) colReader.getObject(), 0.00001); + assertEquals("30.0", colReader.getAsString()); + assertFalse(arrayReader.next()); + + assertEquals("[0.0, 20.5, 30.0]", arrayReader.getAsString()); + assertEquals(Lists.newArrayList(0.0D, 20.5D, 30D), arrayReader.getObject()); assertFalse(reader.next()); rs.clear(); @@ -507,15 +611,16 @@ public void testDoubleArray() { } @Test - public void testStringRW() { + public void testVarcharRW() { BatchSchema batchSchema = new SchemaBuilder() .add("col", MinorType.VARCHAR) .build(); SingleRowSet rs = fixture.rowSetBuilder(batchSchema) .addRow("") - .addRow("abcd") + .addRow("fred") + .addRow("barney") .build(); - assertEquals(2, rs.rowCount()); + assertEquals(3, rs.rowCount()); RowSetReader reader = rs.reader(); ScalarReader colReader = reader.scalar(0); @@ -526,16 +631,21 @@ public void testStringRW() { assertEquals("", colReader.getString()); assertTrue(reader.next()); - assertEquals("abcd", colReader.getString()); - assertEquals("abcd", colReader.getObject()); - assertEquals("\"abcd\"", colReader.getAsString()); + assertEquals("fred", colReader.getString()); + assertEquals("fred", colReader.getObject()); + assertEquals("\"fred\"", colReader.getAsString()); + + assertTrue(reader.next()); + assertEquals("barney", colReader.getString()); + assertEquals("barney", colReader.getObject()); + assertEquals("\"barney\"", colReader.getAsString()); assertFalse(reader.next()); rs.clear(); } @Test - public void testNullableString() { + public void testNullableVarchar() { BatchSchema batchSchema = new SchemaBuilder() .addNullable("col", MinorType.VARCHAR) .build(); @@ -568,7 +678,7 @@ public void testNullableString() { } @Test - public void testStringArray() { + public void testVarcharArray() { BatchSchema batchSchema = new SchemaBuilder() .addArray("col", MinorType.VARCHAR) .build(); @@ -579,28 +689,71 @@ public void testStringArray() { assertEquals(2, rs.rowCount()); RowSetReader reader = rs.reader(); - ScalarElementReader colReader = reader.elements(0); + ArrayReader arrayReader = reader.array(0); + ScalarReader colReader = arrayReader.scalar(); assertEquals(ValueType.STRING, colReader.valueType()); assertTrue(reader.next()); - assertEquals(0, colReader.size()); + assertEquals(0, arrayReader.size()); assertTrue(reader.next()); - assertEquals(3, colReader.size()); - assertEquals("fred", colReader.getString(0)); - assertEquals("", colReader.getString(1)); - assertEquals("wilma", colReader.getString(2)); - assertEquals("fred", colReader.getObject(0)); - assertEquals("", colReader.getObject(1)); - assertEquals("wilma", colReader.getObject(2)); - assertEquals("\"fred\"", colReader.getAsString(0)); - assertEquals("\"\"", colReader.getAsString(1)); - assertEquals("\"wilma\"", colReader.getAsString(2)); + assertEquals(3, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertEquals("fred", colReader.getString()); + assertEquals("fred", colReader.getObject()); + assertEquals("\"fred\"", colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals("", colReader.getString()); + assertEquals("", colReader.getObject()); + assertEquals("\"\"", colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals("wilma", colReader.getString()); + assertEquals("wilma", colReader.getObject()); + assertEquals("\"wilma\"", colReader.getAsString()); + + assertFalse(arrayReader.next()); + + assertEquals("[\"fred\", \"\", \"wilma\"]", arrayReader.getAsString()); + assertEquals(Lists.newArrayList("fred", "", "wilma"), arrayReader.getObject()); assertFalse(reader.next()); rs.clear(); } + /** + * Test the low-level interval-year utilities used by the column accessors. + */ + + @Test + public void testIntervalYearUtils() { + { + Period expected = Period.months(0); + Period actual = DateUtilities.fromIntervalYear(0); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalYearStringBuilder(expected).toString(); + assertEquals("0 years 0 months", fmt); + } + + { + Period expected = Period.years(1).plusMonths(2); + Period actual = DateUtilities.fromIntervalYear(DateUtilities.periodToMonths(expected)); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalYearStringBuilder(expected).toString(); + assertEquals("1 year 2 months", fmt); + } + + { + Period expected = Period.years(6).plusMonths(1); + Period actual = DateUtilities.fromIntervalYear(DateUtilities.periodToMonths(expected)); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalYearStringBuilder(expected).toString(); + assertEquals("6 years 1 month", fmt); + } + } + @Test public void testIntervalYearRW() { BatchSchema batchSchema = new SchemaBuilder() @@ -664,7 +817,6 @@ public void testNullableIntervalYear() { assertTrue(reader.next()); assertTrue(colReader.isNull()); - assertNull(colReader.getPeriod()); assertNull(colReader.getObject()); assertEquals("null", colReader.getAsString()); @@ -692,24 +844,64 @@ public void testIntervalYearArray() { assertEquals(2, rs.rowCount()); RowSetReader reader = rs.reader(); - ScalarElementReader colReader = reader.elements(0); + ArrayReader arrayReader = reader.array(0); + ScalarReader colReader = arrayReader.scalar(); assertEquals(ValueType.PERIOD, colReader.valueType()); assertTrue(reader.next()); - assertEquals(0, colReader.size()); + assertEquals(0, arrayReader.size()); assertTrue(reader.next()); - assertEquals(3, colReader.size()); - assertEquals(p1, colReader.getPeriod(0)); - assertEquals(p2, colReader.getPeriod(1)); - assertEquals(p3, colReader.getPeriod(2)); - assertEquals(p2, colReader.getObject(1)); - assertEquals(p2.toString(), colReader.getAsString(1)); + assertEquals(3, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertEquals(p1, colReader.getPeriod()); + + assertTrue(arrayReader.next()); + assertEquals(p2, colReader.getPeriod()); + assertEquals(p2, colReader.getObject()); + assertEquals(p2.toString(), colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals(p3, colReader.getPeriod()); + + assertFalse(arrayReader.next()); assertFalse(reader.next()); rs.clear(); } + /** + * Test the low-level interval-day utilities used by the column accessors. + */ + + @Test + public void testIntervalDayUtils() { + { + Period expected = Period.days(0); + Period actual = DateUtilities.fromIntervalDay(0, 0); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalDayStringBuilder(expected).toString(); + assertEquals("0 days 0:00:00", fmt); + } + + { + Period expected = Period.days(1).plusHours(5).plusMinutes(6).plusSeconds(7); + Period actual = DateUtilities.fromIntervalDay(1, DateUtilities.timeToMillis(5, 6, 7, 0)); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalDayStringBuilder(expected).toString(); + assertEquals("1 day 5:06:07", fmt); + } + + { + Period expected = Period.days(2).plusHours(12).plusMinutes(23).plusSeconds(34).plusMillis(567); + Period actual = DateUtilities.fromIntervalDay(2, DateUtilities.timeToMillis(12, 23, 34, 567)); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalDayStringBuilder(expected).toString(); + assertEquals("2 days 12:23:34.567", fmt); + } + } + @Test public void testIntervalDayRW() { BatchSchema batchSchema = new SchemaBuilder() @@ -774,7 +966,6 @@ public void testNullableIntervalDay() { assertTrue(reader.next()); assertTrue(colReader.isNull()); - assertNull(colReader.getPeriod()); assertNull(colReader.getObject()); assertEquals("null", colReader.getAsString()); @@ -802,24 +993,79 @@ public void testIntervalDayArray() { assertEquals(2, rs.rowCount()); RowSetReader reader = rs.reader(); - ScalarElementReader colReader = reader.elements(0); + ArrayReader arrayReader = reader.array(0); + ScalarReader colReader = arrayReader.scalar(); assertEquals(ValueType.PERIOD, colReader.valueType()); assertTrue(reader.next()); - assertEquals(0, colReader.size()); + assertEquals(0, arrayReader.size()); assertTrue(reader.next()); - assertEquals(3, colReader.size()); - assertEquals(p1, colReader.getPeriod(0).normalizedStandard()); - assertEquals(p2, colReader.getPeriod(1).normalizedStandard()); - assertEquals(p3.normalizedStandard(), colReader.getPeriod(2).normalizedStandard()); - assertEquals(p2, ((Period) colReader.getObject(1)).normalizedStandard()); - assertEquals(p2.toString(), colReader.getAsString(1)); + assertEquals(3, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertEquals(p1, colReader.getPeriod().normalizedStandard()); + + assertTrue(arrayReader.next()); + assertEquals(p2, colReader.getPeriod().normalizedStandard()); + assertEquals(p2, ((Period) colReader.getObject()).normalizedStandard()); + assertEquals(p2.toString(), colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals(p3.normalizedStandard(), colReader.getPeriod().normalizedStandard()); + + assertFalse(arrayReader.next()); assertFalse(reader.next()); rs.clear(); } + /** + * Test the low-level interval utilities used by the column accessors. + */ + + @Test + public void testIntervalUtils() { + { + Period expected = Period.months(0); + Period actual = DateUtilities.fromInterval(0, 0, 0); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalStringBuilder(expected).toString(); + assertEquals("0 years 0 months 0 days 0:00:00", fmt); + } + + { + Period expected = Period.years(1).plusMonths(2).plusDays(3) + .plusHours(5).plusMinutes(6).plusSeconds(7); + Period actual = DateUtilities.fromInterval(DateUtilities.periodToMonths(expected), 3, + DateUtilities.periodToMillis(expected)); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalStringBuilder(expected).toString(); + assertEquals("1 year 2 months 3 days 5:06:07", fmt); + } + + { + Period expected = Period.years(2).plusMonths(1).plusDays(3) + .plusHours(12).plusMinutes(23).plusSeconds(34) + .plusMillis(456); + Period actual = DateUtilities.fromInterval(DateUtilities.periodToMonths(expected), 3, + DateUtilities.periodToMillis(expected)); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalStringBuilder(expected).toString(); + assertEquals("2 years 1 month 3 days 12:23:34.456", fmt); + } + + { + Period expected = Period.years(2).plusMonths(3).plusDays(1) + .plusHours(12).plusMinutes(23).plusSeconds(34); + Period actual = DateUtilities.fromInterval(DateUtilities.periodToMonths(expected), 1, + DateUtilities.periodToMillis(expected)); + assertEquals(expected, actual.normalizedStandard()); + String fmt = DateUtilities.intervalStringBuilder(expected).toString(); + assertEquals("2 years 3 months 1 day 12:23:34", fmt); + } + } + @Test public void testIntervalRW() { BatchSchema batchSchema = new SchemaBuilder() @@ -890,7 +1136,6 @@ public void testNullableInterval() { assertTrue(reader.next()); assertTrue(colReader.isNull()); - assertNull(colReader.getPeriod()); assertNull(colReader.getObject()); assertEquals("null", colReader.getAsString()); @@ -922,19 +1167,28 @@ public void testIntervalArray() { assertEquals(2, rs.rowCount()); RowSetReader reader = rs.reader(); - ScalarElementReader colReader = reader.elements(0); + ArrayReader arrayReader = reader.array(0); + ScalarReader colReader = arrayReader.scalar(); assertEquals(ValueType.PERIOD, colReader.valueType()); assertTrue(reader.next()); - assertEquals(0, colReader.size()); + assertEquals(0, arrayReader.size()); assertTrue(reader.next()); - assertEquals(3, colReader.size()); - assertEquals(p1, colReader.getPeriod(0).normalizedStandard()); - assertEquals(p2, colReader.getPeriod(1).normalizedStandard()); - assertEquals(p3.normalizedStandard(), colReader.getPeriod(2).normalizedStandard()); - assertEquals(p2, ((Period) colReader.getObject(1)).normalizedStandard()); - assertEquals(p2.toString(), colReader.getAsString(1)); + assertEquals(3, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertEquals(p1, colReader.getPeriod().normalizedStandard()); + + assertTrue(arrayReader.next()); + assertEquals(p2, colReader.getPeriod().normalizedStandard()); + assertEquals(p2, ((Period) colReader.getObject()).normalizedStandard()); + assertEquals(p2.toString(), colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals(p3.normalizedStandard(), colReader.getPeriod().normalizedStandard()); + + assertFalse(arrayReader.next()); assertFalse(reader.next()); rs.clear(); @@ -1051,19 +1305,28 @@ private void decimalArrayTester(MinorType type, int precision) { assertEquals(2, rs.rowCount()); RowSetReader reader = rs.reader(); - ScalarElementReader colReader = reader.elements(0); + ArrayReader arrayReader = reader.array(0); + ScalarReader colReader = arrayReader.scalar(); assertEquals(ValueType.DECIMAL, colReader.valueType()); assertTrue(reader.next()); - assertEquals(0, colReader.size()); + assertEquals(0, arrayReader.size()); assertTrue(reader.next()); - assertEquals(3, colReader.size()); - assertEquals(0, v1.compareTo(colReader.getDecimal(0))); - assertEquals(0, v2.compareTo(colReader.getDecimal(1))); - assertEquals(0, v3.compareTo(colReader.getDecimal(2))); - assertEquals(0, v2.compareTo((BigDecimal) colReader.getObject(1))); - assertEquals(v2.toString(), colReader.getAsString(1)); + assertEquals(3, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertEquals(0, v1.compareTo(colReader.getDecimal())); + + assertTrue(arrayReader.next()); + assertEquals(0, v2.compareTo(colReader.getDecimal())); + assertEquals(0, v2.compareTo((BigDecimal) colReader.getObject())); + assertEquals(v2.toString(), colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertEquals(0, v3.compareTo(colReader.getDecimal())); + + assertFalse(arrayReader.next()); assertFalse(reader.next()); rs.clear(); @@ -1246,19 +1509,28 @@ public void testVarBinaryArray() { assertEquals(2, rs.rowCount()); RowSetReader reader = rs.reader(); - ScalarElementReader colReader = reader.elements(0); + ArrayReader arrayReader = reader.array(0); + ScalarReader colReader = arrayReader.scalar(); assertEquals(ValueType.BYTES, colReader.valueType()); assertTrue(reader.next()); - assertEquals(0, colReader.size()); + assertEquals(0, arrayReader.size()); assertTrue(reader.next()); - assertEquals(3, colReader.size()); - assertTrue(Arrays.equals(v1, colReader.getBytes(0))); - assertTrue(Arrays.equals(v2, colReader.getBytes(1))); - assertTrue(Arrays.equals(v3, colReader.getBytes(2))); - assertTrue(Arrays.equals(v2, (byte[]) colReader.getObject(1))); - assertEquals("[00, 7f, 80, ff]", colReader.getAsString(1)); + assertEquals(3, arrayReader.size()); + + assertTrue(arrayReader.next()); + assertTrue(Arrays.equals(v1, colReader.getBytes())); + + assertTrue(arrayReader.next()); + assertTrue(Arrays.equals(v2, colReader.getBytes())); + assertTrue(Arrays.equals(v2, (byte[]) colReader.getObject())); + assertEquals("[00, 7f, 80, ff]", colReader.getAsString()); + + assertTrue(arrayReader.next()); + assertTrue(Arrays.equals(v3, colReader.getBytes())); + + assertFalse(arrayReader.next()); assertFalse(reader.next()); rs.clear(); diff --git a/exec/memory/base/src/main/java/io/netty/buffer/DrillBuf.java b/exec/memory/base/src/main/java/io/netty/buffer/DrillBuf.java index 109500a43e8..513f50bfc58 100644 --- a/exec/memory/base/src/main/java/io/netty/buffer/DrillBuf.java +++ b/exec/memory/base/src/main/java/io/netty/buffer/DrillBuf.java @@ -823,4 +823,19 @@ public void print(StringBuilder sb, int indent, Verbosity verbosity) { historicalLog.buildHistory(sb, indent + 1, verbosity.includeStackTraces); } } + + /** + * Convenience method to read buffer bytes into a newly allocated byte + * array. + * + * @param srcOffset the offset into this buffer of the data to read + * @param length number of bytes to read + * @return byte array with the requested bytes + */ + + public byte[] unsafeGetMemory(int srcOffset, int length) { + byte buf[] = new byte[length]; + PlatformDependent.copyMemory(addr + srcOffset, buf, 0, length); + return buf; + } } diff --git a/exec/vector/src/main/codegen/templates/ColumnAccessors.java b/exec/vector/src/main/codegen/templates/ColumnAccessors.java index 14ec1e879d9..4836099b1fb 100644 --- a/exec/vector/src/main/codegen/templates/ColumnAccessors.java +++ b/exec/vector/src/main/codegen/templates/ColumnAccessors.java @@ -1,3 +1,4 @@ +<#macro copyright> /* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file @@ -16,9 +17,10 @@ * limitations under the License. */ +// This class is generated using Freemarker and the ${.template_name} template. + <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/vector/accessor/ColumnAccessors.java" /> -<#include "/@includes/license.ftl" /> <#macro getType drillType label> @Override public ValueType valueType() { @@ -31,74 +33,6 @@ public ValueType valueType() { } -<#macro bindReader vectorPrefix drillType isArray > - <#if drillType = "Decimal9" || drillType == "Decimal18"> - private MajorType type; - - private ${vectorPrefix}${drillType}Vector.Accessor accessor; - - @Override - public void bindVector(ValueVector vector) { - <#if drillType = "Decimal9" || drillType == "Decimal18"> - type = vector.getField().getType(); - - accessor = ((${vectorPrefix}${drillType}Vector) vector).getAccessor(); - } - - <#if drillType = "Decimal9" || drillType == "Decimal18"> - @Override - public void bindVector(MajorType type, VectorAccessor va) { - super.bindVector(type, va); - this.type = type; - } - - - private ${vectorPrefix}${drillType}Vector.Accessor accessor() { - if (vectorAccessor == null) { - return accessor; - } else { - return ((${vectorPrefix}${drillType}Vector) vectorAccessor.vector()).getAccessor(); - } - } - -<#macro get drillType accessorType label isArray> - @Override - public ${accessorType} get${label}(<#if isArray>int index) { - <#assign getObject ="getObject"/> - <#if isArray> - <#assign indexVar = "index"/> - <#else> - <#assign indexVar = ""/> - - <#if drillType == "VarChar" || drillType == "Var16Char" || drillType == "VarBinary"> - return accessor().get(vectorIndex.vectorIndex(${indexVar})); - <#elseif drillType == "Decimal9" || drillType == "Decimal18"> - return DecimalUtility.getBigDecimalFromPrimitiveTypes( - accessor().get(vectorIndex.vectorIndex(${indexVar})), - type.getScale(), - type.getPrecision()); - <#elseif accessorType == "BigDecimal" || accessorType == "Period"> - return accessor().${getObject}(vectorIndex.vectorIndex(${indexVar})); - <#elseif drillType == "UInt1"> - return ((int) accessor().get(vectorIndex.vectorIndex(${indexVar}))) & 0xFF; - <#else> - return accessor().get(vectorIndex.vectorIndex(${indexVar})); - - } - <#if drillType == "VarChar"> - - @Override - public String getString(<#if isArray>int index) { - return new String(getBytes(${indexVar}), Charsets.UTF_8); - } - <#elseif drillType == "Var16Char"> - - @Override - public String getString(<#if isArray>int index) { - return new String(getBytes(${indexVar}), Charsets.UTF_16); - } - - <#macro build types vectorType accessorType> <#if vectorType == "Repeated"> <#assign fnPrefix = "Array" /> @@ -126,24 +60,27 @@ public String getString(<#if isArray>int index) { } +<@copyright /> package org.apache.drill.exec.vector.accessor; import java.math.BigDecimal; import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.exec.vector.DateUtilities; +import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.vector.*; import org.apache.drill.exec.util.DecimalUtility; -import org.apache.drill.exec.vector.accessor.reader.BaseScalarReader; -import org.apache.drill.exec.vector.accessor.reader.BaseElementReader; +import org.apache.drill.exec.vector.accessor.reader.BaseScalarReader.BaseVarWidthReader; +import org.apache.drill.exec.vector.accessor.reader.BaseScalarReader.BaseFixedWidthReader; import org.apache.drill.exec.vector.accessor.reader.VectorAccessor; -import org.apache.drill.exec.vector.accessor.writer.BaseScalarWriter; import org.apache.drill.exec.vector.accessor.writer.AbstractFixedWidthWriter.BaseFixedWidthWriter; import org.apache.drill.exec.vector.accessor.writer.BaseVarWidthWriter; import com.google.common.base.Charsets; +import io.netty.buffer.DrillBuf; + import org.joda.time.Period; /** @@ -161,8 +98,6 @@ public String getString(<#if isArray>int index) { * row.) */ -// This class is generated using freemarker and the ${.template_name} template. - public class ColumnAccessors { <#list vv.types as type> @@ -177,56 +112,141 @@ public class ColumnAccessors { <#if accessorType=="BigDecimal"> <#assign label="Decimal"> - <#if drillType == "VarChar" || drillType == "Var16Char"> + <#assign varWidth = drillType == "VarChar" || drillType == "Var16Char" || drillType == "VarBinary" /> + <#assign decimal = drillType == "Decimal9" || drillType == "Decimal18" || + drillType == "Decimal28Sparse" || drillType == "Decimal38Sparse" /> + <#if varWidth> <#assign accessorType = "byte[]"> <#assign label = "Bytes"> + <#assign putArgs = ", int len"> + <#else> + <#assign putArgs = ""> + + <#if javaType == "char"> + <#assign putType = "short" /> + <#assign doCast = true /> + <#else> + <#assign putType = javaType /> + <#assign doCast = (cast == "set") /> <#if ! notyet> //------------------------------------------------------------------------ // ${drillType} readers and writers - public static class ${drillType}ColumnReader extends BaseScalarReader { + <#if varWidth> + public static class ${drillType}ColumnReader extends BaseVarWidthReader { + + <#else> + public static class ${drillType}ColumnReader extends BaseFixedWidthReader { + + private static final int VALUE_WIDTH = ${drillType}Vector.VALUE_WIDTH; - <@bindReader "" drillType false /> + <#if decimal> + private MajorType type; + + + + <#if decimal> + @Override + public void bindVector(ColumnMetadata schema, VectorAccessor va) { + super.bindVector(schema, va); + <#if decimal> + type = va.type(); + + } + <@getType drillType label /> - <@get drillType accessorType label false/> - } - - public static class Nullable${drillType}ColumnReader extends BaseScalarReader { - - <@bindReader "Nullable" drillType false /> - - <@getType drillType label /> + <#if ! varWidth> + @Override public int width() { return VALUE_WIDTH; } + @Override - public boolean isNull() { - return accessor().isNull(vectorIndex.vectorIndex()); + public ${accessorType} get${label}() { + <#assign getObject ="getObject"/> + <#assign indexVar = ""/> + final DrillBuf buf = bufferAccessor.buffer(); + <#if ! varWidth> + final int readOffset = vectorIndex.offset(); + <#assign getOffset = "readOffset * VALUE_WIDTH"> + + <#if varWidth> + final long entry = offsetsReader.getEntry(); + return buf.unsafeGetMemory((int) (entry >> 32), (int) (entry & 0xFFFF_FFFF)); + <#elseif drillType == "Decimal9"> + return DecimalUtility.getBigDecimalFromPrimitiveTypes( + buf.getInt(${getOffset}), + type.getScale(), + type.getPrecision()); + <#elseif drillType == "Decimal18"> + return DecimalUtility.getBigDecimalFromPrimitiveTypes( + buf.getLong(${getOffset}), + type.getScale(), + type.getPrecision()); + <#elseif drillType == "IntervalYear"> + return DateUtilities.fromIntervalYear( + buf.getInt(${getOffset})); + <#elseif drillType == "IntervalDay"> + final int offset = ${getOffset}; + return DateUtilities.fromIntervalDay( + buf.getInt(offset), + buf.getInt(offset + ${minor.millisecondsOffset})); + <#elseif drillType == "Interval"> + final int offset = ${getOffset}; + return DateUtilities.fromInterval( + buf.getInt(offset), + buf.getInt(offset + ${minor.daysOffset}), + buf.getInt(offset + ${minor.millisecondsOffset})); + <#elseif drillType == "Decimal28Sparse" || drillType == "Decimal38Sparse"> + return DecimalUtility.getBigDecimalFromSparse(buf, ${getOffset}, + ${minor.nDecimalDigits}, type.getScale()); + <#elseif drillType == "Decimal28Dense" || drillType == "Decimal38Dense"> + return DecimalUtility.getBigDecimalFromDense(buf, ${getOffset}, + ${minor.nDecimalDigits}, type.getScale(), + ${minor.maxPrecisionDigits}, VALUE_WIDTH); + <#elseif drillType == "UInt1"> + return buf.getByte(${getOffset}) & 0xFF; + <#elseif drillType == "UInt2"> + return buf.getShort(${getOffset}) & 0xFFFF; + <#elseif drillType == "UInt4"> + // Should be the following: + // return ((long) buf.unsafeGetInt(${getOffset})) & 0xFFFF_FFFF; + // else, the unsigned values of 32 bits are mapped to negative. + return buf.getInt(${getOffset}); + <#elseif drillType == "Float4"> + return Float.intBitsToFloat(buf.getInt(${getOffset})); + <#elseif drillType == "Float8"> + return Double.longBitsToDouble(buf.getLong(${getOffset})); + <#else> + return buf.get${putType?cap_first}(${getOffset}); + } + <#if drillType == "VarChar"> - <@get drillType accessorType label false /> - } - - public static class Repeated${drillType}ColumnReader extends BaseElementReader { - - <@bindReader "" drillType true /> - - <@getType drillType label /> + @Override + public String getString() { + return new String(getBytes(${indexVar}), Charsets.UTF_8); + } + <#elseif drillType == "Var16Char"> - <@get drillType accessorType label true /> + @Override + public String getString() { + return new String(getBytes(${indexVar}), Charsets.UTF_16); + } + } - <#assign varWidth = drillType == "VarChar" || drillType == "Var16Char" || drillType == "VarBinary" /> <#if varWidth> public static class ${drillType}ColumnWriter extends BaseVarWidthWriter { <#else> public static class ${drillType}ColumnWriter extends BaseFixedWidthWriter { - <#if drillType = "Decimal9" || drillType == "Decimal18" || - drillType == "Decimal28Sparse" || drillType == "Decimal38Sparse"> + + private static final int VALUE_WIDTH = ${drillType}Vector.VALUE_WIDTH; + + <#if decimal> private MajorType type; - private static final int VALUE_WIDTH = ${drillType}Vector.VALUE_WIDTH; private final ${drillType}Vector vector; @@ -234,8 +254,7 @@ public static class ${drillType}ColumnWriter extends BaseFixedWidthWriter { <#if varWidth> super(((${drillType}Vector) vector).getOffsetVector()); <#else> - <#if drillType = "Decimal9" || drillType == "Decimal18" || - drillType == "Decimal28Sparse" || drillType == "Decimal38Sparse"> + <#if decimal> type = vector.getField().getType(); @@ -300,12 +319,12 @@ public static class ${drillType}ColumnWriter extends BaseFixedWidthWriter { <#elseif drillType == "IntervalDay"> final int offset = ${putAddr}; drillBuf.setInt(offset, value.getDays()); - drillBuf.setInt(offset + 4, periodToMillis(value)); + drillBuf.setInt(offset + 4, DateUtilities.periodToMillis(value)); <#elseif drillType == "Interval"> final int offset = ${putAddr}; drillBuf.setInt(offset, value.getYears() * 12 + value.getMonths()); drillBuf.setInt(offset + 4, value.getDays()); - drillBuf.setInt(offset + 8, periodToMillis(value)); + drillBuf.setInt(offset + 8, DateUtilities.periodToMillis(value)); <#elseif drillType == "Float4"> drillBuf.setInt(${putAddr}, Float.floatToRawIntBits((float) value)); <#elseif drillType == "Float8"> @@ -335,18 +354,22 @@ public final void setString(String value) { - public static int periodToMillis(Period value) { - return ((value.getHours() * 60 + - value.getMinutes()) * 60 + - value.getSeconds()) * 1000 + - value.getMillis(); - } +} +<@pp.changeOutputFile name="/org/apache/drill/exec/vector/accessor/ColumnAccessorUtils.java" /> +<@copyright /> -<@build vv.types "Required" "Reader" /> +package org.apache.drill.exec.vector.accessor; -<@build vv.types "Nullable" "Reader" /> +import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.exec.vector.accessor.ColumnAccessors.*; +import org.apache.drill.exec.vector.accessor.reader.BaseScalarReader; +import org.apache.drill.exec.vector.accessor.writer.BaseScalarWriter; -<@build vv.types "Repeated" "Reader" /> +public class ColumnAccessorUtils { + + private ColumnAccessorUtils() { } + +<@build vv.types "Required" "Reader" /> <@build vv.types "Required" "Writer" /> } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ArrayReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ArrayReader.java index 8f33f0ecf5b..0679c3b5329 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ArrayReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ArrayReader.java @@ -32,7 +32,7 @@ * {@see ArrayWriter} */ -public interface ArrayReader { +public interface ArrayReader extends ColumnReader { /** * Number of elements in the array. @@ -49,26 +49,6 @@ public interface ArrayReader { ObjectType entryType(); - /** - * Return a reader for the elements of a scalar array. - * @return reader for scalar elements - */ - - ScalarElementReader elements(); - - /** - * Return a generic object reader for the array entry. Not available - * for scalar elements. Positions the reader to read the selected - * element. - * - * @param index array index - * @return generic object reader - */ - - ObjectReader entry(int index); - TupleReader tuple(int index); - ArrayReader array(int index); - /** * Return the generic object reader for the array element. This * version does not position the reader, the client must @@ -77,6 +57,7 @@ public interface ArrayReader { */ ObjectReader entry(); + ScalarReader scalar(); TupleReader tuple(); ArrayReader array(); @@ -88,19 +69,14 @@ public interface ArrayReader { void setPosn(int index); - /** - * Return the entire array as an List of objects. - * Note, even if the array is scalar, the elements are still returned - * as a list. This method is primarily for testing. - * @return array as a List of objects - */ - - Object getObject(); + void rewind(); /** - * Return the entire array as a string. Primarily for debugging. - * @return string representation of the array + * Move forward one position. + * + * @return true if another position is available, false if + * the end of the array is reached */ - String getAsString(); + boolean next(); } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ColumnReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ColumnReader.java new file mode 100644 index 00000000000..15e5c742c5b --- /dev/null +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ColumnReader.java @@ -0,0 +1,83 @@ +/* + * 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 org.apache.drill.exec.vector.accessor; + +import org.apache.drill.exec.record.metadata.ColumnMetadata; + +/** + * Base interface for all column readers, defining a generic set of methods + * that all readers provide. In particular, given the metadata and the object + * type, one can determine what to do with each reader when working with readers + * generically. The getObject() and getAsString() methods provide + * generic data access for tests and debugging. + */ + +public interface ColumnReader { + + ColumnMetadata schema(); + + /** + * The type of this reader. + * + * @return type of reader + */ + + ObjectType type(); + + /** + * Determine if this value is null. + *
    + *
  • Nullable scalar: determine if the value is null.
    • + *
  • Non-nullable scalar: always returns false.
    • + *
  • Arrays: always returns false
    • + *
  • Lists: determine if the list for the current row is null. + * In a list, an array entry can be null, empty, or can contain + * items. In repeated types, the array itself is never null. + * If the array is null, then it implicitly has no entries.
    • + *
  • Map or Repeated Map: Always returns false.
    • + *
  • Map inside a union, or in a list that contains a union, + * the tuple itself can be null.
    • + *
  • Union: Determine if the current value is null. Null values have no type + * and no associated reader.
    • + *
+ * + * @return true if this value is null; false otherwise + */ + + boolean isNull(); + + /** + * Return the value of the underlying data as a Java object. + * Primarily for testing + *
    + *
  • Array: Return the entire array as an List of objects. + * Note, even if the array is scalar, the elements are still returned + * as a list.
    • + *
+ * @return the value as a Java object + */ + + Object getObject(); + + /** + * Return the entire object as a string. Primarily for debugging. + * @return string representation of the object + */ + + String getAsString(); +} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ColumnReaderIndex.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ColumnReaderIndex.java index b40b70560ae..edc3623773f 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ColumnReaderIndex.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ColumnReaderIndex.java @@ -18,11 +18,105 @@ package org.apache.drill.exec.vector.accessor; /** - * Index into a vector batch, or an array, at read time. - * Supports direct, indirect and hyper-batches. + * The reader structure is heavily recursive. The top-level reader + * iterates over batches, possibly through an indirection vector + * (SV2 or SV4.) The row is tuple of top-level vectors. Each top-level + * vector may be an array. Iteration through the array works identically + * to iteration over the batch as a whole. (In fact, the scalar readers + * don't know if they are top-level or array readers.) Array nesting + * can continue to any level of depth. + *

+ * Further, when used with a logical join, the top-level iteration + * may be over an array, with an implicit join out to enclosing nesting + * levels. + *

+ * Because of this, the same index interface must work at all nesting + * levels: at the top, and within arrays. This interface + * supports a usage model as follows:


+ * ColumnReaderIndex index = ...
+ * while (index.hasNext()) {
+ *   index.next();
+ *   int hyperIndex = index.hyperVectorIndex();
+ *   int vectorOffset = index.offset();
+ * }
+ *

+ * When convenient, the following abbreviated form is also + * supported:


+ * ColumnReaderIndex index = ...
+ * while (index.next()) {
+ *   int hyperIndex = index.hyperVectorIndex();
+ *   int vectorOffset = index.offset();
+ * }
+ *

+ * For a top-level index, the check of hasNext() and + * call to next() is done by the row set reader. For + * arrays, the call to hasNext() is done by the array + * reader. The call to next() is done by the scalar + * reader (for scalar arrays) or the array reader (for other + * arrays.) + *

+ * The hyper-vector index has meaning only for top-level vectors, + * and is ignored by nested vectors. (Nested vectors work by navigating + * down from a top-level vector.) But, as noted above, any given + * reader does not know if it is at the top or nested level, instead + * it is the {@link VectorAccessor} abstraction that works out the + * nesting levels. */ public interface ColumnReaderIndex { - int batchIndex(); - int vectorIndex(); + + /** + * Ordinal index within the batch or array. Increments from -1. + * (The position before the first item.) + * Identifies the logical row number of top-level records, + * or the array element for arrays. Actual physical + * index may be different if an indirection layer is in use. + * + * @return logical read index + */ + + int logicalIndex(); + + /** + * When used with a hyper-vector (SV4) based batch, returns the + * index of the current batch within the hyper-batch. If this is + * a single batch, or a nested index, then always returns 0. + * + * @return batch index of the current row within the + * hyper-batch + */ + + int hyperVectorIndex(); + + /** + * Vector offset to read. For top-level vectors, the offset may be + * through an indirection (SV2 or SV4). For arrays, the offset is the + * absolute position, with the vector of the current array element. + * + * @return vector read index + */ + + int offset(); + + /** + * Advances the index to the next position. Used: + *

    + *
  • At the top level for normal readers or
    • + * + *
  • An each array level to iterate over arrays.
    • + *
+ * + * @return true if another value is available, false if EOF + */ + + boolean next(); + + /** + * Return the number of items that this index indexes: top-level record + * count for the root index; total element count for nested arrays. + * + * @return element count at this index level + */ + + int size(); } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ObjectReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ObjectReader.java index 9c53e58137d..e3527c5900c 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ObjectReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ObjectReader.java @@ -29,32 +29,8 @@ * {@see ObjectWriter> */ -public interface ObjectReader { - - /** - * The type of this reader. - * - * @return type of reader - */ - - ObjectType type(); +public interface ObjectReader extends ColumnReader { ScalarReader scalar(); - ScalarElementReader elements(); TupleReader tuple(); ArrayReader array(); - - /** - * Return the value of the underlying data as a Java object. - * Primarily for testing - * @return Java object that represents the underlying value - */ - - Object getObject(); - - /** - * Return the entire object as a string. Primarily for debugging. - * @return string representation of the object - */ - - String getAsString(); } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ScalarElementReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ScalarElementReader.java deleted file mode 100644 index d1f31a82f24..00000000000 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ScalarElementReader.java +++ /dev/null @@ -1,65 +0,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. - */ -package org.apache.drill.exec.vector.accessor; - -import java.math.BigDecimal; - -import org.joda.time.Period; - -/** - * Interface to access the values of an array column. In general, each - * vector implements just one of the get methods. Check the vector type - * to know which method to use. Though, generally, when writing test - * code, the type is known to the test writer. - *

- * Arrays allow random access to the values within the array. The index - * passed to each method is the index into the array for the current - * row and column. (This means that arrays are three dimensional: - * the usual (row, column) dimensions plus an array index dimension: - * (row, column, array index). - *

- * Note that the isNull() method is provided for completeness, - * but no Drill array allows null values at present. - *

- * {@see ScalarWriter} - */ - -public interface ScalarElementReader { - /** - * Describe the type of the value. This is a compression of the - * value vector type: it describes which method will return the - * vector value. - * @return the value type which indicates which get method - * is valid for the column - */ - - ValueType valueType(); - int size(); - - boolean isNull(int index); - int getInt(int index); - long getLong(int index); - double getDouble(int index); - String getString(int index); - byte[] getBytes(int index); - BigDecimal getDecimal(int index); - Period getPeriod(int index); - - Object getObject(int index); - String getAsString(int index); -} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ScalarReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ScalarReader.java index e1c26bf29e9..5b09039ebdd 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ScalarReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ScalarReader.java @@ -44,7 +44,7 @@ * {@see ScalarWriter} */ -public interface ScalarReader { +public interface ScalarReader extends ColumnReader { /** * Describe the type of the value. This is a compression of the * value vector type: it describes which method will return the @@ -54,14 +54,6 @@ public interface ScalarReader { */ ValueType valueType(); - - /** - * Report if the column is null. Non-nullable columns always - * return false. - * @return true if the column value is null, false if the - * value is set - */ - boolean isNull(); int getInt(); long getLong(); double getDouble(); @@ -69,7 +61,4 @@ public interface ScalarReader { byte[] getBytes(); BigDecimal getDecimal(); Period getPeriod(); - - Object getObject(); - String getAsString(); } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/TupleReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/TupleReader.java index 8d691c3a28b..c33f57994c3 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/TupleReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/TupleReader.java @@ -25,15 +25,33 @@ * by name or column index (as defined in the tuple schema.) * Also provides two generic methods to get the value as a * Java object or as a string. - *

- * {@see TupleWriter} + * + * @see {@link TupleWriter} */ -public interface TupleReader { - TupleMetadata schema(); +public interface TupleReader extends ColumnReader { + TupleMetadata tupleSchema(); int columnCount(); + /** + * Return a column reader by column index as reported by the + * associated metadata. + * + * @param colIndex column index + * @return reader for the column + * @throws IndexOutOfRangeException if the index is invalid + */ + ObjectReader column(int colIndex); + + /** + * Return a column reader by name. + * + * @param colIndex column name + * @return reader for the column, or null if no such + * column exists + */ + ObjectReader column(String colName); // Convenience methods @@ -46,9 +64,4 @@ public interface TupleReader { TupleReader tuple(String colName); ArrayReader array(int colIndex); ArrayReader array(String colName); - ScalarElementReader elements(int colIndex); - ScalarElementReader elements(String colName); - - Object getObject(); - String getAsString(); } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/UnsupportedConversionError.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/UnsupportedConversionError.java new file mode 100644 index 00000000000..dee2612f073 --- /dev/null +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/UnsupportedConversionError.java @@ -0,0 +1,52 @@ +/* + * 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 org.apache.drill.exec.vector.accessor; + +import org.apache.drill.exec.record.metadata.ColumnMetadata; + +/** + * Raised when a column accessor reads or writes the value using the wrong + * Java type (which may indicate an data inconsistency in the input data.) + */ + +public class UnsupportedConversionError extends UnsupportedOperationException { + + private static final long serialVersionUID = 1L; + + private UnsupportedConversionError(String message) { + super(message); + } + + public static UnsupportedConversionError readError(ColumnMetadata schema, String javaType) { + return new UnsupportedConversionError( + String.format("Column `%s`: Unsupported conversion from Drill type %s to Java type %s", + schema.name(), schema.type().name(), javaType)); + } + + public static UnsupportedConversionError writeError(ColumnMetadata schema, String javaType) { + return new UnsupportedConversionError( + String.format("Column `%s`: Unsupported conversion from Java type %s to Drill type %s", + schema.name(), schema.type().name(), javaType)); + } + + public static UnsupportedConversionError nullError(ColumnMetadata schema) { + return new UnsupportedConversionError( + String.format("Column `%s`: Type %s %s is not nullable", + schema.name(), schema.mode().name(), schema.type().name())); + } +} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ValueType.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ValueType.java index e6687dcd311..5059977ab03 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ValueType.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/ValueType.java @@ -27,5 +27,60 @@ */ public enum ValueType { - INTEGER, LONG, DOUBLE, STRING, BYTES, DECIMAL, PERIOD + + /** + * The value is set from an integer: TINYINT, + * SMALLINT, INT, UINT1, and UINT2. + */ + + INTEGER, + + /** + * The value set from a long: BIGINT and + * UINT4. + */ + + LONG, + + /** + * Type is set from a double: FLOAT4 and FLOAT8. + */ + DOUBLE, + + /** + * The value can be set from a string (for convenience). + * VARCHAR and VAR16CHAR. + */ + + STRING, + + /** + * The value is set from a byte buffer. VARCHAR (in production + * code), VAR16CHAR, VARBINARY. + */ + + BYTES, + + /** + * The value is set from a BigDecimal: any of Drill's decimal + * types. + */ + + DECIMAL, + + /** + * The value is set from a Period. Any of Drill's date/time + * types. (Note: there is a known bug in which Drill incorrectly + * differentiates between local date/times (those without a timezone) + * and absolute date/times (those with a timezone.) Caveat emptor. + */ + + PERIOD, + + /** + * The value has no type. This is typically a dummy writer used + * for unprojected columns. + */ + + NULL } diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/VectorPrinter.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/impl/VectorPrinter.java similarity index 97% rename from exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/VectorPrinter.java rename to exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/impl/VectorPrinter.java index 20562207705..45847bcb5e2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/test/VectorPrinter.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/impl/VectorPrinter.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.drill.test.rowSet.test; +package org.apache.drill.exec.vector.accessor.impl; import org.apache.drill.exec.vector.UInt4Vector; import org.apache.drill.exec.vector.ValueVector; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/package-info.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/package-info.java index c90a7342eee..990ab13124d 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/package-info.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/package-info.java @@ -161,6 +161,190 @@ * the same interface supported the original mutator-based implementation and * the revised Netty-based implementation. The benefit, however, is stark; * the direct-to-Netty version is up to 4x faster (for repeated types). + * + *

Tuple Model

+ * + * Drill has the idea of row and of a map. (A Drill map is much like a "struct": + * every instance of the "map" must have the same columns.) Both are instances + * of the relational concept of a "tuple." In relational theory, a tuple is + * a collection of values in which each value has a name and a position. The + * name is for the user, the position (index) allows efficient implementation. + *

+ * Drill is unusual among query and DB engines in that it does not normally + * use indexes. The reason is easy to understand. Suppose two files contain + * columns a and b. File 1, read by minor fragment 0, contains the columns in + * the order (a, b). But, file 2, read by minor fragment 1, contains the columns + * in the order (b, a). Drill considers this the same schema. Since column + * order can vary, Drill has avoided depending on column order. (But, only + * partly; many bugs have cropped up because some parts of the code do + * require common ordering.) + *

+ * Here we observe that column order varies only across fragments. We have + * control of the column order within our own fragment. (We can coerce varying + * order into a desired order. If the above two files are read by the same + * scan operator, then the first file sets the order at (a, b), and the second + * files (b, a) order can be coerced into the (a, b) order. + *

+ * Given this insight, the readers and writers here promote position to a + * first-class concept. Code can access columns by name (for convenience, + * especially in testing) or by position (for efficiency.) + *

+ * Further, it is often convenient to fetch a column accessor (reader or + * writer) once, then cache it. The design here ensures that such caching works + * well. The goal is that, eventually, operators will code-generate references + * to cached readers and writers instead of generating code that works directly + * with the vectors. + * + *

Lists and Unions

+ * + * Drill provides a List and a Union type. These types are incomplete, buggy + * and ill-supported by Drill's operators. However, they are key to Drill's + * JSON-powered, schema-free marketing message. Thus, we must support them + * in the reader/writer level even if they are broken and under-used elsewhere + * in Drill. (If we did not support them, then the JSON readers could not use + * the new model, and we'd have to support both the old and new versions, which + * would create a bigger mess than we started with.) + *

+ * Drill's other types have a more-or-less simple mapping to the relational + * model, allowing simple reader and writer interfaces. But, the Union and List + * types are not a good fit and cause a very large amount of complexity in the + * reader and writer models. + *

+ * A Union is just that: it is a container for a variety of typed vectors. It + * is like a "union" in C: it has members for each type, but only one type is + * in use at any one time. However, unlike C, the implementation is more like + * a C "struct" every vector takes space or every row, even if no value is stored + * in that row. That is, a Drill union is as if a naive C programmer used a + * "struct" when s/he should have used a union. + *

+ * Unions are designed to evolve dynamically as data is read. Suppose we read + * the following JSON:


+ * {a: 10} {a: "foo"} {a: null} {a: 12.34}
+ *
+ * Here, we discover the need for an Int type, then a Varchar, then mark a + * value as null and finally a Float. The union adds the desired types as we + * request them. The writer mimics this behavior, using a listener to do the + * needed vector work. + *

+ * Further, a union can be null. It carries a types vector that indicates the + * type of each row. A zero-value indicates that the union as a whole is null. + * In this case, null means no value, is is not, say, a null Int or null + * Varchar: it is simply null (as in JSON). Since at most one vector within the union + * carries a value, the element vectors must also be nullable. This means + * that a union has two null bits: one or the union, the other for the + * selected type. It is not clear what Drill semantics are supposed to be. Here + * the writers assume that either the whole union is null, or that exactly one + * member is non-null. Readers are more paranoid: they assume each member is null + * if either the union is null or the member itself is null. (Yes, a bit of a + * mess...) + *

+ * The current union vector format is highly inefficient. + * If the union concept is needed, then it should + * be redesigned, perhaps as a variable-width vector in which each entry + * consists of a type/value pair. (For variable-width values such as + * strings, the implementation would be a triple of (type, length, + * value). The API here is designed to abstract away the implementation + * and should work equally well for the current "union" implementation and + * the possible "variant" implementation. As a result, when changing the + * API, avoid introducing methods that assume an implementation. + *

+ * Lists add another layer of complexity. A list is, logically, a repeated + * union. But, for whatever historical reasons, a List can be other things + * as well. First, it can have no type at all: a list of nothing. This likely + * has no meaning, but the semantics of the List vector allow it. Second, the + * List can be an array of a single type in which each entry can be null. + * (Normal Repeated types can have an empty array for a row, but cannot have + * a null entry. Lists can have either an empty array or a null array in + * order to model the JSON null and [] cases.) + *

+ * When a List has a single type, it stores the backing vector directly within + * the List. But, a list can also be a list of unions. In this case, the List + * stores a union vector as its backing vector. Here, we now have three ways + * to indicate null: the List's bits vector, the type vector in the union, and + * the bits vector in each element vector. Again, the writer assumes that + * if the List vector is null, the entire value for that row is null. The reader + * is again paranoid and handles all three nullable states. (Again, a huge + * mess.) + *

+ * The readers can provide a nice API for these cases since we know the List + * format up front. They can present the list as either a nullable array of + * a single type, or as an array of unions. + *

+ * Writers have more of a challenge. If we knew that a List was being used as + * a list of, say, Nullable Int, we could present the List as an array writer + * with Int elements. But, the List allows dynamic type addition, as with unions. + * (In the case of the list, it has internal special handling for the single vs. + * many type case.) + *

+ * To isolate the client from the list representation, it is simpler to always + * present a List an array of variants. But, this is awkward in the single-type + * case. The solution is to use metadata. If the metadata promises to use only + * a single type, the writer can use the nullable array of X format. If the + * metadata says to use a union (the default), then the List is presented as + * an array of unions, even when the list has 0 or 1 member types. (The + * complexity here is excessive: Drill should really redesign this feature to make + * it simpler and to better fit the relational model.) + * + *

Vector Evolution

+ * + * Drill uses value vector classes created during the rush to ship Drill 1.0. + * They are not optimal: the key value is that the vectors work. + *

+ * The Apache Arrow project created a refined version of the vector classes. + * Much talk has occurred about ripping out Drill's implementation to use + * Arrow instead. + *

+ * However, even Arrow has limits: + *

    + *
  • Like Drill, it uses twice the number of positions in the offset vector + * as for the values vector. (Drill allocates power-of-two sizes. The offset + * vector has one more entry than values. With a power-of-two number of values, + * offsets are rounded to the next power of two.)
    • + *
  • Like Drill before this work, Arrow does not manage vector sizes; it + * allows vectors to grow without bound, causing the memory problems that this + * project seeks to resolve.
    • + *
  • Like Drill, Arrow implements unions as a space-inefficient collection + * of vectors format.
    • + *
+ * If we learn from the above, we might want to create a Value Vectors 2.0 + * based on the following concepts: + *
    + *
  • Store vector values as a chain of fixed-size buffers. This avoids + * memory fragmentation, makes memory allocation much more efficient, is + * easier on the client, and avoids internal fragmentation.
    • + *
  • Store offsets as the end value, not the start value. This eliminates + * the extra offset position, simplifies indexing, and can save on internal + * memory fragmentation.
    • + *
  • Store unions using "variant encoding" as described above.
    • + *
+ * Such changes would be a huge project if every operator continued to work + * directly with vectors and memory buffers. In fact, the cost would be so + * high that these improvements might never be done. + *

+ * Therefore, a goal of this reader/writer layer is to isolate the operators + * from vector implementation. For this to work, the accessors must be at least + * as efficient as direct vector access. (They are now more efficient.) + *

+ * Once all operators use this layer, a switch to Arrow, or an evolution toward + * Value Vectors 2.0 will be much easier. Simply change the vector format and + * update the reader and writer implementations. The rest of the code will + * remain unchanged. (Note, to achieve this goal, it is important to carefully + * design the accessor API [interfaces] to hide implementation details.) + * + *

Simpler Reader API

+ * + * A key value of Drill is the ability for users to add custom record readers. + * But, at present, doing so is very complex because the developer must know + * quite a bit about Drill internals. At this level, they must know how to + * allocate vectors, how to write to each kind of vector, how to keep track + * of array sizes, how to set the vector and batch row counts, and more. In + * general, there is only one right way to do this work. (Though some readers + * use the old-style vector writers, others work with direct memory instead + * of with vectors, and so on.) + *

+ * This layer handles all that work, providing a simple API that encourages + * more custom readers because the work to create the readers becomes far + * simpler. (Other layers tackle other parts of the problem as well.) */ package org.apache.drill.exec.vector.accessor; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractArrayReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractArrayReader.java deleted file mode 100644 index 7fb0c9dc1a5..00000000000 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractArrayReader.java +++ /dev/null @@ -1,188 +0,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. - */ -package org.apache.drill.exec.vector.accessor.reader; - -import org.apache.drill.exec.vector.UInt4Vector.Accessor; -import org.apache.drill.exec.vector.accessor.ArrayReader; -import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; -import org.apache.drill.exec.vector.accessor.ObjectReader; -import org.apache.drill.exec.vector.accessor.ObjectType; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; -import org.apache.drill.exec.vector.accessor.TupleReader; -import org.apache.drill.exec.vector.complex.RepeatedValueVector; - -/** - * Reader for an array-valued column. This reader provides access to specific - * array members via an array index. This is an abstract base class; - * subclasses are generated for each repeated value vector type. - */ - -public abstract class AbstractArrayReader implements ArrayReader { - - /** - * Object representation of an array reader. - */ - - public static class ArrayObjectReader extends AbstractObjectReader { - - private AbstractArrayReader arrayReader; - - public ArrayObjectReader(AbstractArrayReader arrayReader) { - this.arrayReader = arrayReader; - } - - @Override - public void bindIndex(ColumnReaderIndex index) { - arrayReader.bindIndex(index); - } - - @Override - public ObjectType type() { - return ObjectType.ARRAY; - } - - @Override - public ArrayReader array() { - return arrayReader; - } - - @Override - public ScalarElementReader elements() { - return arrayReader.elements(); - } - - @Override - public Object getObject() { - return arrayReader.getObject(); - } - - @Override - public String getAsString() { - return arrayReader.getAsString(); - } - - @Override - public void reposition() { - arrayReader.reposition(); - } - } - - public static class BaseElementIndex { - private final ColumnReaderIndex base; - protected int startOffset; - protected int length; - - public BaseElementIndex(ColumnReaderIndex base) { - this.base = base; - } - - public int batchIndex() { - return base.batchIndex(); - } - - public void reset(int startOffset, int length) { - assert length >= 0; - assert startOffset >= 0; - this.startOffset = startOffset; - this.length = length; - } - - public int size() { return length; } - - public int elementIndex(int index) { - if (index < 0 || length <= index) { - throw new IndexOutOfBoundsException("Index = " + index + ", length = " + length); - } - return startOffset + index; - } - } - - private final Accessor accessor; - private final VectorAccessor vectorAccessor; - protected ColumnReaderIndex baseIndex; - protected BaseElementIndex elementIndex; - - public AbstractArrayReader(RepeatedValueVector vector) { - accessor = vector.getOffsetVector().getAccessor(); - vectorAccessor = null; - } - - public AbstractArrayReader(VectorAccessor vectorAccessor) { - accessor = null; - this.vectorAccessor = vectorAccessor; - } - - public void bindIndex(ColumnReaderIndex index) { - baseIndex = index; - if (vectorAccessor != null) { - vectorAccessor.bind(index); - } - } - - private Accessor accessor() { - if (accessor != null) { - return accessor; - } - return ((RepeatedValueVector) (vectorAccessor.vector())).getOffsetVector().getAccessor(); - } - - public void reposition() { - final int index = baseIndex.vectorIndex(); - final Accessor curAccesssor = accessor(); - final int startPosn = curAccesssor.get(index); - elementIndex.reset(startPosn, curAccesssor.get(index + 1) - startPosn); - } - - @Override - public int size() { return elementIndex.size(); } - - @Override - public ScalarElementReader elements() { - throw new UnsupportedOperationException(); - } - - @Override - public ObjectReader entry(int index) { - throw new UnsupportedOperationException(); - } - - @Override - public TupleReader tuple(int index) { - return entry(index).tuple(); - } - - @Override - public ArrayReader array(int index) { - return entry(index).array(); - } - - @Override - public ObjectReader entry() { - throw new UnsupportedOperationException(); - } - - @Override - public TupleReader tuple() { - return entry().tuple(); - } - - @Override - public ArrayReader array() { - return entry().array(); - } -} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractObjectReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractObjectReader.java index 59a066e05ec..2a801795fe0 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractObjectReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractObjectReader.java @@ -17,18 +17,18 @@ */ package org.apache.drill.exec.vector.accessor.reader; +import org.apache.drill.exec.record.metadata.ColumnMetadata; import org.apache.drill.exec.vector.accessor.ArrayReader; -import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; +import org.apache.drill.exec.vector.accessor.ColumnReader; import org.apache.drill.exec.vector.accessor.ObjectReader; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; +import org.apache.drill.exec.vector.accessor.ObjectType; import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.TupleReader; public abstract class AbstractObjectReader implements ObjectReader { - public abstract void bindIndex(ColumnReaderIndex index); - - public void reposition() { } + @Override + public ColumnMetadata schema() { return reader().schema(); } @Override public ScalarReader scalar() { @@ -45,8 +45,13 @@ public ArrayReader array() { throw new UnsupportedOperationException(); } + public abstract ReaderEvents events(); + + public abstract ColumnReader reader(); + @Override - public ScalarElementReader elements() { - throw new UnsupportedOperationException(); - } + public boolean isNull() { return reader().isNull(); } + + @Override + public ObjectType type() { return reader().type(); } } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractScalarReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractScalarReader.java new file mode 100644 index 00000000000..203de23239c --- /dev/null +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractScalarReader.java @@ -0,0 +1,205 @@ +/* + * 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 org.apache.drill.exec.vector.accessor.reader; + +import java.math.BigDecimal; + +import org.apache.drill.exec.record.metadata.ColumnMetadata; +import org.apache.drill.exec.vector.accessor.ColumnReader; +import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; +import org.apache.drill.exec.vector.accessor.ObjectType; +import org.apache.drill.exec.vector.accessor.ScalarReader; +import org.apache.drill.exec.vector.accessor.UnsupportedConversionError; +import org.apache.drill.exec.vector.accessor.ValueType; +import org.apache.drill.exec.vector.accessor.impl.AccessorUtilities; +import org.joda.time.Period; + +public abstract class AbstractScalarReader implements ScalarReader, ReaderEvents { + + public static class ScalarObjectReader extends AbstractObjectReader { + + private AbstractScalarReader scalarReader; + + public ScalarObjectReader(AbstractScalarReader scalarReader) { + this.scalarReader = scalarReader; + } + + @Override + public ScalarReader scalar() { + return scalarReader; + } + + @Override + public Object getObject() { + return scalarReader.getObject(); + } + + @Override + public String getAsString() { + return scalarReader.getAsString(); + } + + @Override + public ReaderEvents events() { return scalarReader; } + + @Override + public ColumnReader reader() { return scalarReader; } + } + + public static class NullReader extends AbstractScalarReader { + + protected final ColumnMetadata schema; + + protected NullReader(ColumnMetadata schema) { + this.schema = schema; + } + + @Override + public ValueType valueType() { return ValueType.NULL; } + + @Override + public boolean isNull() { return true; } + + @Override + public void bindIndex(ColumnReaderIndex rowIndex) { } + + @Override + public ColumnMetadata schema() { return schema; } + } + + protected ColumnReaderIndex vectorIndex; + protected NullStateReader nullStateReader; + + public static ScalarObjectReader nullReader(ColumnMetadata schema) { + return new ScalarObjectReader(new NullReader(schema)); + } + + @Override + public void bindIndex(ColumnReaderIndex rowIndex) { + vectorIndex = rowIndex; + nullStateReader.bindIndex(rowIndex); + } + + @Override + public void bindNullState(NullStateReader nullStateReader) { + this.nullStateReader = nullStateReader; + } + + @Override + public ObjectType type() { return ObjectType.SCALAR; } + + @Override + public NullStateReader nullStateReader() { return nullStateReader; } + + @Override + public void reposition() { } + + @Override + public boolean isNull() { + return nullStateReader.isNull(); + } + + protected UnsupportedConversionError conversionError(String javaType) { + return UnsupportedConversionError.writeError(schema(), javaType); + } + + @Override + public int getInt() { + throw conversionError("int"); + } + + @Override + public long getLong() { + throw conversionError("long"); + } + + @Override + public double getDouble() { + throw conversionError("double"); + } + + @Override + public String getString() { + throw conversionError("String"); + } + + @Override + public byte[] getBytes() { + throw conversionError("bytes"); + } + + @Override + public BigDecimal getDecimal() { + throw conversionError("Decimal"); + } + + @Override + public Period getPeriod() { + throw conversionError("Period"); + } + + @Override + public Object getObject() { + if (isNull()) { + return null; + } + switch (valueType()) { + case BYTES: + return getBytes(); + case DECIMAL: + return getDecimal(); + case DOUBLE: + return getDouble(); + case INTEGER: + return getInt(); + case LONG: + return getLong(); + case PERIOD: + return getPeriod(); + case STRING: + return getString(); + default: + throw new IllegalStateException("Unexpected type: " + valueType()); + } + } + + @Override + public String getAsString() { + if (isNull()) { + return "null"; + } + switch (valueType()) { + case BYTES: + return AccessorUtilities.bytesToString(getBytes()); + case DOUBLE: + return Double.toString(getDouble()); + case INTEGER: + return Integer.toString(getInt()); + case LONG: + return Long.toString(getLong()); + case STRING: + return "\"" + getString() + "\""; + case DECIMAL: + return getDecimal().toPlainString(); + case PERIOD: + return getPeriod().normalizedStandard().toString(); + default: + throw new IllegalArgumentException("Unsupported type " + valueType()); + } + } +} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractTupleReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractTupleReader.java index 0429f3e71a9..2c09e5b5510 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractTupleReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/AbstractTupleReader.java @@ -20,12 +20,11 @@ import java.util.ArrayList; import java.util.List; -import org.apache.drill.exec.record.metadata.TupleMetadata; import org.apache.drill.exec.vector.accessor.ArrayReader; +import org.apache.drill.exec.vector.accessor.ColumnReader; import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; import org.apache.drill.exec.vector.accessor.ObjectReader; import org.apache.drill.exec.vector.accessor.ObjectType; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; import org.apache.drill.exec.vector.accessor.ScalarReader; import org.apache.drill.exec.vector.accessor.TupleReader; @@ -34,26 +33,15 @@ * column using either a name or a numeric index. */ -public abstract class AbstractTupleReader implements TupleReader { +public abstract class AbstractTupleReader implements TupleReader, ReaderEvents { public static class TupleObjectReader extends AbstractObjectReader { - private AbstractTupleReader tupleReader; + private final AbstractTupleReader tupleReader; public TupleObjectReader(AbstractTupleReader tupleReader) { this.tupleReader = tupleReader; } - - @Override - public void bindIndex(ColumnReaderIndex index) { - tupleReader.bindIndex(index); - } - - @Override - public ObjectType type() { - return ObjectType.TUPLE; - } - @Override public TupleReader tuple() { return tupleReader; @@ -70,30 +58,42 @@ public String getAsString() { } @Override - public void reposition() { - tupleReader.reposition(); - } + public ReaderEvents events() { return tupleReader; } + + @Override + public ColumnReader reader() { return tupleReader; } } - protected final TupleMetadata schema; private final AbstractObjectReader readers[]; + protected NullStateReader nullStateReader; - protected AbstractTupleReader(TupleMetadata schema, AbstractObjectReader readers[]) { - this.schema = schema; + protected AbstractTupleReader(AbstractObjectReader readers[]) { this.readers = readers; } + @Override + public ObjectType type() { return ObjectType.TUPLE; } + + @Override public void bindIndex(ColumnReaderIndex index) { for (int i = 0; i < readers.length; i++) { - readers[i].bindIndex(index); + readers[i].events().bindIndex(index); } } @Override - public TupleMetadata schema() { return schema; } + public void bindNullState(NullStateReader nullStateReader) { + this.nullStateReader = nullStateReader; + } + + @Override + public NullStateReader nullStateReader() { return nullStateReader; } @Override - public int columnCount() { return schema().size(); } + public boolean isNull() { return nullStateReader.isNull(); } + + @Override + public int columnCount() { return tupleSchema().size(); } @Override public ObjectReader column(int colIndex) { @@ -102,12 +102,22 @@ public ObjectReader column(int colIndex) { @Override public ObjectReader column(String colName) { - int index = schema.index(colName); + int index = tupleSchema().index(colName); if (index == -1) { return null; } return readers[index]; } + @Override + public ObjectType type(int colIndex) { + return column(colIndex).type(); + } + + @Override + public ObjectType type(String colName) { + return column(colName).type(); + } + @Override public ScalarReader scalar(int colIndex) { return column(colIndex).scalar(); @@ -139,28 +149,9 @@ public ArrayReader array(String colName) { } @Override - public ObjectType type(int colIndex) { - return column(colIndex).type(); - } - - @Override - public ObjectType type(String colName) { - return column(colName).type(); - } - - @Override - public ScalarElementReader elements(int colIndex) { - return column(colIndex).elements(); - } - - @Override - public ScalarElementReader elements(String colName) { - return column(colName).elements(); - } - public void reposition() { for (int i = 0; i < columnCount(); i++) { - readers[i].reposition(); + readers[i].events().reposition(); } } @@ -176,14 +167,14 @@ public Object getObject() { @Override public String getAsString() { StringBuilder buf = new StringBuilder(); - buf.append("("); + buf.append("{"); for (int i = 0; i < columnCount(); i++) { if (i > 0) { buf.append( ", " ); } buf.append(readers[i].getAsString()); } - buf.append(")"); + buf.append("}"); return buf.toString(); } } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ArrayReaderImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ArrayReaderImpl.java new file mode 100644 index 00000000000..7f2bf39ad3e --- /dev/null +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ArrayReaderImpl.java @@ -0,0 +1,357 @@ +/* + * 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 org.apache.drill.exec.vector.accessor.reader; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.drill.exec.record.metadata.ColumnMetadata; +import org.apache.drill.exec.vector.accessor.ArrayReader; +import org.apache.drill.exec.vector.accessor.ColumnReader; +import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; +import org.apache.drill.exec.vector.accessor.ObjectReader; +import org.apache.drill.exec.vector.accessor.ObjectType; +import org.apache.drill.exec.vector.accessor.ScalarReader; +import org.apache.drill.exec.vector.accessor.TupleReader; + +/** + * Reader for an array-valued column. This reader provides access to specific + * array members via an array index. This class implements all arrays. The + * behavior for specific array types (scalar, map, lists, etc.) is provided + * through composition. + */ + +public class ArrayReaderImpl implements ArrayReader, ReaderEvents { + + /** + * Object representation of an array reader. + */ + + public static class ArrayObjectReader extends AbstractObjectReader { + + private ArrayReaderImpl arrayReader; + + public ArrayObjectReader(ArrayReaderImpl arrayReader) { + this.arrayReader = arrayReader; + } + + @Override + public ArrayReader array() { + return arrayReader; + } + + @Override + public Object getObject() { + return arrayReader.getObject(); + } + + @Override + public String getAsString() { + return arrayReader.getAsString(); + } + + @Override + public ReaderEvents events() { return arrayReader; } + + @Override + public ColumnReader reader() { return arrayReader; } + } + + /** + * Index into the vector of elements for a repeated vector. + * Indexes elements relative to the array. That is, if an array + * has five elements, the index here tracks elements 0..4. + * The actual vector index is given as the start offset plus the + * offset into the array. + *

+ * Indexes allow random or sequential access. Random access is more + * typical for scalar arrays, while sequential access can be more convenient + * for tuple arrays. + */ + + public static class ElementReaderIndex implements ColumnReaderIndex { + protected final ColumnReaderIndex base; + protected int startOffset; + protected int length; + protected int position; + + public ElementReaderIndex(ColumnReaderIndex base) { + this.base = base; + } + + @Override + public int hyperVectorIndex() { return 0; } + + /** + * Reposition this array index for a new array given the array start + * offset and length. + * + * @param startOffset first location within the array's + * offset vector + * @param length number of offset vector locations associated with this + * array + */ + + public void reset(int startOffset, int length) { + assert length >= 0; + assert startOffset >= 0; + this.startOffset = startOffset; + this.length = length; + position = -1; + } + + public void rewind() { + position = -1; + } + + @Override + public int size() { return length; } + + /** + * Given a 0-based index relative to the current array, return an absolute offset + * vector location for the array value. + * + * @param index 0-based index into the current array + * @return absolute offset vector location for the array value + */ + + @Override + public int offset() { + if (position < 0 || length <= position) { + throw new IndexOutOfBoundsException("Index = " + position + ", length = " + length); + } + return startOffset + position; + } + + @Override + public boolean next() { + if (++position < length) { + return true; + } + position = length; + return false; + } + + /** + * Set the current iterator location to the given index offset. + * + * @param index 0-based index into the current array + */ + + public void set(int index) { + if (index < 0 || length < index) { + throw new IndexOutOfBoundsException("Index = " + index + ", length = " + length); + } + position = index; + } + + @Override + public int logicalIndex() { return position; } + } + + private final ColumnMetadata schema; + private final VectorAccessor arrayAccessor; + private final OffsetVectorReader offsetReader; + private final AbstractObjectReader elementReader; + protected ElementReaderIndex elementIndex; + protected NullStateReader nullStateReader; + + public ArrayReaderImpl(ColumnMetadata schema, VectorAccessor va, + AbstractObjectReader elementReader) { + this.schema = schema; + arrayAccessor = va; + this.elementReader = elementReader; + offsetReader = new OffsetVectorReader( + VectorAccessors.arrayOffsetVectorAccessor(va)); + } + + /** + * Build a scalar array for a Repeated type. Such arrays are not nullable. + * + * @param arrayAccessor vector accessor for the repeated vector that holds + * the scalar values + * @param elementReader scalar reader used to decode each scalar value + * @return object reader which wraps the scalar array reader + */ + + public static ArrayObjectReader buildScalar(ColumnMetadata schema, + VectorAccessor arrayAccessor, + BaseScalarReader elementReader) { + + // Reader is bound to the values vector inside the nullable vector. + + elementReader.bindVector(schema, + VectorAccessors.arrayDataAccessor(arrayAccessor)); + + // The scalar array element can't be null. + + elementReader.bindNullState(NullStateReaders.REQUIRED_STATE_READER); + + // Create the array, giving it an offset vector reader based on the + // repeated vector's offset vector. + + ArrayReaderImpl arrayReader = new ArrayReaderImpl(schema, arrayAccessor, + new AbstractScalarReader.ScalarObjectReader(elementReader)); + + // The array itself can't be null. + + arrayReader.bindNullState(NullStateReaders.REQUIRED_STATE_READER); + + // Wrap it all in an object reader. + + return new ArrayObjectReader(arrayReader); + } + + /** + * Build a repeated map reader. + * + * @param arrayAccessor vector accessor for the repeated map vector + * @param elementReader tuple reader that provides access to each + * tuple in the array + * @return object reader that wraps the map array reader + */ + + public static AbstractObjectReader buildTuple(ColumnMetadata schema, + VectorAccessor arrayAccessor, + AbstractObjectReader elementReader) { + + // Create the array reader over the map vector. + + ArrayReaderImpl arrayReader = new ArrayReaderImpl(schema, arrayAccessor, elementReader); + + // The array itself can't be null. + + arrayReader.bindNullState(NullStateReaders.REQUIRED_STATE_READER); + + // Wrap it all in an object reader. + + return new ArrayObjectReader(arrayReader); + } + + @Override + public void bindIndex(ColumnReaderIndex index) { + arrayAccessor.bind(index); + offsetReader.bindIndex(index); + nullStateReader.bindIndex(index); + elementIndex = new ElementReaderIndex(index); + elementReader.events().bindIndex(elementIndex); + } + + @Override + public void bindNullState(NullStateReader nullStateReader) { + this.nullStateReader = nullStateReader; + } + + @Override + public ObjectType type() { return ObjectType.ARRAY; } + + @Override + public ColumnMetadata schema() { return schema; } + + @Override + public NullStateReader nullStateReader() { return nullStateReader; } + + @Override + public boolean isNull() { return nullStateReader.isNull(); } + + @Override + public void reposition() { + long entry = offsetReader.getEntry(); + elementIndex.reset((int) (entry >> 32), (int) (entry & 0xFFFF_FFFF)); + } + + @Override + public boolean next() { + if (! elementIndex.next()) { + return false; + } + elementReader.events().reposition(); + return true; + } + + public ColumnReaderIndex elementIndex() { return elementIndex; } + + @Override + public int size() { return elementIndex.size(); } + + @Override + public void setPosn(int posn) { + elementIndex.set(posn); + elementReader.events().reposition(); + } + + @Override + public void rewind() { + elementIndex.rewind(); + } + + @Override + public ObjectReader entry() { return elementReader; } + + @Override + public ObjectType entryType() { return elementReader.type(); } + + @Override + public ScalarReader scalar() { + return entry().scalar(); + } + + @Override + public TupleReader tuple() { + return entry().tuple(); + } + + @Override + public ArrayReader array() { + return entry().array(); + } + + @Override + public Object getObject() { + + // Simple: return elements as an object list. + // If really needed, could return as a typed array, but that + // is a bit of a hassle. + + rewind(); + List elements = new ArrayList<>(); + while (next()) { + elements.add(elementReader.getObject()); + } + return elements; + } + + @Override + public String getAsString() { + if (isNull()) { + return "null"; + } + rewind(); + StringBuilder buf = new StringBuilder(); + buf.append("["); + int i = 0; + while (next()) { + if (i++ > 0) { + buf.append( ", " ); + } + buf.append(elementReader.getAsString()); + } + buf.append("]"); + return buf.toString(); + } +} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/BaseElementReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/BaseElementReader.java deleted file mode 100644 index f32c101c26f..00000000000 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/BaseElementReader.java +++ /dev/null @@ -1,187 +0,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. - */ -package org.apache.drill.exec.vector.accessor.reader; - -import java.math.BigDecimal; -import java.util.ArrayList; -import java.util.List; - -import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; -import org.apache.drill.exec.vector.accessor.ObjectType; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; -import org.apache.drill.exec.vector.accessor.impl.AccessorUtilities; -import org.joda.time.Period; - -public abstract class BaseElementReader implements ScalarElementReader { - - public static class ScalarElementObjectReader extends AbstractObjectReader { - - private BaseElementReader elementReader; - - public ScalarElementObjectReader(BaseElementReader elementReader) { - this.elementReader = elementReader; - } - - @Override - public void bindIndex(ColumnReaderIndex index) { - elementReader.bindIndex((ElementReaderIndex) index); - } - - @Override - public ObjectType type() { - return ObjectType.SCALAR; - } - - @Override - public ScalarElementReader elements() { - return elementReader; - } - - @Override - public Object getObject() { - // Simple: return elements as an object list. - // If really needed, could return as a typed array, but that - // is a bit of a hassle. - - List elements = new ArrayList<>(); - for (int i = 0; i < elementReader.size(); i++) { - elements.add(elementReader.getObject(i)); - } - return elements; - } - - @Override - public String getAsString() { - StringBuilder buf = new StringBuilder(); - buf.append("["); - for (int i = 0; i < elementReader.size(); i++) { - if (i > 0) { - buf.append( ", " ); - } - buf.append(elementReader.getAsString(i)); - } - buf.append("]"); - return buf.toString(); - } - } - - protected ElementReaderIndex vectorIndex; - protected VectorAccessor vectorAccessor; - - public abstract void bindVector(ValueVector vector); - - public void bindVector(MajorType majorType, VectorAccessor va) { - vectorAccessor = va; - } - - protected void bindIndex(ElementReaderIndex rowIndex) { - this.vectorIndex = rowIndex; - } - - @Override - public int size() { return vectorIndex.size(); } - - @Override - public Object getObject(int index) { - if (isNull(index)) { - return "null"; - } - switch (valueType()) { - case BYTES: - return getBytes(index); - case DECIMAL: - return getDecimal(index); - case DOUBLE: - return getDouble(index); - case INTEGER: - return getInt(index); - case LONG: - return getLong(index); - case PERIOD: - return getPeriod(index); - case STRING: - return getString(index); - default: - throw new IllegalStateException("Unexpected type: " + valueType()); - } - } - - @Override - public String getAsString(int index) { - switch (valueType()) { - case BYTES: - return AccessorUtilities.bytesToString(getBytes(index)); - case DOUBLE: - return Double.toString(getDouble(index)); - case INTEGER: - return Integer.toString(getInt(index)); - case LONG: - return Long.toString(getLong(index)); - case STRING: - return "\"" + getString(index) + "\""; - case DECIMAL: - return getDecimal(index).toPlainString(); - case PERIOD: - return getPeriod(index).normalizedStandard().toString(); - default: - throw new IllegalArgumentException("Unsupported type " + valueType()); - } - } - - @Override - public boolean isNull(int index) { - return false; - } - - @Override - public int getInt(int index) { - throw new UnsupportedOperationException(); - } - - @Override - public long getLong(int index) { - throw new UnsupportedOperationException(); - } - - @Override - public double getDouble(int index) { - throw new UnsupportedOperationException(); - } - - @Override - public String getString(int index) { - throw new UnsupportedOperationException(); - } - - @Override - public byte[] getBytes(int index) { - throw new UnsupportedOperationException(); - } - - @Override - public BigDecimal getDecimal(int index) { - throw new UnsupportedOperationException(); - } - - @Override - public Period getPeriod(int index) { - throw new UnsupportedOperationException(); - } -} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/BaseScalarReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/BaseScalarReader.java index fb9a71160ff..279fb58d015 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/BaseScalarReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/BaseScalarReader.java @@ -17,15 +17,11 @@ */ package org.apache.drill.exec.vector.accessor.reader; -import java.math.BigDecimal; - -import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.exec.vector.ValueVector; +import org.apache.drill.exec.record.metadata.ColumnMetadata; +import org.apache.drill.exec.vector.BaseDataValueVector; import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; -import org.apache.drill.exec.vector.accessor.ObjectType; -import org.apache.drill.exec.vector.accessor.ScalarReader; -import org.apache.drill.exec.vector.accessor.impl.AccessorUtilities; -import org.joda.time.Period; + +import io.netty.buffer.DrillBuf; /** * Column reader implementation that acts as the basis for the @@ -34,156 +30,122 @@ * method(s). */ -public abstract class BaseScalarReader implements ScalarReader { +public abstract class BaseScalarReader extends AbstractScalarReader { + + public abstract static class BaseFixedWidthReader extends BaseScalarReader { - public static class ScalarObjectReader extends AbstractObjectReader { + public abstract int width(); + } - private BaseScalarReader scalarReader; + public abstract static class BaseVarWidthReader extends BaseScalarReader { - public ScalarObjectReader(BaseScalarReader scalarReader) { - this.scalarReader = scalarReader; - } + protected OffsetVectorReader offsetsReader; @Override - public void bindIndex(ColumnReaderIndex index) { - scalarReader.bindIndex(index); + public void bindVector(ColumnMetadata schema, VectorAccessor va) { + super.bindVector(schema, va); + offsetsReader = new OffsetVectorReader( + VectorAccessors.varWidthOffsetVectorAccessor(va)); } @Override - public ObjectType type() { - return ObjectType.SCALAR; + public void bindIndex(ColumnReaderIndex index) { + super.bindIndex(index); + offsetsReader.bindIndex(index); } + } - @Override - public ScalarReader scalar() { - return scalarReader; + /** + * Provide access to the DrillBuf for the data vector. + */ + + public interface BufferAccessor { + DrillBuf buffer(); + } + + private static class SingleVectorBufferAccessor implements BufferAccessor { + private final DrillBuf buffer; + + public SingleVectorBufferAccessor(VectorAccessor va) { + BaseDataValueVector vector = va.vector(); + buffer = vector.getBuffer(); } @Override - public Object getObject() { - return scalarReader.getObject(); + public DrillBuf buffer() { return buffer; } + } + + private static class HyperVectorBufferAccessor implements BufferAccessor { + private final VectorAccessor vectorAccessor; + + public HyperVectorBufferAccessor(VectorAccessor va) { + vectorAccessor = va; } @Override - public String getAsString() { - return scalarReader.getAsString(); + public DrillBuf buffer() { + BaseDataValueVector vector = vectorAccessor.vector(); + return vector.getBuffer(); } } - protected ColumnReaderIndex vectorIndex; + protected ColumnMetadata schema; protected VectorAccessor vectorAccessor; + protected BufferAccessor bufferAccessor; - public static ScalarObjectReader build(ValueVector vector, BaseScalarReader reader) { - reader.bindVector(vector); - return new ScalarObjectReader(reader); - } + public static ScalarObjectReader buildOptional(ColumnMetadata schema, + VectorAccessor va, BaseScalarReader reader) { - public static AbstractObjectReader build(MajorType majorType, VectorAccessor va, - BaseScalarReader reader) { - reader.bindVector(majorType, va); - return new ScalarObjectReader(reader); - } + // Reader is bound to the values vector inside the nullable vector. - public abstract void bindVector(ValueVector vector); + reader.bindVector(schema, VectorAccessors.nullableValuesAccessor(va)); - protected void bindIndex(ColumnReaderIndex rowIndex) { - this.vectorIndex = rowIndex; - if (vectorAccessor != null) { - vectorAccessor.bind(rowIndex); - } - } + // The nullability of each value depends on the "bits" vector + // in the nullable vector. - public void bindVector(MajorType majorType, VectorAccessor va) { - vectorAccessor = va; - } + reader.bindNullState(new NullStateReaders.NullableIsSetVectorStateReader(va)); - @Override - public Object getObject() { - if (isNull()) { - return null; - } - switch (valueType()) { - case BYTES: - return getBytes(); - case DECIMAL: - return getDecimal(); - case DOUBLE: - return getDouble(); - case INTEGER: - return getInt(); - case LONG: - return getLong(); - case PERIOD: - return getPeriod(); - case STRING: - return getString(); - default: - throw new IllegalStateException("Unexpected type: " + valueType()); - } - } + // Wrap the reader in an object reader. - @Override - public String getAsString() { - if (isNull()) { - return "null"; - } - switch (valueType()) { - case BYTES: - return AccessorUtilities.bytesToString(getBytes()); - case DOUBLE: - return Double.toString(getDouble()); - case INTEGER: - return Integer.toString(getInt()); - case LONG: - return Long.toString(getLong()); - case STRING: - return "\"" + getString() + "\""; - case DECIMAL: - return getDecimal().toPlainString(); - case PERIOD: - return getPeriod().normalizedStandard().toString(); - default: - throw new IllegalArgumentException("Unsupported type " + valueType()); - } + return new ScalarObjectReader(reader); } - @Override - public boolean isNull() { - return false; - } + public static ScalarObjectReader buildRequired(ColumnMetadata schema, + VectorAccessor va, BaseScalarReader reader) { - @Override - public int getInt() { - throw new UnsupportedOperationException(); - } + // Reader is bound directly to the required vector. - @Override - public long getLong() { - throw new UnsupportedOperationException(); - } + reader.bindVector(schema, va); - @Override - public double getDouble() { - throw new UnsupportedOperationException(); + // The reader is required, values can't be null. + + reader.bindNullState(NullStateReaders.REQUIRED_STATE_READER); + + // Wrap the reader in an object reader. + + return new ScalarObjectReader(reader); } - @Override - public String getString() { - throw new UnsupportedOperationException(); + public void bindVector(ColumnMetadata schema, VectorAccessor va) { + this.schema = schema; + vectorAccessor = va; + bufferAccessor = bufferAccessor(va); } - @Override - public byte[] getBytes() { - throw new UnsupportedOperationException(); + protected BufferAccessor bufferAccessor(VectorAccessor va) { + if (va.isHyper()) { + return new HyperVectorBufferAccessor(va); + } else { + return new SingleVectorBufferAccessor(va); + } } @Override - public BigDecimal getDecimal() { - throw new UnsupportedOperationException(); + public void bindIndex(ColumnReaderIndex rowIndex) { + super.bindIndex(rowIndex); + vectorAccessor.bind(rowIndex); } @Override - public Period getPeriod() { - throw new UnsupportedOperationException(); - } + public ColumnMetadata schema() { return schema; } } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ColumnReaderFactory.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ColumnReaderFactory.java index 0bcb6e291cb..ae15e5d7a32 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ColumnReaderFactory.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ColumnReaderFactory.java @@ -17,12 +17,9 @@ */ package org.apache.drill.exec.vector.accessor.reader; -import org.apache.drill.common.types.TypeProtos.DataMode; import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.common.types.TypeProtos.MinorType; -import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.exec.vector.accessor.ColumnAccessors; -import org.apache.drill.exec.vector.complex.RepeatedValueVector; +import org.apache.drill.exec.vector.accessor.ColumnAccessorUtils; /** * Gather generated reader classes into a set of class tables to allow rapid @@ -35,19 +32,14 @@ public class ColumnReaderFactory { private static final int typeCount = MinorType.values().length; private static final Class requiredReaders[] = new Class[typeCount]; - private static final Class nullableReaders[] = new Class[typeCount]; - private static final Class elementReaders[] = new Class[typeCount]; static { - ColumnAccessors.defineRequiredReaders(requiredReaders); - ColumnAccessors.defineNullableReaders(nullableReaders); - ColumnAccessors.defineArrayReaders(elementReaders); + ColumnAccessorUtils.defineRequiredReaders(requiredReaders); } - public static AbstractObjectReader buildColumnReader(ValueVector vector) { - MajorType major = vector.getField().getType(); + public static BaseScalarReader buildColumnReader(VectorAccessor va) { + MajorType major = va.type(); MinorType type = major.getMinorType(); - DataMode mode = major.getMode(); switch (type) { case GENERIC_OBJECT: @@ -57,41 +49,7 @@ public static AbstractObjectReader buildColumnReader(ValueVector vector) { case MAP: throw new UnsupportedOperationException(type.toString()); default: - switch (mode) { - case OPTIONAL: - return BaseScalarReader.build(vector, newAccessor(type, nullableReaders)); - case REQUIRED: - return BaseScalarReader.build(vector, newAccessor(type, requiredReaders)); - case REPEATED: - return ScalarArrayReader.build((RepeatedValueVector) vector, newAccessor(type, elementReaders)); - default: - throw new UnsupportedOperationException(mode.toString()); - } - } - } - - public static AbstractObjectReader buildColumnReader(MajorType majorType, VectorAccessor va) { - MinorType type = majorType.getMinorType(); - DataMode mode = majorType.getMode(); - - switch (type) { - case GENERIC_OBJECT: - case LATE: - case NULL: - case LIST: - case MAP: - throw new UnsupportedOperationException(type.toString()); - default: - switch (mode) { - case OPTIONAL: - return BaseScalarReader.build(majorType, va, newAccessor(type, nullableReaders)); - case REQUIRED: - return BaseScalarReader.build(majorType, va, newAccessor(type, requiredReaders)); - case REPEATED: - return ScalarArrayReader.build(majorType, va, newAccessor(type, elementReaders)); - default: - throw new UnsupportedOperationException(mode.toString()); - } + return newAccessor(type, requiredReaders); } } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/MapReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/MapReader.java index 900e0a77c45..73293914718 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/MapReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/MapReader.java @@ -20,6 +20,8 @@ import java.util.List; import org.apache.drill.exec.record.metadata.ColumnMetadata; +import org.apache.drill.exec.record.metadata.TupleMetadata; +import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; /** * Reader for a Drill Map type. Maps are actually tuples, just like rows. @@ -27,17 +29,54 @@ public class MapReader extends AbstractTupleReader { + protected final ColumnMetadata schema; + + /** + * Accessor for the map vector. This class does not use the map vector + * directory. However, in the case of a map hyper-vector, we need to + * tell the vector which batch to use. (For an array, the array does + * this work and the map accessor is null.) + */ + + private final VectorAccessor mapAccessor; + protected MapReader(ColumnMetadata schema, AbstractObjectReader readers[]) { - super(schema.mapSchema(), readers); + this(schema, null, readers); + } + + protected MapReader(ColumnMetadata schema, + VectorAccessor mapAccessor, AbstractObjectReader readers[]) { + super(readers); + this.schema = schema; + this.mapAccessor = mapAccessor; } - public static TupleObjectReader build(ColumnMetadata schema, AbstractObjectReader readers[]) { - return new TupleObjectReader(new MapReader(schema, readers)); + public static TupleObjectReader build(ColumnMetadata schema, + VectorAccessor mapAccessor, + AbstractObjectReader readers[]) { + MapReader mapReader = new MapReader(schema, mapAccessor, readers); + mapReader.bindNullState(NullStateReaders.REQUIRED_STATE_READER); + return new TupleObjectReader(mapReader); } - public static AbstractObjectReader build(ColumnMetadata metadata, + public static AbstractObjectReader build(ColumnMetadata schema, + VectorAccessor mapAccessor, List readers) { AbstractObjectReader readerArray[] = new AbstractObjectReader[readers.size()]; - return build(metadata, readers.toArray(readerArray)); + return build(schema, mapAccessor, readers.toArray(readerArray)); } + + @Override + public void bindIndex(ColumnReaderIndex index) { + if (mapAccessor != null) { + mapAccessor.bind(index); + } + super.bindIndex(index); + } + + @Override + public ColumnMetadata schema() { return schema; } + + @Override + public TupleMetadata tupleSchema() { return schema.mapSchema(); } } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/NullStateReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/NullStateReader.java new file mode 100644 index 00000000000..e52c0f52ef3 --- /dev/null +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/NullStateReader.java @@ -0,0 +1,52 @@ +/* + * 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 org.apache.drill.exec.vector.accessor.reader; + +import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; + +/** + * Internal mechanism to detect if a value is null. Handles the multiple ways + * that Drill represents nulls: + *
    + *
  • Required and repeated modes: value is never null.
    • + *
  • Optional mode: null state is carried by an associated "bits" vector.
    • + *
  • Union: null state is carried by both the bits state of + * the union itself, and the null state of the associated nullable vector. + * (The union states if the column value itself is null; the vector state is + * if that value is null, which will occur if either the column is null, or + * if the type of the column is something other than the type in question.)
    • + *
  • List, with a single data vector: null state is carried by the list vector + * and the associated nullable data vector. Presumably the list vector state + * takes precedence.
    • + *
  • List, with a union data vector (AKA variant array or union array): the + * null state is carried by all three of a) the list vector, b) the union + * vector, and c) the type vectors. Presumably, the list vector state has + * precedence.
    • + *
+ *

+ * The interface here allows each reader to delegate the null logic to a + * separate component, keeping the data access portion itself simple. + *

+ * As with all readers, this reader must handle both the single-batch and + * the hyper-batch cases. + */ + +public interface NullStateReader { + void bindIndex(ColumnReaderIndex rowIndex); + boolean isNull(); +} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/NullStateReaders.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/NullStateReaders.java new file mode 100644 index 00000000000..f1ea09a65cf --- /dev/null +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/NullStateReaders.java @@ -0,0 +1,193 @@ +/* + * 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 org.apache.drill.exec.vector.accessor.reader; + +import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.exec.vector.accessor.ColumnAccessors.UInt1ColumnReader; +import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; +import org.apache.drill.exec.vector.complex.UnionVector; + +public class NullStateReaders { + + public static final RequiredStateReader REQUIRED_STATE_READER = new RequiredStateReader(); + + private NullStateReaders() { } + + /** + * Dummy implementation of a null state reader for cases in which the + * value is never null. Use the {@link NullStateReaders#REQUIRED_STATE_READER} instance + * for this case. + */ + + protected static class RequiredStateReader implements NullStateReader { + + @Override + public void bindIndex(ColumnReaderIndex rowIndex) { } + + @Override + public boolean isNull() { return false; } + } + + /** + * Holder for the NullableVector wrapper around a bits vector and a + * data vector. Manages the bits vector to extract the nullability + * value. + *

+ * This class allows the same reader to handle both the required and + * nullable cases; the only difference is how nulls are handled. + */ + + protected static class NullableIsSetVectorStateReader implements NullStateReader { + + private final VectorAccessor nullableAccessor; + private final UInt1ColumnReader isSetReader; + + public NullableIsSetVectorStateReader(VectorAccessor nullableAccessor) { + this.nullableAccessor = nullableAccessor; + isSetReader = new UInt1ColumnReader(); + isSetReader.bindVector(null, + VectorAccessors.nullableBitsAccessor(nullableAccessor)); + isSetReader.bindNullState(REQUIRED_STATE_READER); + } + + @Override + public void bindIndex(ColumnReaderIndex rowIndex) { + nullableAccessor.bind(rowIndex); + isSetReader.bindIndex(rowIndex); + } + + @Override + public boolean isNull() { + return isSetReader.getInt() == 0; + } + } + + /** + * Holder for the NullableVector wrapper around a bits vector and a + * data vector. Manages the bits vector to extract the nullability + * value. + *

+ * This class allows the same reader to handle both the required and + * nullable cases; the only difference is how nulls are handled. + */ + + protected static class ListIsSetVectorStateReader implements NullStateReader { + + private final VectorAccessor bitsAccessor; + private final UInt1ColumnReader isSetReader; + + public ListIsSetVectorStateReader(VectorAccessor bitsAccessor) { + this.bitsAccessor = bitsAccessor; + isSetReader = new UInt1ColumnReader(); + isSetReader.bindVector(null, bitsAccessor); + isSetReader.bindNullState(REQUIRED_STATE_READER); + } + + @Override + public void bindIndex(ColumnReaderIndex rowIndex) { + bitsAccessor.bind(rowIndex); + isSetReader.bindIndex(rowIndex); + } + + @Override + public boolean isNull() { + return isSetReader.getInt() == 0; + } + } + + /** + * Null state that handles the strange union semantics that both + * the union and the values can be null. A value is null if either + * the union or the value is null. (Though, presumably, in the normal + * case either the union is null or one of the associated values is + * null.) + */ + + protected static class MemberNullStateReader implements NullStateReader { + + private final NullStateReader unionNullState; + private final NullStateReader memberNullState; + + public MemberNullStateReader(NullStateReader unionNullState, NullStateReader memberNullState) { + this.unionNullState = unionNullState; + this.memberNullState = memberNullState; + } + + @Override + public void bindIndex(ColumnReaderIndex rowIndex) { + memberNullState.bindIndex(rowIndex); + } + + @Override + public boolean isNull() { + return unionNullState.isNull() || memberNullState.isNull(); + } + } + + /** + * Handle the awkward situation with complex types. They don't carry their own + * bits (null state) vector. Instead, we define them as null if the type of + * the union is other than the type of the map or list. (Since the same vector + * that holds state also holds the is-null value, this check includes the + * check if the entire union is null.) + */ + + protected static class ComplexMemberStateReader implements NullStateReader { + + private UInt1ColumnReader typeReader; + private MinorType type; + + public ComplexMemberStateReader(UInt1ColumnReader typeReader, MinorType type) { + this.typeReader = typeReader; + this.type = type; + } + + @Override + public void bindIndex(ColumnReaderIndex rowIndex) { } + + @Override + public boolean isNull() { + return typeReader.getInt() != type.getNumber(); + } + } + + /** + * Extract null state from the union vector's type vector. The union reader + * manages the type reader, so no binding is done here. + */ + + protected static class TypeVectorStateReader implements NullStateReader { + + public final UInt1ColumnReader typeReader; + + public TypeVectorStateReader(UInt1ColumnReader typeReader) { + this.typeReader = typeReader; + } + + @Override + public void bindIndex(ColumnReaderIndex rowIndex) { + typeReader.bindIndex(rowIndex); + } + + @Override + public boolean isNull() { + return typeReader.getInt() == UnionVector.NULL_MARKER; + } + } + +} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ObjectArrayReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ObjectArrayReader.java deleted file mode 100644 index 9ed89f1c728..00000000000 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ObjectArrayReader.java +++ /dev/null @@ -1,159 +0,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. - */ -package org.apache.drill.exec.vector.accessor.reader; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; -import org.apache.drill.exec.vector.accessor.ObjectReader; -import org.apache.drill.exec.vector.accessor.ObjectType; -import org.apache.drill.exec.vector.complex.RepeatedValueVector; - -/** - * Reader for an array of either tuples or other arrays. - */ - -public class ObjectArrayReader extends AbstractArrayReader { - - /** - * Index into the vector of elements for a repeated vector. - * Keeps track of the current offset in terms of value positions. - * This is a derived index. The base index points to an entry - * in the offset vector for the array. This inner index picks - * off elements within the range of offsets for that one entry. - * For example:


-   * [ ... 100 105 ...]
-   *
In the above the value 100 might be at outer - * offset 5. The inner array will pick off the five values - * 100...104. - *

- * Because arrays allow random access on read, the inner offset - * is reset on each access to the array. - */ - - public static class ObjectElementReaderIndex extends BaseElementIndex implements ColumnReaderIndex { - - private int posn; - - public ObjectElementReaderIndex(ColumnReaderIndex base) { - super(base); - } - - @Override - public int vectorIndex() { - return startOffset + posn; - } - - public void set(int index) { - if (index < 0 || length <= index) { - throw new IndexOutOfBoundsException("Index = " + index + ", length = " + length); - } - posn = index; - } - - public int posn() { return posn; } - } - - /** - * Reader for each element. - */ - - private final AbstractObjectReader elementReader; - - /** - * Index used to access elements. - */ - - private ObjectElementReaderIndex objElementIndex; - - private ObjectArrayReader(RepeatedValueVector vector, AbstractObjectReader elementReader) { - super(vector); - this.elementReader = elementReader; - } - - private ObjectArrayReader(VectorAccessor vectorAccessor, AbstractObjectReader elementReader) { - super(vectorAccessor); - this.elementReader = elementReader; - } - - public static ArrayObjectReader build(RepeatedValueVector vector, - AbstractObjectReader elementReader) { - return new ArrayObjectReader( - new ObjectArrayReader(vector, elementReader)); - } - - public static AbstractObjectReader build(VectorAccessor vectorAccessor, - AbstractObjectReader elementReader) { - return new ArrayObjectReader( - new ObjectArrayReader(vectorAccessor, elementReader)); - } - - @Override - public void bindIndex(ColumnReaderIndex index) { - super.bindIndex(index); - objElementIndex = new ObjectElementReaderIndex(baseIndex); - elementIndex = objElementIndex; - elementReader.bindIndex(objElementIndex); - } - - @Override - public ObjectType entryType() { - return elementReader.type(); - } - - @Override - public void setPosn(int index) { - objElementIndex.set(index); - elementReader.reposition(); - } - - @Override - public ObjectReader entry() { - return elementReader; - } - - @Override - public ObjectReader entry(int index) { - setPosn(index); - return entry(); - } - - @Override - public Object getObject() { - List array = new ArrayList<>(); - for (int i = 0; i < objElementIndex.size(); i++) { - array.add(entry(i).getObject()); - } - return array; - } - - @Override - public String getAsString() { - StringBuilder buf = new StringBuilder(); - buf.append("["); - for (int i = 0; i < size(); i++) { - if (i > 0) { - buf.append( ", " ); - } - buf.append(entry(i).getAsString()); - } - buf.append("]"); - return buf.toString(); - } -} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/OffsetVectorReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/OffsetVectorReader.java new file mode 100644 index 00000000000..9d81638165c --- /dev/null +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/OffsetVectorReader.java @@ -0,0 +1,70 @@ +/* + * 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 org.apache.drill.exec.vector.accessor.reader; + +import org.apache.drill.exec.record.metadata.ColumnMetadata; +import org.apache.drill.exec.vector.UInt4Vector; +import org.apache.drill.exec.vector.accessor.ValueType; +import org.apache.drill.exec.vector.accessor.reader.BaseScalarReader.BaseFixedWidthReader; +import io.netty.buffer.DrillBuf; + +/** + * Reader for an offset vector. + */ + +public class OffsetVectorReader extends BaseFixedWidthReader { + + private static final int VALUE_WIDTH = UInt4Vector.VALUE_WIDTH; + + public OffsetVectorReader(VectorAccessor offsetsAccessor) { + vectorAccessor = offsetsAccessor; + bufferAccessor = bufferAccessor(offsetsAccessor); + nullStateReader = NullStateReaders.REQUIRED_STATE_READER; + } + + @Override + public ValueType valueType() { + return ValueType.INTEGER; + } + + @Override public int width() { return VALUE_WIDTH; } + + /** + * Return the offset and length of a value encoded as a long. + * The value is encoded to avoid the need to resolve the offset vector + * twice per value. + * + * @return a long with the format:
+ * Upper 32 bits - offset: offset = (int) (entry >> 32)
+ * Lower 32 bits - length: length = (int) (entry & 0xFFFF_FFFF) + */ + + public long getEntry() { + final DrillBuf buf = bufferAccessor.buffer(); + final int readOffset = vectorIndex.offset() * VALUE_WIDTH; + long start = buf.getInt(readOffset); + long end = buf.getInt(readOffset + VALUE_WIDTH); + return (start << 32) + (end - start); + } + + @Override + public void reposition() { } + + @Override + public ColumnMetadata schema() { return null; } +} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/FixedWidthElementReaderIndex.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ReaderEvents.java similarity index 65% rename from exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/FixedWidthElementReaderIndex.java rename to exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ReaderEvents.java index 4f3aeeb9150..2f759464d17 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/FixedWidthElementReaderIndex.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ReaderEvents.java @@ -18,21 +18,14 @@ package org.apache.drill.exec.vector.accessor.reader; import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; -import org.apache.drill.exec.vector.accessor.reader.AbstractArrayReader.BaseElementIndex; /** - * Index into the vector of elements for a repeated vector. - * Keeps track of the current offset in terms of value positions. + * Internal operations to wire up a set of readers. */ -public class FixedWidthElementReaderIndex extends BaseElementIndex implements ElementReaderIndex { - - public FixedWidthElementReaderIndex(ColumnReaderIndex base) { - super(base); - } - - @Override - public int vectorIndex(int posn) { - return elementIndex(posn); - } +public interface ReaderEvents { + void bindIndex(ColumnReaderIndex rowIndex); + void bindNullState(NullStateReader nullStateReader); + NullStateReader nullStateReader(); + void reposition(); } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ScalarArrayReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ScalarArrayReader.java deleted file mode 100644 index d93e4a59920..00000000000 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/ScalarArrayReader.java +++ /dev/null @@ -1,102 +0,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. - */ -package org.apache.drill.exec.vector.accessor.reader; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.drill.common.types.TypeProtos.MajorType; -import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; -import org.apache.drill.exec.vector.accessor.ObjectType; -import org.apache.drill.exec.vector.accessor.ScalarElementReader; -import org.apache.drill.exec.vector.complex.RepeatedValueVector; - -public class ScalarArrayReader extends AbstractArrayReader { - - private final BaseElementReader elementReader; - - private ScalarArrayReader(RepeatedValueVector vector, - BaseElementReader elementReader) { - super(vector); - this.elementReader = elementReader; - } - - private ScalarArrayReader(VectorAccessor va, - BaseElementReader elementReader) { - super(va); - this.elementReader = elementReader; - } - - public static ArrayObjectReader build(RepeatedValueVector vector, - BaseElementReader elementReader) { - elementReader.bindVector(vector.getDataVector()); - return new ArrayObjectReader(new ScalarArrayReader(vector, elementReader)); - } - - public static ArrayObjectReader build(MajorType majorType, VectorAccessor va, - BaseElementReader elementReader) { - elementReader.bindVector(majorType, va); - return new ArrayObjectReader(new ScalarArrayReader(va, elementReader)); - } - - @Override - public void bindIndex(ColumnReaderIndex index) { - super.bindIndex(index); - FixedWidthElementReaderIndex fwElementIndex = new FixedWidthElementReaderIndex(baseIndex); - elementIndex = fwElementIndex; - elementReader.bindIndex(fwElementIndex); - } - - @Override - public ObjectType entryType() { - return ObjectType.SCALAR; - } - - @Override - public ScalarElementReader elements() { - return elementReader; - } - - @Override - public void setPosn(int index) { - throw new IllegalStateException("setPosn() not supported for scalar arrays"); - } - - @Override - public Object getObject() { - List elements = new ArrayList<>(); - for (int i = 0; i < size(); i++) { - elements.add(elementReader.getObject(i)); - } - return elements; - } - - @Override - public String getAsString() { - StringBuilder buf = new StringBuilder(); - buf.append("["); - for (int i = 0; i < size(); i++) { - if (i > 0) { - buf.append( ", " ); - } - buf.append(elementReader.getAsString(i)); - } - buf.append("]"); - return buf.toString(); - } -} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/VectorAccessor.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/VectorAccessor.java index 1cf2a196560..050845b0a88 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/VectorAccessor.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/VectorAccessor.java @@ -17,10 +17,13 @@ */ package org.apache.drill.exec.vector.accessor.reader; +import org.apache.drill.common.types.TypeProtos.MajorType; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; public interface VectorAccessor { + boolean isHyper(); + MajorType type(); void bind(ColumnReaderIndex index); - ValueVector vector(); + T vector(); } diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/VectorAccessors.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/VectorAccessors.java new file mode 100644 index 00000000000..7d70d1de902 --- /dev/null +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/VectorAccessors.java @@ -0,0 +1,344 @@ +/* + * 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 org.apache.drill.exec.vector.accessor.reader; + +import org.apache.drill.common.types.TypeProtos.MajorType; +import org.apache.drill.common.types.TypeProtos.MinorType; +import org.apache.drill.common.types.Types; +import org.apache.drill.exec.vector.NullableVector; +import org.apache.drill.exec.vector.ValueVector; +import org.apache.drill.exec.vector.VariableWidthVector; +import org.apache.drill.exec.vector.accessor.ColumnReaderIndex; +import org.apache.drill.exec.vector.complex.AbstractMapVector; +import org.apache.drill.exec.vector.complex.RepeatedValueVector; + +/** + * Collection of vector accessors. A single class handles the single-batch + * case. But, for hyper-vectors, we need a separate accessor for each + * (vector, sub-vector) combination to handle the + * indirections in the hyper-vector case. + *

+ * For a required vector:
+ * reader index --> hyper vector --> required vector + *

+ * For a nullable vector:
+ * reader index --> hyper vector --> nullable vector
+ * nullable vector --> bits vector
+ * --> values vector + *

+ * For a repeated vector:
+ * reader index --> hyper vector --> repeated vector
+ * repeated vector --> offset vector
+ * --> values vector + *

+ * And so on. In each case, we must start with a top-level + * vector as indicated the row index, indirected through the + * SV4. That is done by the reader index. That points to a + * top-level vector in the hyper-vector. + *

+ * Most of the vectors needed are nested. These inner vectors + * are not part of a hyper-vector list. Instead, we must get the + * top-level vector, then navigate down from that vector to the + * desired vector. + *

+ * Sometimes the navigation is static (the "bits" vector for + * a nullable vector.) Other times, it is a bit more dynamic: a + * member of a map (given by index) or the member of a union + * (given by type.) + *

+ * These accessors can be chained to handle deeply-nested + * structures such as an array of maps that contains a list of + * unions. + *

+ * Because the navigation is required on every access, the use of hyper + * vectors is slow. Since hyper-vectors are seldom used, we + * optimize for the single-batch case by caching vectors at each + * stage. Thus, for the single-batch case, we use different accessor + * implementations. To keep the rest of the code simple, both the + * hyper and single batch cases use the same API, but they use + * entirely different implementations. The methods here choose + * the correct implementation for the single and hyper cases. + */ + +public class VectorAccessors { + + public static class NullVectorAccesor implements VectorAccessor { + + private final MajorType type; + + public NullVectorAccesor(MajorType type) { + this.type = type; + } + + @Override + public boolean isHyper() { return false; } + + @Override + public MajorType type() { return type; } + + @Override + public void bind(ColumnReaderIndex index) { } + + @Override + public T vector() { + throw new UnsupportedOperationException(); + } + } + + public static class SingleVectorAccessor implements VectorAccessor { + + private final ValueVector vector; + + public SingleVectorAccessor(ValueVector vector) { + this.vector = vector; + } + + @Override + public boolean isHyper() { return false; } + + @Override + public void bind(ColumnReaderIndex index) { } + + @Override + public MajorType type() { return vector.getField().getType(); } + + @SuppressWarnings("unchecked") + @Override + public T vector() { return (T) vector; } + } + + /** + * Vector accessor used by the column accessors to obtain the vector for + * each column value. That is, position 0 might be batch 4, index 3, + * while position 1 might be batch 1, index 7, and so on. + */ + + public static abstract class BaseHyperVectorAccessor implements VectorAccessor { + + protected final MajorType type; + + public BaseHyperVectorAccessor(MajorType type) { + this.type = type; + } + + @Override + public boolean isHyper() { return true; } + + @Override + public void bind(ColumnReaderIndex index) { } + + @Override + public MajorType type() { return type; } + } + + /** + * Vector accessor for RepeatedVector → offsets vector + */ + + public static class ArrayOffsetHyperVectorAccessor extends BaseHyperVectorAccessor { + + private VectorAccessor repeatedVectorAccessor; + + public ArrayOffsetHyperVectorAccessor(VectorAccessor va) { + super(Types.required(MinorType.UINT4)); + repeatedVectorAccessor = va; + } + + @SuppressWarnings("unchecked") + @Override + public T vector() { + RepeatedValueVector vector = repeatedVectorAccessor.vector(); + return (T) vector.getOffsetVector(); + } + } + + /** + * Vector accessor for RepeatedVector → data vector + */ + + public static class ArrayDataHyperVectorAccessor implements VectorAccessor { + + private VectorAccessor repeatedVectorAccessor; + + private ArrayDataHyperVectorAccessor(VectorAccessor va) { + repeatedVectorAccessor = va; + } + + @Override + public boolean isHyper() { return true; } + + @Override + public MajorType type() { return repeatedVectorAccessor.type(); } + + @Override + public void bind(ColumnReaderIndex index) { } + + @SuppressWarnings("unchecked") + @Override + public T vector() { + RepeatedValueVector vector = repeatedVectorAccessor.vector(); + return (T) vector.getDataVector(); + } + } + + /** + * Vector accessor for VariableWidthVector → offsets vector + */ + + public static class VarWidthOffsetHyperVectorAccessor extends BaseHyperVectorAccessor { + + private VectorAccessor varWidthVectorAccessor; + + public VarWidthOffsetHyperVectorAccessor(VectorAccessor va) { + super(Types.required(MinorType.UINT4)); + varWidthVectorAccessor = va; + } + + @SuppressWarnings("unchecked") + @Override + public T vector() { + VariableWidthVector vector = varWidthVectorAccessor.vector(); + return (T) vector.getOffsetVector(); + } + } + + /** + * Vector accessor for NullableVector → values vector + */ + + public static class NullableValuesHyperVectorAccessor implements VectorAccessor { + + private VectorAccessor nullableAccessor; + + private NullableValuesHyperVectorAccessor(VectorAccessor va) { + nullableAccessor = va; + } + + @Override + public boolean isHyper() { return true; } + + @Override + public MajorType type() { return nullableAccessor.type(); } + + @Override + public void bind(ColumnReaderIndex index) { } + + @SuppressWarnings("unchecked") + @Override + public T vector() { + NullableVector vector = nullableAccessor.vector(); + return (T) vector.getValuesVector(); + } + } + + /** + * Vector accessor for NullableVector → bits vector + */ + + public static class NullableBitsHyperVectorStateReader extends BaseHyperVectorAccessor { + + public final VectorAccessor nullableAccessor; + + public NullableBitsHyperVectorStateReader(VectorAccessor nullableAccessor) { + super(Types.required(MinorType.UINT1)); + this.nullableAccessor = nullableAccessor; + } + + @SuppressWarnings("unchecked") + @Override + public T vector() { + NullableVector vector = nullableAccessor.vector(); + return (T) vector.getBitsVector(); + } + } + + /** + * Vector accessor for AbstractMapVector → member vector + */ + + public static class MapMemberHyperVectorAccessor extends BaseHyperVectorAccessor { + + private final VectorAccessor mapAccessor; + private final int index; + + public MapMemberHyperVectorAccessor(VectorAccessor va, int index, MajorType type) { + super(type); + mapAccessor = va; + this.index = index; + } + + @SuppressWarnings("unchecked") + @Override + public T vector() { + AbstractMapVector vector = mapAccessor.vector(); + return (T) vector.getChildByOrdinal(index); + } + } + + // Methods to create vector accessors for sub-vectors internal to various + // value vectors. These methods are called from the readers themselves rather + // than the reader builders. + + public static VectorAccessor arrayOffsetVectorAccessor(VectorAccessor repeatedAccessor) { + if (repeatedAccessor.isHyper()) { + return new ArrayOffsetHyperVectorAccessor(repeatedAccessor); + } else { + RepeatedValueVector vector = repeatedAccessor.vector(); + return new SingleVectorAccessor(vector.getOffsetVector()); + } + } + + public static VectorAccessor arrayDataAccessor(VectorAccessor repeatedAccessor) { + if (repeatedAccessor.isHyper()) { + return new ArrayDataHyperVectorAccessor(repeatedAccessor); + } else { + RepeatedValueVector vector = repeatedAccessor.vector(); + return new SingleVectorAccessor( + vector.getDataVector()); + } + } + + public static VectorAccessor varWidthOffsetVectorAccessor(VectorAccessor varWidthAccessor) { + if (varWidthAccessor.isHyper()) { + return new VarWidthOffsetHyperVectorAccessor(varWidthAccessor); + } else { + VariableWidthVector vector = varWidthAccessor.vector(); + return new SingleVectorAccessor(vector.getOffsetVector()); + } + } + + public static VectorAccessor nullableValuesAccessor(VectorAccessor nullableAccessor) { + if (nullableAccessor.isHyper()) { + return new NullableValuesHyperVectorAccessor(nullableAccessor); + } else { + NullableVector vector = nullableAccessor.vector(); + return new SingleVectorAccessor( + vector.getValuesVector()); + } + } + + public static VectorAccessor nullableBitsAccessor(VectorAccessor nullableAccessor) { + if (nullableAccessor.isHyper()) { + return new NullableBitsHyperVectorStateReader(nullableAccessor); + } else { + NullableVector vector = nullableAccessor.vector(); + return new SingleVectorAccessor( + vector.getBitsVector()); + } + } +} diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/package-info.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/package-info.java index a94d2e844d3..823dd2896c6 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/package-info.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/reader/package-info.java @@ -17,10 +17,67 @@ */ /** * Provides the reader hierarchy as explained in the API package. - * The only caveat is that a simplification is provided for arrays of - * scalar values: rather than a scalar reader for each value, the - * {#link ScalarElementReader} class provides access to the entire array - * via indexed get methods. + * + *

Structure

+ * + * The reader implementation divides into four parts: + *
    + *
  1. The readers themselves which start with scalar readers to + * decode data from vectors, then build up to nullable, array, + * union and list readers. Readers are built up via composition, + * often using the (internal) offset vector reader.
    2. + *
  2. The column index abstraction that steps through items in a collection. + * At the top level, the index points to the current row. The top level + * may include an indirection (an SV2 or SV4) which is handled by the + * column index. Within arrays, the column index points to each element + * of the array.
    3. + *
  3. The vector accessor which provides a unified interface for both + * the single-batch and hyper-batch cases. The single-batch versions + * simply hold onto the vector itself. The hyper-batch versions either + * provide access to a specific vector within a hyper-vector (for + * top-level vectors), or navigate from a top-level vector down to an + * inner vector (for nested vectors.)
    4. + *
  4. The null state abstraction which provides a uniform way to + * detect nullability. For example, within the reader system, the + * reader for nullable and required vectors differ only in the associated + * null state reader. Unions and lists have complex null state + * logic: the nullability of a value depends on the nullability + * of the list, the union, and the value itself. The null state + * class implements this logic independent of the reader structure. + *
    5. + * + * + *

    Composition

    + * + * The result is that reader structure makes heavy use of composition: + * readers are built up from each of the above components. The number of + * actual reader classes is small, but the methods to build the readers are + * complex. Most structure is built at build time. Indexes, however are + * provided at a later "bind" time at which a bind call traverses the + * reader tree to associate an index with each reader and vector accessor. + * When a reader is for an array, the bind step creates the index for the + * array elements. + * + *

    Construction

    + * + * Construction of readers is a multi-part process. + *
      + *
    • Start with a single or hyper-vector batch.
      • + *
    • The reader builders in another package parse the batch structure, + * create the required metadata, wrap the (single or hyper) vectors in + * a vector accessor, and call methods in this package.
      • + *
    • Methods here perform the final construction based on the specific + * type of the reader.
      • + *
    + *

    + * The work divides into two main categories: + *

      + *
    • The work which is based on + * the vector structure and single/hyper-vector structure, which is done + * elsewhere.
      • + *
    • The work which is based on the structure of the readers (with + * vector cardinality factored out), which is done here.
      • + *
    */ package org.apache.drill.exec.vector.accessor.reader; \ No newline at end of file diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/ColumnWriterFactory.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/ColumnWriterFactory.java index 30811bb39cd..4a668c4edae 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/ColumnWriterFactory.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/ColumnWriterFactory.java @@ -28,7 +28,7 @@ import org.apache.drill.exec.vector.NullableVector; import org.apache.drill.exec.vector.UInt4Vector; import org.apache.drill.exec.vector.ValueVector; -import org.apache.drill.exec.vector.accessor.ColumnAccessors; +import org.apache.drill.exec.vector.accessor.ColumnAccessorUtils; import org.apache.drill.exec.vector.accessor.writer.AbstractArrayWriter.ArrayObjectWriter; import org.apache.drill.exec.vector.accessor.writer.AbstractScalarWriter.ScalarObjectWriter; import org.apache.drill.exec.vector.accessor.writer.AbstractTupleWriter.TupleObjectWriter; @@ -56,7 +56,7 @@ public class ColumnWriterFactory { private static final Class requiredWriters[] = new Class[typeCount]; static { - ColumnAccessors.defineRequiredWriters(requiredWriters); + ColumnAccessorUtils.defineRequiredWriters(requiredWriters); } public static AbstractObjectWriter buildColumnWriter(ColumnMetadata schema, ValueVector vector) { diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ListVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ListVector.java index 45d91606a34..49bd510744c 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ListVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ListVector.java @@ -55,7 +55,7 @@ public class ListVector extends BaseRepeatedValueVector { public ListVector(MaterializedField field, BufferAllocator allocator, CallBack callBack) { super(field, allocator); - this.bits = new UInt1Vector(MaterializedField.create("$bits$", Types.required(MinorType.UINT1)), allocator); + this.bits = new UInt1Vector(MaterializedField.create(BITS_VECTOR_NAME, Types.required(MinorType.UINT1)), allocator); offsets = getOffsetVector(); this.field.addChild(getDataVector().getField()); this.writer = new UnionListWriter(this); From 77f5e901370c4c23195ac226d140e8f3eca5f71d Mon Sep 17 00:00:00 2001 From: Padma Penumarthy Date: Tue, 20 Mar 2018 13:44:50 -0700 Subject: [PATCH 36/44] DRILL-6284: Add operator metrics for batch sizing for flatten --- .../exec/ops/OperatorMetricRegistry.java | 2 + .../exec/physical/config/FlattenPOP.java | 4 +- .../impl/flatten/FlattenRecordBatch.java | 42 +++++++++++++++ .../AbstractRecordBatchMemoryManager.java | 53 +++++++++++++++++++ .../drill/exec/proto/UserBitShared.java | 20 +++++-- .../exec/proto/beans/CoreOperatorType.java | 4 +- .../src/main/protobuf/UserBitShared.proto | 1 + 7 files changed, 118 insertions(+), 8 deletions(-) diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java index 04243327127..b0291548b3b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java @@ -21,6 +21,7 @@ import org.apache.drill.exec.physical.impl.SingleSenderCreator; import org.apache.drill.exec.physical.impl.aggregate.HashAggTemplate; import org.apache.drill.exec.physical.impl.broadcastsender.BroadcastSenderRootExec; +import org.apache.drill.exec.physical.impl.flatten.FlattenRecordBatch; import org.apache.drill.exec.physical.impl.join.HashJoinBatch; import org.apache.drill.exec.physical.impl.mergereceiver.MergingRecordBatch; import org.apache.drill.exec.physical.impl.partitionsender.PartitionSenderRootExec; @@ -49,6 +50,7 @@ public class OperatorMetricRegistry { register(CoreOperatorType.HASH_JOIN_VALUE, HashJoinBatch.Metric.class); register(CoreOperatorType.EXTERNAL_SORT_VALUE, ExternalSortBatch.Metric.class); register(CoreOperatorType.PARQUET_ROW_GROUP_SCAN_VALUE, ParquetRecordReader.Metric.class); + register(CoreOperatorType.FLATTEN_VALUE, FlattenRecordBatch.Metric.class); } private static void register(final int operatorType, final Class metricDef) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java index 42e6870833a..f3499bf92da 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java @@ -27,6 +27,7 @@ import org.apache.drill.exec.physical.base.AbstractSingle; import org.apache.drill.exec.physical.base.PhysicalOperator; import org.apache.drill.exec.physical.base.PhysicalVisitor; +import org.apache.drill.exec.proto.UserBitShared; import java.util.Iterator; import java.util.List; @@ -67,7 +68,6 @@ protected PhysicalOperator getNewWithChild(PhysicalOperator child) { @Override public int getOperatorType() { - // TODO - add this operator to the protobuf definition - return 0; + return UserBitShared.CoreOperatorType.FLATTEN_VALUE; } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java index 7509809a29f..a1f783f5758 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java @@ -40,6 +40,7 @@ import org.apache.drill.exec.expr.ValueVectorReadExpression; import org.apache.drill.exec.expr.ValueVectorWriteExpression; import org.apache.drill.exec.ops.FragmentContext; +import org.apache.drill.exec.ops.MetricDef; import org.apache.drill.exec.physical.config.FlattenPOP; import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.record.AbstractSingleRecordBatch; @@ -99,6 +100,22 @@ private void clear() { } } + public enum Metric implements MetricDef { + INPUT_BATCH_COUNT, + AVG_INPUT_BATCH_BYTES, + AVG_INPUT_ROW_BYTES, + TOTAL_INPUT_RECORDS, + OUTPUT_BATCH_COUNT, + AVG_OUTPUT_BATCH_BYTES, + AVG_OUTPUT_ROW_BYTES, + TOTAL_OUTPUT_RECORDS; + + @Override + public int metricId() { + return ordinal(); + } + } + private class FlattenMemoryManager extends AbstractRecordBatchMemoryManager { @Override @@ -129,6 +146,8 @@ public void update() { // Number of rows in outgoing batch setOutputRowCount(outputBatchSize, avgOutgoingRowWidth); + setOutgoingRowWidth(avgOutgoingRowWidth); + // Limit to lower bound of total number of rows possible for this batch // i.e. all rows fit within memory budget. setOutputRowCount(Math.min(columnSize.getElementCount(), getOutputRowCount())); @@ -136,6 +155,8 @@ public void update() { logger.debug("flatten incoming batch sizer : {}, outputBatchSize : {}," + "avgOutgoingRowWidth : {}, outputRowCount : {}", getRecordBatchSizer(), outputBatchSize, avgOutgoingRowWidth, getOutputRowCount()); + + updateIncomingStats(); } } @@ -232,6 +253,7 @@ protected IterOutcome doWork() { container.buildSchema(SelectionVectorMode.NONE); } + flattenMemoryManager.updateOutgoingStats(outputRecords); return IterOutcome.OK; } @@ -265,6 +287,9 @@ private void handleRemainder() { if (complexWriters != null) { container.buildSchema(SelectionVectorMode.NONE); } + + flattenMemoryManager.updateOutgoingStats(projRecords); + } public void addComplexWriter(ComplexWriter writer) { @@ -466,4 +491,21 @@ private List getExpressionList() { } return exprs; } + + private void updateStats() { + stats.setLongStat(Metric.INPUT_BATCH_COUNT, flattenMemoryManager.getNumIncomingBatches()); + stats.setLongStat(Metric.AVG_INPUT_BATCH_BYTES, flattenMemoryManager.getAvgInputBatchSize()); + stats.setLongStat(Metric.AVG_INPUT_ROW_BYTES, flattenMemoryManager.getAvgInputRowWidth()); + stats.setLongStat(Metric.TOTAL_INPUT_RECORDS, flattenMemoryManager.getTotalInputRecords()); + stats.setLongStat(Metric.OUTPUT_BATCH_COUNT, flattenMemoryManager.getNumOutgoingBatches()); + stats.setLongStat(Metric.AVG_OUTPUT_BATCH_BYTES, flattenMemoryManager.getAvgOutputBatchSize()); + stats.setLongStat(Metric.AVG_OUTPUT_ROW_BYTES, flattenMemoryManager.getAvgOutputRowWidth()); + stats.setLongStat(Metric.TOTAL_OUTPUT_RECORDS, flattenMemoryManager.getTotalOutputRecords()); + } + + @Override + public void close() { + updateStats(); + super.close(); + } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractRecordBatchMemoryManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractRecordBatchMemoryManager.java index 1abd365834a..67c9cee9fca 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractRecordBatchMemoryManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractRecordBatchMemoryManager.java @@ -29,6 +29,48 @@ public abstract class AbstractRecordBatchMemoryManager { private int outgoingRowWidth; private RecordBatchSizer sizer; + /** + * operator metric stats + */ + private long numIncomingBatches; + private long sumInputBatchSizes; + private long totalInputRecords; + private long numOutgoingBatches; + private long sumOutputBatchSizes; + private long totalOutputRecords; + + public long getNumIncomingBatches() { + return numIncomingBatches; + } + + public long getTotalInputRecords() { + return totalInputRecords; + } + + public long getNumOutgoingBatches() { + return numOutgoingBatches; + } + + public long getTotalOutputRecords() { + return totalOutputRecords; + } + + public long getAvgInputBatchSize() { + return RecordBatchSizer.safeDivide(sumInputBatchSizes, numIncomingBatches); + } + + public long getAvgInputRowWidth() { + return RecordBatchSizer.safeDivide(sumInputBatchSizes, totalInputRecords); + } + + public long getAvgOutputBatchSize() { + return RecordBatchSizer.safeDivide(sumOutputBatchSizes, numOutgoingBatches); + } + + public long getAvgOutputRowWidth() { + return RecordBatchSizer.safeDivide(sumOutputBatchSizes, totalOutputRecords); + } + public void update(int inputIndex) {}; public void update() {}; @@ -78,4 +120,15 @@ public RecordBatchSizer.ColumnSize getColumnSize(String name) { return sizer.getColumn(name); } + public void updateIncomingStats() { + numIncomingBatches++; + sumInputBatchSizes += sizer.netSize(); + totalInputRecords += sizer.rowCount(); + } + + public void updateOutgoingStats(int outputRecords) { + numOutgoingBatches++; + totalOutputRecords += outputRecords; + sumOutputBatchSizes += outgoingRowWidth * outputRecords; + } } diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java index 6ae9deb4cc8..b2cc57d4d9a 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java @@ -525,6 +525,10 @@ public enum CoreOperatorType * KUDU_SUB_SCAN = 39; */ KUDU_SUB_SCAN(39, 39), + /** + * FLATTEN = 40; + */ + FLATTEN(40, 40), ; /** @@ -687,6 +691,10 @@ public enum CoreOperatorType * KUDU_SUB_SCAN = 39; */ public static final int KUDU_SUB_SCAN_VALUE = 39; + /** + * FLATTEN = 40; + */ + public static final int FLATTEN_VALUE = 40; public final int getNumber() { return value; } @@ -733,6 +741,7 @@ public static CoreOperatorType valueOf(int value) { case 37: return PCAP_SUB_SCAN; case 38: return KAFKA_SUB_SCAN; case 39: return KUDU_SUB_SCAN; + case 40: return FLATTEN; default: return null; } } @@ -24113,7 +24122,7 @@ public Builder clearStatus() { "agmentState\022\013\n\007SENDING\020\000\022\027\n\023AWAITING_ALL" + "OCATION\020\001\022\013\n\007RUNNING\020\002\022\014\n\010FINISHED\020\003\022\r\n\t" + "CANCELLED\020\004\022\n\n\006FAILED\020\005\022\032\n\026CANCELLATION_" + - "REQUESTED\020\006*\227\006\n\020CoreOperatorType\022\021\n\rSING" + + "REQUESTED\020\006*\244\006\n\020CoreOperatorType\022\021\n\rSING" + "LE_SENDER\020\000\022\024\n\020BROADCAST_SENDER\020\001\022\n\n\006FIL" + "TER\020\002\022\022\n\016HASH_AGGREGATE\020\003\022\r\n\tHASH_JOIN\020\004" + "\022\016\n\nMERGE_JOIN\020\005\022\031\n\025HASH_PARTITION_SENDE" + @@ -24133,10 +24142,11 @@ public Builder clearStatus() { "ASE_SUB_SCAN\020!\022\n\n\006WINDOW\020\"\022\024\n\020NESTED_LOO" + "P_JOIN\020#\022\021\n\rAVRO_SUB_SCAN\020$\022\021\n\rPCAP_SUB_" + "SCAN\020%\022\022\n\016KAFKA_SUB_SCAN\020&\022\021\n\rKUDU_SUB_S" + - "CAN\020\'*g\n\nSaslStatus\022\020\n\014SASL_UNKNOWN\020\000\022\016\n" + - "\nSASL_START\020\001\022\024\n\020SASL_IN_PROGRESS\020\002\022\020\n\014S" + - "ASL_SUCCESS\020\003\022\017\n\013SASL_FAILED\020\004B.\n\033org.ap" + - "ache.drill.exec.protoB\rUserBitSharedH\001" + "CAN\020\'\022\013\n\007FLATTEN\020(*g\n\nSaslStatus\022\020\n\014SASL" + + "_UNKNOWN\020\000\022\016\n\nSASL_START\020\001\022\024\n\020SASL_IN_PR" + + "OGRESS\020\002\022\020\n\014SASL_SUCCESS\020\003\022\017\n\013SASL_FAILE" + + "D\020\004B.\n\033org.apache.drill.exec.protoB\rUser" + + "BitSharedH\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java index 71595f72e99..dc3f158e7a1 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java @@ -61,7 +61,8 @@ public enum CoreOperatorType implements com.dyuproject.protostuff.EnumLite Date: Thu, 29 Mar 2018 19:05:07 -0700 Subject: [PATCH 37/44] DRILL-6296: Add operator metrics for batch sizing for merge join closes #1181 --- .../exec/ops/OperatorMetricRegistry.java | 2 + .../impl/flatten/FlattenRecordBatch.java | 28 ++- .../physical/impl/join/MergeJoinBatch.java | 90 ++++++- .../AbstractRecordBatchMemoryManager.java | 134 ---------- .../exec/record/RecordBatchMemoryManager.java | 228 ++++++++++++++++++ .../drill/exec/record/RecordIterator.java | 6 +- 6 files changed, 330 insertions(+), 158 deletions(-) delete mode 100644 exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractRecordBatchMemoryManager.java create mode 100644 exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java index b0291548b3b..0b9aeb6dc38 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java @@ -23,6 +23,7 @@ import org.apache.drill.exec.physical.impl.broadcastsender.BroadcastSenderRootExec; import org.apache.drill.exec.physical.impl.flatten.FlattenRecordBatch; import org.apache.drill.exec.physical.impl.join.HashJoinBatch; +import org.apache.drill.exec.physical.impl.join.MergeJoinBatch; import org.apache.drill.exec.physical.impl.mergereceiver.MergingRecordBatch; import org.apache.drill.exec.physical.impl.partitionsender.PartitionSenderRootExec; import org.apache.drill.exec.physical.impl.unorderedreceiver.UnorderedReceiverBatch; @@ -51,6 +52,7 @@ public class OperatorMetricRegistry { register(CoreOperatorType.EXTERNAL_SORT_VALUE, ExternalSortBatch.Metric.class); register(CoreOperatorType.PARQUET_ROW_GROUP_SCAN_VALUE, ParquetRecordReader.Metric.class); register(CoreOperatorType.FLATTEN_VALUE, FlattenRecordBatch.Metric.class); + register(CoreOperatorType.MERGE_JOIN_VALUE, MergeJoinBatch.Metric.class); } private static void register(final int operatorType, final Class metricDef) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java index a1f783f5758..aea415bb4e0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenRecordBatch.java @@ -45,7 +45,7 @@ import org.apache.drill.exec.record.RecordBatchSizer; import org.apache.drill.exec.record.AbstractSingleRecordBatch; import org.apache.drill.exec.record.BatchSchema.SelectionVectorMode; -import org.apache.drill.exec.record.AbstractRecordBatchMemoryManager; +import org.apache.drill.exec.record.RecordBatchMemoryManager; import org.apache.drill.exec.record.MaterializedField; import org.apache.drill.exec.record.RecordBatch; import org.apache.drill.exec.record.TransferPair; @@ -104,11 +104,11 @@ public enum Metric implements MetricDef { INPUT_BATCH_COUNT, AVG_INPUT_BATCH_BYTES, AVG_INPUT_ROW_BYTES, - TOTAL_INPUT_RECORDS, + INPUT_RECORD_COUNT, OUTPUT_BATCH_COUNT, AVG_OUTPUT_BATCH_BYTES, AVG_OUTPUT_ROW_BYTES, - TOTAL_OUTPUT_RECORDS; + OUTPUT_RECORD_COUNT; @Override public int metricId() { @@ -116,7 +116,7 @@ public int metricId() { } } - private class FlattenMemoryManager extends AbstractRecordBatchMemoryManager { + private class FlattenMemoryManager extends RecordBatchMemoryManager { @Override public void update() { @@ -152,9 +152,10 @@ public void update() { // i.e. all rows fit within memory budget. setOutputRowCount(Math.min(columnSize.getElementCount(), getOutputRowCount())); - logger.debug("flatten incoming batch sizer : {}, outputBatchSize : {}," + - "avgOutgoingRowWidth : {}, outputRowCount : {}", getRecordBatchSizer(), outputBatchSize, - avgOutgoingRowWidth, getOutputRowCount()); + logger.debug("incoming batch size : {}", getRecordBatchSizer()); + + logger.debug("output batch size : {}, avg outgoing rowWidth : {}, output rowCount : {}", + outputBatchSize, avgOutgoingRowWidth, getOutputRowCount()); updateIncomingStats(); } @@ -496,11 +497,20 @@ private void updateStats() { stats.setLongStat(Metric.INPUT_BATCH_COUNT, flattenMemoryManager.getNumIncomingBatches()); stats.setLongStat(Metric.AVG_INPUT_BATCH_BYTES, flattenMemoryManager.getAvgInputBatchSize()); stats.setLongStat(Metric.AVG_INPUT_ROW_BYTES, flattenMemoryManager.getAvgInputRowWidth()); - stats.setLongStat(Metric.TOTAL_INPUT_RECORDS, flattenMemoryManager.getTotalInputRecords()); + stats.setLongStat(Metric.INPUT_RECORD_COUNT, flattenMemoryManager.getTotalInputRecords()); stats.setLongStat(Metric.OUTPUT_BATCH_COUNT, flattenMemoryManager.getNumOutgoingBatches()); stats.setLongStat(Metric.AVG_OUTPUT_BATCH_BYTES, flattenMemoryManager.getAvgOutputBatchSize()); stats.setLongStat(Metric.AVG_OUTPUT_ROW_BYTES, flattenMemoryManager.getAvgOutputRowWidth()); - stats.setLongStat(Metric.TOTAL_OUTPUT_RECORDS, flattenMemoryManager.getTotalOutputRecords()); + stats.setLongStat(Metric.OUTPUT_RECORD_COUNT, flattenMemoryManager.getTotalOutputRecords()); + + logger.debug("input: batch count : {}, avg batch bytes : {}, avg row bytes : {}, record count : {}", + flattenMemoryManager.getNumIncomingBatches(), flattenMemoryManager.getAvgInputBatchSize(), + flattenMemoryManager.getAvgInputRowWidth(), flattenMemoryManager.getTotalInputRecords()); + + logger.debug("output: batch count : {}, avg batch bytes : {}, avg row bytes : {}, record count : {}", + flattenMemoryManager.getNumOutgoingBatches(), flattenMemoryManager.getAvgOutputBatchSize(), + flattenMemoryManager.getAvgOutputRowWidth(), flattenMemoryManager.getTotalOutputRecords()); + } @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java index 2155f0a734a..ab50b227f26 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinBatch.java @@ -44,6 +44,7 @@ import org.apache.drill.exec.expr.ExpressionTreeMaterializer; import org.apache.drill.exec.expr.fn.FunctionGenerationHelper; import org.apache.drill.exec.ops.FragmentContext; +import org.apache.drill.exec.ops.MetricDef; import org.apache.drill.exec.physical.config.MergeJoinPOP; import org.apache.drill.exec.physical.impl.common.Comparator; import org.apache.drill.exec.record.RecordBatchSizer; @@ -56,7 +57,7 @@ import org.apache.drill.exec.record.VectorContainer; import org.apache.drill.exec.record.VectorWrapper; import org.apache.drill.exec.record.AbstractRecordBatch; -import org.apache.drill.exec.record.AbstractRecordBatchMemoryManager; +import org.apache.drill.exec.record.RecordBatchMemoryManager; import org.apache.drill.exec.vector.ValueVector; import org.apache.drill.exec.vector.complex.AbstractContainerVector; @@ -109,12 +110,37 @@ public class MergeJoinBatch extends AbstractRecordBatch { private static final String LEFT_INPUT = "LEFT INPUT"; private static final String RIGHT_INPUT = "RIGHT INPUT"; - private class MergeJoinMemoryManager extends AbstractRecordBatchMemoryManager { + private static final int numInputs = 2; + private static final int LEFT_INDEX = 0; + private static final int RIGHT_INDEX = 1; + + public enum Metric implements MetricDef { + LEFT_INPUT_BATCH_COUNT, + LEFT_AVG_INPUT_BATCH_BYTES, + LEFT_AVG_INPUT_ROW_BYTES, + LEFT_INPUT_RECORD_COUNT, + RIGHT_INPUT_BATCH_COUNT, + RIGHT_AVG_INPUT_BATCH_BYTES, + RIGHT_AVG_INPUT_ROW_BYTES, + RIGHT_INPUT_RECORD_COUNT, + OUTPUT_BATCH_COUNT, + AVG_OUTPUT_BATCH_BYTES, + AVG_OUTPUT_ROW_BYTES, + OUTPUT_RECORD_COUNT; + + @Override + public int metricId() { + return ordinal(); + } + } + + private class MergeJoinMemoryManager extends RecordBatchMemoryManager { private int leftRowWidth; private int rightRowWidth; - private RecordBatchSizer leftSizer; - private RecordBatchSizer rightSizer; + public MergeJoinMemoryManager() { + super(numInputs); + } /** * mergejoin operates on one record at a time from the left and right batches @@ -127,17 +153,20 @@ private class MergeJoinMemoryManager extends AbstractRecordBatchMemoryManager { @Override public void update(int inputIndex) { switch(inputIndex) { - case 0: - leftSizer = new RecordBatchSizer(left); - leftRowWidth = leftSizer.netRowWidth(); + case LEFT_INDEX: + setRecordBatchSizer(inputIndex, new RecordBatchSizer(left)); + leftRowWidth = getRecordBatchSizer(inputIndex).netRowWidth(); + logger.debug("left incoming batch size : {}", getRecordBatchSizer(inputIndex)); break; - case 1: - rightSizer = new RecordBatchSizer(right); - rightRowWidth = rightSizer.netRowWidth(); + case RIGHT_INDEX: + setRecordBatchSizer(inputIndex, new RecordBatchSizer(right)); + rightRowWidth = getRecordBatchSizer(inputIndex).netRowWidth(); + logger.debug("right incoming batch size : {}", getRecordBatchSizer(inputIndex)); default: break; } + updateIncomingStats(inputIndex); final int newOutgoingRowWidth = leftRowWidth + rightRowWidth; // If outgoing row width is 0, just return. This is possible for empty batches or @@ -153,16 +182,22 @@ public void update(int inputIndex) { // calculate memory used so far based on previous outgoing row width and how many rows we already processed. final long memoryUsed = status.getOutPosition() * getOutgoingRowWidth(); // This is the remaining memory. - final long remainingMemory = Math.max(outputBatchSize/WORST_CASE_FRAGMENTATION_FACTOR - memoryUsed, 0); + final long remainingMemory = Math.max(outputBatchSize - memoryUsed, 0); // These are number of rows we can fit in remaining memory based on new outgoing row width. final int numOutputRowsRemaining = RecordBatchSizer.safeDivide(remainingMemory, newOutgoingRowWidth); - status.setTargetOutputRowCount(status.getOutPosition() + numOutputRowsRemaining); + status.setTargetOutputRowCount(adjustOutputRowCount(status.getOutPosition() + numOutputRowsRemaining)); setOutgoingRowWidth(newOutgoingRowWidth); + + logger.debug("output batch size : {}, avg outgoing rowWidth : {}, output rowCount : {}", + outputBatchSize, getOutgoingRowWidth(), getOutputRowCount()); } @Override public RecordBatchSizer.ColumnSize getColumnSize(String name) { + RecordBatchSizer leftSizer = getRecordBatchSizer(LEFT_INDEX); + RecordBatchSizer rightSizer = getRecordBatchSizer(RIGHT_INDEX); + if (leftSizer != null && leftSizer.getColumn(name) != null) { return leftSizer.getColumn(name); } @@ -324,10 +359,12 @@ private void setRecordCountInContainer() { Preconditions.checkArgument(!vw.isHyper()); vw.getValueVector().getMutator().setValueCount(getRecordCount()); } + mergeJoinMemoryManager.updateOutgoingStats(getRecordCount()); } @Override public void close() { + updateStats(); super.close(); leftIterator.close(); rightIterator.close(); @@ -573,4 +610,33 @@ private LogicalExpression materializeExpression(LogicalExpression expression, It } return materializedExpr; } + + private void updateStats() { + stats.setLongStat(MergeJoinBatch.Metric.LEFT_INPUT_BATCH_COUNT, mergeJoinMemoryManager.getNumIncomingBatches(LEFT_INDEX)); + stats.setLongStat(MergeJoinBatch.Metric.LEFT_AVG_INPUT_BATCH_BYTES, mergeJoinMemoryManager.getAvgInputBatchSize(LEFT_INDEX)); + stats.setLongStat(MergeJoinBatch.Metric.LEFT_AVG_INPUT_ROW_BYTES, mergeJoinMemoryManager.getAvgInputRowWidth(LEFT_INDEX)); + stats.setLongStat(Metric.LEFT_INPUT_RECORD_COUNT, mergeJoinMemoryManager.getTotalInputRecords(LEFT_INDEX)); + + stats.setLongStat(MergeJoinBatch.Metric.RIGHT_INPUT_BATCH_COUNT, mergeJoinMemoryManager.getNumIncomingBatches(RIGHT_INDEX)); + stats.setLongStat(MergeJoinBatch.Metric.RIGHT_AVG_INPUT_BATCH_BYTES, mergeJoinMemoryManager.getAvgInputBatchSize(RIGHT_INDEX)); + stats.setLongStat(MergeJoinBatch.Metric.RIGHT_AVG_INPUT_ROW_BYTES, mergeJoinMemoryManager.getAvgInputRowWidth(RIGHT_INDEX)); + stats.setLongStat(Metric.RIGHT_INPUT_RECORD_COUNT, mergeJoinMemoryManager.getTotalInputRecords(RIGHT_INDEX)); + + stats.setLongStat(MergeJoinBatch.Metric.OUTPUT_BATCH_COUNT, mergeJoinMemoryManager.getNumOutgoingBatches()); + stats.setLongStat(MergeJoinBatch.Metric.AVG_OUTPUT_BATCH_BYTES, mergeJoinMemoryManager.getAvgOutputBatchSize()); + stats.setLongStat(MergeJoinBatch.Metric.AVG_OUTPUT_ROW_BYTES, mergeJoinMemoryManager.getAvgOutputRowWidth()); + stats.setLongStat(MergeJoinBatch.Metric.OUTPUT_RECORD_COUNT, mergeJoinMemoryManager.getTotalOutputRecords()); + + logger.debug("left input: batch count : {}, avg batch bytes : {}, avg row bytes : {}, record count : {}", + mergeJoinMemoryManager.getNumIncomingBatches(LEFT_INDEX), mergeJoinMemoryManager.getAvgInputBatchSize(LEFT_INDEX), + mergeJoinMemoryManager.getAvgInputRowWidth(LEFT_INDEX), mergeJoinMemoryManager.getTotalInputRecords(LEFT_INDEX)); + + logger.debug("right input: batch count : {}, avg batch bytes : {}, avg row bytes : {}, record count : {}", + mergeJoinMemoryManager.getNumIncomingBatches(RIGHT_INDEX), mergeJoinMemoryManager.getAvgInputBatchSize(RIGHT_INDEX), + mergeJoinMemoryManager.getAvgInputRowWidth(RIGHT_INDEX), mergeJoinMemoryManager.getTotalInputRecords(RIGHT_INDEX)); + + logger.debug("output: batch count : {}, avg batch bytes : {}, avg row bytes : {}, record count : {}", + mergeJoinMemoryManager.getNumOutgoingBatches(), mergeJoinMemoryManager.getAvgOutputBatchSize(), + mergeJoinMemoryManager.getAvgOutputRowWidth(), mergeJoinMemoryManager.getTotalOutputRecords()); + } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractRecordBatchMemoryManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractRecordBatchMemoryManager.java deleted file mode 100644 index 67c9cee9fca..00000000000 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractRecordBatchMemoryManager.java +++ /dev/null @@ -1,134 +0,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. - */ - -package org.apache.drill.exec.record; - -import org.apache.drill.exec.vector.ValueVector; - -public abstract class AbstractRecordBatchMemoryManager { - protected static final int OFFSET_VECTOR_WIDTH = 4; - protected static final int WORST_CASE_FRAGMENTATION_FACTOR = 2; - protected static final int MAX_NUM_ROWS = ValueVector.MAX_ROW_COUNT; - protected static final int MIN_NUM_ROWS = 1; - private int outputRowCount = MAX_NUM_ROWS; - private int outgoingRowWidth; - private RecordBatchSizer sizer; - - /** - * operator metric stats - */ - private long numIncomingBatches; - private long sumInputBatchSizes; - private long totalInputRecords; - private long numOutgoingBatches; - private long sumOutputBatchSizes; - private long totalOutputRecords; - - public long getNumIncomingBatches() { - return numIncomingBatches; - } - - public long getTotalInputRecords() { - return totalInputRecords; - } - - public long getNumOutgoingBatches() { - return numOutgoingBatches; - } - - public long getTotalOutputRecords() { - return totalOutputRecords; - } - - public long getAvgInputBatchSize() { - return RecordBatchSizer.safeDivide(sumInputBatchSizes, numIncomingBatches); - } - - public long getAvgInputRowWidth() { - return RecordBatchSizer.safeDivide(sumInputBatchSizes, totalInputRecords); - } - - public long getAvgOutputBatchSize() { - return RecordBatchSizer.safeDivide(sumOutputBatchSizes, numOutgoingBatches); - } - - public long getAvgOutputRowWidth() { - return RecordBatchSizer.safeDivide(sumOutputBatchSizes, totalOutputRecords); - } - - public void update(int inputIndex) {}; - - public void update() {}; - - public int getOutputRowCount() { - return outputRowCount; - } - - /** - * Given batchSize and rowWidth, this will set output rowCount taking into account - * the min and max that is allowed. - */ - public void setOutputRowCount(int targetBatchSize, int rowWidth) { - this.outputRowCount = adjustOutputRowCount(RecordBatchSizer.safeDivide(targetBatchSize, rowWidth)); - } - - public void setOutputRowCount(int outputRowCount) { - this.outputRowCount = outputRowCount; - } - - /** - * This will adjust rowCount taking into account the min and max that is allowed. - * We will round down to nearest power of two - 1 for better memory utilization. - * -1 is done for adjusting accounting for offset vectors. - */ - public static int adjustOutputRowCount(int rowCount) { - return (Math.min(MAX_NUM_ROWS, Math.max(Integer.highestOneBit(rowCount) - 1, MIN_NUM_ROWS))); - } - - public void setOutgoingRowWidth(int outgoingRowWidth) { - this.outgoingRowWidth = outgoingRowWidth; - } - - public int getOutgoingRowWidth() { - return outgoingRowWidth; - } - - public void setRecordBatchSizer(RecordBatchSizer sizer) { - this.sizer = sizer; - } - - public RecordBatchSizer getRecordBatchSizer() { - return sizer; - } - - public RecordBatchSizer.ColumnSize getColumnSize(String name) { - return sizer.getColumn(name); - } - - public void updateIncomingStats() { - numIncomingBatches++; - sumInputBatchSizes += sizer.netSize(); - totalInputRecords += sizer.rowCount(); - } - - public void updateOutgoingStats(int outputRecords) { - numOutgoingBatches++; - totalOutputRecords += outputRecords; - sumOutputBatchSizes += outgoingRowWidth * outputRecords; - } -} diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java new file mode 100644 index 00000000000..a8bb2594c94 --- /dev/null +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java @@ -0,0 +1,228 @@ +/* + * 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 org.apache.drill.exec.record; + +import com.google.common.base.Preconditions; +import org.apache.drill.exec.vector.ValueVector; + +public class RecordBatchMemoryManager { + protected static final int OFFSET_VECTOR_WIDTH = 4; + protected static final int MAX_NUM_ROWS = ValueVector.MAX_ROW_COUNT; + protected static final int MIN_NUM_ROWS = 1; + protected static final int DEFAULT_INPUT_INDEX = 0; + private int outputRowCount = MAX_NUM_ROWS; + private int outgoingRowWidth; + private RecordBatchSizer[] sizer; + private BatchStats[] inputBatchStats; + private BatchStats outputBatchStats; + + // By default, we expect one input batch stream and one output batch stream. + // Some operators can get multiple input batch streams i.e. for example + // joins get 2 batches (left and right). Merge Receiver can get more than 2. + private int numInputs = 1; + + private class BatchStats { + /** + * operator metric stats + */ + private long numBatches; + private long sumBatchSizes; + private long totalRecords; + + public long getNumBatches() { + return numBatches; + } + + public long getTotalRecords() { + return totalRecords; + } + + public long getAvgBatchSize() { + return RecordBatchSizer.safeDivide(sumBatchSizes, numBatches); + } + + public long getAvgRowWidth() { + return RecordBatchSizer.safeDivide(sumBatchSizes, totalRecords); + } + + public void incNumBatches() { + ++numBatches; + } + + public void incSumBatchSizes(long batchSize) { + sumBatchSizes += batchSize; + } + + public void incTotalRecords(long numRecords) { + totalRecords += numRecords; + } + + } + + public long getNumOutgoingBatches() { + return outputBatchStats.getNumBatches(); + } + + public long getTotalOutputRecords() { + return outputBatchStats.getTotalRecords(); + } + + public long getAvgOutputBatchSize() { + return outputBatchStats.getAvgBatchSize(); + } + + public long getAvgOutputRowWidth() { + return outputBatchStats.getAvgRowWidth(); + } + + public long getNumIncomingBatches() { + return inputBatchStats[DEFAULT_INPUT_INDEX].getNumBatches(); + } + + public long getAvgInputBatchSize() { + return inputBatchStats[DEFAULT_INPUT_INDEX].getAvgBatchSize(); + } + + public long getAvgInputRowWidth() { + return inputBatchStats[DEFAULT_INPUT_INDEX].getAvgRowWidth(); + } + + public long getTotalInputRecords() { + return inputBatchStats[DEFAULT_INPUT_INDEX].getTotalRecords(); + } + + public long getNumIncomingBatches(int index) { + Preconditions.checkArgument(index >= 0 && index < numInputs); + return inputBatchStats[index] == null ? 0 : inputBatchStats[index].getNumBatches(); + } + + public long getAvgInputBatchSize(int index) { + Preconditions.checkArgument(index >= 0 && index < numInputs); + return inputBatchStats[index] == null ? 0 : inputBatchStats[index].getAvgBatchSize(); + } + + public long getAvgInputRowWidth(int index) { + Preconditions.checkArgument(index >= 0 && index < numInputs); + return inputBatchStats[index] == null ? 0 : inputBatchStats[index].getAvgRowWidth(); + } + + public long getTotalInputRecords(int index) { + Preconditions.checkArgument(index >= 0 && index < numInputs); + return inputBatchStats[index] == null ? 0 : inputBatchStats[index].getTotalRecords(); + } + + public RecordBatchMemoryManager(int numInputs) { + this.numInputs = numInputs; + sizer = new RecordBatchSizer[numInputs]; + inputBatchStats = new BatchStats[numInputs]; + outputBatchStats = new BatchStats(); + } + + public RecordBatchMemoryManager() { + sizer = new RecordBatchSizer[numInputs]; + inputBatchStats = new BatchStats[numInputs]; + outputBatchStats = new BatchStats(); + } + + public void update(int inputIndex) {}; + + public void update() {}; + + public int getOutputRowCount() { + return outputRowCount; + } + + /** + * Given batchSize and rowWidth, this will set output rowCount taking into account + * the min and max that is allowed. + */ + public void setOutputRowCount(int targetBatchSize, int rowWidth) { + this.outputRowCount = adjustOutputRowCount(RecordBatchSizer.safeDivide(targetBatchSize, rowWidth)); + } + + public void setOutputRowCount(int outputRowCount) { + this.outputRowCount = outputRowCount; + } + + /** + * This will adjust rowCount taking into account the min and max that is allowed. + * We will round down to nearest power of two - 1 for better memory utilization. + * -1 is done for adjusting accounting for offset vectors. + */ + public static int adjustOutputRowCount(int rowCount) { + return (Math.min(MAX_NUM_ROWS, Math.max(Integer.highestOneBit(rowCount) - 1, MIN_NUM_ROWS))); + } + + public void setOutgoingRowWidth(int outgoingRowWidth) { + this.outgoingRowWidth = outgoingRowWidth; + } + + public int getOutgoingRowWidth() { + return outgoingRowWidth; + } + + public void setRecordBatchSizer(int index, RecordBatchSizer sizer) { + Preconditions.checkArgument(index >= 0 && index < numInputs); + this.sizer[index] = sizer; + inputBatchStats[index] = new BatchStats(); + } + + public void setRecordBatchSizer(RecordBatchSizer sizer) { + this.sizer[DEFAULT_INPUT_INDEX] = sizer; + inputBatchStats[DEFAULT_INPUT_INDEX] = new BatchStats(); + } + + public RecordBatchSizer getRecordBatchSizer(int index) { + Preconditions.checkArgument(index >= 0 && index < numInputs); + return sizer[index]; + } + + public RecordBatchSizer getRecordBatchSizer() { + return sizer[DEFAULT_INPUT_INDEX]; + } + + public RecordBatchSizer.ColumnSize getColumnSize(int index, String name) { + Preconditions.checkArgument(index >= 0 && index < numInputs); + return sizer[index].getColumn(name); + } + + public RecordBatchSizer.ColumnSize getColumnSize(String name) { + return sizer[DEFAULT_INPUT_INDEX].getColumn(name); + } + + public void updateIncomingStats(int index) { + Preconditions.checkArgument(index >= 0 && index < numInputs); + Preconditions.checkArgument(inputBatchStats[index] != null); + inputBatchStats[index].incNumBatches(); + inputBatchStats[index].incSumBatchSizes(sizer[index].netSize()); + inputBatchStats[index].incTotalRecords(sizer[index].rowCount()); + } + + public void updateIncomingStats() { + inputBatchStats[DEFAULT_INPUT_INDEX].incNumBatches(); + inputBatchStats[DEFAULT_INPUT_INDEX].incSumBatchSizes(sizer[DEFAULT_INPUT_INDEX].netSize()); + inputBatchStats[DEFAULT_INPUT_INDEX].incTotalRecords(sizer[DEFAULT_INPUT_INDEX].rowCount()); + } + + public void updateOutgoingStats(int outputRecords) { + outputBatchStats.incNumBatches(); + outputBatchStats.incTotalRecords(outputRecords); + outputBatchStats.incSumBatchSizes(outgoingRowWidth * outputRecords); + } +} diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordIterator.java index 32c69ce1dd5..072a5cb5fcb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordIterator.java @@ -57,12 +57,12 @@ public class RecordIterator implements VectorAccessible { private final VectorContainer container; // Holds VectorContainer of current record batch private final TreeRangeMap batches = TreeRangeMap.create(); - private final AbstractRecordBatchMemoryManager newBatchCallBack; + private final RecordBatchMemoryManager newBatchCallBack; public RecordIterator(RecordBatch incoming, AbstractRecordBatch outgoing, OperatorContext oContext, - int inputIndex, AbstractRecordBatchMemoryManager callBack) { + int inputIndex, RecordBatchMemoryManager callBack) { this(incoming, outgoing, oContext, inputIndex, true, callBack); } @@ -71,7 +71,7 @@ public RecordIterator(RecordBatch incoming, OperatorContext oContext, int inputIndex, boolean enableMarkAndReset, - AbstractRecordBatchMemoryManager callBack) { + RecordBatchMemoryManager callBack) { this.incoming = incoming; this.outgoing = outgoing; this.inputIndex = inputIndex; From 6370ed630b6bc56972d8893618773b2176846085 Mon Sep 17 00:00:00 2001 From: Kunal Khatua Date: Mon, 2 Apr 2018 22:35:53 -0700 Subject: [PATCH 38/44] DRILL-143: Support CGROUPs resource management Introduces the DRILLBIT_CGROUP option in drill-env.sh. The startup script checks if the specified CGroup (ver 2) is available and tries to apply it to the launched Drillbit JVM. This would benefit not just Drill-on-YARN usecases, but any setup that would like CGroups for enforcement of (cpu) resources management. (Also introduced SYS_CGROUP_DIR to account for possible non default locations of CGroup). e.g when Drillbit is configured to use `drillcpu` cgroup ``` [root@maprlabs ~]# /opt/mapr/drill/apache-drill-1.14.0-SNAPSHOT/bin/drillbit.sh restart Stopping drillbit .. Starting drillbit, logging to /var/log/drill/drillbit.out WARN: Drillbit's CPU resource usage will be managed under the CGroup : drillcpu (up to 4.00 cores allowed) ``` e.g. Non-existent CGroup `droolcpu` is used ``` [root@kk127 ~]# /opt/mapr/drill/apache-drill-1.14.0-SNAPSHOT/bin/drillbit.sh restart Stopping drillbit .. Starting drillbit, logging to /var/log/drill/drillbit.out ERROR: cgroup droolcpu does not found. Ensure that daemon is running and cgroup exists ``` closes #1200 --- distribution/src/resources/drill-env.sh | 10 +++++++ distribution/src/resources/drillbit.sh | 39 +++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/distribution/src/resources/drill-env.sh b/distribution/src/resources/drill-env.sh index 351d8673681..4dd52aa1f55 100755 --- a/distribution/src/resources/drill-env.sh +++ b/distribution/src/resources/drill-env.sh @@ -86,6 +86,16 @@ #export DRILL_PID_DIR=${DRILL_PID_DIR:-$DRILL_HOME} +# Default (Standard) CGroup Location: /sys/fs/cgroup +# Specify the cgroup location if it is different from the default +#export SYS_CGROUP_DIR=${SYS_CGROUP_DIR:-"/sys/fs/cgroup"} + +# CGroup to which the Drillbit belongs when running as a daemon using drillbit.sh start . +# Drill will use CGroup for CPU enforcement only. + +# Unset $DRILLBIT_CGROUP by default +#export DRILLBIT_CGROUP=${DRILLBIT_CGROUP:-"drillcpu"} + # Custom JVM arguments to pass to the both the Drillbit and sqlline. Typically # used to override system properties as shown below. Empty by default. diff --git a/distribution/src/resources/drillbit.sh b/distribution/src/resources/drillbit.sh index 11a124ec55e..3634753cdcc 100755 --- a/distribution/src/resources/drillbit.sh +++ b/distribution/src/resources/drillbit.sh @@ -127,6 +127,42 @@ check_before_start() fi } +check_after_start(){ + dbitPid=$1; + # Check and enforce for CGroup + if [ -n "$DRILLBIT_CGROUP" ]; then + check_and_enforce_cgroup $dbitPid + fi +} + +check_and_enforce_cgroup(){ + dbitPid=$1; + kill -0 $dbitPid + if [ $? -gt 0 ]; then + echo "ERROR: Failed to add Drillbit to CGroup ( $DRILLBIT_CGROUP ) for 'cpu'. Ensure that the Drillbit ( pid=$dbitPid ) started up." >&2 + exit 1 + fi + SYS_CGROUP_DIR=${SYS_CGROUP_DIR:-"/sys/fs/cgroup"} + if [ -f $SYS_CGROUP_DIR/cpu/$DRILLBIT_CGROUP/cgroup.procs ]; then + echo $dbitPid > $SYS_CGROUP_DIR/cpu/$DRILLBIT_CGROUP/cgroup.procs + # Verify Enforcement + cgroupStatus=`grep -w $pid $SYS_CGROUP_DIR/cpu/${DRILLBIT_CGROUP}/cgroup.procs` + if [ -z "$cgroupStatus" ]; then + #Ref: https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt + cpu_quota=`cat ${SYS_CGROUP_DIR}/cpu/${DRILLBIT_CGROUP}/cpu.cfs_quota_us` + cpu_period=`cat ${SYS_CGROUP_DIR}/cpu/${DRILLBIT_CGROUP}/cpu.cfs_period_us` + if [ $cpu_period -gt 0 ] && [ $cpu_quota -gt 0 ]; then + coresAllowed=`echo $(( 100 * $cpu_quota / $cpu_period )) | sed 's/..$/.&/'` + echo "INFO: CGroup (drillcpu) will limit Drill to $coresAllowed cpu(s)" + fi + else + echo "ERROR: Failed to add Drillbit to CGroup ( $DRILLBIT_CGROUP ) for 'cpu'. Ensure that the cgroup manages 'cpu'" >&2 + fi + else + echo "ERROR: CGroup $DRILLBIT_CGROUP not found. Ensure that daemon is running, SYS_CGROUP_DIR is correctly set (currently, $SYS_CGROUP_DIR ), and that the CGroup exists" >&2 + fi +} + wait_until_done () { p=$1 @@ -152,8 +188,11 @@ start_bit ( ) echo "`date` Starting $command on `hostname`" >> "$DRILLBIT_LOG_PATH" echo "`ulimit -a`" >> "$DRILLBIT_LOG_PATH" 2>&1 nohup nice -n $DRILL_NICENESS "$DRILL_HOME/bin/runbit" exec ${args[@]} >> "$logout" 2>&1 & + procId=$! + echo $procId > $pid # Yeah, $pid is a file, $procId is the pid... echo $! > $pid sleep 1 + check_after_start $procId } stop_bit ( ) From ead1e9d6325893fde17076b704a1d4b4a94ccef3 Mon Sep 17 00:00:00 2001 From: dvjyothsna Date: Thu, 29 Mar 2018 11:16:56 -0700 Subject: [PATCH 39/44] DRILL-6273: Removed dependency licensed under Category X closes #1195 --- pom.xml | 1 + tools/fmpp/pom.xml | 4 ++++ tools/fmpp/src/main/java/bsh/EvalError.java | 24 +++++++++++++++++++ .../fmpp/src/main/java/bsh/package-info.java | 24 +++++++++++++++++++ 4 files changed, 53 insertions(+) create mode 100644 tools/fmpp/src/main/java/bsh/EvalError.java create mode 100644 tools/fmpp/src/main/java/bsh/package-info.java diff --git a/pom.xml b/pom.xml index b9d395d0715..4b6942696fb 100644 --- a/pom.xml +++ b/pom.xml @@ -380,6 +380,7 @@ log4j:log4j jdk.tools:jdk.tools org.json:json + org.beanshell:bsh diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml index 0770d176d05..708c9b9348d 100644 --- a/tools/fmpp/pom.xml +++ b/tools/fmpp/pom.xml @@ -57,6 +57,10 @@ commons-logging-api commons-logging + + bsh + org.beanshell + diff --git a/tools/fmpp/src/main/java/bsh/EvalError.java b/tools/fmpp/src/main/java/bsh/EvalError.java new file mode 100644 index 00000000000..09737e61a78 --- /dev/null +++ b/tools/fmpp/src/main/java/bsh/EvalError.java @@ -0,0 +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. + */ +package bsh; + +public class EvalError extends Exception { + private EvalError() { + } +} + diff --git a/tools/fmpp/src/main/java/bsh/package-info.java b/tools/fmpp/src/main/java/bsh/package-info.java new file mode 100644 index 00000000000..d40c5f411e6 --- /dev/null +++ b/tools/fmpp/src/main/java/bsh/package-info.java @@ -0,0 +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. + */ + + /** + * Generate-fmpp has a dependency on beanshell EvalError. Beanshell doesn't have a valid + * Apache License, So beanshell is excluded and EvalError class is added to handle the dependency. + */ + +package bsh; From 379196970a0eb4d1c1059902b5daa0673dfb7fbf Mon Sep 17 00:00:00 2001 From: Volodymyr Vysotskyi Date: Wed, 7 Feb 2018 16:24:50 +0200 Subject: [PATCH 40/44] DRILL-6294: Changes to support Calcite 1.16.0 , and remove deprecated API usage closes #1198 --- .../drill/exec/store/jdbc/JdbcPrel.java | 2 +- .../exec/store/jdbc/JdbcStoragePlugin.java | 6 ++- .../drill/exec/planner/RuleInstance.java | 4 +- .../planner/common/DrillFilterRelBase.java | 3 +- .../exec/planner/common/DrillJoinRelBase.java | 6 ++- .../planner/common/DrillProjectRelBase.java | 4 +- .../exec/planner/common/DrillRelOptUtil.java | 27 ++++++------ .../exec/planner/cost/DrillCostBase.java | 9 ++-- .../cost/DrillRelMdDistinctRowCount.java | 2 +- .../planner/logical/DrillConstExecutor.java | 2 +- .../DrillPushFilterPastProjectRule.java | 13 +++--- .../logical/DrillPushLimitToScanRule.java | 17 +++----- .../logical/DrillReduceAggregatesRule.java | 37 +++++++++-------- .../logical/DrillReduceExpressionsRule.java | 4 +- .../exec/planner/logical/DrillSortRel.java | 7 ++-- .../logical/partition/PruneScanRule.java | 6 +-- .../exec/planner/physical/AggPrelBase.java | 10 ----- .../physical/HashToRandomExchangePrel.java | 12 +++--- .../drill/exec/planner/physical/JoinPrel.java | 20 ++++----- .../exec/planner/physical/MergeJoinPrule.java | 11 ++--- .../planner/physical/PhysicalPlanCreator.java | 4 +- .../exec/planner/physical/ProjectPrule.java | 14 +++---- .../exec/planner/physical/StreamAggPrule.java | 6 +-- .../exec/planner/physical/WindowPrule.java | 12 ++---- .../exec/planner/physical/WriterPrule.java | 8 ++-- .../physical/explain/NumberingRelWriter.java | 3 +- .../visitor/ExcessiveExchangeIdentifier.java | 10 ++--- .../physical/visitor/StarColumnConverter.java | 41 ++++++++++--------- .../physical/visitor/SwapHashJoinVisitor.java | 12 +++--- .../exec/planner/sql/DrillSqlAggOperator.java | 6 ++- .../drill/exec/planner/sql/SqlConverter.java | 15 ++++--- .../exec/planner/sql/TypeInferenceUtils.java | 1 + .../sql/handlers/DefaultSqlHandler.java | 3 +- .../planner/sql/handlers/SqlHandlerUtil.java | 8 ++-- .../parser/UnsupportedOperatorsVisitor.java | 22 +++++----- .../store/parquet/ParquetPushDownFilter.java | 8 ++-- exec/jdbc-all/pom.xml | 2 +- .../apache/drill/jdbc/impl/DrillMetaImpl.java | 2 + .../drill/jdbc/impl/DrillResultSetImpl.java | 26 ++++-------- pom.xml | 4 +- 40 files changed, 194 insertions(+), 215 deletions(-) diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcPrel.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcPrel.java index 63752fa801b..abeca2302d8 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcPrel.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcPrel.java @@ -52,7 +52,7 @@ public class JdbcPrel extends AbstractRelNode implements Prel { public JdbcPrel(RelOptCluster cluster, RelTraitSet traitSet, JdbcIntermediatePrel prel) { super(cluster, traitSet); final RelNode input = prel.getInput(); - rows = input.getRows(); + rows = input.estimateRowCount(cluster.getMetadataQuery()); convention = (DrillJdbcConvention) input.getTraitSet().getTrait(ConventionTraitDef.INSTANCE); // generate sql for tree. diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java index 47f0f21cedf..6502e24d00c 100755 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStoragePlugin.java @@ -38,6 +38,7 @@ import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.convert.ConverterRule; +import org.apache.calcite.rel.rel2sql.SqlImplementor; import org.apache.calcite.rex.RexCall; import org.apache.calcite.rex.RexInputRef; import org.apache.calcite.rex.RexNode; @@ -46,6 +47,7 @@ import org.apache.calcite.schema.SchemaPlus; import org.apache.calcite.schema.Table; import org.apache.calcite.sql.SqlDialect; +import org.apache.calcite.sql.SqlDialectFactoryImpl; import org.apache.commons.dbcp.BasicDataSource; import org.apache.drill.common.JSONOptions; import org.apache.drill.common.expression.SchemaPath; @@ -101,7 +103,7 @@ public JdbcStoragePlugin(JdbcStorageConfig config, DrillbitContext context, Stri } this.source = source; - this.dialect = JdbcSchema.createDialect(source); + this.dialect = JdbcSchema.createDialect(SqlDialectFactoryImpl.INSTANCE, source); this.convention = new DrillJdbcConvention(dialect, name); } @@ -163,7 +165,7 @@ public JdbcStoragePlugin getPlugin() { * Returns whether a condition is supported by {@link JdbcJoin}. * *

    Corresponds to the capabilities of - * {@link JdbcJoin#convertConditionToSqlNode}. + * {@link SqlImplementor#convertConditionToSqlNode}. * * @param node Condition * @return Whether condition is supported diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java index a390ff49544..67ddf0691b6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java @@ -44,7 +44,7 @@ public interface RuleInstance { ReduceExpressionsRule PROJECT_INSTANCE = - new ReduceExpressionsRule.ProjectReduceExpressionsRule(LogicalProject.class, + new ReduceExpressionsRule.ProjectReduceExpressionsRule(LogicalProject.class, true, DrillRelFactories.LOGICAL_BUILDER); UnionToDistinctRule UNION_TO_DISTINCT_RULE = @@ -82,7 +82,7 @@ public interface RuleInstance { LogicalJoin.class, DrillRelFactories.LOGICAL_BUILDER); ReduceExpressionsRule CALC_INSTANCE = - new ReduceExpressionsRule.CalcReduceExpressionsRule(LogicalCalc.class, + new ReduceExpressionsRule.CalcReduceExpressionsRule(LogicalCalc.class, true, DrillRelFactories.LOGICAL_BUILDER); FilterSetOpTransposeRule FILTER_SET_OP_TRANSPOSE_RULE = diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillFilterRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillFilterRelBase.java index b87e974315b..b0bca286a48 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillFilterRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillFilterRelBase.java @@ -17,6 +17,7 @@ */ package org.apache.drill.exec.planner.common; +import org.apache.calcite.rel.metadata.RelMdUtil; import org.apache.drill.common.expression.LogicalExpression; import org.apache.drill.exec.planner.cost.DrillCostBase; import org.apache.drill.exec.planner.cost.DrillCostBase.DrillCostFactory; @@ -90,7 +91,7 @@ private double estimateCpuCost(RelMetadataQuery mq) { for (int i = 0; i< numConjuncts; i++) { RexNode conjFilter = RexUtil.composeConjunction(this.getCluster().getRexBuilder(), conjunctions.subList(0, i + 1), false); - compNum += Filter.estimateFilteredRows(child, conjFilter); + compNum += RelMdUtil.estimateFilteredRows(child, conjFilter, mq); } return compNum * DrillCostBase.COMPARE_CPU_COST; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillJoinRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillJoinRelBase.java index ba146f5c9b8..06f02c0533e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillJoinRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillJoinRelBase.java @@ -21,6 +21,7 @@ import java.util.HashSet; import java.util.List; +import org.apache.calcite.rel.core.CorrelationId; import org.apache.calcite.rel.metadata.RelMetadataQuery; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.expr.holders.IntHolder; @@ -55,8 +56,9 @@ public abstract class DrillJoinRelBase extends Join implements DrillRelNode { private final double joinRowFactor; public DrillJoinRelBase(RelOptCluster cluster, RelTraitSet traits, RelNode left, RelNode right, RexNode condition, - JoinRelType joinType){ - super(cluster, traits, left, right, condition, joinType, Collections. emptySet()); + JoinRelType joinType) { + super(cluster, traits, left, right, condition, + CorrelationId.setOf(Collections. emptySet()), joinType); this.joinRowFactor = PrelUtil.getPlannerSettings(cluster.getPlanner()).getRowCountEstimateFactor(); } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillProjectRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillProjectRelBase.java index 8141a8c572c..b7881c2c957 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillProjectRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillProjectRelBase.java @@ -64,7 +64,7 @@ public abstract class DrillProjectRelBase extends Project implements DrillRelNod protected DrillProjectRelBase(Convention convention, RelOptCluster cluster, RelTraitSet traits, RelNode child, List exps, RelDataType rowType) { - super(cluster, traits, child, exps, rowType, Flags.BOXED); + super(cluster, traits, child, exps, rowType); assert getConvention() == convention; nonSimpleFieldCount = this.getRowType().getFieldCount() - getSimpleFieldCount(); } @@ -92,7 +92,7 @@ private List> projects() { protected List getProjectExpressions(DrillParseContext context) { List expressions = Lists.newArrayList(); - HashMap starColPrefixes = new HashMap(); + HashMap starColPrefixes = new HashMap<>(); // T1.* will subsume T1.*0, but will not subsume any regular column/expression. // Select *, col1, *, col2 : the intermediate will output one set of regular columns expanded from star with prefix, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java index dff83f61908..36d7db296c1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelOptUtil.java @@ -89,11 +89,7 @@ public static boolean areRowTypesCompatible( List types = Lists.newArrayListWithCapacity(2); types.add(Types.getMinorTypeFromName(type1.getSqlTypeName().getName())); types.add(Types.getMinorTypeFromName(type2.getSqlTypeName().getName())); - if(TypeCastRules.getLeastRestrictiveType(types) != null) { - return true; - } - - return false; + return TypeCastRules.getLeastRestrictiveType(types) != null; } } return true; @@ -124,8 +120,11 @@ public RexNode get(int index) { } }; - return RelOptUtil.createProject(rel, refs, fieldNames, false, - DrillRelFactories.LOGICAL_BUILDER.create(rel.getCluster(), null)); + return DrillRelFactories.LOGICAL_BUILDER + .create(rel.getCluster(), null) + .push(rel) + .projectNamed(refs, fieldNames, true) + .build(); } public static boolean isTrivialProject(Project project, boolean useNamesInIdentityProjCalc) { @@ -140,11 +139,11 @@ public static boolean isTrivialProject(Project project, boolean useNamesInIdenti * * @param rowType : input rowType * @param typeFactory : type factory used to create a new row type. - * @return + * @return a rowType having all unique field name. */ public static RelDataType uniqifyFieldName(final RelDataType rowType, final RelDataTypeFactory typeFactory) { return typeFactory.createStructType(RelOptUtil.getFieldTypeList(rowType), - SqlValidatorUtil.uniquify(rowType.getFieldNames())); + SqlValidatorUtil.uniquify(rowType.getFieldNames(), SqlValidatorUtil.EXPR_SUGGESTER, true)); } /** @@ -245,9 +244,8 @@ public static boolean isLimit0(RexNode fetch) { * @param project : The project rel * @return : Return true if the rowcount is unknown. Otherwise, false. */ - public static boolean isProjectOutputRowcountUnknown(RelNode project) { - assert project instanceof Project : "Rel is NOT an instance of project!"; - for (RexNode rex : project.getChildExps()) { + public static boolean isProjectOutputRowcountUnknown(Project project) { + for (RexNode rex : project.getProjects()) { if (rex instanceof RexCall) { if ("flatten".equals(((RexCall) rex).getOperator().getName().toLowerCase())) { return true; @@ -263,8 +261,7 @@ public static boolean isProjectOutputRowcountUnknown(RelNode project) { * @param project : The project rel * @return : Return true if the project output schema is unknown. Otherwise, false. */ - public static boolean isProjectOutputSchemaUnknown(RelNode project) { - assert project instanceof Project : "Rel is NOT an instance of project!"; + public static boolean isProjectOutputSchemaUnknown(Project project) { try { RexVisitor visitor = new RexVisitorImpl(true) { @@ -276,7 +273,7 @@ public Void visitCall(RexCall call) { return super.visitCall(call); } }; - for (RexNode rex : ((Project) project).getProjects()) { + for (RexNode rex : project.getProjects()) { rex.accept(visitor); } } catch (Util.FoundOne e) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillCostBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillCostBase.java index 229a1cb8aff..e2259771009 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillCostBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillCostBase.java @@ -1,4 +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 @@ -14,13 +14,13 @@ * 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 org.apache.drill.exec.planner.cost; import org.apache.calcite.plan.RelOptCost; import org.apache.calcite.plan.RelOptUtil; -import org.apache.calcite.util.Util; +import org.apache.calcite.runtime.Utilities; /** * Implementation of the DrillRelOptCost, modeled similar to VolcanoCost @@ -159,7 +159,8 @@ public double getMemory() { @Override public int hashCode() { - return Util.hashCode(rowCount) + Util.hashCode(cpu) + Util.hashCode(io) + Util.hashCode(network); + return Utilities.hashCode(rowCount) + Utilities.hashCode(cpu) + + Utilities.hashCode(io) + Utilities.hashCode(network); } @Override diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelMdDistinctRowCount.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelMdDistinctRowCount.java index ab7fb87a476..054ff5ef8cf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelMdDistinctRowCount.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelMdDistinctRowCount.java @@ -60,6 +60,6 @@ public Double getDistinctRowCount(Join rel, RelMetadataQuery mq, public Double getDistinctRowCount(DrillScanRel scan, RelMetadataQuery mq, ImmutableBitSet groupKey, RexNode predicate) { // Consistent with the estimation of Aggregate row count in RelMdRowCount : distinctRowCount = rowCount * 10%. - return scan.getRows() * 0.1; + return scan.estimateRowCount(mq) * 0.1; } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java index 0cc016b4f94..a8649da008a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java @@ -157,7 +157,7 @@ public void reduce(final RexBuilder rexBuilder, List constExps, final L .message(message) .build(logger); } - reducedValues.add(rexBuilder.makeNullLiteral(sqlTypeName)); + reducedValues.add(rexBuilder.makeNullLiteral(typeFactory.createSqlType(sqlTypeName))); continue; } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java index 7b978bee622..c7f2838397f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushFilterPastProjectRule.java @@ -77,7 +77,7 @@ public void onMatch(RelOptRuleCall call) { } } - final RexNode qualifedPred =RexUtil.composeConjunction(filterRel.getCluster().getRexBuilder(), qualifiedPredList, true); + final RexNode qualifedPred = RexUtil.composeConjunction(filterRel.getCluster().getRexBuilder(), qualifiedPredList, true); if (qualifedPred == null) { return; @@ -90,12 +90,11 @@ public void onMatch(RelOptRuleCall call) { Filter newFilterRel = LogicalFilter.create(projRel.getInput(), newCondition); Project newProjRel = - (Project) RelOptUtil.createProject( - newFilterRel, - Pair.left(projRel.getNamedProjects()), - Pair.right(projRel.getNamedProjects()), - false, - relBuilderFactory.create(projRel.getCluster(), null)); + (Project) relBuilderFactory + .create(newFilterRel.getCluster(), null) + .push(newFilterRel) + .projectNamed(Pair.left(projRel.getNamedProjects()), Pair.right(projRel.getNamedProjects()), true) + .build(); final RexNode unqualifiedPred = RexUtil.composeConjunction(filterRel.getCluster().getRexBuilder(), unqualifiedPredList, true); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java index 068252d985d..99d51e27665 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java @@ -23,12 +23,6 @@ import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptRuleOperand; import org.apache.calcite.rel.RelNode; -import org.apache.calcite.rel.core.Project; -import org.apache.calcite.rex.RexCall; -import org.apache.calcite.rex.RexNode; -import org.apache.calcite.rex.RexVisitor; -import org.apache.calcite.rex.RexVisitorImpl; -import org.apache.calcite.util.Util; import org.apache.drill.exec.physical.base.GroupScan; import org.apache.drill.exec.planner.common.DrillRelOptUtil; @@ -100,9 +94,10 @@ public void onMatch(RelOptRuleCall call) { } }; - protected void doOnMatch(RelOptRuleCall call, DrillLimitRel limitRel, DrillScanRel scanRel, DrillProjectRel projectRel){ + protected void doOnMatch(RelOptRuleCall call, DrillLimitRel limitRel, + DrillScanRel scanRel, DrillProjectRel projectRel) { try { - final int rowCountRequested = (int) limitRel.getRows(); + final int rowCountRequested = (int) limitRel.estimateRowCount(limitRel.getCluster().getMetadataQuery()); final GroupScan newGroupScan = scanRel.getGroupScan().applyLimit(rowCountRequested); @@ -120,10 +115,10 @@ protected void doOnMatch(RelOptRuleCall call, DrillLimitRel limitRel, DrillScanR final RelNode newLimit; if (projectRel != null) { - final RelNode newProject = projectRel.copy(projectRel.getTraitSet(), ImmutableList.of((RelNode)newScanRel)); - newLimit = limitRel.copy(limitRel.getTraitSet(), ImmutableList.of((RelNode)newProject)); + final RelNode newProject = projectRel.copy(projectRel.getTraitSet(), ImmutableList.of((RelNode) newScanRel)); + newLimit = limitRel.copy(limitRel.getTraitSet(), ImmutableList.of(newProject)); } else { - newLimit = limitRel.copy(limitRel.getTraitSet(), ImmutableList.of((RelNode)newScanRel)); + newLimit = limitRel.copy(limitRel.getTraitSet(), ImmutableList.of((RelNode) newScanRel)); } call.transformTo(newLimit); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java index 7ff286f66f7..8ef4923bfe0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java @@ -18,7 +18,6 @@ package org.apache.drill.exec.planner.logical; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collections; @@ -28,6 +27,8 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; +import org.apache.calcite.plan.Convention; +import org.apache.calcite.plan.RelOptCluster; import org.apache.calcite.rel.InvalidRelException; import org.apache.calcite.rel.core.Aggregate; import org.apache.calcite.rel.core.Window; @@ -48,7 +49,6 @@ import org.apache.calcite.plan.RelOptRule; import org.apache.calcite.plan.RelOptRuleCall; import org.apache.calcite.plan.RelOptRuleOperand; -import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.rel.type.RelDataType; import org.apache.calcite.rel.type.RelDataTypeFactory; import org.apache.calcite.rel.type.RelDataTypeField; @@ -199,26 +199,29 @@ private void reduceAggs( inputExprs.size() - input.getRowType().getFieldCount(); if (extraArgCount > 0) { input = - RelOptUtil.createProject( - input, - inputExprs, - CompositeList.of( + relBuilderFactory + .create(input.getCluster(), null) + .push(input) + .projectNamed( + inputExprs, + CompositeList.of( input.getRowType().getFieldNames(), - Collections.nCopies( + Collections.nCopies( extraArgCount, null)), - false, - relBuilderFactory.create(input.getCluster(), null)); + true) + .build(); } Aggregate newAggRel = newAggregateRel( oldAggRel, input, newCalls); RelNode projectRel = - RelOptUtil.createProject( - newAggRel, - projList, - oldAggRel.getRowType().getFieldNames()); + relBuilderFactory + .create(newAggRel.getCluster(), null) + .push(newAggRel) + .projectNamed(projList, oldAggRel.getRowType().getFieldNames(), true) + .build(); ruleCall.transformTo(projectRel); } @@ -317,7 +320,7 @@ private RexNode reduceAvg( iAvgInput); RelDataType sumType = TypeInferenceUtils.getDrillSqlReturnTypeInference(SqlKind.SUM.name(), - ImmutableList.of()) + ImmutableList.of()) .inferReturnType(oldCall.createBinding(oldAggRel)); sumType = typeFactory.createTypeWithNullability( @@ -507,7 +510,7 @@ private RexNode reduceStddev( RelDataType sumType = TypeInferenceUtils.getDrillSqlReturnTypeInference(SqlKind.SUM.name(), - ImmutableList.of()) + ImmutableList.of()) .inferReturnType(oldCall.createBinding(oldAggRel)); sumType = typeFactory.createTypeWithNullability(sumType, true); final AggregateCall sumArgSquaredAggCall = @@ -666,7 +669,9 @@ protected Aggregate newAggregateRel( Aggregate oldAggRel, RelNode inputRel, List newCalls) { - return LogicalAggregate.create(inputRel, oldAggRel.indicator, oldAggRel.getGroupSet(), oldAggRel.getGroupSets(), newCalls); + RelOptCluster cluster = inputRel.getCluster(); + return new LogicalAggregate(cluster, cluster.traitSetOf(Convention.NONE), + inputRel, oldAggRel.indicator, oldAggRel.getGroupSet(), oldAggRel.getGroupSets(), newCalls); } private RelDataType getFieldType(RelNode relNode, int i) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceExpressionsRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceExpressionsRule.java index 6214912a21b..f053f3f1ff6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceExpressionsRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceExpressionsRule.java @@ -39,7 +39,7 @@ public class DrillReduceExpressionsRule { private static class DrillReduceFilterRule extends ReduceExpressionsRule.FilterReduceExpressionsRule { DrillReduceFilterRule() { - super(Filter.class, DrillRelFactories.LOGICAL_BUILDER); + super(Filter.class, true, DrillRelFactories.LOGICAL_BUILDER); } /** @@ -58,7 +58,7 @@ protected RelNode createEmptyRelOrEquivalent(RelOptRuleCall call, Filter filter) private static class DrillReduceCalcRule extends ReduceExpressionsRule.CalcReduceExpressionsRule { DrillReduceCalcRule() { - super(Calc.class, DrillRelFactories.LOGICAL_BUILDER); + super(Calc.class, true, DrillRelFactories.LOGICAL_BUILDER); } /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSortRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSortRel.java index 3436aba89f9..8b68ef36cb5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSortRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillSortRel.java @@ -1,4 +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 @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; +import org.apache.calcite.rel.RelCollations; import org.apache.drill.common.expression.FieldReference; import org.apache.drill.common.logical.data.LogicalOperator; import org.apache.drill.common.logical.data.Order; @@ -27,7 +28,6 @@ import org.apache.drill.exec.planner.torel.ConversionContext; import org.apache.calcite.rel.InvalidRelException; import org.apache.calcite.rel.RelCollation; -import org.apache.calcite.rel.RelCollationImpl; import org.apache.calcite.rel.RelFieldCollation; import org.apache.calcite.rel.RelNode; import org.apache.calcite.rel.core.Sort; @@ -93,8 +93,9 @@ public static RelNode convert(Order order, ConversionContext context) throws Inv String fieldName = ExprHelper.getFieldName(o.getExpr()); int fieldId = fieldMap.get(fieldName); RelFieldCollation c = new RelFieldCollation(fieldId, o.getDirection(), o.getNullDirection()); + collations.add(c); } - return new DrillSortRel(context.getCluster(), context.getLogicalTraits(), input, RelCollationImpl.of(collations)); + return new DrillSortRel(context.getCluster(), context.getLogicalTraits(), input, RelCollations.of(collations)); } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java index 837ddd80a20..5f679a4e67e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/PruneScanRule.java @@ -136,11 +136,11 @@ public void onMatch(RelOptRuleCall call) { } } - public static final RelOptRule getDirFilterOnProject(OptimizerRulesContext optimizerRulesContext) { + public static RelOptRule getDirFilterOnProject(OptimizerRulesContext optimizerRulesContext) { return new DirPruneScanFilterOnProjectRule(optimizerRulesContext); } - public static final RelOptRule getDirFilterOnScan(OptimizerRulesContext optimizerRulesContext) { + public static RelOptRule getDirFilterOnScan(OptimizerRulesContext optimizerRulesContext) { return new DirPruneScanFilterOnScanRule(optimizerRulesContext); } @@ -165,7 +165,7 @@ protected void doOnMatch(RelOptRuleCall call, Filter filterRel, Project projectR condition = filterRel.getCondition(); } else { // get the filter as if it were below the projection. - condition = RelOptUtil.pushFilterPastProject(filterRel.getCondition(), projectRel); + condition = RelOptUtil.pushPastProject(filterRel.getCondition(), projectRel); } RewriteAsBinaryOperators visitor = new RewriteAsBinaryOperators(true, filterRel.getCluster().getRexBuilder()); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java index 232473b4ba6..c84f0fc8ccb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPrelBase.java @@ -17,7 +17,6 @@ */ package org.apache.drill.exec.planner.physical; -import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.apache.calcite.linq4j.Ord; import org.apache.calcite.util.BitSets; @@ -80,18 +79,9 @@ public SqlSumCountAggFunction(RelDataType type) { this.type = type; } - public List getParameterTypes(RelDataTypeFactory typeFactory) { - return ImmutableList.of(type); - } - public RelDataType getType() { return type; } - - public RelDataType getReturnType(RelDataTypeFactory typeFactory) { - return type; - } - } public AggPrelBase(RelOptCluster cluster, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashToRandomExchangePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashToRandomExchangePrel.java index 2254c560b2d..7618edfe32e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashToRandomExchangePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashToRandomExchangePrel.java @@ -44,10 +44,8 @@ import org.apache.calcite.plan.RelTraitSet; import org.apache.drill.exec.server.options.OptionManager; - public class HashToRandomExchangePrel extends ExchangePrel { - private final List fields; public HashToRandomExchangePrel(RelOptCluster cluster, RelTraitSet traitSet, RelNode input, List fields) { @@ -145,8 +143,8 @@ public Prel constructMuxPrel(Prel child, OptionManager options) { new HashPrelUtil.RexNodeBasedHashExpressionCreatorHelper(rexBuilder); final List distFieldRefs = Lists.newArrayListWithExpectedSize(distFields.size()); - for (int i=0; i iterator() { } /** - * Check to make sure that the fields of the inputs are the same as the output field names. If not, insert a project renaming them. - * @param implementor - * @param i - * @param offset - * @param input - * @return + * Check to make sure that the fields of the inputs are the same as the output field names. + * If not, insert a project renaming them. */ public RelNode getJoinInput(int offset, RelNode input) { assert uniqueFieldNames(input.getRowType()); @@ -99,7 +94,8 @@ private RelNode rename(RelNode input, List inputFields, List keys){ + private RelCollation getCollation(List keys) { List fields = Lists.newArrayList(); for (int key : keys) { fields.add(new RelFieldCollation(key)); } - return RelCollationImpl.of(fields); + return RelCollations.of(fields); } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java index 6094221cee9..6a94662e78d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PhysicalPlanCreator.java @@ -1,4 +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 @@ -59,7 +59,7 @@ public QueryContext getContext() { public PhysicalOperator addMetadata(Prel originalPrel, PhysicalOperator op){ op.setOperatorId(opIdMap.get(originalPrel).getAsSingleInt()); - op.setCost(originalPrel.getRows()); + op.setCost(originalPrel.estimateRowCount(originalPrel.getCluster().getMetadataQuery())); return op; } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrule.java index 4aca3146a4d..a6d9719fa23 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectPrule.java @@ -1,4 +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 @@ -23,12 +23,12 @@ import org.apache.calcite.linq4j.Ord; +import org.apache.calcite.rel.RelCollations; import org.apache.drill.exec.planner.logical.DrillProjectRel; import org.apache.drill.exec.planner.logical.RelOptHelper; import org.apache.drill.exec.planner.physical.DrillDistributionTrait.DistributionField; import org.apache.drill.exec.planner.physical.DrillDistributionTrait.DistributionType; import org.apache.calcite.rel.RelCollation; -import org.apache.calcite.rel.RelCollationImpl; import org.apache.calcite.rel.RelCollationTraitDef; import org.apache.calcite.rel.RelFieldCollation; import org.apache.calcite.rel.RelNode; @@ -52,7 +52,7 @@ private ProjectPrule() { @Override public void onMatch(RelOptRuleCall call) { - final DrillProjectRel project = (DrillProjectRel) call.rel(0); + final DrillProjectRel project = call.rel(0); final RelNode input = project.getInput(); RelTraitSet traits = input.getTraitSet().plus(Prel.DRILL_PHYSICAL); @@ -126,14 +126,14 @@ private RelCollation convertRelCollation(RelCollation src, Map } if (newFields.isEmpty()) { - return RelCollationImpl.of(); + return RelCollations.of(); } else { - return RelCollationImpl.of(newFields); + return RelCollations.of(newFields); } } private Map getDistributionMap(DrillProjectRel project) { - Map m = new HashMap(); + Map m = new HashMap<>(); for (Ord node : Ord.zip(project.getProjects())) { // For distribution, either $0 or cast($0 as ...) would keep the distribution after projection. @@ -151,7 +151,7 @@ private Map getDistributionMap(DrillProjectRel project) { } private Map getCollationMap(DrillProjectRel project) { - Map m = new HashMap(); + Map m = new HashMap<>(); for (Ord node : Ord.zip(project.getProjects())) { // For collation, only $0 will keep the sort-ness after projection. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java index 29fa7508c5c..85f516a669f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/StreamAggPrule.java @@ -19,6 +19,7 @@ import java.util.List; +import org.apache.calcite.rel.RelCollations; import org.apache.calcite.util.BitSets; import org.apache.calcite.util.ImmutableBitSet; @@ -27,7 +28,6 @@ import org.apache.drill.exec.planner.physical.AggPrelBase.OperatorPhase; import org.apache.calcite.rel.InvalidRelException; import org.apache.calcite.rel.RelCollation; -import org.apache.calcite.rel.RelCollationImpl; import org.apache.calcite.rel.RelFieldCollation; import org.apache.calcite.rel.RelNode; import org.apache.calcite.plan.RelOptRule; @@ -210,12 +210,12 @@ private void createTransformRequest(RelOptRuleCall call, DrillAggregateRel aggre } - private RelCollation getCollation(DrillAggregateRel rel){ + private RelCollation getCollation(DrillAggregateRel rel) { List fields = Lists.newArrayList(); for (int group : BitSets.toIter(rel.getGroupSet())) { fields.add(new RelFieldCollation(group)); } - return RelCollationImpl.of(fields); + return RelCollations.of(fields); } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java index 4fdb3b90776..475acec91f0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java @@ -24,6 +24,7 @@ import com.google.common.collect.Lists; import org.apache.calcite.linq4j.Ord; +import org.apache.calcite.rel.RelCollations; import org.apache.calcite.rel.core.Window; import org.apache.calcite.util.BitSets; import org.apache.drill.exec.planner.logical.DrillRel; @@ -31,7 +32,6 @@ import org.apache.drill.exec.planner.logical.RelOptHelper; import org.apache.drill.exec.planner.physical.DrillDistributionTrait.DistributionField; import org.apache.calcite.rel.RelCollation; -import org.apache.calcite.rel.RelCollationImpl; import org.apache.calcite.rel.RelFieldCollation; import org.apache.calcite.rel.RelNode; import org.apache.calcite.plan.RelOptRule; @@ -115,9 +115,7 @@ public void onMatch(RelOptRuleCall call) { } List newRowFields = Lists.newArrayList(); - for(RelDataTypeField field : convertedInput.getRowType().getFieldList()) { - newRowFields.add(field); - } + newRowFields.addAll(convertedInput.getRowType().getFieldList()); Iterable newWindowFields = Iterables.filter(window.getRowType().getFieldList(), new Predicate() { @Override @@ -200,11 +198,9 @@ private RelCollation getCollation(Window.Group window) { fields.add(new RelFieldCollation(group)); } - for (RelFieldCollation field : window.orderKeys.getFieldCollations()) { - fields.add(field); - } + fields.addAll(window.orderKeys.getFieldCollations()); - return RelCollationImpl.of(fields); + return RelCollations.of(fields); } private List getDistributionFields(Window.Group window) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrule.java index d4e3d0e1aec..959d9c98b97 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrule.java @@ -1,4 +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 @@ -17,13 +17,11 @@ */ package org.apache.drill.exec.planner.physical; -import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; import org.apache.calcite.rel.RelCollation; -import org.apache.calcite.rel.RelCollationImpl; +import org.apache.calcite.rel.RelCollations; import org.apache.calcite.rel.RelFieldCollation; -import org.apache.drill.common.expression.SchemaPath; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.planner.common.DrillWriterRelBase; import org.apache.drill.exec.planner.logical.DrillRel; @@ -73,7 +71,7 @@ private RelCollation getCollation(List keys){ for (int key : keys) { fields.add(new RelFieldCollation(key)); } - return RelCollationImpl.of(fields); + return RelCollations.of(fields); } private DrillDistributionTrait getDistribution(List keys) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/NumberingRelWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/NumberingRelWriter.java index f078b6e2598..045dba9d48e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/NumberingRelWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/NumberingRelWriter.java @@ -46,7 +46,7 @@ class NumberingRelWriter implements RelWriter { protected final PrintWriter pw; private final SqlExplainLevel detailLevel; protected final Spacer spacer = new Spacer(); - private final List> values = new ArrayList>(); + private final List> values = new ArrayList<>(); private final Map ids; //~ Constructors ----------------------------------------------------------- @@ -160,6 +160,7 @@ public RelWriter itemIf(String term, Object value, boolean condition) { return this; } + @SuppressWarnings("deprecation") public RelWriter done(RelNode node) { int i = 0; if (values.size() > 0 && values.get(0).left.equals("subset")) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ExcessiveExchangeIdentifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ExcessiveExchangeIdentifier.java index 2e95e7ca154..7bfe21483a0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ExcessiveExchangeIdentifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ExcessiveExchangeIdentifier.java @@ -1,4 +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 @@ -30,8 +30,6 @@ import com.google.common.collect.Lists; public class ExcessiveExchangeIdentifier extends BasePrelVisitor { - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ExcessiveExchangeIdentifier.class); - private final long targetSliceSize; public ExcessiveExchangeIdentifier(long targetSliceSize) { @@ -62,8 +60,8 @@ public Prel visitExchange(ExchangePrel prel, MajorFragmentStat parent) throws Ru @Override public Prel visitScreen(ScreenPrel prel, MajorFragmentStat s) throws RuntimeException { s.addScreen(prel); - RelNode child = ((Prel)prel.getInput()).accept(this, s); - return (Prel) prel.copy(prel.getTraitSet(), Collections.singletonList(child)); + RelNode child = ((Prel) prel.getInput()).accept(this, s); + return prel.copy(prel.getTraitSet(), Collections.singletonList(child)); } @Override @@ -102,7 +100,7 @@ class MajorFragmentStat { private boolean isMultiSubScan = false; public void add(Prel prel) { - maxRows = Math.max(prel.getRows(), maxRows); + maxRows = Math.max(prel.estimateRowCount(prel.getCluster().getMetadataQuery()), maxRows); } public void addScreen(ScreenPrel screenPrel) { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java index 0148d4765b2..2ee46f0f406 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java @@ -1,4 +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 @@ -18,7 +18,6 @@ package org.apache.drill.exec.planner.physical.visitor; -import java.beans.Statement; import java.util.Collections; import java.util.HashSet; import java.util.List; @@ -42,12 +41,12 @@ import com.google.common.collect.Lists; -public class StarColumnConverter extends BasePrelVisitor{ +public class StarColumnConverter extends BasePrelVisitor { private static final AtomicLong tableNumber = new AtomicLong(0); - private boolean prefixedForStar = false; - private boolean prefixedForWriter = false; + private boolean prefixedForStar; + private boolean prefixedForWriter; private StarColumnConverter() { prefixedForStar = false; @@ -82,7 +81,7 @@ public Prel visitScreen(ScreenPrel prel, Void value) throws RuntimeException { return insertProjUnderScreenOrWriter(prel, prel.getInput().getRowType(), child); } else { // Prefix is added under CTAS Writer. We need create a new Screen with the converted child. - return (Prel) prel.copy(prel.getTraitSet(), Collections.singletonList(child)); + return prel.copy(prel.getTraitSet(), Collections.singletonList(child)); } } else { // No prefix is @@ -98,7 +97,7 @@ public Prel visitWriter(WriterPrel prel, Void value) throws RuntimeException { if (prefixedForStar) { prefixedForWriter = true; // return insertProjUnderScreenOrWriter(prel, prel.getInput().getRowType(), child); - return (Prel) prel.copy(prel.getTraitSet(), Collections.singletonList(child)); + return prel.copy(prel.getTraitSet(), Collections.singletonList(child)); } else { return prel; } @@ -107,7 +106,7 @@ public Prel visitWriter(WriterPrel prel, Void value) throws RuntimeException { // insert PUS or PUW: Project Under Screen/Writer, when necessary. private Prel insertProjUnderScreenOrWriter(Prel prel, RelDataType origRowType, Prel child) { - ProjectPrel proj = null; + ProjectPrel proj; List children = Lists.newArrayList(); List exprs = Lists.newArrayList(); @@ -116,7 +115,8 @@ private Prel insertProjUnderScreenOrWriter(Prel prel, RelDataType origRowType, P exprs.add(expr); } - RelDataType newRowType = RexUtil.createStructType(child.getCluster().getTypeFactory(), exprs, origRowType.getFieldNames()); + RelDataType newRowType = RexUtil.createStructType(child.getCluster().getTypeFactory(), + exprs, origRowType.getFieldNames(), null); int fieldCount = prel.getRowType().isStruct()? prel.getRowType().getFieldCount():1; @@ -130,13 +130,12 @@ private Prel insertProjUnderScreenOrWriter(Prel prel, RelDataType origRowType, P children.add(proj); return (Prel) prel.copy(prel.getTraitSet(), children); } - @Override - public Prel visitProject(ProjectPrel prel, Void value) throws RuntimeException { - ProjectPrel proj = (ProjectPrel) prel; + @Override + public Prel visitProject(ProjectPrel prel, Void value) throws RuntimeException { // Require prefix rename : there exists other expression, in addition to a star column. if (!prefixedForStar // not set yet. - && StarColumnHelper.containsStarColumnInProject(prel.getInput().getRowType(), proj.getProjects()) + && StarColumnHelper.containsStarColumnInProject(prel.getInput().getRowType(), prel.getProjects()) && prel.getRowType().getFieldNames().size() > 1) { prefixedForStar = true; } @@ -149,7 +148,7 @@ public Prel visitProject(ProjectPrel prel, Void value) throws RuntimeException { List fieldNames = Lists.newArrayList(); - for (Pair pair : Pair.zip(prel.getRowType().getFieldNames(), proj.getProjects())) { + for (Pair pair : Pair.zip(prel.getRowType().getFieldNames(), prel.getProjects())) { if (pair.right instanceof RexInputRef) { String name = child.getRowType().getFieldNames().get(((RexInputRef) pair.right).getIndex()); fieldNames.add(name); @@ -161,9 +160,10 @@ public Prel visitProject(ProjectPrel prel, Void value) throws RuntimeException { // Make sure the field names are unique : no allow of duplicate field names in a rowType. fieldNames = makeUniqueNames(fieldNames); - RelDataType rowType = RexUtil.createStructType(prel.getCluster().getTypeFactory(), proj.getProjects(), fieldNames); + RelDataType rowType = RexUtil.createStructType(prel.getCluster().getTypeFactory(), + prel.getProjects(), fieldNames, null); - ProjectPrel newProj = (ProjectPrel) proj.copy(proj.getTraitSet(), child, proj.getProjects(), rowType); + ProjectPrel newProj = (ProjectPrel) prel.copy(prel.getTraitSet(), child, prel.getProjects(), rowType); if (ProjectRemoveRule.isTrivial(newProj)) { return (Prel) child; @@ -192,7 +192,7 @@ public Prel visitPrel(Prel prel, Void value) throws RuntimeException { @Override public Prel visitScan(ScanPrel scanPrel, Void value) throws RuntimeException { - if (StarColumnHelper.containsStarColumn(scanPrel.getRowType()) && prefixedForStar ) { + if (StarColumnHelper.containsStarColumn(scanPrel.getRowType()) && prefixedForStar) { List exprs = Lists.newArrayList(); @@ -212,7 +212,8 @@ public Prel visitScan(ScanPrel scanPrel, Void value) throws RuntimeException { fieldNames.add(name); // Keep regular column as it is. } } - RelDataType rowType = RexUtil.createStructType(scanPrel.getCluster().getTypeFactory(), exprs, fieldNames); + RelDataType rowType = RexUtil.createStructType(scanPrel.getCluster().getTypeFactory(), + exprs, fieldNames, null); // insert a PAS. ProjectPrel proj = new ProjectPrel(scanPrel.getCluster(), scanPrel.getTraitSet(), scanPrel, exprs, rowType); @@ -231,8 +232,8 @@ private List makeUniqueNames(List names) { // That means we should pick a different name that does not conflict with the original names, in additional // to make sure it's unique in the set of unique names. - HashSet uniqueNames = new HashSet(); - HashSet origNames = new HashSet(names); + HashSet uniqueNames = new HashSet<>(); + HashSet origNames = new HashSet<>(names); List newNames = Lists.newArrayList(); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java index 96c79028e0d..d84cbb4d6dd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java @@ -1,4 +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 @@ -19,13 +19,12 @@ package org.apache.drill.exec.planner.physical.visitor; import com.google.common.collect.Lists; +import org.apache.calcite.rel.metadata.RelMetadataQuery; import org.apache.drill.exec.planner.physical.HashJoinPrel; import org.apache.drill.exec.planner.physical.JoinPrel; import org.apache.drill.exec.planner.physical.Prel; -import org.apache.drill.exec.planner.physical.PrelUtil; import org.apache.calcite.rel.core.JoinRelType; import org.apache.calcite.rel.RelNode; -import org.apache.calcite.rex.RexNode; import java.util.List; @@ -38,7 +37,7 @@ * @see org.apache.drill.exec.planner.physical.HashJoinPrel */ -public class SwapHashJoinVisitor extends BasePrelVisitor{ +public class SwapHashJoinVisitor extends BasePrelVisitor { private static SwapHashJoinVisitor INSTANCE = new SwapHashJoinVisitor(); @@ -67,9 +66,10 @@ public Prel visitJoin(JoinPrel prel, Double value) throws RuntimeException { if (prel instanceof HashJoinPrel) { // Mark left/right is swapped, when INNER hash join's left row count < ( 1+ margin factor) right row count. - if (newJoin.getLeft().getRows() < (1 + value.doubleValue() ) * newJoin.getRight().getRows() && + RelMetadataQuery mq = newJoin.getCluster().getMetadataQuery(); + if (newJoin.getLeft().estimateRowCount(mq) < (1 + value) * newJoin.getRight().estimateRowCount(mq) && newJoin.getJoinType() == JoinRelType.INNER) { - ( (HashJoinPrel) newJoin).setSwapped(true); + ((HashJoinPrel) newJoin).setSwapped(true); } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java index 73ff2007300..9d7fdce0676 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java @@ -1,4 +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 @@ -40,7 +40,9 @@ protected DrillSqlAggOperator(String name, List functions, int sqlReturnTypeInference, null, Checker.getChecker(argCountMin, argCountMax), - SqlFunctionCategory.USER_DEFINED_FUNCTION); + SqlFunctionCategory.USER_DEFINED_FUNCTION, + false, + false); this.functions = functions; } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlConverter.java index 9821bf35666..69362d9392f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/SqlConverter.java @@ -26,7 +26,6 @@ import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import com.google.common.collect.Sets; import org.apache.calcite.adapter.java.JavaTypeFactory; import org.apache.calcite.config.CalciteConnectionConfigImpl; import org.apache.calcite.config.CalciteConnectionProperty; @@ -59,7 +58,7 @@ import org.apache.calcite.sql.parser.SqlParserPos; import org.apache.calcite.sql.type.SqlTypeName; import org.apache.calcite.sql.util.ChainedSqlOperatorTable; -import org.apache.calcite.sql.validate.SqlConformance; +import org.apache.calcite.sql.validate.SqlConformanceEnum; import org.apache.calcite.sql.validate.SqlValidatorCatalogReader; import org.apache.calcite.sql.validate.SqlValidatorImpl; import org.apache.calcite.sql.validate.SqlValidatorScope; @@ -140,7 +139,7 @@ public SqlConverter(QueryContext context) { session); this.opTab = new ChainedSqlOperatorTable(Arrays.asList(context.getDrillOperatorTable(), catalog)); this.costFactory = (settings.useDefaultCosting()) ? null : new DrillCostBase.DrillCostFactory(); - this.validator = new DrillValidator(opTab, catalog, typeFactory, SqlConformance.DEFAULT); + this.validator = new DrillValidator(opTab, catalog, typeFactory, SqlConformanceEnum.DEFAULT); validator.setIdentifierExpansion(true); cluster = null; } @@ -160,7 +159,7 @@ private SqlConverter(SqlConverter parent, SchemaPlus defaultSchema, SchemaPlus r this.catalog = catalog; this.opTab = parent.opTab; this.planner = parent.planner; - this.validator = new DrillValidator(opTab, catalog, typeFactory, SqlConformance.DEFAULT); + this.validator = new DrillValidator(opTab, catalog, typeFactory, SqlConformanceEnum.DEFAULT); this.temporarySchema = parent.temporarySchema; this.session = parent.session; this.drillConfig = parent.drillConfig; @@ -239,10 +238,9 @@ public void useRootSchemaAsDefault(boolean useRoot) { } private class DrillValidator extends SqlValidatorImpl { - private final Set identitySet = Sets.newIdentityHashSet(); protected DrillValidator(SqlOperatorTable opTab, SqlValidatorCatalogReader catalogReader, - RelDataTypeFactory typeFactory, SqlConformance conformance) { + RelDataTypeFactory typeFactory, SqlConformanceEnum conformance) { super(opTab, catalogReader, typeFactory, conformance); } @@ -377,9 +375,10 @@ public RelRoot toRel(final SqlNode validatedNode) { //To avoid unexpected column errors set a value of top to false final RelRoot rel = sqlToRelConverter.convertQuery(validatedNode, false, false); final RelRoot rel2 = rel.withRel(sqlToRelConverter.flattenTypes(rel.rel, true)); - final RelRoot rel3 = rel2.withRel(RelDecorrelator.decorrelateQuery(rel2.rel)); + final RelRoot rel3 = rel2.withRel( + RelDecorrelator.decorrelateQuery(rel2.rel, + sqlToRelConverterConfig.getRelBuilderFactory().create(cluster, null))); return rel3; - } private class Expander implements RelOptTable.ViewExpander { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/TypeInferenceUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/TypeInferenceUtils.java index af544b54def..078094b5ab9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/TypeInferenceUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/TypeInferenceUtils.java @@ -601,6 +601,7 @@ private static class DrillCastSqlReturnTypeInference implements SqlReturnTypeInf private static final DrillCastSqlReturnTypeInference INSTANCE = new DrillCastSqlReturnTypeInference(); @Override + @SuppressWarnings("deprecation") public RelDataType inferReturnType(SqlOperatorBinding opBinding) { final RelDataTypeFactory factory = opBinding.getTypeFactory(); final boolean isNullable = opBinding diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java index 58fac666783..b9fe9ff26e2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DefaultSqlHandler.java @@ -690,7 +690,8 @@ protected DrillRel addRenamedProject(DrillRel rel, RelDataType validatedRowType) SqlValidatorUtil.EXPR_SUGGESTER, rel.getCluster().getTypeFactory().getTypeSystem().isSchemaCaseSensitive()); - RelDataType newRowType = RexUtil.createStructType(rel.getCluster().getTypeFactory(), projections, fieldNames2); + RelDataType newRowType = RexUtil.createStructType(rel.getCluster().getTypeFactory(), + projections, fieldNames2, null); DrillProjectRel topProj = DrillProjectRel.create(rel.getCluster(), rel.getTraitSet(), rel, projections, newRowType); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerUtil.java index 134c28f240d..02f611481e6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerUtil.java @@ -37,7 +37,6 @@ import org.apache.calcite.tools.ValidationException; import org.apache.calcite.rel.RelNode; -import org.apache.calcite.plan.RelOptUtil; import org.apache.calcite.rel.type.RelDataType; import java.io.IOException; @@ -206,8 +205,11 @@ public RexNode get(int index) { } }; - return RelOptUtil.createProject(input, refs, names, false, - DrillRelFactories.LOGICAL_BUILDER.create(input.getCluster(), null)); + return DrillRelFactories.LOGICAL_BUILDER + .create(input.getCluster(), null) + .push(input) + .projectNamed(refs, names, true) + .build(); } } diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java index 917353ee3b2..da7b108f609 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/UnsupportedOperatorsVisitor.java @@ -1,4 +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 @@ -21,11 +21,11 @@ import org.apache.calcite.sql.SqlOperator; import org.apache.calcite.sql.fun.SqlStdOperatorTable; import org.apache.calcite.sql.util.SqlBasicVisitor; +import org.apache.calcite.util.Litmus; import org.apache.drill.exec.ExecConstants; import org.apache.drill.exec.exception.UnsupportedOperatorCollector; import org.apache.drill.exec.ops.QueryContext; import org.apache.drill.exec.planner.physical.PlannerSettings; -import org.apache.drill.exec.planner.sql.DrillCalciteSqlWrapper; import org.apache.drill.exec.work.foreman.SqlUnsupportedException; import org.apache.calcite.sql.SqlSelectKeyword; @@ -479,7 +479,7 @@ private boolean checkOperator(SqlCall sqlCall, List operators, boolean c * If the condition is true, mark flag 'find' as true. */ private static class ExprFinder extends SqlBasicVisitor { - private boolean find = false; + private boolean find; private final SqlNodeCondition condition; public ExprFinder(SqlNodeCondition condition) { @@ -512,15 +512,15 @@ private boolean containsFlatten(SqlNode sqlNode) throws UnsupportedOperationExce * @param sqlSelect SELECT-CLAUSE in the query */ private void detectMultiplePartitions(SqlSelect sqlSelect) { - for(SqlNode nodeInSelectList : sqlSelect.getSelectList()) { + for (SqlNode nodeInSelectList : sqlSelect.getSelectList()) { // If the window function is used with an alias, // enter the first operand of AS operator - if(nodeInSelectList.getKind() == SqlKind.AS + if (nodeInSelectList.getKind() == SqlKind.AS && (((SqlCall) nodeInSelectList).getOperandList().get(0).getKind() == SqlKind.OVER)) { nodeInSelectList = ((SqlCall) nodeInSelectList).getOperandList().get(0); } - if(nodeInSelectList.getKind() != SqlKind.OVER) { + if (nodeInSelectList.getKind() != SqlKind.OVER) { continue; } @@ -530,10 +530,10 @@ private void detectMultiplePartitions(SqlSelect sqlSelect) { // Partition window is referenced as a SqlIdentifier, // which is defined in the window list - if(window instanceof SqlIdentifier) { + if (window instanceof SqlIdentifier) { // Expand the SqlIdentifier as the expression defined in the window list - for(SqlNode sqlNode : sqlSelect.getWindowList()) { - if(((SqlWindow) sqlNode).getDeclName().equalsDeep(window, false)) { + for (SqlNode sqlNode : sqlSelect.getWindowList()) { + if (((SqlWindow) sqlNode).getDeclName().equalsDeep(window, Litmus.IGNORE)) { window = sqlNode; break; } @@ -543,10 +543,10 @@ private void detectMultiplePartitions(SqlSelect sqlSelect) { } // In a SELECT-SCOPE, only a partition can be defined - if(definedWindow == null) { + if (definedWindow == null) { definedWindow = window; } else { - if(!definedWindow.equalsDeep(window, false)) { + if (!definedWindow.equalsDeep(window, Litmus.IGNORE)) { unsupportedOperatorCollector.setException(SqlUnsupportedException.ExceptionType.FUNCTION, "Multiple window definitions in a single SELECT list is not currently supported \n" + "See Apache Drill JIRA: DRILL-3196"); diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java index 42571505010..8d845a5c174 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java @@ -117,15 +117,15 @@ protected void doOnMatch(RelOptRuleCall call, FilterPrel filter, ProjectPrel pro return; } - RexNode condition = null; + RexNode condition; if (project == null) { condition = filter.getCondition(); } else { // get the filter as if it were below the projection. - condition = RelOptUtil.pushFilterPastProject(filter.getCondition(), project); + condition = RelOptUtil.pushPastProject(filter.getCondition(), project); } - if (condition == null || condition.equals(ValueExpressions.BooleanExpression.TRUE)) { + if (condition == null || condition.isAlwaysTrue()) { return; } @@ -167,7 +167,7 @@ protected void doOnMatch(RelOptRuleCall call, FilterPrel filter, ProjectPrel pro inputRel = project.copy(project.getTraitSet(), ImmutableList.of(inputRel)); } - final RelNode newFilter = filter.copy(filter.getTraitSet(), ImmutableList.of(inputRel)); + final RelNode newFilter = filter.copy(filter.getTraitSet(), ImmutableList.of(inputRel)); call.transformTo(newFilter); } diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml index a10c37a204a..b1fe99ec407 100644 --- a/exec/jdbc-all/pom.xml +++ b/exec/jdbc-all/pom.xml @@ -499,7 +499,7 @@ This is likely due to you adding new dependencies to a java-exec and not updating the excludes in this module. This is important as it minimizes the size of the dependency of Drill application users. - 35000000 + 36000000 15000000 ${project.build.directory}/drill-jdbc-all-${project.version}.jar diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillMetaImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillMetaImpl.java index 0b33167fb18..b08c0f56494 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillMetaImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillMetaImpl.java @@ -1096,6 +1096,7 @@ public StatementHandle prepare(ConnectionHandle ch, String sql, long maxRowCount } @Override + @SuppressWarnings("deprecation") public ExecuteResult prepareAndExecute(StatementHandle h, String sql, long maxRowCount, PrepareCallback callback) { final Signature signature = newSignature(sql); try { @@ -1133,6 +1134,7 @@ public Frame fetch(StatementHandle statementHandle, long l, int i) throws NoSuch } @Override + @SuppressWarnings("deprecation") public ExecuteResult execute(StatementHandle statementHandle, List list, long l) throws NoSuchStatementException { return new ExecuteResult(Collections.singletonList( diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetImpl.java index 6ca8ee264ee..4dfce48d336 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetImpl.java @@ -92,18 +92,14 @@ class DrillResultSetImpl extends AvaticaResultSet implements DrillResultSet { * @throws AlreadyClosedSqlException if ResultSet is closed * @throws SQLException if error in calling {@link #isClosed()} */ - private void throwIfClosed() throws AlreadyClosedSqlException, - ExecutionCanceledSqlException, - SQLTimeoutException, - SQLException { - if ( isClosed() ) { + private void throwIfClosed() throws SQLException { + if (isClosed()) { if (cursor instanceof DrillCursor && hasPendingCancelationNotification) { hasPendingCancelationNotification = false; throw new ExecutionCanceledSqlException( - "SQL statement execution canceled; ResultSet now closed." ); - } - else { - throw new AlreadyClosedSqlException( "ResultSet is already closed." ); + "SQL statement execution canceled; ResultSet now closed."); + } else { + throw new AlreadyClosedSqlException("ResultSet is already closed."); } } @@ -1142,16 +1138,8 @@ public void moveToCurrentRow() throws SQLException { } @Override - public AvaticaStatement getStatement() { - try { - throwIfClosed(); - } catch (AlreadyClosedSqlException e) { - // Can't throw any SQLException because AvaticaConnection's - // getStatement() is missing "throws SQLException". - throw new RuntimeException(e.getMessage(), e); - } catch (SQLException e) { - throw new RuntimeException(e.getMessage(), e); - } + public AvaticaStatement getStatement() throws SQLException { + throwIfClosed(); return super.getStatement(); } diff --git a/pom.xml b/pom.xml index 4b6942696fb..5a68ffdb1b1 100644 --- a/pom.xml +++ b/pom.xml @@ -36,8 +36,8 @@ 18.0 2 1.8.1-drill-r0 - 1.15.0-drill-r0 - 1.10.0 + 1.16.0-drill-r0 + 1.11.0 2.7.6 1.1.9-drill-r7 2.7.9 From f8691f4f9b2a8a64d33bad61bd7cb1d9a428569e Mon Sep 17 00:00:00 2001 From: Sorabh Hamirwasia Date: Thu, 5 Apr 2018 15:49:22 -0700 Subject: [PATCH 41/44] DRILL-6311: No logging information in drillbit.log / drillbit.out closes #1202 --- exec/java-exec/pom.xml | 7 ------- exec/jdbc/pom.xml | 7 ------- exec/memory/base/pom.xml | 7 ------- exec/pom.xml | 11 ++++++++++- exec/rpc/pom.xml | 7 ------- exec/vector/pom.xml | 8 -------- 6 files changed, 10 insertions(+), 37 deletions(-) diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml index f2d2ebd2c65..1e25369da1a 100644 --- a/exec/java-exec/pom.xml +++ b/exec/java-exec/pom.xml @@ -367,13 +367,6 @@ - - org.apache.drill - drill-common - ${project.version} - tests - test - com.beust jcommander diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml index ca55724148c..0f315782925 100644 --- a/exec/jdbc/pom.xml +++ b/exec/jdbc/pom.xml @@ -45,13 +45,6 @@ drill-java-exec ${project.version} - - org.apache.drill - drill-common - tests - ${project.version} - test - org.apache.drill.exec drill-java-exec diff --git a/exec/memory/base/pom.xml b/exec/memory/base/pom.xml index f88c4f9bbb4..3234b47b08b 100644 --- a/exec/memory/base/pom.xml +++ b/exec/memory/base/pom.xml @@ -38,13 +38,6 @@ 0.7.1 - - org.apache.drill - drill-common - ${project.version} - tests - test - diff --git a/exec/pom.xml b/exec/pom.xml index 7f2cc64dffc..402064bc807 100644 --- a/exec/pom.xml +++ b/exec/pom.xml @@ -43,7 +43,6 @@ - memory rpc @@ -51,4 +50,14 @@ java-exec jdbc + + + + org.apache.drill + drill-common + ${project.version} + tests + test + + diff --git a/exec/rpc/pom.xml b/exec/rpc/pom.xml index 8b7cec520c6..126992fb43e 100644 --- a/exec/rpc/pom.xml +++ b/exec/rpc/pom.xml @@ -36,13 +36,6 @@ drill-memory-base ${project.version} - - org.apache.drill - drill-common - ${project.version} - tests - test - com.google.protobuf diff --git a/exec/vector/pom.xml b/exec/vector/pom.xml index 21e138d11c9..24f41369ccf 100644 --- a/exec/vector/pom.xml +++ b/exec/vector/pom.xml @@ -64,16 +64,8 @@ hppc 0.7.1 - - - org.apache.drill - drill-common - ${project.version} - tests - - From 1bb292072f249bc8c4334313af8f8537c7ed1622 Mon Sep 17 00:00:00 2001 From: Sorabh Hamirwasia Date: Mon, 5 Feb 2018 13:12:15 -0800 Subject: [PATCH 42/44] DRILL-6322: Lateral Join: Common changes - Add new iterOutcome, Operatortypes, MockRecordBatch for testing Added new Iterator State EMIT, added operatos LATERA_JOIN & UNNEST in CoreOperatorType and added LateralContract interface Implementation of MockRecordBatch to test operator behavior for different IterOutcomes. a) Creates new output container for schema change cases. b) Doesn't create new container for each next() call without schema change, since the operator in test expects the ValueVector object in it's incoming batch to be same unless a OK_NEW_SCHEMA case is hit. Since setup() method of operator in test will store the reference to value vector received in first batch This closes #1211 --- .../exec/physical/base/LateralContract.java | 46 +++++ .../apache/drill/exec/record/RecordBatch.java | 27 ++- .../exec/physical/impl/MockRecordBatch.java | 185 ++++++++++++++++++ .../apache/drill/test/OperatorFixture.java | 28 +-- .../drill/exec/proto/UserBitShared.java | 31 ++- .../exec/proto/beans/CoreOperatorType.java | 6 +- .../src/main/protobuf/UserBitShared.proto | 2 + 7 files changed, 306 insertions(+), 19 deletions(-) create mode 100644 exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/LateralContract.java create mode 100644 exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/MockRecordBatch.java diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/LateralContract.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/LateralContract.java new file mode 100644 index 00000000000..3d6a3c5b946 --- /dev/null +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/LateralContract.java @@ -0,0 +1,46 @@ +/* + * 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 org.apache.drill.exec.physical.base; + +import org.apache.drill.exec.record.RecordBatch; +import org.apache.drill.exec.record.RecordBatch.IterOutcome; + +/** + * Contract between Lateral Join and any operator on right side of it consuming the input + * from left side. + */ +public interface LateralContract { + + /** + * Get reference to left side incoming of LateralJoinRecordBatch + * @return + */ + RecordBatch getIncoming(); + + /** + * Get current record index in incoming to be processed + * @return + */ + int getRecordIndex(); + + /** + * Get the current outcome of left incoming batch + */ + IterOutcome getLeftOutcome(); +} diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatch.java index 7fc086dfa4a..fe7f9e97e9f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatch.java @@ -198,7 +198,32 @@ enum IterOutcome { * {@code OUT_OF_MEMORY} to its caller) and call {@code next()} again. *

    */ - OUT_OF_MEMORY + OUT_OF_MEMORY, + + /** + * Emit record to produce output batches. + *

    + * The call to {@link #next()}, + * read zero or more records with no change in schema as compared to last + * time. It is an indication from upstream operator to unblock and + * produce an output batch based on all the records current operator + * possess. The caller should return this outcome to it's downstream + * operators except LateralJoinRecordBatch, which will consume any EMIT + * from right branch but will pass through EMIT from left branch. + *

    + *

    + * Caller should produce one or more output record batch based on all the + * current data and restart fresh for any new input. If there are multiple + * output batches then caller should send EMIT only with last batch and OK + * with all previous batches. + * For example: Hash Join when received EMIT on build side will stop build + * side and call next() on probe side until it sees EMIT. On seeing EMIT + * from probe side, it should perform JOIN and produce output batches. + * Later it should clear all the data on both build and probe side of + * input and again start from build side. + *

    + */ + EMIT, } /** diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/MockRecordBatch.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/MockRecordBatch.java new file mode 100644 index 00000000000..a16e5b81232 --- /dev/null +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/MockRecordBatch.java @@ -0,0 +1,185 @@ +/* + * 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 org.apache.drill.exec.physical.impl; + +import org.apache.drill.common.expression.SchemaPath; +import org.apache.drill.exec.memory.BufferAllocator; +import org.apache.drill.exec.ops.FragmentContext; +import org.apache.drill.exec.ops.OperatorContext; +import org.apache.drill.exec.record.BatchSchema; +import org.apache.drill.exec.record.CloseableRecordBatch; +import org.apache.drill.exec.record.TypedFieldId; +import org.apache.drill.exec.record.VectorContainer; +import org.apache.drill.exec.record.VectorWrapper; +import org.apache.drill.exec.record.WritableBatch; +import org.apache.drill.exec.record.selection.SelectionVector2; +import org.apache.drill.exec.record.selection.SelectionVector4; + +import java.util.Iterator; +import java.util.List; + +public class MockRecordBatch implements CloseableRecordBatch { + private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(MockRecordBatch.class); + + // These resources are owned by this RecordBatch + private VectorContainer container; + private int currentContainerIndex; + private int currentOutcomeIndex; + private boolean isDone; + + // All the below resources are owned by caller + private final List allTestContainers; + private final List allOutcomes; + private final FragmentContext context; + private final OperatorContext oContext; + private final BufferAllocator allocator; + + public MockRecordBatch(FragmentContext context, OperatorContext oContext, + List testContainers, List iterOutcomes, + BatchSchema schema) { + this.context = context; + this.oContext = oContext; + this.allocator = oContext.getAllocator(); + this.allTestContainers = testContainers; + this.container = new VectorContainer(allocator, schema); + this.allOutcomes = iterOutcomes; + this.currentContainerIndex = 0; + this.currentOutcomeIndex = 0; + this.isDone = false; + } + + @Override + public void close() throws Exception { + container.clear(); + container.setRecordCount(0); + currentContainerIndex = 0; + currentOutcomeIndex = 0; + } + + @Override + public SelectionVector2 getSelectionVector2() { + return null; + } + + @Override + public SelectionVector4 getSelectionVector4() { + return null; + } + + @Override + public FragmentContext getContext() { + return context; + } + + @Override + public BatchSchema getSchema() { + return container.getSchema(); + } + + @Override + public int getRecordCount() { + return container.getRecordCount(); + } + + @Override + public void kill(boolean sendUpstream) { + isDone = true; + container.clear(); + container.setRecordCount(0); + } + + @Override + public VectorContainer getOutgoingContainer() { + return null; + } + + @Override + public TypedFieldId getValueVectorId(SchemaPath path) { + return container.getValueVectorId(path); + } + + @Override + public VectorWrapper getValueAccessorById(Class clazz, int... ids) { + return container.getValueAccessorById(clazz, ids); + } + + @Override + public IterOutcome next() { + + if(isDone) { + return IterOutcome.NONE; + } + + IterOutcome currentOutcome = IterOutcome.OK; + + if (currentContainerIndex < allTestContainers.size()) { + final VectorContainer input = allTestContainers.get(currentContainerIndex); + final int recordCount = input.getRecordCount(); + // We need to do this since the downstream operator expects vector reference to be same + // after first next call in cases when schema is not changed + final BatchSchema inputSchema = input.getSchema(); + if (!container.getSchema().isEquivalent(inputSchema)) { + container.clear(); + container = new VectorContainer(allocator, inputSchema); + } + container.transferIn(input); + container.setRecordCount(recordCount); + } + + if (currentOutcomeIndex < allOutcomes.size()) { + currentOutcome = allOutcomes.get(currentOutcomeIndex); + ++currentOutcomeIndex; + } else { + currentOutcome = IterOutcome.NONE; + } + + switch (currentOutcome) { + case OK: + case OK_NEW_SCHEMA: + case EMIT: + ++currentContainerIndex; + return currentOutcome; + case NONE: + case STOP: + case OUT_OF_MEMORY: + //case OK_NEW_SCHEMA: + isDone = true; + container.setRecordCount(0); + return currentOutcome; + case NOT_YET: + container.setRecordCount(0); + return currentOutcome; + default: + throw new UnsupportedOperationException("This state is not supported"); + } + } + + @Override + public WritableBatch getWritableBatch() { + throw new UnsupportedOperationException("MockRecordBatch doesn't support gettingWritableBatch yet"); + } + + @Override + public Iterator> iterator() { + return container.iterator(); + } + + public boolean isCompleted() { + return isDone; + } +} \ No newline at end of file diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/OperatorFixture.java b/exec/java-exec/src/test/java/org/apache/drill/test/OperatorFixture.java index 3e50f755e2f..bb63277d57c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/OperatorFixture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/OperatorFixture.java @@ -17,11 +17,11 @@ */ package org.apache.drill.test; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutorService; - +import com.google.common.base.Function; +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.util.concurrent.ListenableFuture; +import io.netty.buffer.DrillBuf; import org.apache.calcite.schema.SchemaPlus; import org.apache.drill.common.config.DrillConfig; import org.apache.drill.common.scanner.ClassPathScanner; @@ -66,11 +66,10 @@ import org.apache.drill.test.rowSet.RowSetBuilder; import org.apache.hadoop.security.UserGroupInformation; -import com.google.common.base.Function; -import com.google.common.base.Preconditions; -import com.google.common.util.concurrent.ListenableFuture; - -import io.netty.buffer.DrillBuf; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.Callable; +import java.util.concurrent.ExecutorService; /** * Test fixture for operator and (especially) "sub-operator" tests. @@ -157,6 +156,8 @@ public static class MockFragmentContext extends BaseFragmentContext { private final BufferAllocator allocator; private final ExecutorService scanExecutorService; private final ExecutorService scanDecodeExecutorService; + private final List contexts = Lists.newLinkedList(); + private ExecutorState executorState = new OperatorFixture.MockExecutorState(); private ExecutionControls controls; @@ -251,7 +252,9 @@ public OperatorContext newOperatorContext(PhysicalOperator popConfig, popConfig.getInitialAllocation(), popConfig.getMaxAllocation() ); - return new MockOperatorContext(this, childAllocator, popConfig); + OperatorContext context = new MockOperatorContext(this, childAllocator, popConfig); + contexts.add(context); + return context; } @Override @@ -286,6 +289,9 @@ protected BufferManager getBufferManager() { @Override public void close() { + for(OperatorContext context : contexts) { + context.close(); + } bufferManager.close(); } diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java index b2cc57d4d9a..770ddb4e1e1 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java @@ -529,6 +529,14 @@ public enum CoreOperatorType * FLATTEN = 40; */ FLATTEN(40, 40), + /** + * LATERAL_JOIN = 41; + */ + LATERAL_JOIN(41, 41), + /** + * UNNEST = 42; + */ + UNNEST(42, 42), ; /** @@ -695,6 +703,14 @@ public enum CoreOperatorType * FLATTEN = 40; */ public static final int FLATTEN_VALUE = 40; + /** + * LATERAL_JOIN = 41; + */ + public static final int LATERAL_JOIN_VALUE = 41; + /** + * UNNEST = 42; + */ + public static final int UNNEST_VALUE = 42; public final int getNumber() { return value; } @@ -742,6 +758,8 @@ public static CoreOperatorType valueOf(int value) { case 38: return KAFKA_SUB_SCAN; case 39: return KUDU_SUB_SCAN; case 40: return FLATTEN; + case 41: return LATERAL_JOIN; + case 42: return UNNEST; default: return null; } } @@ -24122,7 +24140,7 @@ public Builder clearStatus() { "agmentState\022\013\n\007SENDING\020\000\022\027\n\023AWAITING_ALL" + "OCATION\020\001\022\013\n\007RUNNING\020\002\022\014\n\010FINISHED\020\003\022\r\n\t" + "CANCELLED\020\004\022\n\n\006FAILED\020\005\022\032\n\026CANCELLATION_" + - "REQUESTED\020\006*\244\006\n\020CoreOperatorType\022\021\n\rSING" + + "REQUESTED\020\006*\302\006\n\020CoreOperatorType\022\021\n\rSING" + "LE_SENDER\020\000\022\024\n\020BROADCAST_SENDER\020\001\022\n\n\006FIL" + "TER\020\002\022\022\n\016HASH_AGGREGATE\020\003\022\r\n\tHASH_JOIN\020\004" + "\022\016\n\nMERGE_JOIN\020\005\022\031\n\025HASH_PARTITION_SENDE" + @@ -24142,11 +24160,12 @@ public Builder clearStatus() { "ASE_SUB_SCAN\020!\022\n\n\006WINDOW\020\"\022\024\n\020NESTED_LOO" + "P_JOIN\020#\022\021\n\rAVRO_SUB_SCAN\020$\022\021\n\rPCAP_SUB_" + "SCAN\020%\022\022\n\016KAFKA_SUB_SCAN\020&\022\021\n\rKUDU_SUB_S" + - "CAN\020\'\022\013\n\007FLATTEN\020(*g\n\nSaslStatus\022\020\n\014SASL" + - "_UNKNOWN\020\000\022\016\n\nSASL_START\020\001\022\024\n\020SASL_IN_PR" + - "OGRESS\020\002\022\020\n\014SASL_SUCCESS\020\003\022\017\n\013SASL_FAILE" + - "D\020\004B.\n\033org.apache.drill.exec.protoB\rUser" + - "BitSharedH\001" + "CAN\020\'\022\013\n\007FLATTEN\020(\022\020\n\014LATERAL_JOIN\020)\022\n\n\006" + + "UNNEST\020**g\n\nSaslStatus\022\020\n\014SASL_UNKNOWN\020\000" + + "\022\016\n\nSASL_START\020\001\022\024\n\020SASL_IN_PROGRESS\020\002\022\020" + + "\n\014SASL_SUCCESS\020\003\022\017\n\013SASL_FAILED\020\004B.\n\033org" + + ".apache.drill.exec.protoB\rUserBitSharedH" + + "\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java index dc3f158e7a1..e7b897d9260 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java @@ -62,7 +62,9 @@ public enum CoreOperatorType implements com.dyuproject.protostuff.EnumLite Date: Thu, 12 Apr 2018 16:39:19 -0700 Subject: [PATCH 43/44] DRILL-6320: Added license-maven-plugin to the pom. --- INSTALL.md | 4 +- pom.xml | 143 ++++++++++++++++++++++++++++++++++++++++------- protocol/pom.xml | 36 ++++++------ 3 files changed, 145 insertions(+), 38 deletions(-) diff --git a/INSTALL.md b/INSTALL.md index 72268e9e04b..21334e6252c 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -4,7 +4,7 @@ Currently, the Apache Drill build process is known to work on Linux, Windows and OSX. To build, you need to have the following software installed on your system to successfully complete a build. * Java 8 - * Maven 3.x + * Maven 3.3.1 or greater ## Confirm settings # java -version @@ -13,7 +13,7 @@ Currently, the Apache Drill build process is known to work on Linux, Windows and Java HotSpot(TM) 64-Bit Server VM (build 25.161-b12, mixed mode) # mvn --version - Apache Maven 3.0.3 (r1075438; 2011-02-28 09:31:09-0800) + Apache Maven 3.3.1 (cab6659f9874fa96462afef40fcf6bc033d58c1c; 2015-03-13T13:10:27-07:00) ## Checkout diff --git a/pom.xml b/pom.xml index 5a68ffdb1b1..eb3ed06f74f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 @@ -67,6 +76,8 @@ 4096 4096 -Xdoclint:none + true + true @@ -192,11 +203,9 @@ org.apache.rat apache-rat-plugin - 0.12 rat-checks - validate check @@ -255,7 +264,15 @@ - + + + com.mycila + license-maven-plugin + org.apache.maven.plugins maven-checkstyle-plugin @@ -355,7 +372,7 @@ - [3.0.4,4) + [3.3.1,4) [1.8,1.9) @@ -430,15 +447,103 @@ + + com.mycila + license-maven-plugin + 3.0 + + true +
    ${maven.multiModuleProjectDirectory}/header
    + + **/clientlib/y2038/*.c + **/clientlib/y2038/*.h + **/resources/parquet/**/* + **/*.g + **/*.woff2 + **/*.ks + **/*.pcap + **/*.props + **/*.conf + **/*.log + **/*.css + **/*.js + **/*.md + **/*.eps + **/*.json + **/*.seq + **/*.parquet + **/*.sql + **/git.properties + **/*.csv + **/*.csvh + **/*.csvh-test + **/*.tsv + **/*.txt + **/*.ssv + **/drill-*.conf + **/.buildpath + **/*.proto + **/*.fmpp + **/target/** + **/*.iml + **/.idea/** + **/*.tdd + **/*.project + **/TAGS + **/*.checkstyle + **/.classpath + **/.settings/** + .*/** + **/*.patch + **/*.pb.cc + **/*.pb.h + **/*.linux + **/client/*build*/** + **/client/tags + **/cmake_install.cmake + **/ssl/*.csr + **/ssl/*.pem + **/ssl/*.p12 + **/*.tbl + **/*.httpd + **/*.autotools + **/*.cproject + **/*.drill + **/*.plist + **/LICENSE + **/NOTICE + KEYS + header + + dependency-reduced-pom.xml + + + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SLASHSTAR_STYLE + SCRIPT_STYLE + +     + + + + check + + + +     - - org.apache.rat - apache-rat-plugin - 0.11 - org.apache.maven.plugins maven-resources-plugin diff --git a/protocol/pom.xml b/protocol/pom.xml index 1e21f3bbddf..5f22b92fc09 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 @@ -140,13 +149,6 @@ com.mycila license-maven-plugin - 2.3 - -
    ${basedir}/../header
    - - **/*.java - -     process-sources From 62f14690870568364723dc77494043a9854a0447 Mon Sep 17 00:00:00 2001 From: Drill Dev Date: Fri, 13 Apr 2018 10:24:45 -0700 Subject: [PATCH 44/44] DRILL-6320: Fixed license headers. closes #1207 --- .travis.yml | 3 +- common/pom.xml | 31 +++++++++------- .../drill/common/AutoCloseablePointer.java | 2 +- .../apache/drill/common/AutoCloseables.java | 2 +- .../drill/common/CatastrophicFailure.java | 2 +- .../drill/common/DeferredException.java | 2 +- .../drill/common/DrillAutoCloseables.java | 2 +- .../apache/drill/common/EventProcessor.java | 2 +- .../apache/drill/common/HistoricalLog.java | 2 +- .../org/apache/drill/common/KerberosUtil.java | 2 +- .../drill/common/SelfCleaningRunnable.java | 2 +- .../org/apache/drill/common/StackTrace.java | 2 +- .../common/collections/ImmutableEntry.java | 6 +-- .../common/collections/MapWithOrdinal.java | 2 +- .../common/concurrent/AutoCloseableLock.java | 2 +- .../common/concurrent/ExtendedLatch.java | 2 +- .../drill/common/config/CommonConstants.java | 2 +- .../drill/common/config/ConfigProvider.java | 2 +- .../drill/common/config/DrillConfig.java | 2 +- .../drill/common/config/NestedConfig.java | 2 +- .../drill/common/config/package-info.java | 2 +- .../DrillConfigurationException.java | 2 +- .../drill/common/exceptions/DrillError.java | 2 +- .../common/exceptions/DrillException.java | 2 +- .../common/exceptions/DrillIOException.java | 2 +- .../exceptions/DrillRuntimeException.java | 2 +- .../drill/common/exceptions/ErrorHelper.java | 2 +- .../exceptions/RetryAfterSpillException.java | 2 +- .../common/exceptions/UserException.java | 2 +- .../exceptions/UserExceptionContext.java | 2 +- .../exceptions/UserRemoteException.java | 2 +- .../drill/common/exceptions/package-info.java | 2 +- .../org/apache/drill/common/package-info.java | 2 +- .../drill/common/scanner/BuildTimeScan.java | 2 +- .../common/scanner/ClassPathScanner.java | 2 +- .../drill/common/scanner/RunTimeScan.java | 2 +- .../persistence/AnnotatedClassDescriptor.java | 2 +- .../persistence/AnnotationDescriptor.java | 2 +- .../persistence/AttributeDescriptor.java | 2 +- .../persistence/ChildClassDescriptor.java | 2 +- .../scanner/persistence/FieldDescriptor.java | 2 +- .../persistence/ParentClassDescriptor.java | 2 +- .../scanner/persistence/ScanResult.java | 2 +- .../scanner/persistence/TypeDescriptor.java | 2 +- .../drill/common/types/package-info.java | 2 +- .../drill/common/util/ConstructorChecker.java | 2 +- .../drill/common/util/CoreDecimalUtility.java | 2 +- .../common/util/DataInputInputStream.java | 2 +- .../common/util/DataOutputOutputStream.java | 2 +- .../DecimalScalePrecisionAddFunction.java | 2 +- .../DecimalScalePrecisionDivideFunction.java | 3 +- .../DecimalScalePrecisionModFunction.java | 3 +- .../DecimalScalePrecisionMulFunction.java | 3 +- .../util/DrillBaseComputeScalePrecision.java | 2 +- .../drill/common/util/DrillFileUtils.java | 2 +- .../drill/common/util/DrillStringUtils.java | 2 +- .../drill/common/util/RepeatTestRule.java | 2 +- .../drill/common/util/package-info.java | 2 +- .../drill/exec/metrics/DrillMetrics.java | 2 +- .../apache/drill/exec/util/AssertionUtil.java | 2 +- .../drill/exec/util/SystemPropertyUtil.java | 2 +- .../drill/categories/HbaseStorageTest.java | 3 +- .../drill/categories/HiveStorageTest.java | 3 +- .../drill/categories/JdbcStorageTest.java | 3 +- .../org/apache/drill/categories/JdbcTest.java | 3 +- .../drill/categories/KafkaStorageTest.java | 1 - .../drill/categories/KuduStorageTest.java | 3 +- .../apache/drill/categories/MemoryTest.java | 3 +- .../drill/categories/MongoStorageTest.java | 3 +- .../apache/drill/categories/OperatorTest.java | 3 +- .../apache/drill/categories/OptionsTest.java | 3 +- .../apache/drill/categories/ParquetTest.java | 3 +- .../apache/drill/categories/PlannerTest.java | 3 +- .../apache/drill/categories/SecurityTest.java | 3 +- .../drill/categories/SqlFunctionTest.java | 3 +- .../org/apache/drill/categories/SqlTest.java | 3 +- .../apache/drill/categories/VectorTest.java | 3 +- .../apache/drill/categories/package-info.java | 3 +- .../common/exceptions/TestUserException.java | 2 +- .../common/map/TestCaseInsensitiveMap.java | 2 +- .../org/apache/drill/test/DirTestWatcher.java | 1 - ...ll2130CommonHamcrestConfigurationTest.java | 2 +- .../org/apache/drill/test/DrillAssert.java | 2 +- .../apache/drill/test/SubDirTestWatcher.java | 1 - .../drill/test/UserExceptionMatcher.java | 2 +- common/src/test/resources/logback-test.xml | 29 ++++++++++----- contrib/data/pom.xml | 27 ++++++++------ contrib/data/tpch-sample-data/bin/pom.xml | 29 ++++++++++----- contrib/data/tpch-sample-data/pom.xml | 29 ++++++++++----- contrib/format-maprdb/pom.xml | 27 ++++++++------ .../exec/store/mapr/TableFormatPlugin.java | 2 +- .../store/mapr/TableFormatPluginConfig.java | 2 +- .../exec/store/mapr/db/MapRDBGroupScan.java | 2 +- .../mapr/db/MapRDBPushFilterIntoScan.java | 2 +- .../exec/store/mapr/db/MapRDBSubScanSpec.java | 2 +- .../exec/store/mapr/db/MapRDBTableStats.java | 2 +- .../store/mapr/db/TabletFragmentInfo.java | 2 +- .../db/json/CompareFunctionsProcessor.java | 2 +- .../exec/store/mapr/db/json/JsonScanSpec.java | 2 +- .../store/mapr/db/json/JsonSubScanSpec.java | 2 +- .../exec/store/mapr/db/util/CommonFns.java | 2 +- .../store/mapr/db/util/FieldPathHelper.java | 31 ++++++++-------- .../mapr/streams/StreamsFormatMatcher.java | 2 +- .../mapr/streams/StreamsFormatPlugin.java | 2 +- .../streams/StreamsFormatPluginConfig.java | 2 +- .../src/main/resources/checkstyle-config.xml | 29 ++++++++++----- .../resources/checkstyle-suppressions.xml | 29 ++++++++++----- .../drill/maprdb/tests/MaprDBTestsSuite.java | 2 +- .../binary/TestMapRDBCFAsJSONString.java | 2 +- .../binary/TestMapRDBFilterPushDown.java | 2 +- .../binary/TestMapRDBProjectPushDown.java | 2 +- .../tests/binary/TestMapRDBQueries.java | 2 +- .../maprdb/tests/binary/TestMapRDBSimple.java | 2 +- .../drill/maprdb/tests/json/BaseJsonTest.java | 2 +- .../src/test/resources/hbase-site.xml | 27 ++++++++------ contrib/gis/pom.xml | 27 ++++++++------ .../exec/expr/fn/impl/gis/STAsGeoJSON.java | 1 - .../drill/exec/expr/fn/impl/gis/STAsJson.java | 1 - .../drill/exec/expr/fn/impl/gis/STAsText.java | 2 +- .../exec/expr/fn/impl/gis/STDWithin.java | 2 +- .../exec/expr/fn/impl/gis/STGeomFromText.java | 2 +- .../expr/fn/impl/gis/STGeomFromTextSrid.java | 2 +- .../exec/expr/fn/impl/gis/STPointFunc.java | 2 +- .../drill/exec/expr/fn/impl/gis/STWithin.java | 2 +- .../exec/expr/fn/impl/gis/GISTestSuite.java | 2 +- .../fn/impl/gis/TestGeometryFunctions.java | 2 +- .../native/client/example/querySubmitter.cpp | 1 - contrib/native/client/readme.boost | 1 - contrib/native/client/readme.macos | 2 - contrib/native/client/readme.sasl | 1 - contrib/native/client/readme.ssl | 1 - contrib/native/client/scripts/cpProtofiles.sh | 1 - contrib/native/client/scripts/fixProtodefs.sh | 1 - .../native/client/src/clientlib/channel.cpp | 1 - .../native/client/src/clientlib/channel.hpp | 1 - .../client/src/clientlib/collectionsImpl.hpp | 1 - .../client/src/clientlib/decimalUtils.cpp | 2 - .../client/src/clientlib/drillClient.cpp | 1 - .../client/src/clientlib/drillClientImpl.cpp | 2 - .../client/src/clientlib/drillClientImpl.hpp | 2 - .../client/src/clientlib/drillConfig.cpp | 1 - .../client/src/clientlib/drillError.cpp | 2 - contrib/native/client/src/clientlib/env.h.in | 1 - .../native/client/src/clientlib/errmsgs.cpp | 1 - .../native/client/src/clientlib/errmsgs.hpp | 1 - .../native/client/src/clientlib/fieldmeta.cpp | 1 - .../native/client/src/clientlib/logger.cpp | 33 ++++++++--------- .../native/client/src/clientlib/logger.hpp | 33 ++++++++--------- .../native/client/src/clientlib/metadata.cpp | 1 - .../native/client/src/clientlib/metadata.hpp | 2 - .../client/src/clientlib/recordBatch.cpp | 1 - .../client/src/clientlib/rpcMessage.cpp | 2 - .../client/src/clientlib/rpcMessage.hpp | 2 - .../src/clientlib/saslAuthenticatorImpl.cpp | 1 - .../src/clientlib/saslAuthenticatorImpl.hpp | 1 - .../client/src/clientlib/streamSocket.hpp | 2 - .../client/src/clientlib/userProperties.cpp | 1 - contrib/native/client/src/clientlib/utils.cpp | 33 ++++++++--------- contrib/native/client/src/clientlib/utils.hpp | 33 ++++++++--------- .../native/client/src/clientlib/wincert.ipp | 1 - .../client/src/clientlib/y2038/time64.c | 2 +- .../client/src/clientlib/y2038/time64.h | 2 +- .../src/clientlib/y2038/time64_config.h | 2 +- .../src/clientlib/y2038/time64_limits.h | 2 +- .../client/src/clientlib/zookeeperClient.cpp | 1 - .../client/src/clientlib/zookeeperClient.hpp | 1 - .../client/src/include/drill/collections.hpp | 1 - .../client/src/include/drill/common.hpp | 2 - .../client/src/include/drill/decimalUtils.hpp | 2 - .../client/src/include/drill/drillClient.hpp | 2 - .../client/src/include/drill/drillConfig.hpp | 2 - .../client/src/include/drill/drillError.hpp | 2 - .../client/src/include/drill/drillc.hpp | 1 - .../client/src/include/drill/fieldmeta.hpp | 1 - .../src/include/drill/preparedStatement.hpp | 1 - .../client/src/include/drill/recordBatch.hpp | 1 - .../client/src/test/CollectionsTest.cpp | 1 - contrib/native/client/src/test/UtilsTest.cpp | 1 - contrib/native/client/src/test/main.cpp | 1 - contrib/native/client/test/ssl/testClient.cpp | 1 - contrib/native/client/test/ssl/testSSL.cpp | 1 - contrib/native/client/test/ssl/testServer.cpp | 2 - contrib/pom.xml | 27 ++++++++------ contrib/sqlline/pom.xml | 31 +++++++++------- contrib/storage-hbase/pom.xml | 27 ++++++++------ .../conv/OrderedBytesBigIntConvertFrom.java | 5 +-- .../conv/OrderedBytesBigIntConvertTo.java | 5 +-- .../conv/OrderedBytesBigIntDescConvertTo.java | 5 +-- .../conv/OrderedBytesDoubleConvertFrom.java | 5 +-- .../conv/OrderedBytesDoubleConvertTo.java | 5 +-- .../conv/OrderedBytesDoubleDescConvertTo.java | 5 +-- .../conv/OrderedBytesFloatConvertFrom.java | 5 +-- .../impl/conv/OrderedBytesFloatConvertTo.java | 5 +-- .../conv/OrderedBytesFloatDescConvertTo.java | 5 +-- .../impl/conv/OrderedBytesIntConvertFrom.java | 5 +-- .../impl/conv/OrderedBytesIntConvertTo.java | 5 +-- .../conv/OrderedBytesIntDescConvertTo.java | 5 +-- .../exec/store/hbase/DrillHBaseConstants.java | 2 +- .../store/hbase/HBaseConnectionManager.java | 2 +- .../store/hbase/HBasePushFilterIntoScan.java | 3 +- .../exec/store/hbase/HBaseRegexParser.java | 2 +- .../store/hbase/HBaseScanBatchCreator.java | 2 +- .../drill/exec/store/hbase/HBaseScanSpec.java | 2 +- .../store/hbase/HBaseStoragePluginConfig.java | 2 +- .../store/hbase/TableStatsCalculator.java | 4 +- .../hbase/config/HBasePStoreProvider.java | 6 +-- .../config/HBasePersistentStoreProvider.java | 2 +- .../org/apache/drill/hbase/BaseHBaseTest.java | 2 +- .../drill/hbase/HBaseRecordReaderTest.java | 2 +- .../drill/hbase/TestHBaseCFAsJSONString.java | 2 +- .../hbase/TestHBaseConnectionManager.java | 2 +- .../drill/hbase/TestHBaseFilterPushDown.java | 2 +- .../drill/hbase/TestHBaseProjectPushDown.java | 2 +- .../apache/drill/hbase/TestHBaseQueries.java | 2 +- .../drill/hbase/TestHBaseRegexParser.java | 2 +- .../hbase/TestHBaseRegionScanAssignments.java | 2 +- .../TestOrderedBytesConvertFunctions.java | 2 +- .../drill/hbase/TestTableGenerator.java | 2 +- ...StorageHBaseHamcrestConfigurationTest.java | 2 +- .../src/test/resources/hbase-site.xml | 36 +++++++++--------- contrib/storage-hive/core/pom.xml | 27 ++++++++------ .../src/main/codegen/includes/license.ftl | 36 +++++++++--------- .../codegen/templates/HiveRecordReaders.java | 1 - .../templates/ObjectInspectorHelper.java | 3 +- .../codegen/templates/ObjectInspectors.java | 2 +- .../drill/exec/expr/HiveFuncHolderExpr.java | 2 +- .../exec/expr/fn/HiveFunctionRegistry.java | 2 +- ...AbstractDrillPrimitiveObjectInspector.java | 2 +- .../fn/impl/hive/DrillDeferredObject.java | 2 +- .../planner/sql/HivePartitionLocation.java | 2 +- .../exec/planner/sql/HiveUDFOperator.java | 3 +- .../sql/HiveUDFOperatorWithoutInference.java | 2 +- .../HivePushPartitionFilterIntoScan.java | 3 +- .../exec/store/hive/ColumnListsCache.java | 31 ++++++++-------- .../store/hive/HiveAuthorizationHelper.java | 2 +- .../exec/store/hive/HiveFieldConverter.java | 2 +- .../drill/exec/store/hive/HivePartition.java | 31 ++++++++-------- .../drill/exec/store/hive/HiveReadEntry.java | 2 +- .../store/hive/HiveStoragePluginConfig.java | 2 +- .../store/hive/HiveTableWithColumnCache.java | 31 ++++++++-------- .../exec/store/hive/HiveTableWrapper.java | 2 +- .../inspectors/AbstractRecordsInspector.java | 13 ++++--- .../inspectors/DefaultRecordsInspector.java | 13 ++++--- .../SkipFooterRecordsInspector.java | 13 ++++--- .../store/hive/schema/DrillHiveViewTable.java | 2 +- .../drill/exec/TestHivePartitionPruning.java | 2 +- .../drill/exec/TestHiveProjectPushDown.java | 2 +- .../drill/exec/fn/hive/HiveTestUDFImpls.java | 6 +-- .../drill/exec/fn/hive/TestHiveUDFs.java | 2 +- .../exec/fn/hive/TestSampleHiveUDFs.java | 2 +- .../apache/drill/exec/hive/HiveTestBase.java | 4 +- .../drill/exec/hive/HiveTestUtilities.java | 4 +- .../drill/exec/hive/TestHiveStorage.java | 2 +- .../hive/TestInfoSchemaOnHiveStorage.java | 2 +- .../hive/BaseTestHiveImpersonation.java | 2 +- .../hive/TestSqlStdBasedAuthorization.java | 2 +- .../TestStorageBasedHiveAuthorization.java | 2 +- .../sql/hive/TestViewSupportOnHiveTables.java | 4 +- .../store/hive/HiveTestDataGenerator.java | 1 - .../SkipFooterRecordsInspectorTest.java | 31 ++++++++-------- .../hive/schema/TestColumnListCache.java | 31 ++++++++-------- ...rageHiveCoreHamcrestConfigurationTest.java | 2 +- contrib/storage-hive/hive-exec-shade/pom.xml | 27 ++++++++------ contrib/storage-hive/pom.xml | 27 ++++++++------ contrib/storage-jdbc/pom.xml | 29 +++++++++------ .../exec/store/jdbc/JdbcBatchCreator.java | 2 +- .../drill/exec/store/jdbc/JdbcDrel.java | 2 +- .../drill/exec/store/jdbc/JdbcGroupScan.java | 2 +- .../exec/store/jdbc/JdbcIntermediatePrel.java | 2 +- .../exec/store/jdbc/JdbcRecordReader.java | 2 +- .../exec/store/jdbc/JdbcStorageConfig.java | 2 +- .../drill/exec/store/jdbc/JdbcSubScan.java | 2 +- contrib/storage-kafka/pom.xml | 29 ++++++++++----- contrib/storage-kudu/pom.xml | 29 ++++++++++----- .../codegen/templates/KuduRecordWriter.java | 3 +- .../drill/exec/store/kudu/DrillKuduTable.java | 2 +- .../exec/store/kudu/KuduScanBatchCreator.java | 2 +- .../drill/exec/store/kudu/KuduScanSpec.java | 2 +- .../exec/store/kudu/KuduSchemaFactory.java | 2 +- .../exec/store/kudu/KuduStoragePlugin.java | 2 +- .../store/kudu/KuduStoragePluginConfig.java | 2 +- .../drill/exec/store/kudu/KuduWriter.java | 2 +- .../store/kudu/KuduWriterBatchCreator.java | 2 +- .../drill/store/kudu/TestKuduConnect.java | 2 +- contrib/storage-mongo/pom.xml | 27 ++++++++------ .../exec/store/mongo/DrillMongoConstants.java | 2 +- .../drill/exec/store/mongo/MongoCnxnKey.java | 2 +- .../mongo/MongoCompareFunctionProcessor.java | 2 +- .../exec/store/mongo/MongoGroupScan.java | 2 +- .../mongo/MongoPushDownFilterForScan.java | 2 +- .../exec/store/mongo/MongoRecordReader.java | 2 +- .../store/mongo/MongoScanBatchCreator.java | 2 +- .../drill/exec/store/mongo/MongoScanSpec.java | 2 +- .../exec/store/mongo/MongoStoragePlugin.java | 2 +- .../store/mongo/MongoStoragePluginConfig.java | 2 +- .../drill/exec/store/mongo/MongoSubScan.java | 2 +- .../drill/exec/store/mongo/MongoUtils.java | 2 +- .../exec/store/mongo/common/ChunkInfo.java | 2 +- .../store/mongo/common/MongoCompareOp.java | 2 +- .../config/MongoPersistentStoreProvider.java | 2 +- .../drill/exec/store/mongo/package-info.java | 2 +- .../mongo/schema/MongoDatabaseSchema.java | 2 +- .../mongo/schema/MongoSchemaFactory.java | 2 +- .../drill/exec/store/mongo/MongoTestBase.java | 2 +- .../exec/store/mongo/MongoTestConstants.java | 2 +- .../store/mongo/TestMongoChunkAssignment.java | 2 +- .../store/mongo/TestMongoFilterPushDown.java | 2 +- .../store/mongo/TestMongoProjectPushDown.java | 2 +- .../exec/store/mongo/TestMongoQueries.java | 2 +- .../exec/store/mongo/TestTableGenerator.java | 2 +- contrib/storage-opentsdb/pom.xml | 27 ++++++++------ distribution/pom.xml | 29 ++++++++++----- distribution/src/assemble/bin.xml | 27 ++++++++------ distribution/src/resources/auto-setup.sh | 17 +++++---- .../src/resources/core-site-example.xml | 28 +++++++------- distribution/src/resources/distrib-env.sh | 17 +++++---- distribution/src/resources/distrib-setup.sh | 17 +++++---- distribution/src/resources/drill-am-log.xml | 31 +++++++++------- distribution/src/resources/drill-am.sh | 16 ++++---- distribution/src/resources/drill-config.sh | 17 +++++---- distribution/src/resources/drill-env.sh | 18 +++++---- distribution/src/resources/drill-on-yarn.sh | 17 +++++---- distribution/src/resources/drill-setup.sh | 17 +++++---- distribution/src/resources/drillbit.sh | 4 +- distribution/src/resources/logback.xml | 27 ++++++++------ distribution/src/resources/saffron.properties | 15 +++++--- distribution/src/resources/sqlline.bat | 18 +++++++++ .../src/resources/yarn-client-log.xml | 27 ++++++++------ distribution/src/resources/yarn-drillbit.sh | 18 ++++----- drill-yarn/pom.xml | 27 ++++++++------ .../appMaster/http/AuthDynamicFeature.java | 2 +- .../yarn/appMaster/http/package-info.java | 3 +- .../drill/yarn/appMaster/package-info.java | 1 - .../drill/yarn/client/package-info.java | 1 - .../apache/drill/yarn/core/package-info.java | 1 - .../org/apache/drill/yarn/package-info.java | 1 - .../apache/drill/yarn/zk/package-info.java | 1 - .../src/main/resources/drill-am/config.ftl | 28 +++++++++----- .../src/main/resources/drill-am/confirm.ftl | 28 +++++++++----- .../src/main/resources/drill-am/generic.ftl | 28 +++++++++----- .../src/main/resources/drill-am/history.ftl | 28 +++++++++----- .../src/main/resources/drill-am/index.ftl | 28 +++++++++----- .../src/main/resources/drill-am/login.ftl | 28 +++++++++----- .../src/main/resources/drill-am/manage.ftl | 28 +++++++++----- .../src/main/resources/drill-am/redirect.ftl | 28 +++++++++----- .../resources/drill-am/shrink-warning.ftl | 28 +++++++++----- .../src/main/resources/drill-am/tasks.ftl | 28 +++++++++----- .../src/test/resources/doy-test-logback.xml | 29 ++++++++++----- drill-yarn/src/test/resources/wrapper.sh | 16 ++++---- .../org/apache/drill/exec/expr/TestPrune.java | 4 +- exec/java-exec/pom.xml | 29 ++++++++++----- .../codegen/includes/compoundIdentifier.ftl | 29 ++++++++++----- .../src/main/codegen/includes/license.ftl | 35 +++++++++--------- .../src/main/codegen/includes/parserImpls.ftl | 28 +++++++++----- .../src/main/codegen/includes/vv_imports.ftl | 28 +++++++++----- .../templates/AbstractRecordWriter.java | 3 +- .../AggrBitwiseLogicalTypeFunctions.java | 2 +- .../codegen/templates/AggrTypeFunctions1.java | 2 +- .../codegen/templates/AggrTypeFunctions2.java | 2 +- .../codegen/templates/AggrTypeFunctions3.java | 2 +- .../main/codegen/templates/CastDateDate.java | 2 +- ...tEmptyStringVarTypesToNullableNumeric.java | 2 +- .../templates/CastFunctionsSrcVarLen.java | 2 +- .../src/main/codegen/templates/CastHigh.java | 2 +- .../templates/CastIntervalInterval.java | 2 +- .../templates/CastVarCharInterval.java | 2 +- .../templates/ComparisonFunctions.java | 4 +- .../templates/CorrelationTypeFunctions.java | 2 +- .../templates/CountAggregateFunctions.java | 3 +- .../codegen/templates/CovarTypeFunctions.java | 2 +- .../templates/DateIntervalAggrFunctions1.java | 2 +- .../DateDateArithmeticFunctions.java | 3 +- .../DateIntervalArithmeticFunctions.java | 2 +- .../DateToCharFunctions.java | 3 +- .../DateTruncFunctions.java | 3 +- .../Extract.java | 2 +- .../IntervalIntervalArithmetic.java | 2 +- .../IntervalNumericArithmetic.java | 2 +- .../SqlToDateTypeFunctions.java | 3 +- .../ToDateTypeFunctions.java | 3 +- .../ToTimeStampFunction.java | 3 +- .../templates/Decimal/CastDecimalFloat.java | 2 +- .../Decimal/DecimalAggrTypeFunctions1.java | 2 - .../Decimal/DecimalAggrTypeFunctions2.java | 1 - .../templates/Decimal/DecimalFunctions.java | 1 - .../codegen/templates/DirectoryExplorers.java | 5 +-- .../codegen/templates/DrillVersionInfo.java | 5 +-- .../templates/EventBasedRecordWriter.java | 1 - .../templates/IntervalAggrFunctions2.java | 2 +- .../templates/JsonOutputRecordWriter.java | 3 +- .../templates/MathFunctionTemplates.java | 2 +- .../main/codegen/templates/MathFunctions.java | 2 +- .../codegen/templates/NewValueFunctions.java | 2 +- .../main/codegen/templates/NullOperator.java | 2 +- .../templates/NumericFunctionsTemplates.java | 3 +- .../templates/NumericToCharFunctions.java | 3 +- .../templates/ParquetOutputRecordWriter.java | 3 +- .../codegen/templates/ParquetTypeHelper.java | 3 +- .../templates/RecordValueAccessor.java | 2 +- .../main/codegen/templates/RecordWriter.java | 2 +- .../main/codegen/templates/SqlAccessors.java | 1 - .../templates/StringOutputRecordWriter.java | 1 - .../main/codegen/templates/SumZeroAggr.java | 2 +- .../main/codegen/templates/TypeHelper.java | 3 +- .../codegen/templates/UnionFunctions.java | 3 +- .../templates/VarCharAggrFunctions1.java | 2 +- .../drill/exec/TestMemoryRetention.java | 2 +- .../cache/AbstractStreamSerializable.java | 2 +- .../exec/cache/CachedVectorContainer.java | 2 +- .../org/apache/drill/exec/cache/Counter.java | 2 +- .../drill/exec/cache/DistributedCache.java | 2 +- .../drill/exec/cache/DistributedMap.java | 2 +- .../drill/exec/cache/DistributedMultiMap.java | 2 +- .../drill/exec/cache/DrillSerializable.java | 2 +- .../LoopedAbstractDrillSerializable.java | 2 +- .../exec/cache/SerializationDefinition.java | 2 +- .../apache/drill/exec/cache/package-info.java | 2 +- .../apache/drill/exec/client/DrillClient.java | 2 +- .../drill/exec/client/QuerySubmitter.java | 2 +- .../drill/exec/client/package-info.java | 2 +- .../exec/compile/AbstractClassCompiler.java | 2 +- .../apache/drill/exec/compile/AsmUtil.java | 2 +- .../drill/exec/compile/ByteCodeLoader.java | 2 +- .../drill/exec/compile/CachedClassLoader.java | 2 +- .../exec/compile/CheckClassVisitorFsm.java | 2 +- .../exec/compile/CheckMethodVisitorFsm.java | 2 +- .../drill/exec/compile/ClassBodyBuilder.java | 2 +- .../drill/exec/compile/CompilationConfig.java | 2 +- .../exec/compile/DrillCheckClassAdapter.java | 2 +- .../exec/compile/DrillDiagnosticListener.java | 2 +- .../exec/compile/DrillInitMethodVisitor.java | 2 +- .../exec/compile/DrillJavaFileManager.java | 2 +- .../exec/compile/DrillJavaFileObject.java | 2 +- .../apache/drill/exec/compile/FsmCursor.java | 2 +- .../drill/exec/compile/FsmDescriptor.java | 2 +- .../compile/InnerClassAccessStripper.java | 2 +- .../drill/exec/compile/JDKClassCompiler.java | 2 +- .../exec/compile/JaninoClassCompiler.java | 2 +- .../apache/drill/exec/compile/LogWriter.java | 2 +- .../drill/exec/compile/MergeAdapter.java | 2 +- .../compile/RetargetableClassVisitor.java | 2 +- .../exec/compile/TemplateClassDefinition.java | 2 +- .../compile/bytecode/AloadPopRemover.java | 2 +- .../exec/compile/bytecode/DirectSorter.java | 2 +- .../compile/bytecode/InstructionModifier.java | 2 +- .../exec/compile/bytecode/MethodAnalyzer.java | 2 +- .../compile/bytecode/ReplacingBasicValue.java | 2 +- .../bytecode/ReplacingInterpreter.java | 2 +- .../bytecode/ScalarReplacementNode.java | 2 +- .../bytecode/ScalarReplacementTypes.java | 2 +- .../bytecode/TrackingInstructionList.java | 2 +- .../compile/bytecode/ValueHolderIden.java | 2 +- .../ValueHolderReplacementVisitor.java | 2 +- .../exec/compile/bytecode/package-info.java | 2 +- .../drill/exec/compile/package-info.java | 2 +- .../compile/sig/CodeGeneratorArgument.java | 2 +- .../exec/compile/sig/CodeGeneratorMethod.java | 2 +- .../compile/sig/CodeGeneratorSignature.java | 2 +- .../exec/compile/sig/GeneratorMapping.java | 2 +- .../drill/exec/compile/sig/MappingSet.java | 2 +- .../exec/compile/sig/RuntimeOverridden.java | 2 +- .../drill/exec/compile/sig/Signature.java | 2 +- .../drill/exec/compile/sig/VVReadBatch.java | 2 +- .../drill/exec/compile/sig/VVWriteBatch.java | 2 +- .../drill/exec/compile/sig/package-info.java | 2 +- .../drill/exec/coord/ClusterCoordinator.java | 2 +- .../exec/coord/DistributedSemaphore.java | 2 +- .../coord/DrillServiceInstanceHelper.java | 2 +- .../exec/coord/DrillbitEndpointSerDe.java | 2 +- .../coord/local/LocalClusterCoordinator.java | 2 +- .../exec/coord/local/MapBackedStore.java | 6 +-- .../drill/exec/coord/local/package-info.java | 2 +- .../apache/drill/exec/coord/package-info.java | 2 +- .../exec/coord/store/BaseTransientStore.java | 6 +-- .../store/CachingTransientStoreFactory.java | 6 +-- .../exec/coord/store/TransientStore.java | 6 +-- .../coord/store/TransientStoreConfig.java | 6 +-- .../store/TransientStoreConfigBuilder.java | 6 +-- .../exec/coord/store/TransientStoreEvent.java | 6 +-- .../coord/store/TransientStoreEventType.java | 6 +-- .../coord/store/TransientStoreFactory.java | 6 +-- .../coord/store/TransientStoreListener.java | 6 +-- .../drill/exec/coord/zk/EventDispatcher.java | 6 +-- .../apache/drill/exec/coord/zk/PathUtils.java | 4 +- .../exec/coord/zk/ZKClusterCoordinator.java | 2 +- .../exec/coord/zk/ZKRegistrationHandle.java | 2 +- .../exec/coord/zk/ZkDistributedSemaphore.java | 2 +- .../drill/exec/coord/zk/ZkEphemeralStore.java | 6 +-- .../coord/zk/ZkTransientStoreFactory.java | 6 +-- .../drill/exec/coord/zk/ZookeeperClient.java | 4 +- .../drill/exec/coord/zk/package-info.java | 2 +- .../org/apache/drill/exec/disk/Spool.java | 2 +- .../apache/drill/exec/disk/package-info.java | 2 +- .../drill/exec/dotdrill/DotDrillFile.java | 2 +- .../drill/exec/dotdrill/DotDrillType.java | 2 +- .../drill/exec/dotdrill/DotDrillUtil.java | 2 +- .../drill/exec/dotdrill/package-info.java | 2 +- .../drill/exec/exception/BitComException.java | 2 +- .../ClassTransformationException.java | 2 +- .../exception/DrillbitStartupException.java | 2 +- .../exception/FragmentSetupException.java | 2 +- .../FunctionValidationException.java | 6 +-- .../exception/JarValidationException.java | 6 +-- .../exec/exception/OptimizerException.java | 2 +- .../exec/exception/SchemaChangeException.java | 2 +- .../drill/exec/exception/SetupException.java | 2 +- .../drill/exec/exception/StoreException.java | 6 +-- .../UnsupportedOperatorCollector.java | 2 +- .../exception/VersionMismatchException.java | 6 +-- .../drill/exec/exception/package-info.java | 2 +- .../drill/exec/expr/BatchReference.java | 13 ++++--- .../apache/drill/exec/expr/BooleanType.java | 2 +- .../apache/drill/exec/expr/CloneVisitor.java | 6 +-- .../drill/exec/expr/DebugStringBuilder.java | 2 +- .../drill/exec/expr/DirectExpression.java | 2 +- .../apache/drill/exec/expr/DrillAggFunc.java | 2 +- .../org/apache/drill/exec/expr/DrillFunc.java | 2 +- .../drill/exec/expr/DrillSimpleFunc.java | 2 +- .../drill/exec/expr/EqualityVisitor.java | 4 +- .../drill/exec/expr/GetSetVectorHelper.java | 2 +- .../apache/drill/exec/expr/HashVisitor.java | 6 +-- .../exec/expr/HoldingContainerExpression.java | 2 +- .../exec/expr/SingleClassStringWriter.java | 2 +- .../apache/drill/exec/expr/SizedJBlock.java | 3 +- .../exec/expr/ValueVectorWriteExpression.java | 2 +- .../drill/exec/expr/annotations/Output.java | 2 +- .../drill/exec/expr/annotations/Param.java | 2 +- .../exec/expr/annotations/Workspace.java | 2 +- .../expr/fn/DrillComplexWriterFuncHolder.java | 1 - .../drill/exec/expr/fn/ExceptionFunction.java | 6 +-- .../exec/expr/fn/FunctionLookupContext.java | 2 +- .../drill/exec/expr/fn/FunctionUtils.java | 13 ++++--- .../exec/expr/fn/MethodGrabbingVisitor.java | 2 +- .../exec/expr/fn/ModifiedUnparseVisitor.java | 2 +- .../expr/fn/PluggableFunctionRegistry.java | 2 +- .../expr/fn/impl/AggregateErrorFunctions.java | 2 +- .../drill/exec/expr/fn/impl/Alternator.java | 2 +- .../drill/exec/expr/fn/impl/BitFunctions.java | 2 +- .../expr/fn/impl/BooleanAggrFunctions.java | 7 +--- .../exec/expr/fn/impl/ByteSubstring.java | 2 +- .../exec/expr/fn/impl/CastBigIntDate.java | 2 +- .../expr/fn/impl/CastBigIntTimeStamp.java | 2 +- .../drill/exec/expr/fn/impl/CastIntTime.java | 2 +- .../expr/fn/impl/CastVarCharVar16Char.java | 2 +- .../expr/fn/impl/CharSequenceWrapper.java | 4 +- .../exec/expr/fn/impl/CharSubstring.java | 2 +- .../exec/expr/fn/impl/ContextFunctions.java | 2 +- .../exec/expr/fn/impl/CryptoFunctions.java | 14 +++---- .../exec/expr/fn/impl/DateTypeFunctions.java | 1 - .../exec/expr/fn/impl/DrillByteArray.java | 2 +- .../drill/exec/expr/fn/impl/DrillHash.java | 3 +- .../exec/expr/fn/impl/Hash32AsDouble.java | 2 +- .../exec/expr/fn/impl/Hash32Functions.java | 2 +- .../expr/fn/impl/Hash32FunctionsWithSeed.java | 2 +- .../expr/fn/impl/Hash32WithSeedAsDouble.java | 2 +- .../exec/expr/fn/impl/Hash64AsDouble.java | 2 +- .../exec/expr/fn/impl/Hash64Functions.java | 2 +- .../expr/fn/impl/Hash64FunctionsWithSeed.java | 2 +- .../expr/fn/impl/Hash64WithSeedAsDouble.java | 2 +- .../drill/exec/expr/fn/impl/HashHelper.java | 2 +- .../drill/exec/expr/fn/impl/IsFalse.java | 3 +- .../drill/exec/expr/fn/impl/IsNotFalse.java | 3 +- .../drill/exec/expr/fn/impl/IsNotTrue.java | 3 +- .../drill/exec/expr/fn/impl/IsTrue.java | 3 +- .../drill/exec/expr/fn/impl/Mappify.java | 2 +- .../exec/expr/fn/impl/MappifyUtility.java | 2 +- .../exec/expr/fn/impl/MathFunctions.java | 2 +- .../drill/exec/expr/fn/impl/MurmurHash3.java | 5 +-- .../exec/expr/fn/impl/NetworkFunctions.java | 1 - .../apache/drill/exec/expr/fn/impl/Not.java | 3 +- .../exec/expr/fn/impl/ParseQueryFunction.java | 34 ++++++++--------- .../exec/expr/fn/impl/ParseUrlFunction.java | 18 +++++---- .../drill/exec/expr/fn/impl/RegexpUtil.java | 2 +- .../expr/fn/impl/SimpleRepeatedFunctions.java | 2 +- .../exec/expr/fn/impl/SqlPatternFactory.java | 1 - .../expr/fn/impl/StringFunctionHelpers.java | 3 +- .../exec/expr/fn/impl/StringFunctionUtil.java | 2 +- .../exec/expr/fn/impl/UnionFunctions.java | 2 +- .../drill/exec/expr/fn/impl/VarHelpers.java | 2 +- .../drill/exec/expr/fn/impl/XXHash.java | 2 +- .../fn/impl/conv/BigIntBEConvertFrom.java | 2 +- .../expr/fn/impl/conv/BigIntBEConvertTo.java | 2 +- .../expr/fn/impl/conv/BigIntConvertFrom.java | 5 +-- .../expr/fn/impl/conv/BigIntConvertTo.java | 5 +-- .../fn/impl/conv/BigIntVLongConvertFrom.java | 2 +- .../fn/impl/conv/BigIntVLongConvertTo.java | 2 +- .../fn/impl/conv/BooleanByteConvertFrom.java | 5 +-- .../fn/impl/conv/BooleanByteConvertTo.java | 5 +-- .../impl/conv/ConvertFromImpalaTimestamp.java | 4 +- .../fn/impl/conv/DateEpochBEConvertFrom.java | 2 +- .../fn/impl/conv/DateEpochBEConvertTo.java | 2 +- .../fn/impl/conv/DateEpochConvertFrom.java | 5 +-- .../expr/fn/impl/conv/DateEpochConvertTo.java | 5 +-- .../fn/impl/conv/DoubleBEConvertFrom.java | 5 +-- .../expr/fn/impl/conv/DoubleBEConvertTo.java | 5 +-- .../expr/fn/impl/conv/DoubleConvertFrom.java | 5 +-- .../expr/fn/impl/conv/DoubleConvertTo.java | 5 +-- .../expr/fn/impl/conv/DummyConvertFrom.java | 5 +-- .../expr/fn/impl/conv/DummyConvertTo.java | 5 +-- .../exec/expr/fn/impl/conv/DummyFlatten.java | 4 +- .../expr/fn/impl/conv/FloatBEConvertFrom.java | 5 +-- .../expr/fn/impl/conv/FloatBEConvertTo.java | 5 +-- .../expr/fn/impl/conv/FloatConvertFrom.java | 5 +-- .../expr/fn/impl/conv/FloatConvertTo.java | 5 +-- .../expr/fn/impl/conv/IntBEConvertFrom.java | 2 +- .../expr/fn/impl/conv/IntBEConvertTo.java | 2 +- .../expr/fn/impl/conv/IntConvertFrom.java | 5 +-- .../exec/expr/fn/impl/conv/IntConvertTo.java | 5 +-- .../expr/fn/impl/conv/IntVIntConvertFrom.java | 2 +- .../expr/fn/impl/conv/IntVIntConvertTo.java | 2 +- .../expr/fn/impl/conv/JsonConvertFrom.java | 3 +- .../exec/expr/fn/impl/conv/JsonConvertTo.java | 3 +- .../expr/fn/impl/conv/RoundFunctions.java | 5 +-- .../fn/impl/conv/SmallIntBEConvertFrom.java | 5 +-- .../fn/impl/conv/SmallIntBEConvertTo.java | 5 +-- .../fn/impl/conv/SmallIntConvertFrom.java | 5 +-- .../expr/fn/impl/conv/SmallIntConvertTo.java | 5 +-- .../fn/impl/conv/TimeEpochBEConvertFrom.java | 2 +- .../fn/impl/conv/TimeEpochBEConvertTo.java | 2 +- .../fn/impl/conv/TimeEpochConvertFrom.java | 5 +-- .../expr/fn/impl/conv/TimeEpochConvertTo.java | 5 +-- .../conv/TimeStampEpochBEConvertFrom.java | 2 +- .../impl/conv/TimeStampEpochBEConvertTo.java | 2 +- .../impl/conv/TimeStampEpochConvertFrom.java | 5 +-- .../fn/impl/conv/TimeStampEpochConvertTo.java | 5 +-- .../expr/fn/impl/conv/TinyIntConvertFrom.java | 5 +-- .../expr/fn/impl/conv/TinyIntConvertTo.java | 5 +-- .../expr/fn/impl/conv/UInt4BEConvertFrom.java | 2 +- .../expr/fn/impl/conv/UInt4BEConvertTo.java | 2 +- .../expr/fn/impl/conv/UInt4ConvertFrom.java | 5 +-- .../expr/fn/impl/conv/UInt4ConvertTo.java | 5 +-- .../expr/fn/impl/conv/UInt8ConvertFrom.java | 5 +-- .../expr/fn/impl/conv/UInt8ConvertTo.java | 5 +-- .../expr/fn/impl/conv/UTF16ConvertFrom.java | 5 +-- .../expr/fn/impl/conv/UTF16ConvertTo.java | 5 +-- .../expr/fn/impl/conv/UTF8ConvertFrom.java | 5 +-- .../exec/expr/fn/impl/conv/UTF8ConvertTo.java | 5 +-- .../fn/interpreter/InterpreterEvaluator.java | 2 +- .../fn/output/ConcatReturnTypeInference.java | 13 ++++--- .../fn/output/DecimalReturnTypeInference.java | 13 ++++--- .../fn/output/DefaultReturnTypeInference.java | 13 ++++--- .../fn/output/PadReturnTypeInference.java | 13 ++++--- .../expr/fn/output/ReturnTypeInference.java | 13 ++++--- .../SameInOutLengthReturnTypeInference.java | 13 ++++--- .../output/StringCastReturnTypeInference.java | 13 ++++--- .../exec/expr/fn/registry/FunctionHolder.java | 6 +-- .../fn/registry/FunctionRegistryHolder.java | 4 +- .../drill/exec/expr/fn/registry/JarScan.java | 6 +-- .../fn/registry/RemoteFunctionRegistry.java | 4 +- .../apache/drill/exec/expr/package-info.java | 2 +- .../expr/stat/ParquetBooleanPredicates.java | 13 ++++--- .../stat/ParquetComparisonPredicates.java | 13 ++++--- .../expr/stat/ParquetFilterPredicate.java | 7 ++-- .../exec/expr/stat/ParquetIsPredicates.java | 13 ++++--- .../expr/stat/ParquetPredicatesHelper.java | 4 +- .../exec/expr/stat/RangeExprEvaluator.java | 4 +- .../exec/ops/AccountingUserConnection.java | 2 +- .../org/apache/drill/exec/ops/Consumer.java | 2 +- .../drill/exec/ops/ContextInformation.java | 4 +- .../apache/drill/exec/ops/FragmentStats.java | 2 +- .../org/apache/drill/exec/ops/MetricDef.java | 2 +- .../apache/drill/exec/ops/OpProfileDef.java | 2 +- .../exec/ops/OperatorMetricRegistry.java | 6 +-- .../drill/exec/ops/OptimizerRulesContext.java | 2 +- .../drill/exec/ops/SendingAccountor.java | 2 +- .../apache/drill/exec/ops/StatusHandler.java | 2 +- .../apache/drill/exec/ops/UdfUtilities.java | 4 +- .../drill/exec/ops/ViewExpansionContext.java | 4 +- .../apache/drill/exec/opt/BasicOptimizer.java | 2 +- .../drill/exec/opt/IdentityOptimizer.java | 2 +- .../org/apache/drill/exec/opt/Optimizer.java | 2 +- .../org/apache/drill/exec/package-info.java | 2 +- .../exec/physical/DataValidationMode.java | 2 +- .../drill/exec/physical/EndpointAffinity.java | 2 +- .../exec/physical/MinorFragmentEndpoint.java | 4 +- .../PhysicalOperatorSetupException.java | 2 +- .../drill/exec/physical/WriteEntry.java | 2 +- .../exec/physical/base/AbstractExchange.java | 2 +- .../physical/base/AbstractFileGroupScan.java | 2 +- .../exec/physical/base/AbstractMultiple.java | 2 +- .../base/AbstractPhysicalVisitor.java | 2 +- .../exec/physical/base/AbstractReceiver.java | 2 +- .../exec/physical/base/AbstractSender.java | 2 +- .../exec/physical/base/AbstractSingle.java | 2 +- .../exec/physical/base/AbstractStore.java | 2 +- .../exec/physical/base/AbstractSubScan.java | 2 +- .../drill/exec/physical/base/Exchange.java | 2 +- .../exec/physical/base/FileGroupScan.java | 2 +- .../exec/physical/base/FragmentLeaf.java | 2 +- .../drill/exec/physical/base/HasAffinity.java | 2 +- .../apache/drill/exec/physical/base/Leaf.java | 2 +- .../exec/physical/base/PhysicalOperator.java | 2 +- .../physical/base/PhysicalOperatorUtil.java | 2 +- .../exec/physical/base/PhysicalVisitor.java | 2 +- .../drill/exec/physical/base/Receiver.java | 2 +- .../apache/drill/exec/physical/base/Root.java | 2 +- .../apache/drill/exec/physical/base/Scan.java | 2 +- .../drill/exec/physical/base/ScanStats.java | 2 +- .../exec/physical/base/SchemalessScan.java | 13 ++++--- .../drill/exec/physical/base/Sender.java | 2 +- .../drill/exec/physical/base/Store.java | 2 +- .../drill/exec/physical/base/SubScan.java | 2 +- .../drill/exec/physical/base/Writer.java | 3 +- .../config/AbstractDeMuxExchange.java | 2 +- .../physical/config/AbstractMuxExchange.java | 2 +- .../physical/config/BroadcastExchange.java | 4 +- .../exec/physical/config/BroadcastSender.java | 3 +- .../exec/physical/config/ComplexToJson.java | 2 +- .../drill/exec/physical/config/Filter.java | 2 +- .../exec/physical/config/FlattenPOP.java | 4 +- .../exec/physical/config/HashAggregate.java | 2 +- .../exec/physical/config/HashJoinPOP.java | 3 +- .../physical/config/HashPartitionSender.java | 2 +- .../physical/config/HashToMergeExchange.java | 2 +- .../physical/config/HashToRandomExchange.java | 2 +- .../physical/config/IteratorValidator.java | 2 +- .../drill/exec/physical/config/Limit.java | 4 +- .../exec/physical/config/MergeJoinPOP.java | 2 +- .../physical/config/MergingReceiverPOP.java | 2 +- .../physical/config/NestedLoopJoinPOP.java | 1 - .../physical/config/OrderedMuxExchange.java | 2 +- .../config/OrderedPartitionExchange.java | 2 +- .../exec/physical/config/PartitionRange.java | 2 +- .../physical/config/ProducerConsumer.java | 2 +- .../drill/exec/physical/config/Project.java | 2 +- .../exec/physical/config/RangeSender.java | 2 +- .../drill/exec/physical/config/Screen.java | 2 +- .../config/SelectionVectorRemover.java | 2 +- .../physical/config/SingleMergeExchange.java | 3 +- .../exec/physical/config/SingleSender.java | 2 +- .../drill/exec/physical/config/Sort.java | 2 +- .../physical/config/StreamingAggregate.java | 2 +- .../drill/exec/physical/config/TopN.java | 2 +- .../drill/exec/physical/config/Trace.java | 3 +- .../drill/exec/physical/config/UnionAll.java | 2 +- .../config/UnorderedDeMuxExchange.java | 2 +- .../physical/config/UnorderedMuxExchange.java | 2 +- .../physical/config/UnorderedReceiver.java | 2 +- .../drill/exec/physical/config/Values.java | 2 +- .../drill/exec/physical/config/WindowPOP.java | 3 +- .../exec/physical/impl/BaseRootExec.java | 2 +- .../exec/physical/impl/BatchCreator.java | 2 +- .../impl/OperatorCreatorRegistry.java | 2 +- .../exec/physical/impl/OutputMutator.java | 2 +- .../exec/physical/impl/PhysicalConfig.java | 2 +- .../drill/exec/physical/impl/RootCreator.java | 2 +- .../drill/exec/physical/impl/RootExec.java | 2 +- .../exec/physical/impl/ScreenCreator.java | 2 +- .../physical/impl/SingleSenderCreator.java | 2 +- .../physical/impl/TopN/PriorityQueue.java | 2 +- .../impl/TopN/TopNSortBatchCreator.java | 2 +- .../exec/physical/impl/TraceInjector.java | 1 - .../exec/physical/impl/WriterRecordBatch.java | 1 - .../impl/aggregate/BatchIterator.java | 2 +- .../impl/aggregate/HashAggBatchCreator.java | 2 +- .../impl/aggregate/HashAggregator.java | 2 +- .../aggregate/StreamingAggBatchCreator.java | 2 +- .../impl/aggregate/StreamingAggregator.java | 2 +- .../BroadcastSenderCreator.java | 2 +- .../BroadcastSenderRootExec.java | 4 +- .../impl/common/ChainedHashTable.java | 14 +++---- .../exec/physical/impl/common/Comparator.java | 6 +-- .../exec/physical/impl/common/HashTable.java | 2 +- .../physical/impl/common/HashTableConfig.java | 2 +- .../physical/impl/common/HashTableStats.java | 2 +- .../physical/impl/common/IndexPointer.java | 2 +- .../impl/filter/EvalSetupException.java | 2 +- .../impl/filter/EvaluationPredicate.java | 2 +- .../impl/filter/FilterBatchCreator.java | 2 +- .../physical/impl/filter/FilterSignature.java | 2 +- .../physical/impl/filter/FilterTemplate4.java | 2 +- .../impl/filter/ReturnValueExpression.java | 2 +- .../impl/flatten/FlattenBatchCreator.java | 2 +- .../exec/physical/impl/flatten/Flattener.java | 2 +- .../impl/join/HashJoinBatchCreator.java | 2 +- .../physical/impl/join/HashJoinHelper.java | 3 +- .../physical/impl/join/HashJoinProbe.java | 3 +- .../impl/join/HashJoinProbeTemplate.java | 2 +- .../exec/physical/impl/join/JoinTemplate.java | 2 +- .../exec/physical/impl/join/JoinUtils.java | 1 - .../exec/physical/impl/join/JoinWorker.java | 2 +- .../physical/impl/join/MergeJoinCreator.java | 2 +- .../impl/join/NestedLoopJoinBatchCreator.java | 2 +- .../impl/limit/LimitBatchCreator.java | 2 +- .../physical/impl/limit/LimitRecordBatch.java | 2 +- .../impl/materialize/QueryWritableBatch.java | 2 +- .../impl/materialize/RecordMaterializer.java | 2 +- .../materialize/VectorRecordMaterializer.java | 2 +- .../OrderedPartitionProjector.java | 2 +- .../OrderedPartitionSenderCreator.java | 2 +- .../impl/orderedpartitioner/SampleCopier.java | 2 +- .../SampleCopierTemplate.java | 2 +- .../SampleSortTemplate.java | 2 +- .../impl/orderedpartitioner/SampleSorter.java | 2 +- .../PartitionOutgoingBatch.java | 2 +- .../PartitionSenderCreator.java | 2 +- .../impl/partitionsender/Partitioner.java | 2 +- .../partitionsender/PartitionerDecorator.java | 2 +- .../ProducerConsumerBatchCreator.java | 2 +- .../project/ComplexToJsonBatchCreator.java | 2 +- .../impl/project/ProjectBatchCreator.java | 2 +- .../exec/physical/impl/project/Projector.java | 2 +- .../physical/impl/sort/SortBatchCreator.java | 2 +- .../exec/physical/impl/sort/SortTemplate.java | 2 +- .../drill/exec/physical/impl/sort/Sorter.java | 2 +- .../impl/svremover/SVRemoverCreator.java | 2 +- .../impl/trace/TraceBatchCreator.java | 3 +- .../physical/impl/trace/TraceRecordBatch.java | 5 +-- .../impl/union/UnionAllBatchCreator.java | 2 +- .../exec/physical/impl/union/UnionAller.java | 2 +- .../impl/union/UnionAllerTemplate.java | 1 - .../impl/validate/BatchValidator.java | 2 +- .../validate/IteratorValidatorInjector.java | 2 +- .../impl/window/FrameSupportTemplate.java | 2 +- .../exec/physical/impl/window/Partition.java | 2 +- .../physical/impl/window/WindowDataBatch.java | 4 +- .../impl/window/WindowFrameBatchCreator.java | 3 +- .../physical/impl/window/WindowFunction.java | 2 +- .../exec/physical/impl/xsort/BatchGroup.java | 2 +- .../impl/xsort/ExternalSortBatchCreator.java | 2 +- .../exec/physical/impl/xsort/MSorter.java | 2 +- .../impl/xsort/PriorityQueueCopier.java | 2 +- .../xsort/PriorityQueueCopierTemplate.java | 2 +- .../physical/rowSet/impl/package-info.java | 1 - .../rowSet/model/hyper/package-info.java | 1 - .../physical/rowSet/model/package-info.java | 1 - .../planner/AbstractOpWrapperVisitor.java | 2 +- .../planner/AbstractPartitionDescriptor.java | 2 +- .../exec/planner/DFSDirPartitionLocation.java | 3 +- .../planner/DFSFilePartitionLocation.java | 2 +- .../drill/exec/planner/DrillRelBuilder.java | 13 ++++--- .../planner/ParquetPartitionDescriptor.java | 2 +- .../planner/ParquetPartitionLocation.java | 2 +- .../exec/planner/PartitionDescriptor.java | 2 +- .../drill/exec/planner/PartitionLocation.java | 2 +- .../exec/planner/PhysicalPlanReader.java | 2 +- .../drill/exec/planner/PlannerType.java | 2 +- .../drill/exec/planner/RuleInstance.java | 13 ++++--- .../exec/planner/SimplePartitionLocation.java | 3 +- .../exec/planner/common/DrillRelNode.java | 3 +- .../planner/common/DrillUnionRelBase.java | 2 +- .../planner/common/DrillValuesRelBase.java | 13 ++++--- .../planner/common/DrillWindowRelBase.java | 3 +- .../planner/common/DrillWriterRelBase.java | 2 +- .../exec/planner/cost/DrillCostBase.java | 1 - .../exec/planner/cost/DrillRelOptCost.java | 5 +-- .../planner/cost/DrillRelOptCostFactory.java | 6 +-- .../fragment/DistributionAffinity.java | 6 +-- .../drill/exec/planner/fragment/Fragment.java | 2 +- .../fragment/FragmentParallelizer.java | 6 +-- .../planner/fragment/FragmentVisitor.java | 2 +- .../HardAffinityFragmentParallelizer.java | 6 +-- .../fragment/MakeFragmentsVisitor.java | 2 +- .../planner/fragment/ParallelizationInfo.java | 4 +- .../fragment/ParallelizationParameters.java | 6 +-- .../SoftAffinityFragmentParallelizer.java | 4 +- .../drill/exec/planner/fragment/Stats.java | 2 +- .../exec/planner/fragment/StatsCollector.java | 2 +- .../drill/exec/planner/fragment/Wrapper.java | 2 +- .../contrib/ExchangeRemoverMaterializer.java | 2 +- .../fragment/contrib/OperatorIdVisitor.java | 2 +- .../contrib/SplittingParallelizer.java | 2 +- .../planner/logical/CreateTableEntry.java | 3 +- .../logical/DirPrunedEnumerableTableScan.java | 3 +- .../planner/logical/DrillConstExecutor.java | 2 +- .../DrillFilterAggregateTransposeRule.java | 1 - .../exec/planner/logical/DrillFilterRel.java | 2 +- .../planner/logical/DrillImplementor.java | 2 +- .../exec/planner/logical/DrillJoinRel.java | 2 +- .../exec/planner/logical/DrillLimitRel.java | 2 +- .../planner/logical/DrillMergeFilterRule.java | 2 +- .../planner/logical/DrillParseContext.java | 2 +- .../exec/planner/logical/DrillProjectRel.java | 2 +- .../DrillProjectSetOpTransposeRule.java | 1 - .../logical/DrillPushLimitToScanRule.java | 1 - .../logical/DrillReduceAggregatesRule.java | 1 - .../drill/exec/planner/logical/DrillRel.java | 2 +- .../planner/logical/DrillRelFactories.java | 1 - .../exec/planner/logical/DrillScreenRel.java | 2 +- .../logical/DrillViewInfoProvider.java | 2 +- .../exec/planner/logical/DrillWindowRel.java | 3 +- .../exec/planner/logical/DrillWindowRule.java | 1 - .../exec/planner/logical/DrillWriterRel.java | 2 +- .../planner/logical/DynamicDrillTable.java | 2 +- .../planner/logical/EnumerableDrillRule.java | 2 +- .../exec/planner/logical/ExprHelper.java | 2 +- .../logical/ExtendableRelDataType.java | 13 ++++--- .../exec/planner/logical/RelOptHelper.java | 2 +- .../planner/logical/ScanFieldDeterminer.java | 2 +- .../exec/planner/logical/StoragePlugins.java | 2 +- .../partition/FindPartitionConditions.java | 2 +- .../partition/ParquetPruneScanRule.java | 2 +- .../partition/RewriteAsBinaryOperators.java | 34 ++++++++--------- .../RewriteCombineBinaryOperators.java | 34 ++++++++--------- .../exec/planner/physical/AggPruleBase.java | 1 - .../physical/BroadcastExchangePrel.java | 1 - .../planner/physical/ComplexToJsonPrel.java | 2 +- .../physical/ConvertCountToDirectScan.java | 1 - .../planner/physical/DirectScanPrule.java | 2 +- .../physical/DrillDistributionTrait.java | 2 +- .../physical/DrillDistributionTraitDef.java | 2 +- .../exec/planner/physical/DrillScanPrel.java | 2 +- .../exec/planner/physical/ExchangePrel.java | 3 +- .../exec/planner/physical/FilterPrel.java | 3 +- .../exec/planner/physical/FilterPrule.java | 2 +- .../exec/planner/physical/FlattenPrel.java | 4 +- .../physical/HasDistributionAffinity.java | 6 +-- .../exec/planner/physical/HashPrelUtil.java | 2 +- .../drill/exec/planner/physical/JoinPrel.java | 1 - .../exec/planner/physical/JoinPruleBase.java | 1 - .../exec/planner/physical/LimitPrel.java | 2 +- .../exec/planner/physical/LimitPrule.java | 2 +- .../LimitUnionExchangeTransposeRule.java | 2 +- .../physical/OrderedMuxExchangePrel.java | 2 +- .../physical/ProducerConsumerPrel.java | 2 +- .../planner/physical/ProjectAllowDupPrel.java | 3 +- .../planner/physical/PushLimitToTopN.java | 3 +- .../exec/planner/physical/ScanPrule.java | 2 +- .../exec/planner/physical/ScreenPrel.java | 2 +- .../exec/planner/physical/ScreenPrule.java | 2 +- .../physical/SelectionVectorRemoverPrel.java | 2 +- .../exec/planner/physical/SinglePrel.java | 2 +- .../exec/planner/physical/SortPrule.java | 2 +- .../exec/planner/physical/UnionPrel.java | 3 +- .../physical/UnorderedDeMuxExchangePrel.java | 3 +- .../physical/UnorderedMuxExchangePrel.java | 3 +- .../exec/planner/physical/WindowPrel.java | 3 +- .../exec/planner/physical/WindowPrule.java | 1 - .../exec/planner/physical/WriterPrel.java | 2 +- .../physical/explain/PrelSequencer.java | 2 +- .../physical/visitor/BasePrelVisitor.java | 2 +- .../visitor/ComplexToJsonPrelVisitor.java | 2 +- .../visitor/FinalColumnReorderer.java | 2 +- .../visitor/InsertLocalExchangeVisitor.java | 4 +- .../visitor/JoinPrelRenameVisitor.java | 3 +- .../planner/physical/visitor/PrelVisitor.java | 2 +- .../visitor/ProducerConsumerPrelVisitor.java | 2 +- .../physical/visitor/RelUniqifier.java | 2 +- .../visitor/RewriteProjectToFlatten.java | 4 +- .../RexVisitorComplexExprSplitter.java | 4 +- .../visitor/SelectionVectorPrelVisitor.java | 2 +- .../visitor/SplitUpComplexExpressions.java | 2 +- .../physical/visitor/StarColumnConverter.java | 1 - .../physical/visitor/SwapHashJoinVisitor.java | 1 - .../physical/visitor/TopProjectVisitor.java | 13 ++++--- .../drill/exec/planner/sql/Checker.java | 2 +- .../planner/sql/DrillCalciteSqlWrapper.java | 2 +- .../planner/sql/DrillExtractConvertlet.java | 2 +- .../exec/planner/sql/DrillSqlAggOperator.java | 4 +- .../DrillSqlAggOperatorWithoutInference.java | 6 +-- .../exec/planner/sql/DrillSqlOperator.java | 7 ++-- .../sql/DrillSqlOperatorWithoutInference.java | 6 +-- .../exec/planner/sql/DynamicReturnType.java | 2 +- .../drill/exec/planner/sql/DynamicType.java | 2 +- .../planner/sql/ExpandingConcurrentMap.java | 2 +- .../drill/exec/planner/sql/FixedRange.java | 2 +- .../exec/planner/sql/QueryInputException.java | 2 +- .../sql/handlers/AbstractSqlHandler.java | 2 +- .../sql/handlers/CreateFunctionHandler.java | 4 +- .../sql/handlers/DescribeSchemaHandler.java | 6 +-- .../sql/handlers/DescribeTableHandler.java | 1 - .../sql/handlers/DropFunctionHandler.java | 4 +- .../handlers/FindHardDistributionScans.java | 6 +-- .../sql/handlers/SetOptionHandler.java | 2 +- .../sql/handlers/ShowFilesCommandResult.java | 3 +- .../sql/handlers/ShowSchemasHandler.java | 3 +- .../sql/handlers/ShowTablesHandler.java | 1 - .../sql/handlers/SimpleCommandResult.java | 2 +- .../sql/handlers/SqlHandlerConfig.java | 3 +- .../sql/handlers/UseSchemaHandler.java | 2 +- .../parser/DrillCalciteWrapperUtility.java | 3 +- .../planner/sql/parser/DrillParserUtil.java | 3 +- .../exec/planner/sql/parser/DrillSqlCall.java | 2 +- .../sql/parser/DrillSqlDescribeTable.java | 31 ++++++++-------- .../planner/sql/parser/SqlCreateFunction.java | 6 +-- .../planner/sql/parser/SqlCreateView.java | 2 +- .../planner/sql/parser/SqlDropFunction.java | 6 +-- .../exec/planner/sql/parser/SqlDropTable.java | 2 +- .../exec/planner/sql/parser/SqlDropView.java | 2 +- .../sql/parser/SqlRefreshMetadata.java | 2 +- .../exec/planner/sql/parser/SqlShowFiles.java | 2 +- .../planner/sql/parser/SqlShowSchemas.java | 2 +- .../planner/sql/parser/SqlShowTables.java | 2 +- .../exec/planner/sql/parser/SqlUseSchema.java | 2 +- .../DrillParserWithCompoundIdConverter.java | 2 +- .../types/AbstractRelDataTypeHolder.java | 13 ++++--- .../types/DrillFixedRelDataTypeImpl.java | 2 +- .../planner/types/DrillRelDataTypeSystem.java | 3 +- .../types/ExtendableRelDataTypeHolder.java | 13 ++++--- .../exec/proto/helper/QueryIdHelper.java | 3 +- .../record/AbstractBinaryRecordBatch.java | 3 +- .../record/AbstractSingleRecordBatch.java | 2 +- .../exec/record/CloseableRecordBatch.java | 2 +- .../org/apache/drill/exec/record/DeadBuf.java | 2 +- .../exec/record/FragmentWritableBatch.java | 2 +- .../drill/exec/record/MajorTypeSerDe.java | 2 +- .../drill/exec/record/MaterializeVisitor.java | 2 +- .../drill/exec/record/RawFragmentBatch.java | 2 +- .../exec/record/RawFragmentBatchProvider.java | 2 +- .../exec/record/RecordBatchMemoryManager.java | 1 - .../drill/exec/record/SchemaBuilder.java | 2 +- .../apache/drill/exec/record/SchemaUtil.java | 4 +- .../drill/exec/record/SchemalessBatch.java | 1 - .../drill/exec/record/SimpleRecordBatch.java | 1 - .../exec/record/SimpleVectorWrapper.java | 2 +- .../drill/exec/record/TypedFieldId.java | 2 +- .../drill/exec/record/VectorAccessible.java | 2 +- .../record/VectorAccessibleComplexWriter.java | 2 +- .../drill/exec/record/VectorWrapper.java | 2 +- .../selection/SelectionVector4Builder.java | 2 +- .../resolver/DefaultFunctionResolver.java | 3 +- .../exec/resolver/ExactFunctionResolver.java | 2 +- .../drill/exec/resolver/FunctionResolver.java | 3 +- .../resolver/FunctionResolverFactory.java | 3 +- .../exec/resolver/ResolverTypePrecedence.java | 3 +- .../drill/exec/resolver/TypeCastRules.java | 1 - .../exec/rpc/AbstractClientConnection.java | 2 +- .../exec/rpc/AbstractConnectionConfig.java | 4 +- ...bstractDisposableUserClientConnection.java | 2 +- .../drill/exec/rpc/AbstractRpcMetrics.java | 2 +- .../exec/rpc/AbstractServerConnection.java | 2 +- .../drill/exec/rpc/BitConnectionConfig.java | 4 +- .../apache/drill/exec/rpc/BitRpcUtility.java | 2 +- .../drill/exec/rpc/ConnectionConfig.java | 4 +- .../drill/exec/rpc/FailingRequestHandler.java | 4 +- .../drill/exec/rpc/UserClientConnection.java | 2 +- .../exec/rpc/control/ControlConnection.java | 2 +- .../rpc/control/ControlConnectionManager.java | 2 +- .../control/ControlProtobufLengthDecoder.java | 2 +- .../exec/rpc/control/ControlRpcConfig.java | 2 +- .../exec/rpc/control/ControlRpcMetrics.java | 2 +- .../drill/exec/rpc/control/ControlTunnel.java | 2 +- .../drill/exec/rpc/control/Controller.java | 2 +- .../rpc/control/CustomHandlerRegistry.java | 2 +- .../rpc/control/DefaultInstanceHandler.java | 2 +- .../drill/exec/rpc/control/WorkEventBus.java | 2 +- .../apache/drill/exec/rpc/data/AckSender.java | 2 +- .../exec/rpc/data/DataClientConnection.java | 2 +- .../exec/rpc/data/DataConnectionConfig.java | 4 +- .../exec/rpc/data/DataConnectionCreator.java | 2 +- .../exec/rpc/data/DataConnectionManager.java | 2 +- .../rpc/data/DataDefaultInstanceHandler.java | 2 +- .../rpc/data/DataProtobufLengthDecoder.java | 2 +- .../drill/exec/rpc/data/DataRpcConfig.java | 2 +- .../drill/exec/rpc/data/DataRpcMetrics.java | 2 +- .../exec/rpc/data/DataServerConnection.java | 4 +- .../rpc/data/DataServerRequestHandler.java | 4 +- .../drill/exec/rpc/data/DataTunnel.java | 2 +- .../exec/rpc/data/IncomingDataBatch.java | 2 +- .../rpc/security/AuthenticatorProvider.java | 4 +- .../security/ClientAuthenticatorProvider.java | 4 +- .../rpc/security/FastSaslClientFactory.java | 4 +- .../rpc/security/FastSaslServerFactory.java | 2 +- .../rpc/security/SecurityConfiguration.java | 2 +- .../security/ServerAuthenticationHandler.java | 4 +- .../security/kerberos/KerberosFactory.java | 4 +- .../drill/exec/rpc/security/package-info.java | 3 +- .../exec/rpc/security/plain/PlainServer.java | 2 +- .../user/AwaitableUserResultsListener.java | 2 +- .../rpc/user/InboundImpersonationManager.java | 2 +- .../drill/exec/rpc/user/QueryDataBatch.java | 2 +- .../exec/rpc/user/QueryResultHandler.java | 2 +- .../rpc/user/UserProtobufLengthDecoder.java | 2 +- .../exec/rpc/user/UserResultsListener.java | 2 +- .../drill/exec/rpc/user/UserRpcConfig.java | 2 +- .../drill/exec/rpc/user/UserRpcMetrics.java | 2 +- .../user/security/Pam4jUserAuthenticator.java | 2 +- .../user/security/PamUserAuthenticator.java | 2 +- .../security/UserAuthenticationException.java | 4 +- .../rpc/user/security/UserAuthenticator.java | 4 +- .../security/UserAuthenticatorFactory.java | 2 +- .../security/UserAuthenticatorTemplate.java | 4 +- .../drill/exec/schema/BackedRecord.java | 2 +- .../apache/drill/exec/schema/DataRecord.java | 2 +- .../apache/drill/exec/schema/DiffSchema.java | 2 +- .../org/apache/drill/exec/schema/Field.java | 2 +- .../apache/drill/exec/schema/IdGenerator.java | 2 +- .../apache/drill/exec/schema/ListSchema.java | 2 +- .../apache/drill/exec/schema/NamedField.java | 2 +- .../drill/exec/schema/ObjectSchema.java | 2 +- .../drill/exec/schema/OrderedField.java | 2 +- .../org/apache/drill/exec/schema/Record.java | 2 +- .../drill/exec/schema/RecordSchema.java | 2 +- .../drill/exec/schema/SchemaIdGenerator.java | 2 +- .../schema/json/jackson/JacksonHelper.java | 2 +- .../serialization/InstanceSerializer.java | 6 +-- .../exec/serialization/JacksonSerializer.java | 6 +-- .../exec/serialization/ProtoSerializer.java | 6 +-- .../exec/server/DrillbitStateManager.java | 1 - .../exec/server/QueryProfileStoreContext.java | 2 +- .../drill/exec/server/RemoteServiceSet.java | 2 +- .../drill/exec/server/StartupOptions.java | 2 +- .../server/options/DrillConfigIterator.java | 2 +- .../server/options/FragmentOptionManager.java | 2 +- .../server/options/InMemoryOptionManager.java | 2 +- .../exec/server/options/OptionDefinition.java | 3 +- .../drill/exec/server/options/OptionList.java | 2 +- .../exec/server/options/OptionManager.java | 2 +- .../exec/server/options/OptionMetaData.java | 3 +- .../exec/server/options/OptionValue.java | 2 +- .../server/options/PersistedOptionValue.java | 1 - .../server/options/QueryOptionManager.java | 2 +- .../server/options/SessionOptionManager.java | 2 +- .../server/rest/GenericExceptionMapper.java | 2 +- .../drill/exec/server/rest/LogsResources.java | 8 ++-- .../exec/server/rest/MetricsResources.java | 2 +- .../exec/server/rest/PluginConfigWrapper.java | 3 +- .../drill/exec/server/rest/QueryWrapper.java | 1 - .../exec/server/rest/ThreadsResources.java | 2 +- .../exec/server/rest/UserNameFilter.java | 4 +- .../drill/exec/server/rest/WebServer.java | 4 +- .../exec/server/rest/WebServerConstants.java | 2 +- .../exec/server/rest/WebSessionResources.java | 7 ++-- .../exec/server/rest/WebUserConnection.java | 2 +- .../server/rest/auth/AuthDynamicFeature.java | 2 +- .../DrillHttpConstraintSecurityHandler.java | 4 +- .../DrillHttpSecurityHandlerProvider.java | 6 +-- .../rest/auth/DrillSpnegoAuthenticator.java | 2 - .../rest/auth/DrillSpnegoLoginService.java | 6 +-- .../server/rest/auth/FormSecurityHanlder.java | 2 +- .../exec/server/rest/auth/SpnegoConfig.java | 6 +-- .../rest/auth/SpnegoSecurityHandler.java | 2 +- .../exec/server/rest/profile/Comparators.java | 2 +- .../exec/server/rest/profile/Filters.java | 2 +- .../server/rest/profile/FragmentWrapper.java | 2 +- .../rest/profile/OperatorPathBuilder.java | 2 +- .../server/rest/profile/OperatorWrapper.java | 2 +- .../rest/profile/SimpleDurationFormat.java | 2 +- .../server/rest/profile/TableBuilder.java | 2 +- .../drill/exec/service/ServiceEngine.java | 2 +- .../exec/store/AbstractRecordReader.java | 2 +- .../exec/store/AbstractStoragePlugin.java | 2 +- .../exec/store/BatchExceededException.java | 2 +- .../drill/exec/store/ClassPathFileSystem.java | 2 +- .../drill/exec/store/ColumnExplorer.java | 4 +- .../exec/store/DistributedStorageEngine.java | 2 +- .../exec/store/LocalSyncableFileSystem.java | 2 +- .../exec/store/NamedStoragePluginConfig.java | 2 +- .../drill/exec/store/PartitionExplorer.java | 4 +- .../exec/store/PartitionExplorerImpl.java | 4 +- .../store/PartitionNotFoundException.java | 4 +- .../drill/exec/store/RecordDataType.java | 2 +- .../apache/drill/exec/store/RecordReader.java | 2 +- .../drill/exec/store/ResourceInputStream.java | 2 +- .../apache/drill/exec/store/SchemaConfig.java | 4 +- .../exec/store/SchemaPartitionExplorer.java | 4 +- .../drill/exec/store/SchemaTreeProvider.java | 4 +- .../drill/exec/store/StoragePluginMap.java | 2 +- .../drill/exec/store/StorageStrategy.java | 4 +- .../drill/exec/store/TimedRunnable.java | 2 +- .../exec/store/avro/AvroFormatConfig.java | 2 +- .../exec/store/avro/AvroRecordReader.java | 2 +- .../drill/exec/store/avro/AvroTypeHelper.java | 2 +- .../exec/store/bson/BsonRecordReader.java | 2 +- .../store/dfs/DrillFSDataInputStream.java | 2 +- .../drill/exec/store/dfs/FormatCreator.java | 2 +- .../drill/exec/store/dfs/FormatPlugin.java | 2 +- .../dfs/FormatPluginOptionExtractor.java | 2 +- .../dfs/FormatPluginOptionsDescriptor.java | 2 +- .../drill/exec/store/dfs/FormatSelection.java | 2 +- .../store/dfs/NamedFormatPluginConfig.java | 2 +- .../drill/exec/store/dfs/OpenFileTracker.java | 4 +- .../exec/store/dfs/ReadEntryWithPath.java | 2 +- .../exec/store/dfs/SubDirectoryList.java | 4 +- .../drill/exec/store/dfs/WorkspaceConfig.java | 2 +- .../exec/store/dfs/easy/EasyGroupScan.java | 2 +- .../dfs/easy/EasyReaderBatchCreator.java | 2 +- .../dfs/easy/EasyWriterBatchCreator.java | 2 +- .../exec/store/direct/DirectBatchCreator.java | 2 +- .../exec/store/direct/DirectSubScan.java | 2 +- .../store/easy/json/JSONRecordReader.java | 2 +- .../exec/store/easy/json/JsonProcessor.java | 2 +- .../easy/json/reader/BaseJsonProcessor.java | 2 +- .../easy/json/reader/CountingJsonReader.java | 2 +- .../SequenceFileFormatConfig.java | 2 +- .../SequenceFileFormatPlugin.java | 2 +- .../SequenceFileRecordReader.java | 2 +- .../text/compliant/FieldVarCharOutput.java | 2 +- .../StreamFinishedPseudoException.java | 2 +- .../store/easy/text/compliant/TextInput.java | 2 +- .../store/easy/text/compliant/TextOutput.java | 2 +- .../text/compliant/TextParsingContext.java | 2 +- .../text/compliant/TextParsingSettings.java | 2 +- .../store/easy/text/compliant/TextReader.java | 2 +- .../exec/store/httpd/HttpdLogRecord.java | 14 ++++--- .../drill/exec/store/httpd/HttpdParser.java | 14 ++++--- .../exec/store/httpd/HttpdParserTest.java | 14 ++++--- .../store/ischema/InfoSchemaBatchCreator.java | 2 +- .../exec/store/ischema/InfoSchemaConfig.java | 2 +- .../store/ischema/InfoSchemaConstants.java | 4 +- .../store/ischema/InfoSchemaDrillTable.java | 2 +- .../exec/store/ischema/InfoSchemaFilter.java | 4 +- .../ischema/InfoSchemaFilterBuilder.java | 2 +- .../store/ischema/InfoSchemaGroupScan.java | 2 +- ...foSchemaPushFilterIntoRecordGenerator.java | 3 +- .../ischema/InfoSchemaStoragePlugin.java | 2 +- .../exec/store/ischema/InfoSchemaSubScan.java | 2 +- .../exec/store/ischema/InfoSchemaTable.java | 2 +- .../store/ischema/InfoSchemaTableType.java | 2 +- .../drill/exec/store/ischema/Records.java | 3 +- .../exec/store/ischema/package-info.java | 2 +- .../exec/store/parquet/ColumnDataReader.java | 2 +- .../drill/exec/store/parquet/Metadata.java | 4 +- .../exec/store/parquet/MetadataVersion.java | 4 +- .../ParquetDirectByteBufferAllocator.java | 3 +- .../store/parquet/ParquetFilterBuilder.java | 2 + .../exec/store/parquet/ParquetGroupScan.java | 4 +- .../store/parquet/ParquetPushDownFilter.java | 2 + .../parquet/ParquetRGFilterEvaluator.java | 6 +-- .../parquet/ParquetWriterBatchCreator.java | 2 +- .../exec/store/parquet/RowGroupReadEntry.java | 2 +- .../columnreaders/AsyncPageReader.java | 2 +- .../parquet/columnreaders/BitReader.java | 2 +- .../columnreaders/ColumnReaderFactory.java | 4 +- .../columnreaders/FixedByteAlignedReader.java | 2 +- .../FixedWidthRepeatedReader.java | 2 +- .../columnreaders/NullableBitReader.java | 2 +- .../columnreaders/NullableColumnReader.java | 2 +- .../NullableFixedByteAlignedReaders.java | 2 +- .../NullableVarLengthValuesColumn.java | 4 +- .../parquet/columnreaders/PageReader.java | 2 +- .../ParquetFixedWidthDictionaryReaders.java | 4 +- .../ParquetToDrillTypeConverter.java | 4 +- .../columnreaders/VarLenBinaryReader.java | 2 +- .../columnreaders/VarLengthColumn.java | 4 +- .../columnreaders/VarLengthColumnReaders.java | 4 +- .../columnreaders/VarLengthValuesColumn.java | 4 +- .../parquet/stat/ColumnStatCollector.java | 6 +-- .../store/parquet/stat/ColumnStatistics.java | 6 +-- .../stat/ParquetFooterStatCollector.java | 6 +-- .../DrillParquetRecordMaterializer.java | 2 +- .../drill/exec/store/pcap/PcapDrillTable.java | 17 +++++---- .../exec/store/pcap/PcapFormatConfig.java | 17 +++++---- .../exec/store/pcap/PcapFormatPlugin.java | 17 +++++---- .../exec/store/pcap/PcapFormatUtils.java | 17 +++++---- .../exec/store/pcap/PcapRecordReader.java | 17 +++++---- .../drill/exec/store/pcap/package-info.java | 17 +++++---- .../drill/exec/store/pcap/schema/Schema.java | 17 +++++---- .../store/pojo/AbstractPojoRecordReader.java | 13 ++++--- .../drill/exec/store/pojo/PojoDataType.java | 2 +- .../exec/store/schedule/AffinityCreator.java | 2 +- .../store/schedule/AssignmentCreator.java | 2 +- .../exec/store/schedule/BlockMapBuilder.java | 2 +- .../exec/store/schedule/CompleteFileWork.java | 2 +- .../exec/store/schedule/CompleteWork.java | 2 +- .../exec/store/schedule/EndpointByteMap.java | 2 +- .../store/schedule/EndpointByteMapImpl.java | 2 +- .../exec/store/sys/BasePersistentStore.java | 4 +- .../sys/BitToUserConnectionIterator.java | 2 +- .../exec/store/sys/DrillbitIterator.java | 2 +- .../store/sys/ExtendedOptionIterator.java | 2 +- .../drill/exec/store/sys/MemoryIterator.java | 2 +- .../drill/exec/store/sys/OptionIterator.java | 2 +- .../exec/store/sys/PersistentStoreConfig.java | 2 +- .../exec/store/sys/PersistentStoreMode.java | 6 +-- .../store/sys/PersistentStoreProvider.java | 2 +- .../store/sys/PersistentStoreRegistry.java | 2 +- .../exec/store/sys/StaticDrillTable.java | 2 +- .../apache/drill/exec/store/sys/Store.java | 13 +++---- .../store/sys/SystemTablePluginConfig.java | 2 +- .../drill/exec/store/sys/ThreadsIterator.java | 2 +- .../drill/exec/store/sys/VersionIterator.java | 2 +- .../store/sys/VersionedPersistentStore.java | 13 +++---- .../store/sys/local/LocalPStoreProvider.java | 6 +-- .../store/sys/store/DataChangeVersion.java | 6 +-- .../exec/store/sys/store/InMemoryStore.java | 4 +- .../sys/store/VersionedDelegatingStore.java | 13 +++---- .../provider/BasePersistentStoreProvider.java | 6 +-- .../CachingPersistentStoreProvider.java | 2 +- .../LocalPersistentStoreProvider.java | 2 +- .../ZookeeperPersistentStoreProvider.java | 2 +- .../exec/store/sys/zk/ZkPStoreProvider.java | 6 +-- .../drill/exec/testing/ControlsInjector.java | 2 +- .../exec/testing/ControlsInjectorFactory.java | 2 +- .../exec/testing/CountDownLatchInjection.java | 2 +- .../testing/CountDownLatchInjectionImpl.java | 2 +- .../exec/testing/ExceptionInjection.java | 2 +- .../testing/ExecutionControlsInjector.java | 2 +- .../apache/drill/exec/testing/Injection.java | 2 +- .../InjectionConfigurationException.java | 2 +- .../drill/exec/testing/InjectionSite.java | 2 +- .../exec/testing/NoOpControlsInjector.java | 2 +- .../drill/exec/testing/PauseInjection.java | 2 +- .../exec/testing/store/NoWriteLocalStore.java | 4 +- .../exec/util/ApproximateStringMatcher.java | 4 +- .../exec/util/ArrayWrappedIntIntMap.java | 4 +- .../apache/drill/exec/util/ByteBufUtil.java | 2 +- .../drill/exec/util/DrillFileSystemUtil.java | 4 +- .../drill/exec/util/FileSystemUtil.java | 4 +- .../apache/drill/exec/util/GuavaPatcher.java | 2 +- .../drill/exec/util/ImpersonationUtil.java | 2 +- .../org/apache/drill/exec/util/JarUtil.java | 6 +-- .../exec/util/StoragePluginTestUtils.java | 2 +- .../BufferedDirectBufInputStream.java | 6 +-- .../util/filereader/DirectBufInputStream.java | 6 +-- .../apache/drill/exec/vector/CopyUtil.java | 2 +- .../drill/exec/vector/VectorValidator.java | 2 +- .../vector/accessor/AbstractSqlAccessor.java | 2 +- .../accessor/BoundCheckingAccessor.java | 2 +- .../exec/vector/accessor/GenericAccessor.java | 2 +- .../accessor/InvalidAccessException.java | 2 +- .../exec/vector/accessor/SqlAccessor.java | 2 +- .../vector/accessor/UnionSqlAccessor.java | 2 +- .../exec/vector/complex/FieldIdUtil.java | 4 +- .../vector/complex/fn/BasicJsonOutput.java | 2 +- .../vector/complex/fn/DateOutputFormat.java | 2 +- .../complex/fn/DrillBufInputStream.java | 2 +- .../vector/complex/fn/ExtendedJsonOutput.java | 2 +- .../exec/vector/complex/fn/ExtendedType.java | 2 +- .../vector/complex/fn/ExtendedTypeName.java | 2 +- .../exec/vector/complex/fn/JsonOutput.java | 2 +- .../exec/vector/complex/fn/JsonReader.java | 2 +- .../vector/complex/fn/JsonReaderUtils.java | 2 +- .../exec/vector/complex/fn/JsonWriter.java | 2 +- .../exec/vector/complex/fn/SeekableBAIS.java | 2 +- .../exec/vector/complex/fn/WorkingBuffer.java | 2 +- .../complex/impl/VectorContainerWriter.java | 2 +- .../drill/exec/work/EndpointListener.java | 2 +- .../drill/exec/work/ExecErrorConstants.java | 2 +- .../apache/drill/exec/work/WorkManager.java | 2 +- .../work/batch/AbstractDataCollector.java | 2 +- .../exec/work/batch/BaseRawBatchBuffer.java | 2 +- .../drill/exec/work/batch/DataCollector.java | 2 +- .../exec/work/batch/IncomingBuffers.java | 2 +- .../exec/work/batch/MergingCollector.java | 2 +- .../exec/work/batch/PartitionedCollector.java | 2 +- .../drill/exec/work/batch/RawBatchBuffer.java | 2 +- .../exec/work/batch/ResponseSenderQueue.java | 2 +- .../work/batch/SpoolingRawBatchBuffer.java | 2 +- .../work/batch/UnlimitedRawBatchBuffer.java | 2 +- .../work/foreman/DrillbitStatusListener.java | 2 +- .../exec/work/foreman/ForemanException.java | 2 +- .../work/foreman/ForemanSetupException.java | 2 +- .../drill/exec/work/foreman/FragmentData.java | 2 +- .../work/foreman/FragmentStatusListener.java | 2 +- .../exec/work/foreman/FragmentsRunner.java | 13 ++++--- .../drill/exec/work/foreman/LoggedQuery.java | 2 +- .../work/foreman/SqlUnsupportedException.java | 3 +- .../foreman/UnsupportedDataTypeException.java | 2 +- .../foreman/UnsupportedFunctionException.java | 2 +- .../UnsupportedRelOperatorException.java | 2 +- .../fragment/AbstractFragmentManager.java | 2 +- .../exec/work/fragment/FragmentExecutor.java | 2 +- .../exec/work/fragment/FragmentManager.java | 2 +- .../work/fragment/FragmentStatusReporter.java | 2 +- .../work/fragment/NonRootFragmentManager.java | 2 +- .../work/fragment/RootFragmentManager.java | 2 +- .../fragment/StateTransitionException.java | 2 +- .../exec/work/metadata/MetadataProvider.java | 6 +-- .../work/metadata/ServerMetaProvider.java | 4 +- .../prepare/PreparedStatementProvider.java | 4 +- .../drill/exec/work/user/UserWorker.java | 2 +- .../hadoop/ColumnChunkIncReadStore.java | 2 +- .../ParquetColumnChunkPageWriteStore.java | 13 +++---- .../src/main/resources/rest/error.ftl | 28 +++++++++----- .../src/main/resources/rest/generic.ftl | 28 +++++++++----- .../src/main/resources/rest/index.ftl | 28 +++++++++----- .../src/main/resources/rest/login.ftl | 28 +++++++++----- .../src/main/resources/rest/logs/list.ftl | 28 +++++++++----- .../src/main/resources/rest/logs/log.ftl | 28 +++++++++----- .../src/main/resources/rest/mainLogin.ftl | 29 ++++++++++----- .../main/resources/rest/metrics/metrics.ftl | 28 +++++++++----- .../src/main/resources/rest/options.ftl | 28 +++++++++----- .../src/main/resources/rest/profile/list.ftl | 28 +++++++++----- .../main/resources/rest/profile/profile.ftl | 28 +++++++++----- .../resources/rest/query/errorMessage.ftl | 28 +++++++++----- .../src/main/resources/rest/query/list.ftl | 28 +++++++++----- .../src/main/resources/rest/query/query.ftl | 28 +++++++++----- .../src/main/resources/rest/query/result.ftl | 28 +++++++++----- .../src/main/resources/rest/status.ftl | 28 +++++++++----- .../src/main/resources/rest/storage/list.ftl | 28 +++++++++----- .../main/resources/rest/storage/update.ftl | 28 +++++++++----- .../main/resources/rest/threads/threads.ftl | 28 +++++++++----- exec/java-exec/src/main/sh/drill-config.sh | 35 ++++++++---------- exec/java-exec/src/main/sh/drillbit.sh | 37 +++++++++---------- .../org/apache/drill/ParquetSchemaMerge.java | 2 +- .../java/org/apache/drill/PlanTestBase.java | 1 - .../org/apache/drill/SingleRowListener.java | 2 +- .../org/apache/drill/TestAggNullable.java | 2 +- .../org/apache/drill/TestAltSortQueries.java | 2 +- .../java/org/apache/drill/TestCTASJson.java | 2 +- .../apache/drill/TestCTASPartitionFilter.java | 2 +- .../org/apache/drill/TestCaseSensitivity.java | 3 +- .../org/apache/drill/TestCorrelation.java | 2 +- .../drill/TestDisabledFunctionality.java | 2 +- .../apache/drill/TestDynamicUDFSupport.java | 4 +- .../org/apache/drill/TestExampleQueries.java | 2 +- .../org/apache/drill/TestFrameworkTest.java | 4 +- .../org/apache/drill/TestFunctionsQuery.java | 2 +- .../org/apache/drill/TestImplicitCasting.java | 2 +- .../java/org/apache/drill/TestInList.java | 2 +- .../org/apache/drill/TestMergeFilterPlan.java | 3 +- .../apache/drill/TestOutOfMemoryOutcome.java | 2 +- .../org/apache/drill/TestPartitionFilter.java | 2 +- .../drill/TestPlanVerificationUtilities.java | 4 +- .../org/apache/drill/TestProjectPushDown.java | 3 +- .../org/apache/drill/TestSchemaChange.java | 2 +- .../org/apache/drill/TestSelectivity.java | 2 +- .../java/org/apache/drill/TestTextJoin.java | 2 +- .../org/apache/drill/TestTpchDistributed.java | 2 +- .../drill/TestTpchDistributedConcurrent.java | 2 +- .../drill/TestTpchDistributedStreaming.java | 2 +- .../org/apache/drill/TestTpchExplain.java | 2 +- .../java/org/apache/drill/TestTpchLimit0.java | 2 +- .../org/apache/drill/TestTpchPlanning.java | 2 +- .../org/apache/drill/TestTpchSingleMode.java | 2 +- .../drill/TestUtf8SupportInQueryString.java | 13 ++++--- .../common/scanner/TestClassPathScanner.java | 2 +- .../drill/exec/DrillSystemTestBase.java | 2 +- .../drill/exec/HyperVectorValueIterator.java | 4 +- .../org/apache/drill/exec/RunRootExec.java | 2 +- .../java/org/apache/drill/exec/SortTest.java | 2 +- .../apache/drill/exec/TestEmptyInputSql.java | 1 - .../drill/exec/TestOpSerialization.java | 1 - .../drill/exec/TestQueriesOnLargeFile.java | 3 +- .../drill/exec/TestRepeatedReaders.java | 1 - .../org/apache/drill/exec/TestSSLConfig.java | 7 ++-- .../apache/drill/exec/TestWithZookeeper.java | 2 +- .../apache/drill/exec/ZookeeperTestUtil.java | 31 ++++++++-------- .../ConnectTriesPropertyTestClusterBits.java | 6 +-- .../exec/client/DrillClientSystemTest.java | 2 +- .../drill/exec/client/DrillClientTest.java | 6 +-- .../apache/drill/exec/client/DumpCatTest.java | 2 +- .../exec/compile/CodeCompilerTestFactory.java | 2 +- .../compile/ExampleExternalInterface.java | 2 +- .../drill/exec/compile/ExampleTemplate.java | 2 +- .../compile/TestClassCompilationTypes.java | 2 +- .../compile/bytecode/ReplaceMethodInvoke.java | 2 +- .../exec/coord/zk/TestEphemeralStore.java | 4 +- .../exec/coord/zk/TestEventDispatcher.java | 6 +-- .../drill/exec/coord/zk/TestPathUtils.java | 6 +-- .../exec/coord/zk/TestZookeeperClient.java | 4 +- .../apache/drill/exec/expr/EscapeTest1.java | 2 +- .../drill/exec/expr/ExpressionTest.java | 2 +- .../drill/exec/expr/TestLogicalExprSerDe.java | 5 +-- .../exec/expr/fn/FunctionInitializerTest.java | 13 ++++--- .../fn/impl/TestSimpleRepeatedFunctions.java | 2 +- .../exec/expr/fn/impl/TestSqlPatterns.java | 1 - .../registry/FunctionRegistryHolderTest.java | 4 +- .../exec/fn/impl/TestAggregateFunction.java | 2 +- .../fn/impl/TestByteComparisonFunctions.java | 2 +- .../exec/fn/impl/TestCastEmptyStrings.java | 7 ++-- .../exec/fn/impl/TestContextFunctions.java | 2 +- .../exec/fn/impl/TestCryptoFunctions.java | 14 +++---- .../exec/fn/impl/TestDateAddFunctions.java | 31 ++++++++-------- .../drill/exec/fn/impl/TestDateFunctions.java | 6 +-- .../exec/fn/impl/TestDateTruncFunctions.java | 6 +-- .../drill/exec/fn/impl/TestMathFunctions.java | 3 +- .../fn/impl/TestMathFunctionsWithNanInf.java | 32 ++++++++-------- .../drill/exec/fn/impl/TestMultiInputAdd.java | 7 ++-- .../exec/fn/impl/TestNetworkFunctions.java | 1 - .../fn/impl/TestNewAggregateFunctions.java | 2 +- .../exec/fn/impl/TestNewDateFunctions.java | 2 +- .../exec/fn/impl/TestNewMathFunctions.java | 3 +- .../impl/TestNewSimpleRepeatedFunctions.java | 2 +- .../exec/fn/impl/TestRepeatedFunction.java | 2 +- .../drill/exec/fn/impl/TestTrigFunctions.java | 6 +-- .../fn/impl/testing/GeneratorFunctions.java | 2 +- .../fn/impl/testing/TestDateConversions.java | 31 ++++++++-------- .../exec/fn/interp/TestConstantFolding.java | 4 +- .../impersonation/BaseTestImpersonation.java | 4 +- .../TestImpersonationDisabledWithMiniDFS.java | 4 +- .../TestImpersonationMetadata.java | 4 +- .../TestImpersonationQueries.java | 4 +- .../TestInboundImpersonation.java | 2 +- .../TestInboundImpersonationPrivileges.java | 4 +- .../drill/exec/memory/TestAllocators.java | 3 +- .../exec/nested/TestFastComplexSchema.java | 2 +- .../exec/nested/TestNestedComplexSchema.java | 2 +- .../drill/exec/opt/BasicOptimizerTest.java | 2 +- .../config/TestParsePhysicalPlan.java | 2 +- .../exec/physical/impl/SimpleRootExec.java | 2 +- .../physical/impl/TestBroadcastExchange.java | 2 +- .../exec/physical/impl/TestCastFunctions.java | 2 +- .../impl/TestCastVarCharToBigInt.java | 2 +- .../impl/TestComparisonFunctions.java | 2 +- .../drill/exec/physical/impl/TestDecimal.java | 2 +- .../impl/TestDistributedFragmentRun.java | 2 +- .../physical/impl/TestExtractFunctions.java | 2 +- .../impl/TestHashToRandomExchange.java | 2 +- .../impl/TestImplicitCastFunctions.java | 2 +- .../exec/physical/impl/TestLocalExchange.java | 4 +- .../physical/impl/TestOrderedMuxExchange.java | 4 +- .../impl/TestReverseImplicitCast.java | 2 +- .../physical/impl/TestSimpleFunctions.java | 2 +- .../physical/impl/TestStringFunctions.java | 2 +- .../exec/physical/impl/TestUnionExchange.java | 2 +- .../impl/TopN/TestTopNSchemaChanges.java | 2 +- .../drill/exec/physical/impl/agg/TestAgg.java | 2 +- .../exec/physical/impl/agg/TestHashAggr.java | 1 - .../physical/impl/agg/TestHashAggrSpill.java | 1 - .../impl/broadcastsender/TestBroadcast.java | 2 +- .../impl/filter/TestLargeInClause.java | 2 +- .../impl/filter/TestSimpleFilter.java | 2 +- .../physical/impl/flatten/TestFlatten.java | 2 +- .../impl/flatten/TestFlattenPlanning.java | 6 +-- .../exec/physical/impl/join/TestHashJoin.java | 2 +- .../impl/join/TestHashJoinAdvanced.java | 1 - .../impl/join/TestMergeJoinMulCondition.java | 2 +- .../impl/join/TestNestedLoopJoin.java | 1 - .../limit/TestEarlyLimit0Optimization.java | 4 +- .../impl/limit/TestLimitWithExchanges.java | 2 +- .../physical/impl/limit/TestSimpleLimit.java | 2 +- .../mergereceiver/TestMergingReceiver.java | 1 - .../TestOrderedPartitionExchange.java | 2 +- .../impl/project/TestSimpleProjection.java | 2 +- .../physical/impl/sort/TestSimpleSort.java | 2 +- .../exec/physical/impl/sort/TestSort.java | 2 +- .../impl/svremover/TestSVRemover.java | 2 +- .../impl/trace/TestTraceMultiRecordBatch.java | 2 +- .../impl/trace/TestTraceOutputDump.java | 2 +- .../impl/validate/TestBatchValidator.java | 2 +- .../impl/window/GenerateTestData.java | 2 +- .../physical/impl/window/TestWindowFrame.java | 4 +- .../TestCorruptParquetDateCorrection.java | 4 +- .../physical/impl/xsort/TestExternalSort.java | 4 +- .../unit/BasicPhysicalOpUnitTest.java | 6 +-- .../physical/unit/MiniPlanUnitTestBase.java | 5 +-- .../physical/unit/PhysicalOpUnitTestBase.java | 4 +- .../exec/physical/unit/TestMiniPlan.java | 5 +-- .../physical/unit/TestNullInputMiniPlan.java | 5 +-- .../physical/unit/TestOutputBatchSize.java | 5 +-- .../PhysicalPlanReaderTestFactory.java | 2 +- .../planner/TestDirectoryExplorerUDFs.java | 2 +- .../TestHardAffinityFragmentParallelizer.java | 6 +-- .../exec/planner/logical/FilterSplitTest.java | 2 +- .../logical/TestCaseNullableTypes.java | 31 ++++++++-------- .../drill/exec/pop/PopUnitTestBase.java | 2 +- .../drill/exec/pop/TestFragmentChecker.java | 2 +- .../apache/drill/exec/pop/TestFragmenter.java | 2 +- .../drill/exec/pop/TestInjectionValue.java | 2 +- .../exec/record/TestMaterializedField.java | 4 +- .../drill/exec/record/TestRecordIterator.java | 2 +- .../exec/record/vector/TestDateTypes.java | 2 +- .../exec/rpc/control/TestCustomTunnel.java | 2 +- .../drill/exec/rpc/data/TestBitRpc.java | 2 +- .../exec/rpc/security/KerberosHelper.java | 2 +- .../TemporaryTablesAutomaticDropTest.java | 4 +- .../security/TestCustomUserAuthenticator.java | 2 +- .../user/security/TestUserBitKerberos.java | 2 +- .../TestUserBitKerberosEncryption.java | 2 +- .../rpc/user/security/TestUserBitSSL.java | 2 +- .../user/security/TestUserBitSSLServer.java | 2 +- .../TestUserBitSaslCompatibility.java | 2 +- .../testing/UserAuthenticatorTestImpl.java | 4 +- .../drill/exec/server/DrillClientFactory.java | 2 +- .../drill/exec/server/HelloResource.java | 2 +- .../drill/exec/server/TestDurationFormat.java | 2 +- .../apache/drill/exec/server/TestOptions.java | 2 +- .../exec/server/TestOptionsAuthEnabled.java | 2 +- .../drill/exec/server/TestTpcdsSf1Leaks.java | 2 +- .../exec/server/options/OptionValueTest.java | 1 - .../options/PersistedOptionValueTest.java | 1 - .../server/options/TestConfigLinkage.java | 3 +- .../exec/server/rest/StatusResourcesTest.java | 1 - .../server/rest/TestMainLoginPageModel.java | 2 +- .../server/rest/WebSessionResourcesTest.java | 2 +- .../spnego/TestDrillSpnegoAuthenticator.java | 2 +- .../rest/spnego/TestSpnegoAuthentication.java | 4 +- .../server/rest/spnego/TestSpnegoConfig.java | 2 +- .../drill/exec/sql/TestBaseViewSupport.java | 2 +- .../org/apache/drill/exec/sql/TestCTTAS.java | 4 +- .../apache/drill/exec/sql/TestInfoSchema.java | 2 +- .../exec/sql/TestSimpleCastFunctions.java | 2 +- .../exec/sql/TestSqlBracketlessSyntax.java | 2 +- .../drill/exec/sql/TestViewSupport.java | 2 +- .../apache/drill/exec/sql/TestWithClause.java | 2 +- .../drill/exec/store/ByteArrayUtil.java | 2 +- .../exec/store/CachedSingleFileSystem.java | 2 +- .../exec/store/FormatPluginSerDeTest.java | 13 ++++--- .../drill/exec/store/StorageStrategyTest.java | 13 ++++--- .../exec/store/TestAffinityCalculator.java | 2 +- .../exec/store/TestImplicitFileColumns.java | 6 +-- .../drill/exec/store/TestTimedRunnable.java | 2 +- .../exec/store/bson/TestBsonRecordReader.java | 2 +- .../exec/store/dfs/TestDrillFileSystem.java | 4 +- .../dfs/TestFormatPluginOptionExtractor.java | 2 +- .../apache/drill/exec/store/dfs/TestGlob.java | 6 +-- .../store/easy/text/compliant/TestCsv.java | 2 +- .../Drill2283InfoSchemaVarchar1BugTest.java | 4 +- .../ischema/TestInfoSchemaFilterPushDown.java | 2 +- .../exec/store/json/TestJsonRecordReader.java | 2 +- .../drill/exec/store/parquet/FieldInfo.java | 4 +- .../parquet/ParquetRecordReaderTest.java | 2 +- .../ParquetSimpleTestFileGenerator.java | 2 +- .../store/parquet/ParquetTestProperties.java | 4 +- .../exec/store/parquet/TestFileGenerator.java | 2 +- .../store/parquet/TestFixedlenDecimal.java | 2 +- .../parquet/TestParquetFilterPushDown.java | 1 - .../exec/store/parquet/WrapAroundCounter.java | 4 +- .../TestColumnReaderFactory.java | 2 +- .../parquet/columnreaders/TestDateReader.java | 2 +- .../parquet2/TestDrillParquetReader.java | 2 +- .../exec/store/pcap/TestPcapDecoder.java | 17 +++++---- .../exec/store/pcap/TestPcapRecordReader.java | 17 +++++---- .../sequencefile/TestSequenceFileReader.java | 2 +- .../exec/store/store/TestAssignment.java | 2 +- .../drill/exec/store/sys/PStoreTestUtil.java | 2 +- .../exec/store/sys/TestPStoreProviders.java | 3 +- .../drill/exec/store/text/TestCsvHeader.java | 2 +- .../exec/store/text/TestNewTextReader.java | 2 +- .../drill/exec/store/text/TestTextColumn.java | 21 +++++++---- .../exec/store/text/TextRecordReaderTest.java | 2 +- ...2130JavaExecHamcrestConfigurationTest.java | 2 +- .../apache/drill/exec/testing/Controls.java | 2 +- .../exec/testing/ControlsInjectionUtil.java | 2 +- .../testing/TestCountDownLatchInjection.java | 2 +- .../exec/testing/TestExceptionInjection.java | 2 +- .../exec/testing/TestPauseInjection.java | 2 +- .../drill/exec/testing/TestResourceLeak.java | 2 +- .../exec/util/DrillFileSystemUtilTest.java | 13 ++++--- .../drill/exec/util/FileSystemUtilTest.java | 4 +- .../exec/util/FileSystemUtilTestBase.java | 13 ++++--- .../drill/exec/util/MiniZooKeeperCluster.java | 2 +- .../util/TestApproximateStringMatcher.java | 4 +- .../exec/util/TestArrayWrappedIntIntMap.java | 4 +- .../exec/vector/TestSplitAndTransfer.java | 2 +- .../vector/accessor/GenericAccessorTest.java | 2 +- .../vector/accessor/TestTimePrintMillis.java | 2 +- .../vector/complex/TestEmptyPopulation.java | 2 +- .../fn/TestJsonReaderWithSparseFiles.java | 2 +- .../complex/writer/TestComplexToJson.java | 2 +- .../complex/writer/TestComplexTypeReader.java | 1 - .../complex/writer/TestComplexTypeWriter.java | 3 +- .../complex/writer/TestExtendedTypes.java | 2 +- .../vector/complex/writer/TestJsonNanInf.java | 32 ++++++++-------- .../complex/writer/TestPromotableWriter.java | 6 +-- .../vector/complex/writer/TestRepeated.java | 2 +- .../drill/exec/work/batch/FileTest.java | 2 +- .../exec/work/batch/TestSpoolingBuffer.java | 2 +- .../fragment/FragmentStatusReporterTest.java | 15 ++++---- .../fragment/TestFragmentExecutorCancel.java | 2 +- .../work/metadata/TestMetadataProvider.java | 6 +-- .../work/metadata/TestServerMetaProvider.java | 4 +- .../prepare/PreparedStatementTestBase.java | 13 ++++--- .../TestLimit0VsRegularQueriesMetadata.java | 13 ++++--- .../TestPreparedStatementProvider.java | 4 +- .../apache/drill/test/BaseDirTestWatcher.java | 1 - .../drill/test/ClusterFixtureBuilder.java | 2 +- .../org/apache/drill/test/ClusterTest.java | 2 +- .../org/apache/drill/test/ConfigBuilder.java | 2 +- .../java/org/apache/drill/test/FieldDef.java | 2 +- .../org/apache/drill/test/ProfileParser.java | 2 +- .../org/apache/drill/test/QueryTestUtil.java | 2 +- .../apache/drill/test/RestClientFixture.java | 1 - .../drill/test/TestGracefulShutdown.java | 1 - .../test/rowSet/file/JsonFileBuilder.java | 1 - .../apache/drill/vector/TestFillEmpties.java | 3 +- .../src/test/resources/core-site.xml | 28 +++++++------- .../src/test/resources/saffron.properties | 15 +++++--- .../src/test/resources/ssl-server-invalid.xml | 19 ++++++++++ exec/jdbc-all/pom.xml | 31 +++++++++------- .../drill/jdbc/DrillbitClassLoader.java | 2 +- .../apache/drill/jdbc/ITTestShadedJar.java | 2 +- exec/jdbc/pom.xml | 29 ++++++++++----- .../apache/drill/jdbc/DrillConnection.java | 2 +- .../drill/jdbc/DrillConnectionConfig.java | 2 +- .../drill/jdbc/DrillDatabaseMetaData.java | 13 ++++--- .../drill/jdbc/DrillPreparedStatement.java | 15 ++++---- .../org/apache/drill/jdbc/DrillResultSet.java | 2 +- .../org/apache/drill/jdbc/DrillStatement.java | 15 ++++---- .../java/org/apache/drill/jdbc/Driver.java | 2 +- .../drill/jdbc/SQLConversionException.java | 2 +- .../jdbc/SQLConversionOverflowException.java | 2 +- .../drill/jdbc/SchemaChangeListener.java | 2 +- .../drill/jdbc/SqlTimeoutException.java | 2 +- .../jdbc/impl/AvaticaDrillSqlAccessor.java | 2 +- .../org/apache/drill/jdbc/impl/BasicList.java | 2 +- .../drill/jdbc/impl/DrillAccessorList.java | 2 +- .../apache/drill/jdbc/impl/DrillCursor.java | 2 +- .../apache/drill/jdbc/impl/DrillFactory.java | 3 +- .../apache/drill/jdbc/impl/DrillHandler.java | 2 +- .../drill/jdbc/impl/DrillJdbc40Factory.java | 2 +- .../drill/jdbc/impl/DrillJdbc41Factory.java | 1 - .../drill/jdbc/impl/DrillRemoteStatement.java | 2 +- .../jdbc/impl/DrillResultSetMetaDataImpl.java | 3 +- .../drill/jdbc/impl/DrillStatementImpl.java | 2 +- .../jdbc/impl/DrillStatementRegistry.java | 2 +- .../apache/drill/jdbc/impl/DriverImpl.java | 2 +- .../jdbc/impl/GlobalServiceSetReference.java | 2 +- .../jdbc/impl/TypeConvertingSqlAccessor.java | 4 +- .../drill/jdbc/impl/WrappedAccessor.java | 5 +-- .../org/apache/drill/jdbc/package-info.java | 1 - .../apache/drill/jdbc/proxy/package-info.java | 1 - .../resources/apache-drill-jdbc.properties | 1 + .../drill/jdbc/CachingConnectionFactory.java | 2 +- .../apache/drill/jdbc/ConnectionFactory.java | 2 +- .../org/apache/drill/jdbc/ConnectionInfo.java | 2 +- .../ConnectionTransactionMethodsTest.java | 2 +- .../drill/jdbc/NonClosableConnection.java | 2 +- .../ResultSetGetMethodConversionsTest.java | 2 +- .../drill/jdbc/ResultSetMetaDataTest.java | 2 +- .../org/apache/drill/jdbc/StatementTest.java | 2 +- .../impl/TypeConvertingSqlAccessorTest.java | 2 +- .../jdbc/test/Bug1735ConnectionCloseTest.java | 2 +- ...1735ResultSetCloseReleasesBuffersTest.java | 2 +- ...ColumnsDataTypeNotTypeCodeIntBugsTest.java | 2 +- ...2130JavaJdbcHamcrestConfigurationTest.java | 2 +- ...l2288GetColumnsMetadataWhenNoRowsTest.java | 2 +- ...GetBooleanFailsSayingWrongTypeBugTest.java | 2 +- ...ll2461IntervalsBreakInfoSchemaBugTest.java | 2 +- ...63GetNullsFailedWithAssertionsBugTest.java | 2 +- .../java/org/apache/drill/jdbc/test/Hook.java | 2 +- .../JdbcConnectTriesTestEmbeddedBits.java | 7 ++-- .../apache/drill/jdbc/test/JdbcDataTest.java | 2 +- .../test/JdbcNullOrderingAndGroupingTest.java | 2 +- .../drill/jdbc/test/JdbcTestActionBase.java | 2 +- .../drill/jdbc/test/JdbcTestQueryBase.java | 2 +- .../test/TestAggregateFunctionsQuery.java | 2 +- .../apache/drill/jdbc/test/TestBugFixes.java | 2 +- .../drill/jdbc/test/TestJdbcDistQuery.java | 2 +- .../drill/jdbc/test/TestJdbcMetadata.java | 2 +- exec/memory/base/pom.xml | 29 ++++++++++----- .../io/netty/buffer/ExpandableByteBuf.java | 2 +- .../java/io/netty/buffer/LargeBuffer.java | 2 +- .../netty/buffer/MutableWrappedByteBuf.java | 2 +- .../buffer/UnsafeDirectLittleEndian.java | 3 +- .../exec/exception/OutOfMemoryException.java | 2 +- .../drill/exec/memory/AllocationManager.java | 2 +- .../exec/memory/AllocationReservation.java | 2 +- .../exec/memory/AllocatorClosedException.java | 2 +- .../drill/exec/memory/BoundsChecking.java | 2 +- .../drill/exec/memory/BufferAllocator.java | 2 +- .../exec/memory/DrillByteBufAllocator.java | 2 +- .../drill/exec/memory/RootAllocator.java | 2 +- .../drill/exec/memory/package-info.java | 2 +- .../apache/drill/exec/ops/BufferManager.java | 4 +- .../org/apache/drill/exec/util/Pointer.java | 2 +- .../drill/exec/memory/BoundsCheckingTest.java | 13 +++---- .../drill/exec/memory/TestAccountant.java | 2 +- .../drill/exec/memory/TestBaseAllocator.java | 2 +- .../drill/exec/memory/TestEndianess.java | 2 +- exec/memory/pom.xml | 27 ++++++++------ exec/pom.xml | 31 +++++++++------- exec/rpc/pom.xml | 29 ++++++++++----- .../drill/common/SerializedExecutor.java | 2 +- .../exec/rpc/AbstractHandshakeHandler.java | 2 +- .../java/org/apache/drill/exec/rpc/Acks.java | 2 +- .../exec/rpc/BaseRpcOutcomeListener.java | 2 +- .../exec/rpc/ChannelClosedException.java | 2 +- .../ChannelListenerWithCoordinationId.java | 2 +- .../drill/exec/rpc/ChunkCreationHandler.java | 2 +- .../drill/exec/rpc/ClientConnection.java | 4 +- .../drill/exec/rpc/ConnectionThrottle.java | 2 +- .../apache/drill/exec/rpc/DrillRpcFuture.java | 2 +- .../drill/exec/rpc/DrillRpcFutureImpl.java | 2 +- .../drill/exec/rpc/EncryptionContext.java | 3 +- .../drill/exec/rpc/EncryptionContextImpl.java | 2 +- .../drill/exec/rpc/FutureBitCommand.java | 2 +- .../drill/exec/rpc/InboundRpcMessage.java | 2 +- .../drill/exec/rpc/ListeningCommand.java | 2 +- .../drill/exec/rpc/NamedThreadFactory.java | 2 +- .../exec/rpc/NonTransientRpcException.java | 2 +- .../drill/exec/rpc/OutOfMemoryHandler.java | 2 +- .../drill/exec/rpc/OutboundRpcMessage.java | 2 +- .../drill/exec/rpc/ProtobufLengthDecoder.java | 2 +- .../exec/rpc/ReconnectingConnection.java | 2 +- .../drill/exec/rpc/ResettableBarrier.java | 2 +- .../org/apache/drill/exec/rpc/Response.java | 2 +- .../apache/drill/exec/rpc/ResponseSender.java | 2 +- .../drill/exec/rpc/RpcCheckedFuture.java | 2 +- .../org/apache/drill/exec/rpc/RpcCommand.java | 2 +- .../org/apache/drill/exec/rpc/RpcConfig.java | 2 +- .../drill/exec/rpc/RpcConnectionHandler.java | 2 +- .../org/apache/drill/exec/rpc/RpcDecoder.java | 2 +- .../org/apache/drill/exec/rpc/RpcEncoder.java | 2 +- .../apache/drill/exec/rpc/RpcException.java | 2 +- .../drill/exec/rpc/RpcExceptionHandler.java | 2 +- .../org/apache/drill/exec/rpc/RpcMessage.java | 2 +- .../org/apache/drill/exec/rpc/RpcMetrics.java | 5 +-- .../org/apache/drill/exec/rpc/RpcOutcome.java | 2 +- .../drill/exec/rpc/RpcOutcomeListener.java | 2 +- .../org/apache/drill/exec/rpc/SaslCodec.java | 1 - .../drill/exec/rpc/SaslDecryptionHandler.java | 1 - .../drill/exec/rpc/SaslEncryptionHandler.java | 1 - .../apache/drill/exec/rpc/TransportCheck.java | 2 +- .../drill/exec/rpc/UserRpcException.java | 2 +- .../AuthenticationOutcomeListener.java | 2 +- .../exec/rpc/security/SaslProperties.java | 2 +- exec/vector/pom.xml | 29 ++++++++++----- .../src/main/codegen/includes/license.ftl | 36 +++++++++--------- .../src/main/codegen/includes/vv_imports.ftl | 28 +++++++++----- .../templates/AbstractFieldReader.java | 1 - .../templates/AbstractFieldWriter.java | 3 +- .../AbstractPromotableFieldWriter.java | 3 +- .../main/codegen/templates/BaseReader.java | 3 +- .../main/codegen/templates/BaseWriter.java | 3 +- .../codegen/templates/BasicTypeHelper.java | 1 - .../main/codegen/templates/ComplexCopier.java | 3 +- .../codegen/templates/ComplexReaders.java | 3 +- .../codegen/templates/ComplexWriters.java | 3 +- .../codegen/templates/FixedValueVectors.java | 1 - .../codegen/templates/HolderReaderImpl.java | 3 +- .../main/codegen/templates/ListWriters.java | 1 - .../main/codegen/templates/MapWriters.java | 3 +- .../main/codegen/templates/NullReader.java | 3 +- .../templates/RepeatedValueVectors.java | 1 - .../codegen/templates/UnionListWriter.java | 1 - .../main/codegen/templates/UnionReader.java | 3 +- .../main/codegen/templates/UnionVector.java | 1 - .../main/codegen/templates/UnionWriter.java | 1 - .../main/codegen/templates/ValueHolders.java | 2 +- .../templates/VariableLengthVectors.java | 1 - .../OversizedAllocationException.java | 2 +- .../SchemaChangeRuntimeException.java | 2 +- .../expr/fn/impl/ByteFunctionHelpers.java | 5 +-- .../drill/exec/expr/fn/impl/DateUtility.java | 1 - .../exec/expr/holders/ComplexHolder.java | 2 +- .../drill/exec/expr/holders/ListHolder.java | 2 +- .../drill/exec/expr/holders/MapHolder.java | 2 +- .../drill/exec/expr/holders/ObjectHolder.java | 3 +- .../exec/expr/holders/RepeatedListHolder.java | 2 +- .../exec/expr/holders/RepeatedMapHolder.java | 2 +- .../drill/exec/expr/holders/UnionHolder.java | 2 +- .../drill/exec/expr/holders/ValueHolder.java | 2 +- .../drill/exec/record/TransferPair.java | 2 +- .../org/apache/drill/exec/util/CallBack.java | 2 +- .../drill/exec/util/JsonStringArrayList.java | 2 +- .../drill/exec/util/JsonStringHashMap.java | 2 +- .../java/org/apache/drill/exec/util/Text.java | 2 +- .../drill/exec/vector/AddOrGetResult.java | 2 +- .../drill/exec/vector/DateUtilities.java | 1 - .../NullableVectorDefinitionSetter.java | 2 +- .../exec/vector/SchemaChangeCallBack.java | 3 +- .../drill/exec/vector/UntypedNullHolder.java | 1 - .../drill/exec/vector/UntypedNullVector.java | 3 +- .../drill/exec/vector/ValueHolderHelper.java | 2 +- .../drill/exec/vector/VectorTrimmer.java | 2 +- .../accessor/writer/dummy/package-info.java | 1 - .../vector/accessor/writer/package-info.java | 1 - .../vector/complex/ContainerVectorLike.java | 2 +- .../vector/complex/EmptyValuePopulator.java | 2 +- .../exec/vector/complex/Positionable.java | 2 +- .../complex/RepeatedFixedWidthVectorLike.java | 2 +- .../vector/complex/RepeatedValueVector.java | 2 +- .../RepeatedVariableWidthVectorLike.java | 2 +- .../vector/complex/VectorWithOrdinal.java | 2 +- .../complex/impl/AbstractBaseReader.java | 2 +- .../complex/impl/AbstractBaseWriter.java | 2 +- .../complex/impl/ComplexWriterImpl.java | 2 +- .../complex/impl/MapOrListWriterImpl.java | 2 +- .../vector/complex/impl/PromotableWriter.java | 4 +- .../complex/impl/RepeatedListReaderImpl.java | 5 +-- .../complex/impl/RepeatedMapReaderImpl.java | 5 +-- .../impl/SingleLikeRepeatedMapReaderImpl.java | 3 +- .../complex/impl/SingleListReaderImpl.java | 6 +-- .../complex/impl/SingleMapReaderImpl.java | 7 +--- .../vector/complex/impl/UnionListReader.java | 5 +-- .../vector/complex/reader/FieldReader.java | 2 +- .../vector/complex/writer/FieldWriter.java | 2 +- .../exec/vector/VariableLengthVectorTest.java | 2 +- header | 2 +- logical/pom.xml | 31 +++++++++------- .../org/apache/drill/common/JSONOptions.java | 2 +- .../common/config/LogicalPlanPersistence.java | 2 +- .../exceptions/ExecutionSetupException.java | 2 +- .../ExpressionParsingException.java | 2 +- .../LogicalOperatorValidationException.java | 2 +- .../LogicalPlanParsingException.java | 2 +- .../common/expression/BooleanOperator.java | 3 +- .../common/expression/CastExpression.java | 2 +- .../common/expression/ConvertExpression.java | 2 +- .../common/expression/ErrorCollector.java | 2 +- .../common/expression/ErrorCollectorImpl.java | 2 +- .../common/expression/ExpressionFunction.java | 2 +- .../common/expression/ExpressionPosition.java | 2 +- .../drill/common/expression/FunctionCall.java | 2 +- .../expression/FunctionCallFactory.java | 2 +- .../drill/common/expression/FunctionName.java | 2 +- .../MajorTypeInLogicalExpression.java | 2 +- .../common/expression/NullExpression.java | 2 +- .../expression/OutputTypeDeterminer.java | 2 +- .../common/expression/TypedNullConstant.java | 2 +- .../common/expression/ValidationError.java | 2 +- .../common/expression/fn/CastFunctions.java | 2 +- .../common/expression/fn/FuncHolder.java | 2 +- .../expression/fn/JodaDateValidator.java | 31 ++++++++-------- .../common/expression/fn/package-info.java | 2 +- .../drill/common/expression/package-info.java | 2 +- .../common/expression/types/AtomType.java | 2 +- .../common/expression/types/DataType.java | 2 +- .../expression/types/DataTypeFactory.java | 2 +- .../common/expression/types/LateBindType.java | 2 +- .../common/expression/types/package-info.java | 2 +- .../visitors/ConditionalExprOptimizer.java | 3 +- .../visitors/ExpressionValidationError.java | 2 +- .../ExpressionValidationException.java | 2 +- .../common/expression/visitors/OpVisitor.java | 2 +- .../visitors/SimpleExprVisitor.java | 2 +- .../expression/visitors/package-info.java | 2 +- .../drill/common/graph/AdjacencyList.java | 2 +- .../common/graph/AdjacencyListBuilder.java | 2 +- .../org/apache/drill/common/graph/Edge.java | 2 +- .../org/apache/drill/common/graph/Graph.java | 2 +- .../apache/drill/common/graph/GraphAlgos.java | 2 +- .../apache/drill/common/graph/GraphValue.java | 2 +- .../drill/common/graph/GraphVisitor.java | 2 +- .../apache/drill/common/graph/Visitable.java | 2 +- .../drill/common/graph/package-info.java | 2 +- .../common/logical/FormatPluginConfig.java | 2 +- .../drill/common/logical/LogicalPlan.java | 2 +- .../common/logical/LogicalPlanBuilder.java | 4 +- .../drill/common/logical/PlanProperties.java | 4 +- .../common/logical/StoragePluginConfig.java | 2 +- .../logical/StoragePluginConfigBase.java | 2 +- .../logical/UnexpectedOperatorType.java | 2 +- .../drill/common/logical/ValidationError.java | 2 +- .../common/logical/data/AbstractBuilder.java | 2 +- .../logical/data/AbstractSingleBuilder.java | 2 +- .../drill/common/logical/data/Filter.java | 2 +- .../drill/common/logical/data/Flatten.java | 2 +- .../logical/data/GroupingAggregate.java | 2 +- .../drill/common/logical/data/Join.java | 2 +- .../common/logical/data/JoinCondition.java | 2 +- .../drill/common/logical/data/Limit.java | 2 +- .../common/logical/data/LogicalOperator.java | 2 +- .../logical/data/LogicalOperatorBase.java | 2 +- .../common/logical/data/NamedExpression.java | 2 +- .../drill/common/logical/data/Project.java | 2 +- .../common/logical/data/RunningAggregate.java | 2 +- .../drill/common/logical/data/Scan.java | 2 +- .../drill/common/logical/data/Sequence.java | 2 +- .../logical/data/SingleInputOperator.java | 2 +- .../common/logical/data/SinkOperator.java | 2 +- .../common/logical/data/SourceOperator.java | 2 +- .../drill/common/logical/data/Store.java | 2 +- .../drill/common/logical/data/Transform.java | 2 +- .../drill/common/logical/data/Union.java | 2 +- .../drill/common/logical/data/Values.java | 2 +- .../drill/common/logical/data/Window.java | 2 +- .../drill/common/logical/data/Writer.java | 2 +- .../common/logical/data/package-info.java | 2 +- .../data/visitors/AbstractLogicalVisitor.java | 2 +- .../logical/data/visitors/LogicalVisitor.java | 2 +- .../logical/data/visitors/package-info.java | 2 +- .../drill/common/logical/package-info.java | 2 +- .../common/util/AbstractDynamicBean.java | 2 +- .../common/expression/PathSegmentTests.java | 2 +- .../expression/fn/JodaDateValidatorTest.java | 31 ++++++++-------- .../common/expression/parser/TreeTest.java | 2 +- .../drill/storage/CheckStorageConfig.java | 2 +- .../apache/drill/common/types/DataMode.java | 2 +- .../apache/drill/common/types/MajorType.java | 2 +- .../apache/drill/common/types/MinorType.java | 2 +- .../drill/common/types/SchemaTypeProtos.java | 2 +- .../apache/drill/common/types/TypeProtos.java | 2 +- .../apache/drill/exec/proto/BitControl.java | 2 +- .../org/apache/drill/exec/proto/BitData.java | 2 +- .../drill/exec/proto/CoordinationProtos.java | 2 +- .../apache/drill/exec/proto/ExecProtos.java | 2 +- .../drill/exec/proto/GeneralRPCProtos.java | 2 +- .../drill/exec/proto/SchemaBitControl.java | 2 +- .../drill/exec/proto/SchemaBitData.java | 2 +- .../exec/proto/SchemaCoordinationProtos.java | 2 +- .../drill/exec/proto/SchemaDefProtos.java | 2 +- .../drill/exec/proto/SchemaExecProtos.java | 2 +- .../exec/proto/SchemaGeneralRPCProtos.java | 2 +- .../exec/proto/SchemaSchemaDefProtos.java | 2 +- .../drill/exec/proto/SchemaUserBitShared.java | 2 +- .../drill/exec/proto/SchemaUserProtos.java | 2 +- .../drill/exec/proto/UserBitShared.java | 2 +- .../apache/drill/exec/proto/UserProtos.java | 2 +- .../apache/drill/exec/proto/beans/Ack.java | 2 +- .../exec/proto/beans/BitClientHandshake.java | 2 +- .../exec/proto/beans/BitControlHandshake.java | 2 +- .../exec/proto/beans/BitServerHandshake.java | 2 +- .../drill/exec/proto/beans/BitStatus.java | 2 +- .../exec/proto/beans/BitToUserHandshake.java | 2 +- .../exec/proto/beans/CatalogMetadata.java | 2 +- .../exec/proto/beans/CollateSupport.java | 2 +- .../drill/exec/proto/beans/Collector.java | 2 +- .../exec/proto/beans/ColumnMetadata.java | 2 +- .../exec/proto/beans/ColumnSearchability.java | 2 +- .../exec/proto/beans/ColumnUpdatability.java | 2 +- .../exec/proto/beans/CompleteRpcMessage.java | 2 +- .../exec/proto/beans/ConvertSupport.java | 2 +- .../exec/proto/beans/CoreOperatorType.java | 2 +- .../proto/beans/CorrelationNamesSupport.java | 2 +- .../beans/CreatePreparedStatementReq.java | 2 +- .../beans/CreatePreparedStatementResp.java | 2 +- .../drill/exec/proto/beans/CustomMessage.java | 2 +- .../proto/beans/DateTimeLiteralsSupport.java | 2 +- .../drill/exec/proto/beans/DrillPBError.java | 2 +- .../proto/beans/DrillServiceInstance.java | 2 +- .../exec/proto/beans/DrillbitEndpoint.java | 2 +- .../exec/proto/beans/ExceptionWrapper.java | 2 +- .../exec/proto/beans/FinishedReceiver.java | 2 +- .../exec/proto/beans/FragmentHandle.java | 2 +- .../exec/proto/beans/FragmentRecordBatch.java | 2 +- .../drill/exec/proto/beans/FragmentState.java | 2 +- .../exec/proto/beans/FragmentStatus.java | 2 +- .../exec/proto/beans/GetCatalogsReq.java | 2 +- .../exec/proto/beans/GetCatalogsResp.java | 2 +- .../drill/exec/proto/beans/GetColumnsReq.java | 2 +- .../exec/proto/beans/GetColumnsResp.java | 2 +- .../proto/beans/GetQueryPlanFragments.java | 2 +- .../drill/exec/proto/beans/GetSchemasReq.java | 2 +- .../exec/proto/beans/GetSchemasResp.java | 2 +- .../exec/proto/beans/GetServerMetaResp.java | 2 +- .../drill/exec/proto/beans/GetTablesReq.java | 2 +- .../drill/exec/proto/beans/GetTablesResp.java | 2 +- .../exec/proto/beans/GroupBySupport.java | 2 +- .../exec/proto/beans/HandshakeStatus.java | 2 +- .../exec/proto/beans/IdentifierCasing.java | 2 +- .../exec/proto/beans/InitializeFragments.java | 2 +- .../apache/drill/exec/proto/beans/Jar.java | 2 +- .../drill/exec/proto/beans/LikeFilter.java | 2 +- .../proto/beans/MajorFragmentProfile.java | 2 +- .../drill/exec/proto/beans/MetricValue.java | 2 +- .../proto/beans/MinorFragmentProfile.java | 2 +- .../drill/exec/proto/beans/NamePart.java | 2 +- .../drill/exec/proto/beans/NodeStatus.java | 2 +- .../drill/exec/proto/beans/NullCollation.java | 2 +- .../exec/proto/beans/OperatorProfile.java | 2 +- .../exec/proto/beans/OrderBySupport.java | 2 +- .../exec/proto/beans/OuterJoinSupport.java | 2 +- .../drill/exec/proto/beans/ParsingError.java | 2 +- .../drill/exec/proto/beans/PlanFragment.java | 2 +- .../exec/proto/beans/PreparedStatement.java | 2 +- .../proto/beans/PreparedStatementHandle.java | 2 +- .../drill/exec/proto/beans/Property.java | 2 +- .../proto/beans/QueryContextInformation.java | 2 +- .../drill/exec/proto/beans/QueryData.java | 2 +- .../drill/exec/proto/beans/QueryId.java | 2 +- .../drill/exec/proto/beans/QueryInfo.java | 2 +- .../exec/proto/beans/QueryPlanFragments.java | 2 +- .../drill/exec/proto/beans/QueryProfile.java | 2 +- .../drill/exec/proto/beans/QueryResult.java | 2 +- .../exec/proto/beans/QueryResultsMode.java | 2 +- .../drill/exec/proto/beans/QueryType.java | 2 +- .../exec/proto/beans/RecordBatchDef.java | 2 +- .../drill/exec/proto/beans/Registry.java | 2 +- .../exec/proto/beans/RequestResults.java | 2 +- .../drill/exec/proto/beans/RequestStatus.java | 2 +- .../proto/beans/ResultColumnMetadata.java | 2 +- .../apache/drill/exec/proto/beans/Roles.java | 2 +- .../drill/exec/proto/beans/RpcChannel.java | 2 +- .../exec/proto/beans/RpcEndpointInfos.java | 2 +- .../drill/exec/proto/beans/RpcHeader.java | 2 +- .../drill/exec/proto/beans/RpcMode.java | 2 +- .../drill/exec/proto/beans/RpcType.java | 2 +- .../drill/exec/proto/beans/RunQuery.java | 2 +- .../drill/exec/proto/beans/SaslMessage.java | 2 +- .../drill/exec/proto/beans/SaslStatus.java | 2 +- .../drill/exec/proto/beans/SaslSupport.java | 2 +- .../exec/proto/beans/SchemaMetadata.java | 2 +- .../exec/proto/beans/SerializedField.java | 2 +- .../drill/exec/proto/beans/ServerMeta.java | 2 +- .../beans/ServerPreparedStatementState.java | 2 +- .../proto/beans/StackTraceElementWrapper.java | 2 +- .../drill/exec/proto/beans/StreamProfile.java | 2 +- .../exec/proto/beans/SubQuerySupport.java | 2 +- .../drill/exec/proto/beans/TableMetadata.java | 2 +- .../drill/exec/proto/beans/UnionSupport.java | 2 +- .../exec/proto/beans/UserCredentials.java | 2 +- .../exec/proto/beans/UserProperties.java | 2 +- .../exec/proto/beans/UserToBitHandshake.java | 2 +- .../drill/exec/proto/beans/ValueMode.java | 2 +- .../exec/proto/beans/WorkQueueStatus.java | 2 +- .../resources/assemblies/source-assembly.xml | 29 ++++++++++----- src/main/resources/checkstyle-config.xml | 31 ++++++++++------ .../resources/checkstyle-suppressions.xml | 29 ++++++++++----- tools/drill-patch-review.py | 7 ++-- tools/fmpp/pom.xml | 29 ++++++++++----- .../org/apache/drill/fmpp/mojo/FMPPMojo.java | 2 +- tools/pom.xml | 27 ++++++++------ tools/verify_release.sh | 34 ++++++++--------- 2067 files changed, 4511 insertions(+), 4259 deletions(-) diff --git a/.travis.yml b/.travis.yml index a3d22a657e9..f04607f26ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,4 +22,5 @@ cache: directories: - "$HOME/.m2" install: MAVEN_OPTS="-Xms1G -Xmx1G" mvn install --batch-mode -DskipTests=true -Dmaven.javadoc.skip=true -Dmaven.source.skip=true -script: mvn install -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill.categories.SecurityTest" -DforkCount=1 -DmemoryMb=2560 -DdirectMemoryMb=4608 +script: mvn install -Drat.skip=false -Dlicense.skip=false -DexcludedGroups="org.apache.drill.categories.SlowTest,org.apache.drill.categories.UnlikelyTest,org.apache.drill +.categories.SecurityTest" -DforkCount=1 -DmemoryMb=2560 -DdirectMemoryMb=4608 diff --git a/common/pom.xml b/common/pom.xml index bf32e267640..2891f1efbc5 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/common/src/main/java/org/apache/drill/common/AutoCloseablePointer.java b/common/src/main/java/org/apache/drill/common/AutoCloseablePointer.java index 3a0ac4a2db5..be296b65968 100644 --- a/common/src/main/java/org/apache/drill/common/AutoCloseablePointer.java +++ b/common/src/main/java/org/apache/drill/common/AutoCloseablePointer.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/AutoCloseables.java b/common/src/main/java/org/apache/drill/common/AutoCloseables.java index c12063cfc85..8ca715e6d8f 100644 --- a/common/src/main/java/org/apache/drill/common/AutoCloseables.java +++ b/common/src/main/java/org/apache/drill/common/AutoCloseables.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/CatastrophicFailure.java b/common/src/main/java/org/apache/drill/common/CatastrophicFailure.java index 2f6536e4bea..18e5747843f 100644 --- a/common/src/main/java/org/apache/drill/common/CatastrophicFailure.java +++ b/common/src/main/java/org/apache/drill/common/CatastrophicFailure.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/DeferredException.java b/common/src/main/java/org/apache/drill/common/DeferredException.java index 721a217b474..a38af21657a 100644 --- a/common/src/main/java/org/apache/drill/common/DeferredException.java +++ b/common/src/main/java/org/apache/drill/common/DeferredException.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/DrillAutoCloseables.java b/common/src/main/java/org/apache/drill/common/DrillAutoCloseables.java index 11fb9a8f579..c1132d0372a 100644 --- a/common/src/main/java/org/apache/drill/common/DrillAutoCloseables.java +++ b/common/src/main/java/org/apache/drill/common/DrillAutoCloseables.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/EventProcessor.java b/common/src/main/java/org/apache/drill/common/EventProcessor.java index 08ec55e626a..82f5d873693 100644 --- a/common/src/main/java/org/apache/drill/common/EventProcessor.java +++ b/common/src/main/java/org/apache/drill/common/EventProcessor.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/HistoricalLog.java b/common/src/main/java/org/apache/drill/common/HistoricalLog.java index 33312158ef2..08e5e7ba059 100644 --- a/common/src/main/java/org/apache/drill/common/HistoricalLog.java +++ b/common/src/main/java/org/apache/drill/common/HistoricalLog.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/KerberosUtil.java b/common/src/main/java/org/apache/drill/common/KerberosUtil.java index 6b8301c63c0..f8632d36cec 100644 --- a/common/src/main/java/org/apache/drill/common/KerberosUtil.java +++ b/common/src/main/java/org/apache/drill/common/KerberosUtil.java @@ -7,7 +7,7 @@ * "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, diff --git a/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java b/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java index 6a6972174ed..f1804ae6f71 100644 --- a/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java +++ b/common/src/main/java/org/apache/drill/common/SelfCleaningRunnable.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/StackTrace.java b/common/src/main/java/org/apache/drill/common/StackTrace.java index 1dbffe6caa0..a3ec92e4e9b 100644 --- a/common/src/main/java/org/apache/drill/common/StackTrace.java +++ b/common/src/main/java/org/apache/drill/common/StackTrace.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java b/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java index 99ea5444f30..0b566b6c28d 100644 --- a/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java +++ b/common/src/main/java/org/apache/drill/common/collections/ImmutableEntry.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java b/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java index 5e54b2d2527..37dce2f30ba 100644 --- a/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java +++ b/common/src/main/java/org/apache/drill/common/collections/MapWithOrdinal.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/concurrent/AutoCloseableLock.java b/common/src/main/java/org/apache/drill/common/concurrent/AutoCloseableLock.java index 3fe5c1e01c5..b5b1df9b983 100644 --- a/common/src/main/java/org/apache/drill/common/concurrent/AutoCloseableLock.java +++ b/common/src/main/java/org/apache/drill/common/concurrent/AutoCloseableLock.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/concurrent/ExtendedLatch.java b/common/src/main/java/org/apache/drill/common/concurrent/ExtendedLatch.java index 3e14f8acfcd..9868537e479 100644 --- a/common/src/main/java/org/apache/drill/common/concurrent/ExtendedLatch.java +++ b/common/src/main/java/org/apache/drill/common/concurrent/ExtendedLatch.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/config/CommonConstants.java b/common/src/main/java/org/apache/drill/common/config/CommonConstants.java index eab48d058b8..1b5fb29c014 100644 --- a/common/src/main/java/org/apache/drill/common/config/CommonConstants.java +++ b/common/src/main/java/org/apache/drill/common/config/CommonConstants.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/config/ConfigProvider.java b/common/src/main/java/org/apache/drill/common/config/ConfigProvider.java index feeb64d3e3a..8d643f43b96 100644 --- a/common/src/main/java/org/apache/drill/common/config/ConfigProvider.java +++ b/common/src/main/java/org/apache/drill/common/config/ConfigProvider.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java index 0d5c881b902..66058643daf 100644 --- a/common/src/main/java/org/apache/drill/common/config/DrillConfig.java +++ b/common/src/main/java/org/apache/drill/common/config/DrillConfig.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/config/NestedConfig.java b/common/src/main/java/org/apache/drill/common/config/NestedConfig.java index a1533a5de07..79bb88c5e6d 100644 --- a/common/src/main/java/org/apache/drill/common/config/NestedConfig.java +++ b/common/src/main/java/org/apache/drill/common/config/NestedConfig.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/config/package-info.java b/common/src/main/java/org/apache/drill/common/config/package-info.java index 2b2bbb4e0c1..2cd56af939c 100644 --- a/common/src/main/java/org/apache/drill/common/config/package-info.java +++ b/common/src/main/java/org/apache/drill/common/config/package-info.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/DrillConfigurationException.java b/common/src/main/java/org/apache/drill/common/exceptions/DrillConfigurationException.java index 8411a1b1ece..3f88e28e748 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/DrillConfigurationException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/DrillConfigurationException.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java b/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java index df7004c9508..202d2e265a5 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/DrillError.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/DrillException.java b/common/src/main/java/org/apache/drill/common/exceptions/DrillException.java index 3cd086c0764..5acee3eed4b 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/DrillException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/DrillException.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java b/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java index d91fb132c48..ef422ae9442 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/DrillIOException.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/DrillRuntimeException.java b/common/src/main/java/org/apache/drill/common/exceptions/DrillRuntimeException.java index 8786994b268..98b1a9d0302 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/DrillRuntimeException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/DrillRuntimeException.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/ErrorHelper.java b/common/src/main/java/org/apache/drill/common/exceptions/ErrorHelper.java index 9b2097d39c0..2a331bb9107 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/ErrorHelper.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/ErrorHelper.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/RetryAfterSpillException.java b/common/src/main/java/org/apache/drill/common/exceptions/RetryAfterSpillException.java index 8fd5a95fec2..3bda97ff032 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/RetryAfterSpillException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/RetryAfterSpillException.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/UserException.java b/common/src/main/java/org/apache/drill/common/exceptions/UserException.java index 19a1f9151e5..56cb935f326 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/UserException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/UserException.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/UserExceptionContext.java b/common/src/main/java/org/apache/drill/common/exceptions/UserExceptionContext.java index 962973b1112..fa2c4373e75 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/UserExceptionContext.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/UserExceptionContext.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/UserRemoteException.java b/common/src/main/java/org/apache/drill/common/exceptions/UserRemoteException.java index d13fb4940d8..04c9890e492 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/UserRemoteException.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/UserRemoteException.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/exceptions/package-info.java b/common/src/main/java/org/apache/drill/common/exceptions/package-info.java index c16c69c582c..1781491a0ac 100644 --- a/common/src/main/java/org/apache/drill/common/exceptions/package-info.java +++ b/common/src/main/java/org/apache/drill/common/exceptions/package-info.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/package-info.java b/common/src/main/java/org/apache/drill/common/package-info.java index 4de8489efa4..5b3959e6123 100644 --- a/common/src/main/java/org/apache/drill/common/package-info.java +++ b/common/src/main/java/org/apache/drill/common/package-info.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java b/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java index 7f2aaa01bcd..a8b65cc91ab 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java +++ b/common/src/main/java/org/apache/drill/common/scanner/BuildTimeScan.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java b/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java index 889efa3df94..fa64ac081e0 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java +++ b/common/src/main/java/org/apache/drill/common/scanner/ClassPathScanner.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java b/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java index 7faa0fbd23b..f9c64f4f446 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java +++ b/common/src/main/java/org/apache/drill/common/scanner/RunTimeScan.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotatedClassDescriptor.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotatedClassDescriptor.java index 13abbb5ab7a..82cbd5fb5b3 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotatedClassDescriptor.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotatedClassDescriptor.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java index f76ad49e2bc..466922950fd 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/AnnotationDescriptor.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/AttributeDescriptor.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/AttributeDescriptor.java index 81a80974768..48d51b9b7b1 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/AttributeDescriptor.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/AttributeDescriptor.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/ChildClassDescriptor.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/ChildClassDescriptor.java index 7e81bd8a118..8e3fceb412a 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/ChildClassDescriptor.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/ChildClassDescriptor.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/FieldDescriptor.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/FieldDescriptor.java index dae2a74902e..b52cb30c0a8 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/FieldDescriptor.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/FieldDescriptor.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/ParentClassDescriptor.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/ParentClassDescriptor.java index 210c4f5cfb0..82fad6909ec 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/ParentClassDescriptor.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/ParentClassDescriptor.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java index 7004bcbd3cf..290b47b9487 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/ScanResult.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/scanner/persistence/TypeDescriptor.java b/common/src/main/java/org/apache/drill/common/scanner/persistence/TypeDescriptor.java index f144ccaab4f..264f6fd04b3 100644 --- a/common/src/main/java/org/apache/drill/common/scanner/persistence/TypeDescriptor.java +++ b/common/src/main/java/org/apache/drill/common/scanner/persistence/TypeDescriptor.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/types/package-info.java b/common/src/main/java/org/apache/drill/common/types/package-info.java index 1334c6f97aa..97be23f9854 100644 --- a/common/src/main/java/org/apache/drill/common/types/package-info.java +++ b/common/src/main/java/org/apache/drill/common/types/package-info.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/ConstructorChecker.java b/common/src/main/java/org/apache/drill/common/util/ConstructorChecker.java index 9c24afa60af..bff480cd67d 100644 --- a/common/src/main/java/org/apache/drill/common/util/ConstructorChecker.java +++ b/common/src/main/java/org/apache/drill/common/util/ConstructorChecker.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/CoreDecimalUtility.java b/common/src/main/java/org/apache/drill/common/util/CoreDecimalUtility.java index bf12cfb3689..33c1f48deb8 100644 --- a/common/src/main/java/org/apache/drill/common/util/CoreDecimalUtility.java +++ b/common/src/main/java/org/apache/drill/common/util/CoreDecimalUtility.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java b/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java index 60d37e33bd3..9e727f4cb36 100644 --- a/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java +++ b/common/src/main/java/org/apache/drill/common/util/DataInputInputStream.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/DataOutputOutputStream.java b/common/src/main/java/org/apache/drill/common/util/DataOutputOutputStream.java index c089e921fda..a32da08da97 100644 --- a/common/src/main/java/org/apache/drill/common/util/DataOutputOutputStream.java +++ b/common/src/main/java/org/apache/drill/common/util/DataOutputOutputStream.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionAddFunction.java b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionAddFunction.java index f37bc29db5c..77a2e7d942d 100644 --- a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionAddFunction.java +++ b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionAddFunction.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionDivideFunction.java b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionDivideFunction.java index 6214e3e7b17..74e6dbf222e 100644 --- a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionDivideFunction.java +++ b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionDivideFunction.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.common.util; diff --git a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionModFunction.java b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionModFunction.java index 1c411971434..075a50bd269 100644 --- a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionModFunction.java +++ b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionModFunction.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.common.util; diff --git a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionMulFunction.java b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionMulFunction.java index 7693f207112..3caed6a4543 100644 --- a/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionMulFunction.java +++ b/common/src/main/java/org/apache/drill/common/util/DecimalScalePrecisionMulFunction.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.common.util; /* diff --git a/common/src/main/java/org/apache/drill/common/util/DrillBaseComputeScalePrecision.java b/common/src/main/java/org/apache/drill/common/util/DrillBaseComputeScalePrecision.java index be07a35e739..4f113517879 100644 --- a/common/src/main/java/org/apache/drill/common/util/DrillBaseComputeScalePrecision.java +++ b/common/src/main/java/org/apache/drill/common/util/DrillBaseComputeScalePrecision.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java b/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java index f20fef7a211..343c9473ba8 100644 --- a/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java +++ b/common/src/main/java/org/apache/drill/common/util/DrillFileUtils.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/DrillStringUtils.java b/common/src/main/java/org/apache/drill/common/util/DrillStringUtils.java index 1ad005194bd..bc3b01b3ef1 100644 --- a/common/src/main/java/org/apache/drill/common/util/DrillStringUtils.java +++ b/common/src/main/java/org/apache/drill/common/util/DrillStringUtils.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/RepeatTestRule.java b/common/src/main/java/org/apache/drill/common/util/RepeatTestRule.java index bc2eabf84a9..fd6d95ef8b9 100644 --- a/common/src/main/java/org/apache/drill/common/util/RepeatTestRule.java +++ b/common/src/main/java/org/apache/drill/common/util/RepeatTestRule.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/common/util/package-info.java b/common/src/main/java/org/apache/drill/common/util/package-info.java index 1d7d41830e1..669f41d8404 100644 --- a/common/src/main/java/org/apache/drill/common/util/package-info.java +++ b/common/src/main/java/org/apache/drill/common/util/package-info.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java b/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java index e046ef412b8..46222ab0a6c 100644 --- a/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java +++ b/common/src/main/java/org/apache/drill/exec/metrics/DrillMetrics.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/exec/util/AssertionUtil.java b/common/src/main/java/org/apache/drill/exec/util/AssertionUtil.java index 770ed076953..f4fc9aba7e9 100644 --- a/common/src/main/java/org/apache/drill/exec/util/AssertionUtil.java +++ b/common/src/main/java/org/apache/drill/exec/util/AssertionUtil.java @@ -1,4 +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 diff --git a/common/src/main/java/org/apache/drill/exec/util/SystemPropertyUtil.java b/common/src/main/java/org/apache/drill/exec/util/SystemPropertyUtil.java index 1b06778c5cc..1da7b9fe800 100644 --- a/common/src/main/java/org/apache/drill/exec/util/SystemPropertyUtil.java +++ b/common/src/main/java/org/apache/drill/exec/util/SystemPropertyUtil.java @@ -1,4 +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 diff --git a/common/src/test/java/org/apache/drill/categories/HbaseStorageTest.java b/common/src/test/java/org/apache/drill/categories/HbaseStorageTest.java index 91b7b15e113..5dfa3be925e 100644 --- a/common/src/test/java/org/apache/drill/categories/HbaseStorageTest.java +++ b/common/src/test/java/org/apache/drill/categories/HbaseStorageTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/HiveStorageTest.java b/common/src/test/java/org/apache/drill/categories/HiveStorageTest.java index f4125a02338..0dbf5898c4e 100644 --- a/common/src/test/java/org/apache/drill/categories/HiveStorageTest.java +++ b/common/src/test/java/org/apache/drill/categories/HiveStorageTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/JdbcStorageTest.java b/common/src/test/java/org/apache/drill/categories/JdbcStorageTest.java index 4e01a1645c6..ecf4afed7a0 100644 --- a/common/src/test/java/org/apache/drill/categories/JdbcStorageTest.java +++ b/common/src/test/java/org/apache/drill/categories/JdbcStorageTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/JdbcTest.java b/common/src/test/java/org/apache/drill/categories/JdbcTest.java index 0c2e9a19409..93d8442934d 100644 --- a/common/src/test/java/org/apache/drill/categories/JdbcTest.java +++ b/common/src/test/java/org/apache/drill/categories/JdbcTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java b/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java index 3229a54fc4a..774353c026a 100644 --- a/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java +++ b/common/src/test/java/org/apache/drill/categories/KafkaStorageTest.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/KuduStorageTest.java b/common/src/test/java/org/apache/drill/categories/KuduStorageTest.java index ae025bdd34a..a94db04147f 100644 --- a/common/src/test/java/org/apache/drill/categories/KuduStorageTest.java +++ b/common/src/test/java/org/apache/drill/categories/KuduStorageTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/MemoryTest.java b/common/src/test/java/org/apache/drill/categories/MemoryTest.java index 7d874c0c171..824086ff71c 100644 --- a/common/src/test/java/org/apache/drill/categories/MemoryTest.java +++ b/common/src/test/java/org/apache/drill/categories/MemoryTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/MongoStorageTest.java b/common/src/test/java/org/apache/drill/categories/MongoStorageTest.java index 39021c143ad..af0edd698f6 100644 --- a/common/src/test/java/org/apache/drill/categories/MongoStorageTest.java +++ b/common/src/test/java/org/apache/drill/categories/MongoStorageTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/OperatorTest.java b/common/src/test/java/org/apache/drill/categories/OperatorTest.java index a6854b3b613..8d04d4aaeb2 100644 --- a/common/src/test/java/org/apache/drill/categories/OperatorTest.java +++ b/common/src/test/java/org/apache/drill/categories/OperatorTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/OptionsTest.java b/common/src/test/java/org/apache/drill/categories/OptionsTest.java index e506a8f8453..fea8a0ad2e8 100644 --- a/common/src/test/java/org/apache/drill/categories/OptionsTest.java +++ b/common/src/test/java/org/apache/drill/categories/OptionsTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/ParquetTest.java b/common/src/test/java/org/apache/drill/categories/ParquetTest.java index c5bf8e120d5..aafaeb40ce7 100644 --- a/common/src/test/java/org/apache/drill/categories/ParquetTest.java +++ b/common/src/test/java/org/apache/drill/categories/ParquetTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/PlannerTest.java b/common/src/test/java/org/apache/drill/categories/PlannerTest.java index 4b1bcd9c4c1..c7cb7a6c884 100644 --- a/common/src/test/java/org/apache/drill/categories/PlannerTest.java +++ b/common/src/test/java/org/apache/drill/categories/PlannerTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/SecurityTest.java b/common/src/test/java/org/apache/drill/categories/SecurityTest.java index afe29a33f4a..e0081d5e73b 100644 --- a/common/src/test/java/org/apache/drill/categories/SecurityTest.java +++ b/common/src/test/java/org/apache/drill/categories/SecurityTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/SqlFunctionTest.java b/common/src/test/java/org/apache/drill/categories/SqlFunctionTest.java index 78f67c0194a..c9943d52230 100644 --- a/common/src/test/java/org/apache/drill/categories/SqlFunctionTest.java +++ b/common/src/test/java/org/apache/drill/categories/SqlFunctionTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/SqlTest.java b/common/src/test/java/org/apache/drill/categories/SqlTest.java index 158e7545a43..b2120bbe79a 100644 --- a/common/src/test/java/org/apache/drill/categories/SqlTest.java +++ b/common/src/test/java/org/apache/drill/categories/SqlTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/VectorTest.java b/common/src/test/java/org/apache/drill/categories/VectorTest.java index 3a248b5ebcb..5312aca342a 100644 --- a/common/src/test/java/org/apache/drill/categories/VectorTest.java +++ b/common/src/test/java/org/apache/drill/categories/VectorTest.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.categories; /** diff --git a/common/src/test/java/org/apache/drill/categories/package-info.java b/common/src/test/java/org/apache/drill/categories/package-info.java index 9f47ecd8a5b..bb699c14baa 100644 --- a/common/src/test/java/org/apache/drill/categories/package-info.java +++ b/common/src/test/java/org/apache/drill/categories/package-info.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** *

    * This package stores the JUnit test categories. The theory behind categories is that there are three broad categories of tests: diff --git a/common/src/test/java/org/apache/drill/common/exceptions/TestUserException.java b/common/src/test/java/org/apache/drill/common/exceptions/TestUserException.java index 46dfcfd5668..42af634eb26 100644 --- a/common/src/test/java/org/apache/drill/common/exceptions/TestUserException.java +++ b/common/src/test/java/org/apache/drill/common/exceptions/TestUserException.java @@ -1,4 +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 diff --git a/common/src/test/java/org/apache/drill/common/map/TestCaseInsensitiveMap.java b/common/src/test/java/org/apache/drill/common/map/TestCaseInsensitiveMap.java index 8f31620d870..8901d533131 100644 --- a/common/src/test/java/org/apache/drill/common/map/TestCaseInsensitiveMap.java +++ b/common/src/test/java/org/apache/drill/common/map/TestCaseInsensitiveMap.java @@ -1,4 +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 diff --git a/common/src/test/java/org/apache/drill/test/DirTestWatcher.java b/common/src/test/java/org/apache/drill/test/DirTestWatcher.java index c741b802359..271ac940d1b 100644 --- a/common/src/test/java/org/apache/drill/test/DirTestWatcher.java +++ b/common/src/test/java/org/apache/drill/test/DirTestWatcher.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.test; import org.apache.commons.io.FileUtils; diff --git a/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java b/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java index 0830461ed17..ee814881cb0 100644 --- a/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java +++ b/common/src/test/java/org/apache/drill/test/Drill2130CommonHamcrestConfigurationTest.java @@ -1,4 +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 diff --git a/common/src/test/java/org/apache/drill/test/DrillAssert.java b/common/src/test/java/org/apache/drill/test/DrillAssert.java index 35106775958..0feca06d2ac 100644 --- a/common/src/test/java/org/apache/drill/test/DrillAssert.java +++ b/common/src/test/java/org/apache/drill/test/DrillAssert.java @@ -1,4 +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 diff --git a/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java b/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java index bffb605c436..64393f345a7 100644 --- a/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java +++ b/common/src/test/java/org/apache/drill/test/SubDirTestWatcher.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.test; import com.google.common.base.Preconditions; diff --git a/common/src/test/java/org/apache/drill/test/UserExceptionMatcher.java b/common/src/test/java/org/apache/drill/test/UserExceptionMatcher.java index eba0d78df46..36525c966e9 100644 --- a/common/src/test/java/org/apache/drill/test/UserExceptionMatcher.java +++ b/common/src/test/java/org/apache/drill/test/UserExceptionMatcher.java @@ -1,4 +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 diff --git a/common/src/test/resources/logback-test.xml b/common/src/test/resources/logback-test.xml index 8ee3537ef6a..1cd04dccfc1 100644 --- a/common/src/test/resources/logback-test.xml +++ b/common/src/test/resources/logback-test.xml @@ -1,14 +1,23 @@ - + diff --git a/contrib/data/pom.xml b/contrib/data/pom.xml index 99450d931cc..b61caaa8e1a 100644 --- a/contrib/data/pom.xml +++ b/contrib/data/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/data/tpch-sample-data/bin/pom.xml b/contrib/data/tpch-sample-data/bin/pom.xml index b6c1e489195..9afb8f1adbd 100644 --- a/contrib/data/tpch-sample-data/bin/pom.xml +++ b/contrib/data/tpch-sample-data/bin/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/contrib/data/tpch-sample-data/pom.xml b/contrib/data/tpch-sample-data/pom.xml index dc425555c00..2cf3f35ca24 100644 --- a/contrib/data/tpch-sample-data/pom.xml +++ b/contrib/data/tpch-sample-data/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/contrib/format-maprdb/pom.xml b/contrib/format-maprdb/pom.xml index d9587c5d018..22c79bfc7ea 100644 --- a/contrib/format-maprdb/pom.xml +++ b/contrib/format-maprdb/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java index b0131fda7be..0d983bd38c5 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPlugin.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPluginConfig.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPluginConfig.java index 904cdb98a5c..72c69a62486 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPluginConfig.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/TableFormatPluginConfig.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java index 2de30e301ba..effdcdebe86 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBGroupScan.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java index 601fa027ce1..8655f5b2fd5 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBPushFilterIntoScan.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScanSpec.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScanSpec.java index 3ffe47c840b..40ab4f44771 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScanSpec.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBSubScanSpec.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableStats.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableStats.java index 162776c4cbf..5e1e2e74811 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableStats.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/MapRDBTableStats.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/TabletFragmentInfo.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/TabletFragmentInfo.java index e71c67c0f17..66fa232f090 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/TabletFragmentInfo.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/TabletFragmentInfo.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java index 0faa8880f6d..36e7309fe07 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/CompareFunctionsProcessor.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonScanSpec.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonScanSpec.java index f316eebb580..685839400fc 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonScanSpec.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonScanSpec.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonSubScanSpec.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonSubScanSpec.java index 3e5dce7367e..3fe0a3b6527 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonSubScanSpec.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/json/JsonSubScanSpec.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/CommonFns.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/CommonFns.java index a7b8cd1614d..0409de161e8 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/CommonFns.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/CommonFns.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/FieldPathHelper.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/FieldPathHelper.java index 9e0621aad07..16a5b68aab1 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/FieldPathHelper.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/db/util/FieldPathHelper.java @@ -1,19 +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. + */ package org.apache.drill.exec.store.mapr.db.util; import com.google.common.collect.Queues; diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatMatcher.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatMatcher.java index 47e9927cc87..e4ee2542f53 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatMatcher.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatMatcher.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatPlugin.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatPlugin.java index f7c76b5cfb7..206954bf3b6 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatPlugin.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatPlugin.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatPluginConfig.java b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatPluginConfig.java index b061f03b15b..1da795c5374 100644 --- a/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatPluginConfig.java +++ b/contrib/format-maprdb/src/main/java/org/apache/drill/exec/store/mapr/streams/StreamsFormatPluginConfig.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/main/resources/checkstyle-config.xml b/contrib/format-maprdb/src/main/resources/checkstyle-config.xml index 6743466b568..a66ded2a05d 100644 --- a/contrib/format-maprdb/src/main/resources/checkstyle-config.xml +++ b/contrib/format-maprdb/src/main/resources/checkstyle-config.xml @@ -1,14 +1,23 @@ - + diff --git a/contrib/format-maprdb/src/main/resources/checkstyle-suppressions.xml b/contrib/format-maprdb/src/main/resources/checkstyle-suppressions.xml index c30ff09cc21..c6c34b94a55 100644 --- a/contrib/format-maprdb/src/main/resources/checkstyle-suppressions.xml +++ b/contrib/format-maprdb/src/main/resources/checkstyle-suppressions.xml @@ -1,14 +1,23 @@ - + diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java index a26ddebadbc..f43fc74586e 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/MaprDBTestsSuite.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBCFAsJSONString.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBCFAsJSONString.java index 525b034f387..c5928064965 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBCFAsJSONString.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBCFAsJSONString.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBFilterPushDown.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBFilterPushDown.java index b049f37424b..c6d76a7d4a3 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBFilterPushDown.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBFilterPushDown.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBProjectPushDown.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBProjectPushDown.java index 59d7a513c3a..63d6abb28a3 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBProjectPushDown.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBProjectPushDown.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBQueries.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBQueries.java index 69e04a5ff48..5393aa178d8 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBQueries.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBQueries.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBSimple.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBSimple.java index 6271fb641aa..d4fad8e5784 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBSimple.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/binary/TestMapRDBSimple.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java index 27dd7ce8143..4b3ec5b8354 100644 --- a/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java +++ b/contrib/format-maprdb/src/test/java/com/mapr/drill/maprdb/tests/json/BaseJsonTest.java @@ -1,4 +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 diff --git a/contrib/format-maprdb/src/test/resources/hbase-site.xml b/contrib/format-maprdb/src/test/resources/hbase-site.xml index 92e8a867486..ec26f708202 100644 --- a/contrib/format-maprdb/src/test/resources/hbase-site.xml +++ b/contrib/format-maprdb/src/test/resources/hbase-site.xml @@ -1,19 +1,22 @@ diff --git a/contrib/gis/pom.xml b/contrib/gis/pom.xml index 7844f858d9d..2d096825e64 100644 --- a/contrib/gis/pom.xml +++ b/contrib/gis/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsGeoJSON.java b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsGeoJSON.java index 1c934bb192e..3f41504417b 100644 --- a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsGeoJSON.java +++ b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsGeoJSON.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Wrapper for ESRI ST_AsGeoJson function to convert geometry to valid geojson */ diff --git a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsJson.java b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsJson.java index ddc18658636..e1708339066 100644 --- a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsJson.java +++ b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsJson.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * Wrapper for ESRI ST_AsJson to convert geometry into REST Json. * Emulates functionality from spatial-framework-for-hadoop. diff --git a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsText.java b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsText.java index aff1c07eb61..17b78581c84 100644 --- a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsText.java +++ b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STAsText.java @@ -1,4 +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 diff --git a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STDWithin.java b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STDWithin.java index c6927c81a2c..70f09470032 100644 --- a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STDWithin.java +++ b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STDWithin.java @@ -1,4 +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 diff --git a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STGeomFromText.java b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STGeomFromText.java index 98f22ba7bad..3a613e14bf6 100644 --- a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STGeomFromText.java +++ b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STGeomFromText.java @@ -1,4 +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 diff --git a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STGeomFromTextSrid.java b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STGeomFromTextSrid.java index 3da074430bf..055eb948d00 100644 --- a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STGeomFromTextSrid.java +++ b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STGeomFromTextSrid.java @@ -1,4 +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 diff --git a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STPointFunc.java b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STPointFunc.java index 731a392813f..2024e3b2362 100644 --- a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STPointFunc.java +++ b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STPointFunc.java @@ -1,4 +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 diff --git a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STWithin.java b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STWithin.java index 615f2a7542b..f229c63482a 100644 --- a/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STWithin.java +++ b/contrib/gis/src/main/java/org/apache/drill/exec/expr/fn/impl/gis/STWithin.java @@ -1,4 +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 diff --git a/contrib/gis/src/test/java/org/apache/drill/exec/expr/fn/impl/gis/GISTestSuite.java b/contrib/gis/src/test/java/org/apache/drill/exec/expr/fn/impl/gis/GISTestSuite.java index 70b6086ea3b..07521c3520b 100644 --- a/contrib/gis/src/test/java/org/apache/drill/exec/expr/fn/impl/gis/GISTestSuite.java +++ b/contrib/gis/src/test/java/org/apache/drill/exec/expr/fn/impl/gis/GISTestSuite.java @@ -1,4 +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 diff --git a/contrib/gis/src/test/java/org/apache/drill/exec/expr/fn/impl/gis/TestGeometryFunctions.java b/contrib/gis/src/test/java/org/apache/drill/exec/expr/fn/impl/gis/TestGeometryFunctions.java index b2d4c6f0963..8e5ead3d1ef 100644 --- a/contrib/gis/src/test/java/org/apache/drill/exec/expr/fn/impl/gis/TestGeometryFunctions.java +++ b/contrib/gis/src/test/java/org/apache/drill/exec/expr/fn/impl/gis/TestGeometryFunctions.java @@ -1,4 +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 diff --git a/contrib/native/client/example/querySubmitter.cpp b/contrib/native/client/example/querySubmitter.cpp index 43b909d26b1..519dd93d5eb 100644 --- a/contrib/native/client/example/querySubmitter.cpp +++ b/contrib/native/client/example/querySubmitter.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include #include diff --git a/contrib/native/client/readme.boost b/contrib/native/client/readme.boost index 39a7bfb8ca6..cd6b3192c98 100644 --- a/contrib/native/client/readme.boost +++ b/contrib/native/client/readme.boost @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - Building Boost for Drill on MacOs/Linux -------------------------------- diff --git a/contrib/native/client/readme.macos b/contrib/native/client/readme.macos index e9be7126779..f50c30ae0a4 100644 --- a/contrib/native/client/readme.macos +++ b/contrib/native/client/readme.macos @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - MacOS build (tested on OS X El Capitan) Install Prerequisites diff --git a/contrib/native/client/readme.sasl b/contrib/native/client/readme.sasl index 3eab47192bd..a6219f37d22 100644 --- a/contrib/native/client/readme.sasl +++ b/contrib/native/client/readme.sasl @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - ## On Mac OS and Linux * Download cyrus-sasl tarball or clone git sources. diff --git a/contrib/native/client/readme.ssl b/contrib/native/client/readme.ssl index 8c875cfda3d..f454b689707 100644 --- a/contrib/native/client/readme.ssl +++ b/contrib/native/client/readme.ssl @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - Installing OpenSSL - On Mac: brew install openssl diff --git a/contrib/native/client/scripts/cpProtofiles.sh b/contrib/native/client/scripts/cpProtofiles.sh index 1e2d01e3a70..5dd8716735c 100755 --- a/contrib/native/client/scripts/cpProtofiles.sh +++ b/contrib/native/client/scripts/cpProtofiles.sh @@ -1,5 +1,4 @@ #!/bin/bash - # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/contrib/native/client/scripts/fixProtodefs.sh b/contrib/native/client/scripts/fixProtodefs.sh index d882ca6c268..41efec27dd6 100755 --- a/contrib/native/client/scripts/fixProtodefs.sh +++ b/contrib/native/client/scripts/fixProtodefs.sh @@ -1,5 +1,4 @@ #!/bin/bash - # # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file diff --git a/contrib/native/client/src/clientlib/channel.cpp b/contrib/native/client/src/clientlib/channel.cpp index 84f3eb43f4b..535fad77ce7 100644 --- a/contrib/native/client/src/clientlib/channel.cpp +++ b/contrib/native/client/src/clientlib/channel.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include #include "drill/drillConfig.hpp" diff --git a/contrib/native/client/src/clientlib/channel.hpp b/contrib/native/client/src/clientlib/channel.hpp index c7ebfeee6a2..73273aa7b34 100644 --- a/contrib/native/client/src/clientlib/channel.hpp +++ b/contrib/native/client/src/clientlib/channel.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef CHANNEL_HPP #define CHANNEL_HPP diff --git a/contrib/native/client/src/clientlib/collectionsImpl.hpp b/contrib/native/client/src/clientlib/collectionsImpl.hpp index be1b54f488c..48b315d65ce 100644 --- a/contrib/native/client/src/clientlib/collectionsImpl.hpp +++ b/contrib/native/client/src/clientlib/collectionsImpl.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef DRILL_COLLECTIONSIMPL_H #define DRILL_COLLECTIONSIMPL_H diff --git a/contrib/native/client/src/clientlib/decimalUtils.cpp b/contrib/native/client/src/clientlib/decimalUtils.cpp index 779ee72b772..6e26c55287d 100644 --- a/contrib/native/client/src/clientlib/decimalUtils.cpp +++ b/contrib/native/client/src/clientlib/decimalUtils.cpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #include #include "drill/recordBatch.hpp" #include "drill/decimalUtils.hpp" diff --git a/contrib/native/client/src/clientlib/drillClient.cpp b/contrib/native/client/src/clientlib/drillClient.cpp index 429a178864e..44a36d668ac 100644 --- a/contrib/native/client/src/clientlib/drillClient.cpp +++ b/contrib/native/client/src/clientlib/drillClient.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include "drill/common.hpp" #include "drill/drillClient.hpp" diff --git a/contrib/native/client/src/clientlib/drillClientImpl.cpp b/contrib/native/client/src/clientlib/drillClientImpl.cpp index 60ae7a40900..bfc17abe1e0 100644 --- a/contrib/native/client/src/clientlib/drillClientImpl.cpp +++ b/contrib/native/client/src/clientlib/drillClientImpl.cpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #include "drill/common.hpp" #include #include diff --git a/contrib/native/client/src/clientlib/drillClientImpl.hpp b/contrib/native/client/src/clientlib/drillClientImpl.hpp index 541c41efb91..891874c7d4b 100644 --- a/contrib/native/client/src/clientlib/drillClientImpl.hpp +++ b/contrib/native/client/src/clientlib/drillClientImpl.hpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef DRILL_CLIENT_IMPL_H #define DRILL_CLIENT_IMPL_H diff --git a/contrib/native/client/src/clientlib/drillConfig.cpp b/contrib/native/client/src/clientlib/drillConfig.cpp index 90a751a1902..2248c1e9c18 100644 --- a/contrib/native/client/src/clientlib/drillConfig.cpp +++ b/contrib/native/client/src/clientlib/drillConfig.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include "drill/common.hpp" #include "drill/drillConfig.hpp" diff --git a/contrib/native/client/src/clientlib/drillError.cpp b/contrib/native/client/src/clientlib/drillError.cpp index 046eb53300e..7a4f45c2ffe 100644 --- a/contrib/native/client/src/clientlib/drillError.cpp +++ b/contrib/native/client/src/clientlib/drillError.cpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #include "drill/drillError.hpp" #include "errmsgs.hpp" #include "logger.hpp" diff --git a/contrib/native/client/src/clientlib/env.h.in b/contrib/native/client/src/clientlib/env.h.in index 746a500a42a..380746a3fbe 100644 --- a/contrib/native/client/src/clientlib/env.h.in +++ b/contrib/native/client/src/clientlib/env.h.in @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef ENV_H #define ENV_H diff --git a/contrib/native/client/src/clientlib/errmsgs.cpp b/contrib/native/client/src/clientlib/errmsgs.cpp index a5d4a442897..c1ac80d0649 100644 --- a/contrib/native/client/src/clientlib/errmsgs.cpp +++ b/contrib/native/client/src/clientlib/errmsgs.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include #include diff --git a/contrib/native/client/src/clientlib/errmsgs.hpp b/contrib/native/client/src/clientlib/errmsgs.hpp index c4a00802656..fac646b815f 100644 --- a/contrib/native/client/src/clientlib/errmsgs.hpp +++ b/contrib/native/client/src/clientlib/errmsgs.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef ERRMSGS_H #define ERRMSGS_H diff --git a/contrib/native/client/src/clientlib/fieldmeta.cpp b/contrib/native/client/src/clientlib/fieldmeta.cpp index 13e11348d4b..797b038ebc0 100644 --- a/contrib/native/client/src/clientlib/fieldmeta.cpp +++ b/contrib/native/client/src/clientlib/fieldmeta.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include "drill/common.hpp" #include "drill/fieldmeta.hpp" #include "../protobuf/UserBitShared.pb.h" diff --git a/contrib/native/client/src/clientlib/logger.cpp b/contrib/native/client/src/clientlib/logger.cpp index c498ee14bc3..2d1709a86ac 100644 --- a/contrib/native/client/src/clientlib/logger.cpp +++ b/contrib/native/client/src/clientlib/logger.cpp @@ -1,21 +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. + */ #include #include "boost/date_time/posix_time/posix_time.hpp" #include "boost/thread.hpp" diff --git a/contrib/native/client/src/clientlib/logger.hpp b/contrib/native/client/src/clientlib/logger.hpp index 2eb98c0cf43..e7a7114d7a1 100644 --- a/contrib/native/client/src/clientlib/logger.hpp +++ b/contrib/native/client/src/clientlib/logger.hpp @@ -1,21 +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. + */ #ifndef __LOGGER_H #define __LOGGER_H diff --git a/contrib/native/client/src/clientlib/metadata.cpp b/contrib/native/client/src/clientlib/metadata.cpp index 843b3074bc0..637c83b33e9 100644 --- a/contrib/native/client/src/clientlib/metadata.cpp +++ b/contrib/native/client/src/clientlib/metadata.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include #include diff --git a/contrib/native/client/src/clientlib/metadata.hpp b/contrib/native/client/src/clientlib/metadata.hpp index 5edb16f3237..31678d7bb1b 100644 --- a/contrib/native/client/src/clientlib/metadata.hpp +++ b/contrib/native/client/src/clientlib/metadata.hpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef DRILL_METADATA_H #define DRILL_METADATA_H diff --git a/contrib/native/client/src/clientlib/recordBatch.cpp b/contrib/native/client/src/clientlib/recordBatch.cpp index 6e1329314ed..d7c196d000f 100644 --- a/contrib/native/client/src/clientlib/recordBatch.cpp +++ b/contrib/native/client/src/clientlib/recordBatch.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include "drill/common.hpp" #include "drill/fieldmeta.hpp" #include "drill/recordBatch.hpp" diff --git a/contrib/native/client/src/clientlib/rpcMessage.cpp b/contrib/native/client/src/clientlib/rpcMessage.cpp index 87d2fdbc0bb..7bfd6ff8625 100644 --- a/contrib/native/client/src/clientlib/rpcMessage.cpp +++ b/contrib/native/client/src/clientlib/rpcMessage.cpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #include #include #include diff --git a/contrib/native/client/src/clientlib/rpcMessage.hpp b/contrib/native/client/src/clientlib/rpcMessage.hpp index 43bcaeb1399..54d492bd9e4 100644 --- a/contrib/native/client/src/clientlib/rpcMessage.hpp +++ b/contrib/native/client/src/clientlib/rpcMessage.hpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef RPC_MESSAGE_H #define RPC_MESSAGE_H diff --git a/contrib/native/client/src/clientlib/saslAuthenticatorImpl.cpp b/contrib/native/client/src/clientlib/saslAuthenticatorImpl.cpp index 1f32b5e77fc..6348704c227 100644 --- a/contrib/native/client/src/clientlib/saslAuthenticatorImpl.cpp +++ b/contrib/native/client/src/clientlib/saslAuthenticatorImpl.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include #include diff --git a/contrib/native/client/src/clientlib/saslAuthenticatorImpl.hpp b/contrib/native/client/src/clientlib/saslAuthenticatorImpl.hpp index a0ee5a5c97b..56bfcb8f1fb 100644 --- a/contrib/native/client/src/clientlib/saslAuthenticatorImpl.hpp +++ b/contrib/native/client/src/clientlib/saslAuthenticatorImpl.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef DRILLCLIENT_SASLAUTHENTICATORIMPL_HPP #define DRILLCLIENT_SASLAUTHENTICATORIMPL_HPP diff --git a/contrib/native/client/src/clientlib/streamSocket.hpp b/contrib/native/client/src/clientlib/streamSocket.hpp index 5db4dcaa97c..06ce8be2238 100644 --- a/contrib/native/client/src/clientlib/streamSocket.hpp +++ b/contrib/native/client/src/clientlib/streamSocket.hpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef STREAMSOCKET_HPP #define STREAMSOCKET_HPP diff --git a/contrib/native/client/src/clientlib/userProperties.cpp b/contrib/native/client/src/clientlib/userProperties.cpp index 666f587c5b7..f1aa82fa3ca 100644 --- a/contrib/native/client/src/clientlib/userProperties.cpp +++ b/contrib/native/client/src/clientlib/userProperties.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include "drill/userProperties.hpp" diff --git a/contrib/native/client/src/clientlib/utils.cpp b/contrib/native/client/src/clientlib/utils.cpp index ff9729c6022..25d070ed330 100644 --- a/contrib/native/client/src/clientlib/utils.cpp +++ b/contrib/native/client/src/clientlib/utils.cpp @@ -1,21 +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. + */ #include #include #include "utils.hpp" diff --git a/contrib/native/client/src/clientlib/utils.hpp b/contrib/native/client/src/clientlib/utils.hpp index d30794c9aed..429ada0e041 100644 --- a/contrib/native/client/src/clientlib/utils.hpp +++ b/contrib/native/client/src/clientlib/utils.hpp @@ -1,21 +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. + */ #ifndef __UTILS_H #define __UTILS_H diff --git a/contrib/native/client/src/clientlib/wincert.ipp b/contrib/native/client/src/clientlib/wincert.ipp index c1af70a3693..cdf86ad222f 100644 --- a/contrib/native/client/src/clientlib/wincert.ipp +++ b/contrib/native/client/src/clientlib/wincert.ipp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #if defined(IS_SSL_ENABLED) #include diff --git a/contrib/native/client/src/clientlib/y2038/time64.c b/contrib/native/client/src/clientlib/y2038/time64.c index bbbabe2747a..6d2578a5be6 100644 --- a/contrib/native/client/src/clientlib/y2038/time64.c +++ b/contrib/native/client/src/clientlib/y2038/time64.c @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2007-2010 Michael G Schwern diff --git a/contrib/native/client/src/clientlib/y2038/time64.h b/contrib/native/client/src/clientlib/y2038/time64.h index 89fbd7ce9d9..c63321ff7b6 100644 --- a/contrib/native/client/src/clientlib/y2038/time64.h +++ b/contrib/native/client/src/clientlib/y2038/time64.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2007-2010 Michael G Schwern diff --git a/contrib/native/client/src/clientlib/y2038/time64_config.h b/contrib/native/client/src/clientlib/y2038/time64_config.h index 8f68bef6882..4416e6b1424 100644 --- a/contrib/native/client/src/clientlib/y2038/time64_config.h +++ b/contrib/native/client/src/clientlib/y2038/time64_config.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2007-2010 Michael G Schwern diff --git a/contrib/native/client/src/clientlib/y2038/time64_limits.h b/contrib/native/client/src/clientlib/y2038/time64_limits.h index e640cae9a26..dc89b04e6e1 100644 --- a/contrib/native/client/src/clientlib/y2038/time64_limits.h +++ b/contrib/native/client/src/clientlib/y2038/time64_limits.h @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2007-2010 Michael G Schwern diff --git a/contrib/native/client/src/clientlib/zookeeperClient.cpp b/contrib/native/client/src/clientlib/zookeeperClient.cpp index cd2ac0055f3..3959c3d1379 100644 --- a/contrib/native/client/src/clientlib/zookeeperClient.cpp +++ b/contrib/native/client/src/clientlib/zookeeperClient.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include #include diff --git a/contrib/native/client/src/clientlib/zookeeperClient.hpp b/contrib/native/client/src/clientlib/zookeeperClient.hpp index 25d6af5a529..ca2509ac621 100644 --- a/contrib/native/client/src/clientlib/zookeeperClient.hpp +++ b/contrib/native/client/src/clientlib/zookeeperClient.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifdef _WIN32 #include #else diff --git a/contrib/native/client/src/include/drill/collections.hpp b/contrib/native/client/src/include/drill/collections.hpp index 9fbfcc5e258..157f8000787 100644 --- a/contrib/native/client/src/include/drill/collections.hpp +++ b/contrib/native/client/src/include/drill/collections.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef _DRILL_COLLECTIONS_H #define _DRILL_COLLECTIONS_H diff --git a/contrib/native/client/src/include/drill/common.hpp b/contrib/native/client/src/include/drill/common.hpp index d8e2da78d2b..18cfc69fff5 100644 --- a/contrib/native/client/src/include/drill/common.hpp +++ b/contrib/native/client/src/include/drill/common.hpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef _COMMON_H_ #define _COMMON_H_ diff --git a/contrib/native/client/src/include/drill/decimalUtils.hpp b/contrib/native/client/src/include/drill/decimalUtils.hpp index 5f56e4d46e0..2ace8577254 100644 --- a/contrib/native/client/src/include/drill/decimalUtils.hpp +++ b/contrib/native/client/src/include/drill/decimalUtils.hpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef _DECIMAL_UTILS_H #define _DECIMAL_UTILS_H diff --git a/contrib/native/client/src/include/drill/drillClient.hpp b/contrib/native/client/src/include/drill/drillClient.hpp index ceaf50d4375..a09e6661b00 100644 --- a/contrib/native/client/src/include/drill/drillClient.hpp +++ b/contrib/native/client/src/include/drill/drillClient.hpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef DRILL_CLIENT_H #define DRILL_CLIENT_H diff --git a/contrib/native/client/src/include/drill/drillConfig.hpp b/contrib/native/client/src/include/drill/drillConfig.hpp index 46bbbb2d261..c60cd9d3389 100644 --- a/contrib/native/client/src/include/drill/drillConfig.hpp +++ b/contrib/native/client/src/include/drill/drillConfig.hpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef DRILL_CONFIG_H #define DRILL_CONFIG_H diff --git a/contrib/native/client/src/include/drill/drillError.hpp b/contrib/native/client/src/include/drill/drillError.hpp index 072df1c3107..3a6fd4e8a9f 100644 --- a/contrib/native/client/src/include/drill/drillError.hpp +++ b/contrib/native/client/src/include/drill/drillError.hpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #ifndef DRILL_ERROR_H #define DRILL_ERROR_H diff --git a/contrib/native/client/src/include/drill/drillc.hpp b/contrib/native/client/src/include/drill/drillc.hpp index 21a18e7d875..906d58e2c34 100644 --- a/contrib/native/client/src/include/drill/drillc.hpp +++ b/contrib/native/client/src/include/drill/drillc.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef DRILL_CLIENT_ALL_H #define DRILL_CLIENT_ALL_H diff --git a/contrib/native/client/src/include/drill/fieldmeta.hpp b/contrib/native/client/src/include/drill/fieldmeta.hpp index 40c9cca9b2a..8c3c5e45924 100644 --- a/contrib/native/client/src/include/drill/fieldmeta.hpp +++ b/contrib/native/client/src/include/drill/fieldmeta.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef FIELDMETA_H #define FIELDMETA_H diff --git a/contrib/native/client/src/include/drill/preparedStatement.hpp b/contrib/native/client/src/include/drill/preparedStatement.hpp index 2a7d15a6a0c..0232a78df51 100644 --- a/contrib/native/client/src/include/drill/preparedStatement.hpp +++ b/contrib/native/client/src/include/drill/preparedStatement.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef PREPAREDSTATEMENT_H #define PREPAREDSTATEMENT_H diff --git a/contrib/native/client/src/include/drill/recordBatch.hpp b/contrib/native/client/src/include/drill/recordBatch.hpp index 8d1a0a3e684..30287b6adc9 100644 --- a/contrib/native/client/src/include/drill/recordBatch.hpp +++ b/contrib/native/client/src/include/drill/recordBatch.hpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #ifndef RECORDBATCH_H #define RECORDBATCH_H diff --git a/contrib/native/client/src/test/CollectionsTest.cpp b/contrib/native/client/src/test/CollectionsTest.cpp index ebac941c7fc..c8e49a9fb3b 100644 --- a/contrib/native/client/src/test/CollectionsTest.cpp +++ b/contrib/native/client/src/test/CollectionsTest.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include diff --git a/contrib/native/client/src/test/UtilsTest.cpp b/contrib/native/client/src/test/UtilsTest.cpp index 0fba45e205f..38ab461c1fb 100644 --- a/contrib/native/client/src/test/UtilsTest.cpp +++ b/contrib/native/client/src/test/UtilsTest.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include diff --git a/contrib/native/client/src/test/main.cpp b/contrib/native/client/src/test/main.cpp index e5e17101dd9..343a625cf80 100644 --- a/contrib/native/client/src/test/main.cpp +++ b/contrib/native/client/src/test/main.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include diff --git a/contrib/native/client/test/ssl/testClient.cpp b/contrib/native/client/test/ssl/testClient.cpp index 485954f4c36..0568a00b54f 100644 --- a/contrib/native/client/test/ssl/testClient.cpp +++ b/contrib/native/client/test/ssl/testClient.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include #include diff --git a/contrib/native/client/test/ssl/testSSL.cpp b/contrib/native/client/test/ssl/testSSL.cpp index 42625661687..d40b0e93734 100644 --- a/contrib/native/client/test/ssl/testSSL.cpp +++ b/contrib/native/client/test/ssl/testSSL.cpp @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - #include #include #include diff --git a/contrib/native/client/test/ssl/testServer.cpp b/contrib/native/client/test/ssl/testServer.cpp index 98b24a3b60a..c9ff2fc815e 100644 --- a/contrib/native/client/test/ssl/testServer.cpp +++ b/contrib/native/client/test/ssl/testServer.cpp @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - #include #include #include diff --git a/contrib/pom.xml b/contrib/pom.xml index 080c073d2be..6ae2330bfc7 100644 --- a/contrib/pom.xml +++ b/contrib/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/sqlline/pom.xml b/contrib/sqlline/pom.xml index a0f79a055bc..a4fadfa0bdc 100644 --- a/contrib/sqlline/pom.xml +++ b/contrib/sqlline/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/storage-hbase/pom.xml b/contrib/storage-hbase/pom.xml index 329eba33b57..f07043ffe90 100644 --- a/contrib/storage-hbase/pom.xml +++ b/contrib/storage-hbase/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntConvertFrom.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntConvertFrom.java index fdef3644e59..d0166589a35 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntConvertFrom.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntConvertTo.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntConvertTo.java index 16dfa14178c..7ef9f5757d7 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntConvertTo.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntDescConvertTo.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntDescConvertTo.java index 16145244712..8d179bb5854 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntDescConvertTo.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesBigIntDescConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleConvertFrom.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleConvertFrom.java index 6fbd04636a5..14764f18ba7 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleConvertFrom.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleConvertTo.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleConvertTo.java index a0276ce5235..d9d62ad4191 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleConvertTo.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleDescConvertTo.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleDescConvertTo.java index 29122c78cdc..894a6b766be 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleDescConvertTo.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesDoubleDescConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatConvertFrom.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatConvertFrom.java index 11cff0f82ff..cbc2011bb86 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatConvertFrom.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatConvertTo.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatConvertTo.java index 2aa37fff850..7a51d0b6628 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatConvertTo.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatDescConvertTo.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatDescConvertTo.java index 318c9b39185..51b2a3e0895 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatDescConvertTo.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesFloatDescConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntConvertFrom.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntConvertFrom.java index 60a660a5816..7270df0f867 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntConvertFrom.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntConvertTo.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntConvertTo.java index 63e1570e1b1..de77ebdea30 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntConvertTo.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntDescConvertTo.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntDescConvertTo.java index 0835328d922..d5ffe5d6787 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntDescConvertTo.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/OrderedBytesIntDescConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/DrillHBaseConstants.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/DrillHBaseConstants.java index 0b2fb796f82..db1b1fade27 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/DrillHBaseConstants.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/DrillHBaseConstants.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseConnectionManager.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseConnectionManager.java index 2dd067349d6..83586f733ab 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseConnectionManager.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseConnectionManager.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java index 172a5476558..632f0465993 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBasePushFilterIntoScan.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.store.hbase; import org.apache.calcite.plan.RelOptRuleCall; diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseRegexParser.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseRegexParser.java index c05baaa0248..99e7d58c0c0 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseRegexParser.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseRegexParser.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanBatchCreator.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanBatchCreator.java index 87c64ac9e9d..e874c54cc12 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanBatchCreator.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanBatchCreator.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanSpec.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanSpec.java index 797ec7fc2a4..793d924f43f 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanSpec.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseScanSpec.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePluginConfig.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePluginConfig.java index 85f0d13d0c5..e92d616d6b9 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePluginConfig.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/HBaseStoragePluginConfig.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/TableStatsCalculator.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/TableStatsCalculator.java index 4e0365cb996..379fb7cd47d 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/TableStatsCalculator.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/TableStatsCalculator.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePStoreProvider.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePStoreProvider.java index df32b87c46e..507d8b62894 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePStoreProvider.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePStoreProvider.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStoreProvider.java b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStoreProvider.java index 1dd44cde543..1f3a53d4532 100644 --- a/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStoreProvider.java +++ b/contrib/storage-hbase/src/main/java/org/apache/drill/exec/store/hbase/config/HBasePersistentStoreProvider.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java index 9d4b4cda718..51312fc392d 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/BaseHBaseTest.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/HBaseRecordReaderTest.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/HBaseRecordReaderTest.java index f1bcf3c035c..6820c79d533 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/HBaseRecordReaderTest.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/HBaseRecordReaderTest.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseCFAsJSONString.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseCFAsJSONString.java index 173ee4a49e5..592dda07396 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseCFAsJSONString.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseCFAsJSONString.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseConnectionManager.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseConnectionManager.java index 4a033661516..36224b305c2 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseConnectionManager.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseConnectionManager.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java index 81008073914..0e14cb183e2 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseFilterPushDown.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseProjectPushDown.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseProjectPushDown.java index d916659930e..28bf0361379 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseProjectPushDown.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseProjectPushDown.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java index 0d5349943d7..abd76a7e693 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseQueries.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegexParser.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegexParser.java index ccd454f8166..1c018298497 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegexParser.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegexParser.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java index 08164dc5c14..112eb87f4da 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestHBaseRegionScanAssignments.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java index e376ef07005..a045fc575a6 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestOrderedBytesConvertFunctions.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestTableGenerator.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestTableGenerator.java index e69f4e22743..26d1c440b35 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestTableGenerator.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/TestTableGenerator.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/test/Drill2130StorageHBaseHamcrestConfigurationTest.java b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/test/Drill2130StorageHBaseHamcrestConfigurationTest.java index a822c79cd3d..9f272aa1aca 100644 --- a/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/test/Drill2130StorageHBaseHamcrestConfigurationTest.java +++ b/contrib/storage-hbase/src/test/java/org/apache/drill/hbase/test/Drill2130StorageHBaseHamcrestConfigurationTest.java @@ -1,4 +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 diff --git a/contrib/storage-hbase/src/test/resources/hbase-site.xml b/contrib/storage-hbase/src/test/resources/hbase-site.xml index f5c0fcbf78c..c5e308aacf4 100644 --- a/contrib/storage-hbase/src/test/resources/hbase-site.xml +++ b/contrib/storage-hbase/src/test/resources/hbase-site.xml @@ -1,25 +1,23 @@ diff --git a/contrib/storage-hive/core/pom.xml b/contrib/storage-hive/core/pom.xml index 351ed8897cc..0f7ff1f088c 100644 --- a/contrib/storage-hive/core/pom.xml +++ b/contrib/storage-hive/core/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/storage-hive/core/src/main/codegen/includes/license.ftl b/contrib/storage-hive/core/src/main/codegen/includes/license.ftl index 6117e6aa597..9faaa7299b9 100644 --- a/contrib/storage-hive/core/src/main/codegen/includes/license.ftl +++ b/contrib/storage-hive/core/src/main/codegen/includes/license.ftl @@ -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. -*/ \ No newline at end of file +<#-- + + 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. + +--> diff --git a/contrib/storage-hive/core/src/main/codegen/templates/HiveRecordReaders.java b/contrib/storage-hive/core/src/main/codegen/templates/HiveRecordReaders.java index a6e588b84d8..74484640000 100644 --- a/contrib/storage-hive/core/src/main/codegen/templates/HiveRecordReaders.java +++ b/contrib/storage-hive/core/src/main/codegen/templates/HiveRecordReaders.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* * This template is used to generate different Hive record reader classes for different data formats * to avoid JIT profile pullusion. These readers are derived from HiveAbstractReader which implements diff --git a/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectorHelper.java b/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectorHelper.java index 0ee433b3e6a..e936222e1e3 100644 --- a/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectorHelper.java +++ b/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectorHelper.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/expr/fn/impl/hive/ObjectInspectorHelper.java" /> diff --git a/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectors.java b/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectors.java index 9f239006266..9c45314163f 100644 --- a/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectors.java +++ b/contrib/storage-hive/core/src/main/codegen/templates/ObjectInspectors.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/HiveFuncHolderExpr.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/HiveFuncHolderExpr.java index 3121c47979f..5cec0fbdcf3 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/HiveFuncHolderExpr.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/HiveFuncHolderExpr.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java index 8d8707e7207..f6232f680df 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/HiveFunctionRegistry.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/impl/hive/AbstractDrillPrimitiveObjectInspector.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/impl/hive/AbstractDrillPrimitiveObjectInspector.java index b451086b14a..474a3bb64b0 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/impl/hive/AbstractDrillPrimitiveObjectInspector.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/impl/hive/AbstractDrillPrimitiveObjectInspector.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/impl/hive/DrillDeferredObject.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/impl/hive/DrillDeferredObject.java index fbc5f05f63e..40dc74f875f 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/impl/hive/DrillDeferredObject.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/expr/fn/impl/hive/DrillDeferredObject.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionLocation.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionLocation.java index 5a2ae30c299..3f91e3a0fbe 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionLocation.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HivePartitionLocation.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperator.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperator.java index 8ed72df9121..d1329bed534 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperator.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperator.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.sql; import org.apache.calcite.sql.SqlCallBinding; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperatorWithoutInference.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperatorWithoutInference.java index f8358120ecd..4bfdcb4161f 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperatorWithoutInference.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/HiveUDFOperatorWithoutInference.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/logical/HivePushPartitionFilterIntoScan.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/logical/HivePushPartitionFilterIntoScan.java index 0bdfe9955d9..565fa48854a 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/logical/HivePushPartitionFilterIntoScan.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/planner/sql/logical/HivePushPartitionFilterIntoScan.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.sql.logical; import org.apache.calcite.rel.RelNode; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/ColumnListsCache.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/ColumnListsCache.java index ae4baa193c6..3fefce3ccd7 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/ColumnListsCache.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/ColumnListsCache.java @@ -1,19 +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. + */ package org.apache.drill.exec.store.hive; import com.google.common.collect.ImmutableList; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveAuthorizationHelper.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveAuthorizationHelper.java index 4c8b8150032..98a94220c84 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveAuthorizationHelper.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveAuthorizationHelper.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveFieldConverter.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveFieldConverter.java index 441de219b41..2fab5a4d4ae 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveFieldConverter.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveFieldConverter.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HivePartition.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HivePartition.java index ad539b19226..0516be7746c 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HivePartition.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HivePartition.java @@ -1,19 +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. + */ package org.apache.drill.exec.store.hive; import org.apache.hadoop.hive.metastore.api.Partition; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveReadEntry.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveReadEntry.java index 0cf7433a957..1fe2e35cace 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveReadEntry.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveReadEntry.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePluginConfig.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePluginConfig.java index 38440aa763c..b6f15c81e34 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePluginConfig.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveStoragePluginConfig.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWithColumnCache.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWithColumnCache.java index 91888ef0b50..f7dedf367e9 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWithColumnCache.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWithColumnCache.java @@ -1,19 +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. + */ package org.apache.drill.exec.store.hive; import org.apache.hadoop.hive.metastore.api.FieldSchema; diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWrapper.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWrapper.java index 7f2afa608bf..4caa4ac1472 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWrapper.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/HiveTableWrapper.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/AbstractRecordsInspector.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/AbstractRecordsInspector.java index 026c3d1576d..a5ab2396c80 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/AbstractRecordsInspector.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/AbstractRecordsInspector.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/DefaultRecordsInspector.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/DefaultRecordsInspector.java index 2ffa64ac249..55a1a3d20f8 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/DefaultRecordsInspector.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/DefaultRecordsInspector.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/SkipFooterRecordsInspector.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/SkipFooterRecordsInspector.java index eee4df01344..f7e62405331 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/SkipFooterRecordsInspector.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/readers/inspectors/SkipFooterRecordsInspector.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java index 1a08433491c..aedc5f22d72 100644 --- a/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java +++ b/contrib/storage-hive/core/src/main/java/org/apache/drill/exec/store/hive/schema/DrillHiveViewTable.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHivePartitionPruning.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHivePartitionPruning.java index 2f899adbf12..ef5a169162c 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHivePartitionPruning.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHivePartitionPruning.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveProjectPushDown.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveProjectPushDown.java index cff09b05139..6d7ad136b42 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveProjectPushDown.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/TestHiveProjectPushDown.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/HiveTestUDFImpls.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/HiveTestUDFImpls.java index 8abd1faee23..5a93b87ecc2 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/HiveTestUDFImpls.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/HiveTestUDFImpls.java @@ -1,6 +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 @@ -16,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.fn.hive; import org.apache.hadoop.hive.common.type.HiveChar; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java index 3872563f20d..305d9b574c1 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestHiveUDFs.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestSampleHiveUDFs.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestSampleHiveUDFs.java index 11da81d3736..7808352c6b3 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestSampleHiveUDFs.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/fn/hive/TestSampleHiveUDFs.java @@ -1,4 +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 diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestBase.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestBase.java index ddc808ea90e..e3d884b5797 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestBase.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestBase.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestUtilities.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestUtilities.java index 49738aa013b..0556c93c887 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestUtilities.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/HiveTestUtilities.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestHiveStorage.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestHiveStorage.java index 9f46e6699ee..4da22b6a3ae 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestHiveStorage.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestHiveStorage.java @@ -7,7 +7,7 @@ * "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, diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestInfoSchemaOnHiveStorage.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestInfoSchemaOnHiveStorage.java index 3e0631600fd..7f7a4011d76 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestInfoSchemaOnHiveStorage.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/hive/TestInfoSchemaOnHiveStorage.java @@ -7,7 +7,7 @@ * "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, diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/BaseTestHiveImpersonation.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/BaseTestHiveImpersonation.java index a289af9ea3c..3c6e2c29832 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/BaseTestHiveImpersonation.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/BaseTestHiveImpersonation.java @@ -7,7 +7,7 @@ * "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, diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java index ef6c547a38b..30b7430a187 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestSqlStdBasedAuthorization.java @@ -7,7 +7,7 @@ * "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, diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java index 972c5451073..5a3e3732090 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/impersonation/hive/TestStorageBasedHiveAuthorization.java @@ -7,7 +7,7 @@ * "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, diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/sql/hive/TestViewSupportOnHiveTables.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/sql/hive/TestViewSupportOnHiveTables.java index 3e70731fd26..3706ff21fba 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/sql/hive/TestViewSupportOnHiveTables.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/sql/hive/TestViewSupportOnHiveTables.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java index 93786d08092..78e5b393a39 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/HiveTestDataGenerator.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.store.hive; import java.io.File; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/inspectors/SkipFooterRecordsInspectorTest.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/inspectors/SkipFooterRecordsInspectorTest.java index 92970ed3861..68a387874a9 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/inspectors/SkipFooterRecordsInspectorTest.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/inspectors/SkipFooterRecordsInspectorTest.java @@ -1,19 +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. + */ package org.apache.drill.exec.store.hive.inspectors; import org.apache.drill.exec.store.hive.readers.inspectors.SkipFooterRecordsInspector; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java index ff4900a9a40..f02f58e9101 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/store/hive/schema/TestColumnListCache.java @@ -1,19 +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. + */ package org.apache.drill.exec.store.hive.schema; import com.google.common.collect.Lists; diff --git a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/test/Drill2130StorageHiveCoreHamcrestConfigurationTest.java b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/test/Drill2130StorageHiveCoreHamcrestConfigurationTest.java index 77cea9349d0..472891868c7 100644 --- a/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/test/Drill2130StorageHiveCoreHamcrestConfigurationTest.java +++ b/contrib/storage-hive/core/src/test/java/org/apache/drill/exec/test/Drill2130StorageHiveCoreHamcrestConfigurationTest.java @@ -1,4 +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 diff --git a/contrib/storage-hive/hive-exec-shade/pom.xml b/contrib/storage-hive/hive-exec-shade/pom.xml index 85fdae08303..cfbd6d00f17 100644 --- a/contrib/storage-hive/hive-exec-shade/pom.xml +++ b/contrib/storage-hive/hive-exec-shade/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/storage-hive/pom.xml b/contrib/storage-hive/pom.xml index 74433d26ebb..572f3d93f18 100644 --- a/contrib/storage-hive/pom.xml +++ b/contrib/storage-hive/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/storage-jdbc/pom.xml b/contrib/storage-jdbc/pom.xml index 90fca4c12a1..34b3a723ab9 100755 --- a/contrib/storage-jdbc/pom.xml +++ b/contrib/storage-jdbc/pom.xml @@ -1,17 +1,22 @@ 4.0.0 diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchCreator.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchCreator.java index d37bfad6ec2..7b9343837d4 100755 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchCreator.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcBatchCreator.java @@ -1,4 +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 diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcDrel.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcDrel.java index 52dd29f7712..50548684e6a 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcDrel.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcDrel.java @@ -1,4 +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 diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcGroupScan.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcGroupScan.java index 95b03cf5022..ed6b674c459 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcGroupScan.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcGroupScan.java @@ -1,4 +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 diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcIntermediatePrel.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcIntermediatePrel.java index 0adb5e0b0b7..5774f6c6f90 100644 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcIntermediatePrel.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcIntermediatePrel.java @@ -1,4 +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 diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcRecordReader.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcRecordReader.java index 364b8a8177c..bea99c71a68 100755 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcRecordReader.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcRecordReader.java @@ -1,4 +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 diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java index 15eb675aece..3c3ce3c4421 100755 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcStorageConfig.java @@ -1,4 +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 diff --git a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcSubScan.java b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcSubScan.java index fcafd4c27f1..65fa4fdabbb 100755 --- a/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcSubScan.java +++ b/contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/JdbcSubScan.java @@ -1,4 +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 diff --git a/contrib/storage-kafka/pom.xml b/contrib/storage-kafka/pom.xml index 88938efa630..a7f6ed0323a 100644 --- a/contrib/storage-kafka/pom.xml +++ b/contrib/storage-kafka/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/contrib/storage-kudu/pom.xml b/contrib/storage-kudu/pom.xml index 8a0dc057364..f3926de69de 100644 --- a/contrib/storage-kudu/pom.xml +++ b/contrib/storage-kudu/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/contrib/storage-kudu/src/main/codegen/templates/KuduRecordWriter.java b/contrib/storage-kudu/src/main/codegen/templates/KuduRecordWriter.java index 2b76cac60da..9de0cf25d09 100644 --- a/contrib/storage-kudu/src/main/codegen/templates/KuduRecordWriter.java +++ b/contrib/storage-kudu/src/main/codegen/templates/KuduRecordWriter.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="org/apache/drill/exec/store/kudu/KuduRecordWriter.java" /> /** diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/DrillKuduTable.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/DrillKuduTable.java index 8404aac140d..fc199d3fa4c 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/DrillKuduTable.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/DrillKuduTable.java @@ -1,4 +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 diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanBatchCreator.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanBatchCreator.java index 7d09d10faa6..1e8dce73d26 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanBatchCreator.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanBatchCreator.java @@ -1,4 +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 diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanSpec.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanSpec.java index b669f7973b3..2e92369390c 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanSpec.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduScanSpec.java @@ -1,4 +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 diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSchemaFactory.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSchemaFactory.java index 4d9caf39ae5..fe2def33cba 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSchemaFactory.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduSchemaFactory.java @@ -1,4 +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 diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduStoragePlugin.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduStoragePlugin.java index 0d987556c8c..a3863931fa2 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduStoragePlugin.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduStoragePlugin.java @@ -1,4 +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 diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduStoragePluginConfig.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduStoragePluginConfig.java index e07f9671d1b..e3bab87c999 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduStoragePluginConfig.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduStoragePluginConfig.java @@ -1,4 +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 diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduWriter.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduWriter.java index 03e29d3268c..88a6849d1ec 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduWriter.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduWriter.java @@ -1,4 +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 diff --git a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduWriterBatchCreator.java b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduWriterBatchCreator.java index 962a1d0be0f..22e86bafaff 100644 --- a/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduWriterBatchCreator.java +++ b/contrib/storage-kudu/src/main/java/org/apache/drill/exec/store/kudu/KuduWriterBatchCreator.java @@ -1,4 +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 diff --git a/contrib/storage-kudu/src/test/java/org/apache/drill/store/kudu/TestKuduConnect.java b/contrib/storage-kudu/src/test/java/org/apache/drill/store/kudu/TestKuduConnect.java index 134642d2065..bf660377258 100644 --- a/contrib/storage-kudu/src/test/java/org/apache/drill/store/kudu/TestKuduConnect.java +++ b/contrib/storage-kudu/src/test/java/org/apache/drill/store/kudu/TestKuduConnect.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/pom.xml b/contrib/storage-mongo/pom.xml index 36fb163e73c..12be696cb8d 100644 --- a/contrib/storage-mongo/pom.xml +++ b/contrib/storage-mongo/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/DrillMongoConstants.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/DrillMongoConstants.java index 71550afa0c2..5c6f68e43e9 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/DrillMongoConstants.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/DrillMongoConstants.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCnxnKey.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCnxnKey.java index 5323d1b7f1f..e510dddfe74 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCnxnKey.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCnxnKey.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCompareFunctionProcessor.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCompareFunctionProcessor.java index d588f1e8bb2..130ea0f06fc 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCompareFunctionProcessor.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoCompareFunctionProcessor.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java index b8341931e99..92571ff59e5 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoGroupScan.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoPushDownFilterForScan.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoPushDownFilterForScan.java index 5b3fcd8981d..29c1743640d 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoPushDownFilterForScan.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoPushDownFilterForScan.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoRecordReader.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoRecordReader.java index 19f9e073297..689b8a1206b 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoRecordReader.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoRecordReader.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanBatchCreator.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanBatchCreator.java index c970cfd690d..6ba96ccf8fa 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanBatchCreator.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanBatchCreator.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanSpec.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanSpec.java index 20b9b6efe8d..5c56fcc2bd9 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanSpec.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoScanSpec.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePlugin.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePlugin.java index 7b3fa171695..c7d0f6c3b5d 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePlugin.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePlugin.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePluginConfig.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePluginConfig.java index b39e7b9b0d0..e76e405a5e2 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePluginConfig.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoStoragePluginConfig.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java index 962ea760e73..ed9f555c7dd 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoSubScan.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoUtils.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoUtils.java index 3b48f86191d..28c6c69e6e6 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoUtils.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/MongoUtils.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/common/ChunkInfo.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/common/ChunkInfo.java index fc01638f80d..31c03e47fc9 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/common/ChunkInfo.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/common/ChunkInfo.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/common/MongoCompareOp.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/common/MongoCompareOp.java index 574a40f6922..ef89bfb68e9 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/common/MongoCompareOp.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/common/MongoCompareOp.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/config/MongoPersistentStoreProvider.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/config/MongoPersistentStoreProvider.java index 33127bdb85a..1a082ac44f2 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/config/MongoPersistentStoreProvider.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/config/MongoPersistentStoreProvider.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/package-info.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/package-info.java index e23eb53daa5..435fd9a3a31 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/package-info.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/package-info.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoDatabaseSchema.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoDatabaseSchema.java index 0c33ec52f16..e20062963ec 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoDatabaseSchema.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoDatabaseSchema.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoSchemaFactory.java b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoSchemaFactory.java index be212def6c4..4f4e4d00d1a 100644 --- a/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoSchemaFactory.java +++ b/contrib/storage-mongo/src/main/java/org/apache/drill/exec/store/mongo/schema/MongoSchemaFactory.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestBase.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestBase.java index ffc6009c948..923c648ca24 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestBase.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestBase.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestConstants.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestConstants.java index 290c3c336a5..2320d5316f1 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestConstants.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/MongoTestConstants.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java index 01618ffc319..638cacb840f 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoChunkAssignment.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoFilterPushDown.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoFilterPushDown.java index 553f0e18d71..645c018cfec 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoFilterPushDown.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoFilterPushDown.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoProjectPushDown.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoProjectPushDown.java index 4d228c8e001..241ec2bc84e 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoProjectPushDown.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoProjectPushDown.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoQueries.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoQueries.java index 8d0064f2f94..49d27467f35 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoQueries.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestMongoQueries.java @@ -1,4 +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 diff --git a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestTableGenerator.java b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestTableGenerator.java index ffe37910f97..37b975a76ee 100644 --- a/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestTableGenerator.java +++ b/contrib/storage-mongo/src/test/java/org/apache/drill/exec/store/mongo/TestTableGenerator.java @@ -1,4 +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 diff --git a/contrib/storage-opentsdb/pom.xml b/contrib/storage-opentsdb/pom.xml index ddd1eb6d7d2..fdd35d0b9c7 100644 --- a/contrib/storage-opentsdb/pom.xml +++ b/contrib/storage-opentsdb/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index 7f481b36556..796b02e4ead 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/distribution/src/assemble/bin.xml b/distribution/src/assemble/bin.xml index fff07b337e5..e044801f9bf 100644 --- a/distribution/src/assemble/bin.xml +++ b/distribution/src/assemble/bin.xml @@ -1,19 +1,22 @@ + 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/distribution/src/resources/distrib-env.sh b/distribution/src/resources/distrib-env.sh index 1813b8dca80..2a18ebe0439 100755 --- a/distribution/src/resources/distrib-env.sh +++ b/distribution/src/resources/distrib-env.sh @@ -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 is empty by default. Default Drill environment settings appear # in drill-config.sh. Distributions can replace this file with a diff --git a/distribution/src/resources/distrib-setup.sh b/distribution/src/resources/distrib-setup.sh index e641b7690a9..a9fea50f5e3 100644 --- a/distribution/src/resources/distrib-setup.sh +++ b/distribution/src/resources/distrib-setup.sh @@ -1,18 +1,21 @@ #!/usr/bin/env bash -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You under the Apache License, Version 2.0 -# (the "License"); you may not use this file except in compliance with -# the License. You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# 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 is empty by default. Drill startup checks will be # performed in drill-config.sh. Distributions can replace this file with a diff --git a/distribution/src/resources/drill-am-log.xml b/distribution/src/resources/drill-am-log.xml index 77fc37c1c08..187ca9dc1f8 100644 --- a/distribution/src/resources/drill-am-log.xml +++ b/distribution/src/resources/drill-am-log.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/AuthDynamicFeature.java b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/AuthDynamicFeature.java index 55cd59aaaf4..12ee267be48 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/AuthDynamicFeature.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/AuthDynamicFeature.java @@ -1,4 +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 diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/package-info.java b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/package-info.java index 13f1bd831e6..f018507b6b9 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/package-info.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/http/package-info.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * */ diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/package-info.java b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/package-info.java index 0ff835d8be1..85b3fd76457 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/package-info.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/appMaster/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Implements the Drill Application Master for YARN. *

    diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/client/package-info.java b/drill-yarn/src/main/java/org/apache/drill/yarn/client/package-info.java index c03c2fa3398..1222a58966e 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/client/package-info.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/client/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Implements a "YARN client" for Drill-on-YARN. The client uploads files to * DFS, then requests that YARN start the Application Master. Much fiddling diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/core/package-info.java b/drill-yarn/src/main/java/org/apache/drill/yarn/core/package-info.java index aaa0ffffe4d..b43a2f27fdf 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/core/package-info.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/core/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Holds functionality common to the Drill-on-YARN client and Application Master (AM). * Includes configuration, utilities, and wrappers around various YARN data classes. diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/package-info.java b/drill-yarn/src/main/java/org/apache/drill/yarn/package-info.java index 170dfa8d5ca..6fede99e482 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/package-info.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Hosts Apache Drill under Apache Hadoop YARN. Consists of two main * components as required by YARN: a client application which uses YARN to diff --git a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/package-info.java b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/package-info.java index 14bb427e34c..da51848b419 100644 --- a/drill-yarn/src/main/java/org/apache/drill/yarn/zk/package-info.java +++ b/drill-yarn/src/main/java/org/apache/drill/yarn/zk/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Interface between the Application Master and ZooKeeper. Classes here manage two * registrations: Drillbits and the AM itself. diff --git a/drill-yarn/src/main/resources/drill-am/config.ftl b/drill-yarn/src/main/resources/drill-am/config.ftl index 8405c1f507a..3da82d5d06f 100644 --- a/drill-yarn/src/main/resources/drill-am/config.ftl +++ b/drill-yarn/src/main/resources/drill-am/config.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/drill-yarn/src/main/resources/drill-am/confirm.ftl b/drill-yarn/src/main/resources/drill-am/confirm.ftl index 515293d1829..80562380ea5 100644 --- a/drill-yarn/src/main/resources/drill-am/confirm.ftl +++ b/drill-yarn/src/main/resources/drill-am/confirm.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/drill-yarn/src/main/resources/drill-am/generic.ftl b/drill-yarn/src/main/resources/drill-am/generic.ftl index b76a917db3d..b497248b2cf 100644 --- a/drill-yarn/src/main/resources/drill-am/generic.ftl +++ b/drill-yarn/src/main/resources/drill-am/generic.ftl @@ -1,14 +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. + +--> <#-- Adapted from the Drill generic.ftl, adjusted for use in the AM. --> <#macro page_head> diff --git a/drill-yarn/src/main/resources/drill-am/history.ftl b/drill-yarn/src/main/resources/drill-am/history.ftl index c588d06874b..e44e15122fc 100644 --- a/drill-yarn/src/main/resources/drill-am/history.ftl +++ b/drill-yarn/src/main/resources/drill-am/history.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/drill-yarn/src/main/resources/drill-am/index.ftl b/drill-yarn/src/main/resources/drill-am/index.ftl index 18d6ab590e2..107deae389e 100644 --- a/drill-yarn/src/main/resources/drill-am/index.ftl +++ b/drill-yarn/src/main/resources/drill-am/index.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/drill-yarn/src/main/resources/drill-am/login.ftl b/drill-yarn/src/main/resources/drill-am/login.ftl index 036229e2e85..3f34a51b3f6 100644 --- a/drill-yarn/src/main/resources/drill-am/login.ftl +++ b/drill-yarn/src/main/resources/drill-am/login.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/drill-yarn/src/main/resources/drill-am/manage.ftl b/drill-yarn/src/main/resources/drill-am/manage.ftl index 682530ce385..2c261434f82 100644 --- a/drill-yarn/src/main/resources/drill-am/manage.ftl +++ b/drill-yarn/src/main/resources/drill-am/manage.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/drill-yarn/src/main/resources/drill-am/redirect.ftl b/drill-yarn/src/main/resources/drill-am/redirect.ftl index b38d10c5786..894dbab283c 100644 --- a/drill-yarn/src/main/resources/drill-am/redirect.ftl +++ b/drill-yarn/src/main/resources/drill-am/redirect.ftl @@ -1,14 +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. + +--> diff --git a/drill-yarn/src/main/resources/drill-am/shrink-warning.ftl b/drill-yarn/src/main/resources/drill-am/shrink-warning.ftl index dded46a957a..3f5a9e34ca3 100644 --- a/drill-yarn/src/main/resources/drill-am/shrink-warning.ftl +++ b/drill-yarn/src/main/resources/drill-am/shrink-warning.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/drill-yarn/src/main/resources/drill-am/tasks.ftl b/drill-yarn/src/main/resources/drill-am/tasks.ftl index c6725b14d28..4a46caf9d55 100644 --- a/drill-yarn/src/main/resources/drill-am/tasks.ftl +++ b/drill-yarn/src/main/resources/drill-am/tasks.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/drill-yarn/src/test/resources/doy-test-logback.xml b/drill-yarn/src/test/resources/doy-test-logback.xml index b00ff5fc9bc..819ee485d17 100644 --- a/drill-yarn/src/test/resources/doy-test-logback.xml +++ b/drill-yarn/src/test/resources/doy-test-logback.xml @@ -1,14 +1,23 @@ - + + 4.0.0 diff --git a/exec/java-exec/src/main/codegen/includes/compoundIdentifier.ftl b/exec/java-exec/src/main/codegen/includes/compoundIdentifier.ftl index f613770ec37..1e8efb43535 100644 --- a/exec/java-exec/src/main/codegen/includes/compoundIdentifier.ftl +++ b/exec/java-exec/src/main/codegen/includes/compoundIdentifier.ftl @@ -1,13 +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. + +--> /** * Parses a Drill compound identifier. */ diff --git a/exec/java-exec/src/main/codegen/includes/license.ftl b/exec/java-exec/src/main/codegen/includes/license.ftl index 0455fd87ddc..9faaa7299b9 100644 --- a/exec/java-exec/src/main/codegen/includes/license.ftl +++ b/exec/java-exec/src/main/codegen/includes/license.ftl @@ -1,18 +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. - ******************************************************************************/ \ No newline at end of file + 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. + +--> diff --git a/exec/java-exec/src/main/codegen/includes/parserImpls.ftl b/exec/java-exec/src/main/codegen/includes/parserImpls.ftl index 813461d8385..8cccf4d07b1 100644 --- a/exec/java-exec/src/main/codegen/includes/parserImpls.ftl +++ b/exec/java-exec/src/main/codegen/includes/parserImpls.ftl @@ -1,14 +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. + +--> <#-- Add implementations of additional parser statements here. Each implementation should return an object of SqlNode type. diff --git a/exec/java-exec/src/main/codegen/includes/vv_imports.ftl b/exec/java-exec/src/main/codegen/includes/vv_imports.ftl index fadcab855a4..586c78988eb 100644 --- a/exec/java-exec/src/main/codegen/includes/vv_imports.ftl +++ b/exec/java-exec/src/main/codegen/includes/vv_imports.ftl @@ -1,14 +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. + +--> import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/exec/java-exec/src/main/codegen/templates/AbstractRecordWriter.java b/exec/java-exec/src/main/codegen/templates/AbstractRecordWriter.java index 83b811ecad8..070e947aa33 100644 --- a/exec/java-exec/src/main/codegen/templates/AbstractRecordWriter.java +++ b/exec/java-exec/src/main/codegen/templates/AbstractRecordWriter.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import java.lang.UnsupportedOperationException; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/AggrBitwiseLogicalTypeFunctions.java b/exec/java-exec/src/main/codegen/templates/AggrBitwiseLogicalTypeFunctions.java index b6d3e73afea..0fac22ef7c7 100644 --- a/exec/java-exec/src/main/codegen/templates/AggrBitwiseLogicalTypeFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/AggrBitwiseLogicalTypeFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions1.java b/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions1.java index fa4e8f12bec..ebf20e53e11 100644 --- a/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions1.java +++ b/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions1.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions2.java b/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions2.java index 7c396d909d1..8b8f1cfcbbe 100644 --- a/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions2.java +++ b/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions2.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions3.java b/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions3.java index 9b73418024b..20753be475e 100644 --- a/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions3.java +++ b/exec/java-exec/src/main/codegen/templates/AggrTypeFunctions3.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/CastDateDate.java b/exec/java-exec/src/main/codegen/templates/CastDateDate.java index f4ba51d6b62..5b1707d5512 100644 --- a/exec/java-exec/src/main/codegen/templates/CastDateDate.java +++ b/exec/java-exec/src/main/codegen/templates/CastDateDate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/CastEmptyStringVarTypesToNullableNumeric.java b/exec/java-exec/src/main/codegen/templates/CastEmptyStringVarTypesToNullableNumeric.java index 68ebccc7b7d..e0942e9df73 100644 --- a/exec/java-exec/src/main/codegen/templates/CastEmptyStringVarTypesToNullableNumeric.java +++ b/exec/java-exec/src/main/codegen/templates/CastEmptyStringVarTypesToNullableNumeric.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/CastFunctionsSrcVarLen.java b/exec/java-exec/src/main/codegen/templates/CastFunctionsSrcVarLen.java index 6f2266b53f3..e3be87b6d78 100644 --- a/exec/java-exec/src/main/codegen/templates/CastFunctionsSrcVarLen.java +++ b/exec/java-exec/src/main/codegen/templates/CastFunctionsSrcVarLen.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/CastHigh.java b/exec/java-exec/src/main/codegen/templates/CastHigh.java index a3f9c917f60..26d6be80dc7 100644 --- a/exec/java-exec/src/main/codegen/templates/CastHigh.java +++ b/exec/java-exec/src/main/codegen/templates/CastHigh.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/CastIntervalInterval.java b/exec/java-exec/src/main/codegen/templates/CastIntervalInterval.java index f1659ad3bf4..1fc3e173ffe 100644 --- a/exec/java-exec/src/main/codegen/templates/CastIntervalInterval.java +++ b/exec/java-exec/src/main/codegen/templates/CastIntervalInterval.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/CastVarCharInterval.java b/exec/java-exec/src/main/codegen/templates/CastVarCharInterval.java index 8f68ff6898f..f9396a69d5a 100644 --- a/exec/java-exec/src/main/codegen/templates/CastVarCharInterval.java +++ b/exec/java-exec/src/main/codegen/templates/CastVarCharInterval.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/ComparisonFunctions.java b/exec/java-exec/src/main/codegen/templates/ComparisonFunctions.java index 502418e26aa..2113c2586c9 100644 --- a/exec/java-exec/src/main/codegen/templates/ComparisonFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/ComparisonFunctions.java @@ -1,4 +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 @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - /** NOTE: ComparisonFunctions.java does not contain/generate all comparison functions. DecimalFunctions.java and DateIntervalFunctions.java contain diff --git a/exec/java-exec/src/main/codegen/templates/CorrelationTypeFunctions.java b/exec/java-exec/src/main/codegen/templates/CorrelationTypeFunctions.java index 133a17a6293..f14e037a403 100644 --- a/exec/java-exec/src/main/codegen/templates/CorrelationTypeFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/CorrelationTypeFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/CountAggregateFunctions.java b/exec/java-exec/src/main/codegen/templates/CountAggregateFunctions.java index b32bb280b25..74b93b1e079 100644 --- a/exec/java-exec/src/main/codegen/templates/CountAggregateFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/CountAggregateFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import java.lang.Override; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/CovarTypeFunctions.java b/exec/java-exec/src/main/codegen/templates/CovarTypeFunctions.java index 08f623d5abc..80fd769d47c 100644 --- a/exec/java-exec/src/main/codegen/templates/CovarTypeFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/CovarTypeFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalAggrFunctions1.java b/exec/java-exec/src/main/codegen/templates/DateIntervalAggrFunctions1.java index 18be0b7e1aa..f526575b02c 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalAggrFunctions1.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalAggrFunctions1.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateDateArithmeticFunctions.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateDateArithmeticFunctions.java index 03db5e67a5e..a8eb863fe97 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateDateArithmeticFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateDateArithmeticFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.expr.annotations.Workspace; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateIntervalArithmeticFunctions.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateIntervalArithmeticFunctions.java index 5c9f5de6dfa..9a9832181f4 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateIntervalArithmeticFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateIntervalArithmeticFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateToCharFunctions.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateToCharFunctions.java index 6ef2d3e5dbe..8bfe0a7df69 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateToCharFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateToCharFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.expr.annotations.Workspace; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateTruncFunctions.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateTruncFunctions.java index 480d5016724..1907305ad62 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateTruncFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/DateTruncFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.expr.annotations.Workspace; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/Extract.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/Extract.java index 2442672ae6b..ece71284d85 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/Extract.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/Extract.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/IntervalIntervalArithmetic.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/IntervalIntervalArithmetic.java index 41af7ebc34c..7fecabb2e7c 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/IntervalIntervalArithmetic.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/IntervalIntervalArithmetic.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/IntervalNumericArithmetic.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/IntervalNumericArithmetic.java index 6e06c0c2c70..66e754c3606 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/IntervalNumericArithmetic.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/IntervalNumericArithmetic.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/SqlToDateTypeFunctions.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/SqlToDateTypeFunctions.java index 038582670d2..32d824a980b 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/SqlToDateTypeFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/SqlToDateTypeFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.expr.annotations.Workspace; <@pp.dropOutputFile/> diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/ToDateTypeFunctions.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/ToDateTypeFunctions.java index 321761780e0..7c410e3512c 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/ToDateTypeFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/ToDateTypeFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.expr.annotations.Workspace; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/ToTimeStampFunction.java b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/ToTimeStampFunction.java index 44db9df9027..8dacca8659c 100644 --- a/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/ToTimeStampFunction.java +++ b/exec/java-exec/src/main/codegen/templates/DateIntervalFunctionTemplates/ToTimeStampFunction.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.expr.annotations.Workspace; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/Decimal/CastDecimalFloat.java b/exec/java-exec/src/main/codegen/templates/Decimal/CastDecimalFloat.java index c393255c823..1acbe5ebd0d 100644 --- a/exec/java-exec/src/main/codegen/templates/Decimal/CastDecimalFloat.java +++ b/exec/java-exec/src/main/codegen/templates/Decimal/CastDecimalFloat.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/Decimal/DecimalAggrTypeFunctions1.java b/exec/java-exec/src/main/codegen/templates/Decimal/DecimalAggrTypeFunctions1.java index 8e85777008c..55ce0772eaf 100644 --- a/exec/java-exec/src/main/codegen/templates/Decimal/DecimalAggrTypeFunctions1.java +++ b/exec/java-exec/src/main/codegen/templates/Decimal/DecimalAggrTypeFunctions1.java @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/Decimal/DecimalAggrTypeFunctions2.java b/exec/java-exec/src/main/codegen/templates/Decimal/DecimalAggrTypeFunctions2.java index 8729a3116d0..e2da4282b63 100644 --- a/exec/java-exec/src/main/codegen/templates/Decimal/DecimalAggrTypeFunctions2.java +++ b/exec/java-exec/src/main/codegen/templates/Decimal/DecimalAggrTypeFunctions2.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.expr.annotations.Workspace; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/Decimal/DecimalFunctions.java b/exec/java-exec/src/main/codegen/templates/Decimal/DecimalFunctions.java index 6197b06232a..721a9d49c71 100644 --- a/exec/java-exec/src/main/codegen/templates/Decimal/DecimalFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/Decimal/DecimalFunctions.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.expr.annotations.Workspace; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/DirectoryExplorers.java b/exec/java-exec/src/main/codegen/templates/DirectoryExplorers.java index f0101cad224..9c87f00d4d3 100644 --- a/exec/java-exec/src/main/codegen/templates/DirectoryExplorers.java +++ b/exec/java-exec/src/main/codegen/templates/DirectoryExplorers.java @@ -1,4 +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 @@ -14,8 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ - + */ <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/expr/fn/impl/DirectoryExplorers.java" /> diff --git a/exec/java-exec/src/main/codegen/templates/DrillVersionInfo.java b/exec/java-exec/src/main/codegen/templates/DrillVersionInfo.java index c7ff4c73d2b..a988b6af05d 100644 --- a/exec/java-exec/src/main/codegen/templates/DrillVersionInfo.java +++ b/exec/java-exec/src/main/codegen/templates/DrillVersionInfo.java @@ -1,4 +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 @@ -14,8 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ - + */ <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/common/util/DrillVersionInfo.java" /> diff --git a/exec/java-exec/src/main/codegen/templates/EventBasedRecordWriter.java b/exec/java-exec/src/main/codegen/templates/EventBasedRecordWriter.java index b88d4a1bcb6..2b4d7108290 100644 --- a/exec/java-exec/src/main/codegen/templates/EventBasedRecordWriter.java +++ b/exec/java-exec/src/main/codegen/templates/EventBasedRecordWriter.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.planner.physical.WriterPrel; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/IntervalAggrFunctions2.java b/exec/java-exec/src/main/codegen/templates/IntervalAggrFunctions2.java index 7973629e3c9..30c749f26e1 100644 --- a/exec/java-exec/src/main/codegen/templates/IntervalAggrFunctions2.java +++ b/exec/java-exec/src/main/codegen/templates/IntervalAggrFunctions2.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/JsonOutputRecordWriter.java b/exec/java-exec/src/main/codegen/templates/JsonOutputRecordWriter.java index 651f5a860b3..2bd3d0c50fe 100644 --- a/exec/java-exec/src/main/codegen/templates/JsonOutputRecordWriter.java +++ b/exec/java-exec/src/main/codegen/templates/JsonOutputRecordWriter.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="org/apache/drill/exec/store/JSONOutputRecordWriter.java" /> <#include "/@includes/license.ftl" /> diff --git a/exec/java-exec/src/main/codegen/templates/MathFunctionTemplates.java b/exec/java-exec/src/main/codegen/templates/MathFunctionTemplates.java index 4bf7e164167..c0067b33a8e 100644 --- a/exec/java-exec/src/main/codegen/templates/MathFunctionTemplates.java +++ b/exec/java-exec/src/main/codegen/templates/MathFunctionTemplates.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/MathFunctions.java b/exec/java-exec/src/main/codegen/templates/MathFunctions.java index 0745aee750d..d1366cb090e 100644 --- a/exec/java-exec/src/main/codegen/templates/MathFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/MathFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/NewValueFunctions.java b/exec/java-exec/src/main/codegen/templates/NewValueFunctions.java index 5591d669c4b..03460db6f9d 100644 --- a/exec/java-exec/src/main/codegen/templates/NewValueFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/NewValueFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/NullOperator.java b/exec/java-exec/src/main/codegen/templates/NullOperator.java index 9a92aace2cd..17c94dfaf8b 100644 --- a/exec/java-exec/src/main/codegen/templates/NullOperator.java +++ b/exec/java-exec/src/main/codegen/templates/NullOperator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/NumericFunctionsTemplates.java b/exec/java-exec/src/main/codegen/templates/NumericFunctionsTemplates.java index e8ff431c71f..b26e9eee187 100644 --- a/exec/java-exec/src/main/codegen/templates/NumericFunctionsTemplates.java +++ b/exec/java-exec/src/main/codegen/templates/NumericFunctionsTemplates.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/NumericToCharFunctions.java b/exec/java-exec/src/main/codegen/templates/NumericToCharFunctions.java index 78f4f7dc068..638095015d5 100644 --- a/exec/java-exec/src/main/codegen/templates/NumericToCharFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/NumericToCharFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.expr.annotations.Workspace; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java b/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java index 0af352731ee..26a33b9dcf5 100644 --- a/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java +++ b/exec/java-exec/src/main/codegen/templates/ParquetOutputRecordWriter.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.parquet.io.api.Binary; import java.lang.Override; diff --git a/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java b/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java index 7584b826440..fc7100b8de9 100644 --- a/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java +++ b/exec/java-exec/src/main/codegen/templates/ParquetTypeHelper.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.common.types.MinorType; import org.apache.parquet.format.ConvertedType; import org.apache.parquet.schema.DecimalMetadata; diff --git a/exec/java-exec/src/main/codegen/templates/RecordValueAccessor.java b/exec/java-exec/src/main/codegen/templates/RecordValueAccessor.java index 5e7d87c97b7..aa65d381b92 100644 --- a/exec/java-exec/src/main/codegen/templates/RecordValueAccessor.java +++ b/exec/java-exec/src/main/codegen/templates/RecordValueAccessor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/RecordWriter.java b/exec/java-exec/src/main/codegen/templates/RecordWriter.java index 4c7a1294b9d..470c5f26e1d 100644 --- a/exec/java-exec/src/main/codegen/templates/RecordWriter.java +++ b/exec/java-exec/src/main/codegen/templates/RecordWriter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/SqlAccessors.java b/exec/java-exec/src/main/codegen/templates/SqlAccessors.java index 888d1c61827..29f1ac5d03d 100644 --- a/exec/java-exec/src/main/codegen/templates/SqlAccessors.java +++ b/exec/java-exec/src/main/codegen/templates/SqlAccessors.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import java.lang.Override; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/StringOutputRecordWriter.java b/exec/java-exec/src/main/codegen/templates/StringOutputRecordWriter.java index 70c699e1427..cee157bba00 100644 --- a/exec/java-exec/src/main/codegen/templates/StringOutputRecordWriter.java +++ b/exec/java-exec/src/main/codegen/templates/StringOutputRecordWriter.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.store.AbstractRecordWriter; import java.lang.Override; diff --git a/exec/java-exec/src/main/codegen/templates/SumZeroAggr.java b/exec/java-exec/src/main/codegen/templates/SumZeroAggr.java index bc16b0c1ee7..b251e6ee487 100644 --- a/exec/java-exec/src/main/codegen/templates/SumZeroAggr.java +++ b/exec/java-exec/src/main/codegen/templates/SumZeroAggr.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/codegen/templates/TypeHelper.java b/exec/java-exec/src/main/codegen/templates/TypeHelper.java index e4c8f33193a..8829c79992b 100644 --- a/exec/java-exec/src/main/codegen/templates/TypeHelper.java +++ b/exec/java-exec/src/main/codegen/templates/TypeHelper.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.vector.complex.UnionVector; <@pp.dropOutputFile /> diff --git a/exec/java-exec/src/main/codegen/templates/UnionFunctions.java b/exec/java-exec/src/main/codegen/templates/UnionFunctions.java index f3ea566ec89..82aac2f8c56 100644 --- a/exec/java-exec/src/main/codegen/templates/UnionFunctions.java +++ b/exec/java-exec/src/main/codegen/templates/UnionFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/expr/fn/impl/GUnionFunctions.java" /> diff --git a/exec/java-exec/src/main/codegen/templates/VarCharAggrFunctions1.java b/exec/java-exec/src/main/codegen/templates/VarCharAggrFunctions1.java index dd73f7991ce..c0930f3ea4f 100644 --- a/exec/java-exec/src/main/codegen/templates/VarCharAggrFunctions1.java +++ b/exec/java-exec/src/main/codegen/templates/VarCharAggrFunctions1.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/TestMemoryRetention.java b/exec/java-exec/src/main/java/org/apache/drill/exec/TestMemoryRetention.java index f6321252646..c87cd509879 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/TestMemoryRetention.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/TestMemoryRetention.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/AbstractStreamSerializable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/AbstractStreamSerializable.java index 1888e3bb1e8..e3ee6a68a96 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/AbstractStreamSerializable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/AbstractStreamSerializable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/CachedVectorContainer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/CachedVectorContainer.java index 99d08e67ba2..cf944469bf3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/CachedVectorContainer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/CachedVectorContainer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/Counter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/Counter.java index 4568878f6fd..d6b37e29e0c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/Counter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/Counter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedCache.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedCache.java index b0a9c3ecaf2..760ea3989e9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedCache.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedCache.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMap.java index 7d3ca9ccd7e..1e562da286b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMap.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMultiMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMultiMap.java index 301f0386585..efa00b8e8db 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMultiMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DistributedMultiMap.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DrillSerializable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DrillSerializable.java index 21ed37c3a07..4e05a528276 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DrillSerializable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/DrillSerializable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/LoopedAbstractDrillSerializable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/LoopedAbstractDrillSerializable.java index 82004364d26..c7218f1efa8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/LoopedAbstractDrillSerializable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/LoopedAbstractDrillSerializable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/SerializationDefinition.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/SerializationDefinition.java index a5df73a8ff2..84c37ba47c8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/SerializationDefinition.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/SerializationDefinition.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/package-info.java index cc17d314747..0673d0984fa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/cache/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/cache/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java index ec01ff32862..f880b936c35 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/DrillClient.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/QuerySubmitter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/QuerySubmitter.java index c285fb7c699..d9f47b52f93 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/QuerySubmitter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/QuerySubmitter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/client/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/client/package-info.java index 56763363974..ec2f810629b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/client/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/client/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/AbstractClassCompiler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/AbstractClassCompiler.java index 4caf8e1f61c..9b120decef6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/AbstractClassCompiler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/AbstractClassCompiler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/AsmUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/AsmUtil.java index 5e7a9e7e080..fd071d62307 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/AsmUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/AsmUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java index c11d02d4e30..801675454ba 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ByteCodeLoader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CachedClassLoader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CachedClassLoader.java index 5270aa810b9..196cc521755 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CachedClassLoader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CachedClassLoader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CheckClassVisitorFsm.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CheckClassVisitorFsm.java index d43824a8ca9..2420cedc668 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CheckClassVisitorFsm.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CheckClassVisitorFsm.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CheckMethodVisitorFsm.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CheckMethodVisitorFsm.java index ceb1ae37d34..ca933dff8a7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CheckMethodVisitorFsm.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CheckMethodVisitorFsm.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassBodyBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassBodyBuilder.java index 34f622e8bab..86e743e8870 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassBodyBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/ClassBodyBuilder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CompilationConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CompilationConfig.java index c724549cfe7..7d7180d2c3f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CompilationConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/CompilationConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillCheckClassAdapter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillCheckClassAdapter.java index 1043bfccdda..4076c2379cc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillCheckClassAdapter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillCheckClassAdapter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillDiagnosticListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillDiagnosticListener.java index 890243c4f8a..eb02b370940 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillDiagnosticListener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillDiagnosticListener.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillInitMethodVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillInitMethodVisitor.java index a077853f2d0..45bb645842a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillInitMethodVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillInitMethodVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileManager.java index 96d31197d14..511e7f5cb02 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileObject.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileObject.java index 7b95374229f..5e6145e5758 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileObject.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/DrillJavaFileObject.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmCursor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmCursor.java index 7b833af6ddd..84104668418 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmCursor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmCursor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmDescriptor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmDescriptor.java index a6b2da16cc0..6b168333a77 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmDescriptor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/FsmDescriptor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/InnerClassAccessStripper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/InnerClassAccessStripper.java index ed83384b253..8ca3f11a69e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/InnerClassAccessStripper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/InnerClassAccessStripper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java index 60070784aa8..923910cf49d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JDKClassCompiler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JaninoClassCompiler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JaninoClassCompiler.java index cab8e22ca64..0bce9661814 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JaninoClassCompiler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/JaninoClassCompiler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/LogWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/LogWriter.java index 7ea747107a7..cfc1986358d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/LogWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/LogWriter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/MergeAdapter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/MergeAdapter.java index 3a01dda8de2..231dfb3b69d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/MergeAdapter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/MergeAdapter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/RetargetableClassVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/RetargetableClassVisitor.java index 72e55b7d36d..bc82ce32e05 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/RetargetableClassVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/RetargetableClassVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/TemplateClassDefinition.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/TemplateClassDefinition.java index 1979db158f5..c8a8c3c2b90 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/TemplateClassDefinition.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/TemplateClassDefinition.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/AloadPopRemover.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/AloadPopRemover.java index 1200855040b..a6df261d3d0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/AloadPopRemover.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/AloadPopRemover.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/DirectSorter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/DirectSorter.java index 31110a847a9..8d5f679253c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/DirectSorter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/DirectSorter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java index 8677a391401..e8c221b1dfd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/InstructionModifier.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/MethodAnalyzer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/MethodAnalyzer.java index d0b862718ce..78cf16fc16e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/MethodAnalyzer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/MethodAnalyzer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingBasicValue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingBasicValue.java index 13f45754a1c..c05f5cbbecf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingBasicValue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingBasicValue.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingInterpreter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingInterpreter.java index c18e965c916..2755accac65 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingInterpreter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ReplacingInterpreter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementNode.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementNode.java index adbf2faa445..3963e9b52a3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementNode.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementNode.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementTypes.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementTypes.java index b52eb0c6bec..001762f7e21 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementTypes.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ScalarReplacementTypes.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/TrackingInstructionList.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/TrackingInstructionList.java index c6fa5fb91b5..7ffe047844d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/TrackingInstructionList.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/TrackingInstructionList.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java index cc2eda1aff0..b2c34c954fc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderIden.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderReplacementVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderReplacementVisitor.java index 9dee164c701..1ed9ea592ee 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderReplacementVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/ValueHolderReplacementVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/package-info.java index 4ef36992e95..a6c1e08e92c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/bytecode/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/package-info.java index 85227d92cc7..d8c09cf1610 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorArgument.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorArgument.java index ce9f6c942c2..78b01b471d6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorArgument.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorArgument.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorMethod.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorMethod.java index c83498a7483..ebb31f492c6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorMethod.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorMethod.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorSignature.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorSignature.java index 956171d0d5e..21c6cf376ea 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorSignature.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/CodeGeneratorSignature.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/GeneratorMapping.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/GeneratorMapping.java index b9b62a84482..f8aafccdc9f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/GeneratorMapping.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/GeneratorMapping.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/MappingSet.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/MappingSet.java index fbc586f1dab..7214c578e47 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/MappingSet.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/MappingSet.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/RuntimeOverridden.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/RuntimeOverridden.java index 382c5bcb4a3..30552c664ba 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/RuntimeOverridden.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/RuntimeOverridden.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/Signature.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/Signature.java index 54fa3d605de..87fe66f53c7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/Signature.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/Signature.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVReadBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVReadBatch.java index 93616c2f31a..4a72b9a4b5d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVReadBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVReadBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVWriteBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVWriteBatch.java index dff92d00a1b..a4b3685cb03 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVWriteBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/VVWriteBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/package-info.java index 32b52257667..b16a2c41ab5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/compile/sig/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/ClusterCoordinator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/ClusterCoordinator.java index 32b16334f46..d1c08de8073 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/ClusterCoordinator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/ClusterCoordinator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DistributedSemaphore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DistributedSemaphore.java index d9d876438ed..0522517dcc4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DistributedSemaphore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DistributedSemaphore.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillServiceInstanceHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillServiceInstanceHelper.java index 94b3a11586b..2a6644d2514 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillServiceInstanceHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillServiceInstanceHelper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillbitEndpointSerDe.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillbitEndpointSerDe.java index 3961b4b7fa9..fa760d23a33 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillbitEndpointSerDe.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/DrillbitEndpointSerDe.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java index 86bc6061977..3717dac97c9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/LocalClusterCoordinator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/MapBackedStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/MapBackedStore.java index c3c8f5a9165..9f259c1bca1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/MapBackedStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/MapBackedStore.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/package-info.java index 6151983c1b3..aa5eb63948a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/local/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/package-info.java index 18b8737e01d..1079692c33d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/BaseTransientStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/BaseTransientStore.java index 463e1fb8ae0..0c361752f9b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/BaseTransientStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/BaseTransientStore.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/CachingTransientStoreFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/CachingTransientStoreFactory.java index b500c5d571e..a32c8fce93b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/CachingTransientStoreFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/CachingTransientStoreFactory.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStore.java index ca9b028c4f3..e308fb93a19 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStore.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfig.java index 36f53ab1b76..3d039cb67e5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfig.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfigBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfigBuilder.java index a019a773271..7acfae69283 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfigBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreConfigBuilder.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEvent.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEvent.java index a0b57251ac2..f276ba83b08 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEvent.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEvent.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEventType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEventType.java index 51ae2c7dd2a..8e6ad1e8113 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEventType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreEventType.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreFactory.java index c3d351d7555..4de35bbbcd4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreFactory.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreListener.java index 3cd86f9fc46..20b8b42a879 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreListener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/store/TransientStoreListener.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/EventDispatcher.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/EventDispatcher.java index 580cfcd4fce..8dc0e129181 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/EventDispatcher.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/EventDispatcher.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/PathUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/PathUtils.java index bc452a97edc..ecbffc8e218 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/PathUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/PathUtils.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java index 472bc3d821e..cc23a99ecf5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKClusterCoordinator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKRegistrationHandle.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKRegistrationHandle.java index fca3296a092..4f3730fbd0d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKRegistrationHandle.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZKRegistrationHandle.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkDistributedSemaphore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkDistributedSemaphore.java index 5e638016f0a..bdd7470c4e6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkDistributedSemaphore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkDistributedSemaphore.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkEphemeralStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkEphemeralStore.java index f485e9ebb65..263e38c2902 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkEphemeralStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkEphemeralStore.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkTransientStoreFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkTransientStoreFactory.java index a58c376c0f4..74abc1456cb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkTransientStoreFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZkTransientStoreFactory.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZookeeperClient.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZookeeperClient.java index 17cb6cbbd75..08398986939 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZookeeperClient.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/ZookeeperClient.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/package-info.java index 9ae3cae876c..e1bbc8bf08c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/coord/zk/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/disk/Spool.java b/exec/java-exec/src/main/java/org/apache/drill/exec/disk/Spool.java index 75886646c38..ff9279378cc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/disk/Spool.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/disk/Spool.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/disk/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/disk/package-info.java index e1897dfbeb2..76936aae6a1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/disk/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/disk/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillFile.java b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillFile.java index 1946ceeced5..f7c014c1dec 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillFile.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillFile.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillType.java index 3915359ec2c..e94d9f85983 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillType.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillUtil.java index 19c99282c24..e6ddc1d41a1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/DotDrillUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/package-info.java index cde44dfedd2..f603a7ac21b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/dotdrill/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/BitComException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/BitComException.java index 6b36bc305b6..b612ac79f6b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/BitComException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/BitComException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/ClassTransformationException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/ClassTransformationException.java index 8bf91c48cc6..14b3cd2ac9c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/ClassTransformationException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/ClassTransformationException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/DrillbitStartupException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/DrillbitStartupException.java index 03257cefb1c..bd17918f830 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/DrillbitStartupException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/DrillbitStartupException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/FragmentSetupException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/FragmentSetupException.java index c2768467ab1..2a1f774ec56 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/FragmentSetupException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/FragmentSetupException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/FunctionValidationException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/FunctionValidationException.java index 7475e24ba69..5fdfbab55cc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/FunctionValidationException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/FunctionValidationException.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/JarValidationException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/JarValidationException.java index a6fa40753c9..67196242c38 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/JarValidationException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/JarValidationException.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/OptimizerException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/OptimizerException.java index 0e7d21a30a7..71b4b8ed610 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/OptimizerException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/OptimizerException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SchemaChangeException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SchemaChangeException.java index acb49130233..07386aeea31 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SchemaChangeException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SchemaChangeException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SetupException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SetupException.java index e877e759233..cc332815984 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SetupException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/SetupException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/StoreException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/StoreException.java index 506d48562d0..d04ddfb8d9f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/StoreException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/StoreException.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/UnsupportedOperatorCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/UnsupportedOperatorCollector.java index de2df83559a..8c5f69a441e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/UnsupportedOperatorCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/UnsupportedOperatorCollector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/VersionMismatchException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/VersionMismatchException.java index 796f4100cc4..714685e202e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/VersionMismatchException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/VersionMismatchException.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/package-info.java index 2e1325f415d..7a28030a7ac 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/exception/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/exception/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BatchReference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BatchReference.java index 440f69f4bb9..dae5e172936 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BatchReference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BatchReference.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BooleanType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BooleanType.java index 6ffde9f3c8e..849ca78bc08 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BooleanType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/BooleanType.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CloneVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CloneVisitor.java index b1fb5e768e1..84d120357cd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CloneVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/CloneVisitor.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DebugStringBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DebugStringBuilder.java index 057c6217c3d..a9b0f229b08 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DebugStringBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DebugStringBuilder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DirectExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DirectExpression.java index b99cd1372be..4285e8d812a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DirectExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DirectExpression.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillAggFunc.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillAggFunc.java index 21599f65575..b80b56c2872 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillAggFunc.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillAggFunc.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillFunc.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillFunc.java index 17fb82c01e9..c35f644b47c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillFunc.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillFunc.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillSimpleFunc.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillSimpleFunc.java index 40817f2cdff..9394221079a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillSimpleFunc.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/DrillSimpleFunc.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EqualityVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EqualityVisitor.java index 44ff78c8e18..3f322b8da8a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EqualityVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/EqualityVisitor.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/GetSetVectorHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/GetSetVectorHelper.java index 547f0f2f2fd..fc939838598 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/GetSetVectorHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/GetSetVectorHelper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HashVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HashVisitor.java index 27c349e5382..53fbaa3a66c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HashVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HashVisitor.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HoldingContainerExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HoldingContainerExpression.java index 3e6ad4a3dba..882ac58bd5c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HoldingContainerExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/HoldingContainerExpression.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java index a284db1cb3b..dd820082d08 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SingleClassStringWriter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SizedJBlock.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SizedJBlock.java index 5d806a32b88..fdc469724d0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SizedJBlock.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/SizedJBlock.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr; import com.sun.codemodel.JBlock; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java index 1fb46e43cca..e2a947bda54 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/ValueVectorWriteExpression.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Output.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Output.java index 1013c343360..a1c235d00f4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Output.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Output.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Param.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Param.java index a9312115277..def41b77093 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Param.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Param.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Workspace.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Workspace.java index b9b81202f2e..0aa42806fd7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Workspace.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/annotations/Workspace.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillComplexWriterFuncHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillComplexWriterFuncHolder.java index 061dd3dc715..9be1b3a72e9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillComplexWriterFuncHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/DrillComplexWriterFuncHolder.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn; import org.apache.drill.common.expression.FieldReference; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ExceptionFunction.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ExceptionFunction.java index 9e5fced2145..facc4340d98 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ExceptionFunction.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ExceptionFunction.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionLookupContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionLookupContext.java index 0a27f65557f..944041e8051 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionLookupContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionLookupContext.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionUtils.java index f565b675f00..d4b2163bf12 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/FunctionUtils.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/MethodGrabbingVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/MethodGrabbingVisitor.java index 91718bcdfdd..2fe7bcb6eed 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/MethodGrabbingVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/MethodGrabbingVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ModifiedUnparseVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ModifiedUnparseVisitor.java index 966c46519ee..58e3c3a1f71 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ModifiedUnparseVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/ModifiedUnparseVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/PluggableFunctionRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/PluggableFunctionRegistry.java index 6ad4388a985..9fedd8bec22 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/PluggableFunctionRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/PluggableFunctionRegistry.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/AggregateErrorFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/AggregateErrorFunctions.java index 3c270a0f544..2456a841029 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/AggregateErrorFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/AggregateErrorFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Alternator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Alternator.java index fc880f2acf8..fa7eb570c0f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Alternator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Alternator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java index 4930aef75eb..ade76ebb9f9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BitFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BooleanAggrFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BooleanAggrFunctions.java index ae67606f192..20170e42b85 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BooleanAggrFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/BooleanAggrFunctions.java @@ -1,6 +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 @@ -16,8 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ - + */ /* * This class is automatically generated from AggrTypeFunctions2.tdd using FreeMarker. */ diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteSubstring.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteSubstring.java index 381f46c8288..bcbfeb5a6eb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteSubstring.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteSubstring.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntDate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntDate.java index b510678b557..2c78b07947e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntDate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntDate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStamp.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStamp.java index dbd814bea5b..637f25245ea 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStamp.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastBigIntTimeStamp.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastIntTime.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastIntTime.java index 8962af8f0b9..c53dee4a99b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastIntTime.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastIntTime.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastVarCharVar16Char.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastVarCharVar16Char.java index 99976a7fda0..edb929128f4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastVarCharVar16Char.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CastVarCharVar16Char.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSequenceWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSequenceWrapper.java index d085494abdc..ba433e9cecc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSequenceWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSequenceWrapper.java @@ -1,4 +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,7 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSubstring.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSubstring.java index 38342c6a6e1..ee6baff6d46 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSubstring.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CharSubstring.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ContextFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ContextFunctions.java index 030ac258db9..e3241f28408 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ContextFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ContextFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CryptoFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CryptoFunctions.java index 65e5fb51786..f3f3e7ba849 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CryptoFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/CryptoFunctions.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * @@ -14,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java index 25db420b191..d6d4b1cce84 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DateTypeFunctions.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DrillByteArray.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DrillByteArray.java index 5fd7e521731..02e7237db23 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DrillByteArray.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DrillByteArray.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DrillHash.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DrillHash.java index 8a92b81cbe7..82ce4b4aae6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DrillHash.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/DrillHash.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32AsDouble.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32AsDouble.java index 0d912e8153d..e0db999be07 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32AsDouble.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32AsDouble.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32Functions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32Functions.java index bb08197fedc..c04dd958d0d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32Functions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32Functions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32FunctionsWithSeed.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32FunctionsWithSeed.java index 7d492495b04..65fb0eec96b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32FunctionsWithSeed.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32FunctionsWithSeed.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32WithSeedAsDouble.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32WithSeedAsDouble.java index f3d4d54708e..038d917d98d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32WithSeedAsDouble.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash32WithSeedAsDouble.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64AsDouble.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64AsDouble.java index f9080b78053..3329664b531 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64AsDouble.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64AsDouble.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64Functions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64Functions.java index 157cbcd3ae0..dc508cb97ee 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64Functions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64Functions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64FunctionsWithSeed.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64FunctionsWithSeed.java index 833a209920e..47f903d2b9d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64FunctionsWithSeed.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64FunctionsWithSeed.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64WithSeedAsDouble.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64WithSeedAsDouble.java index 0079d98ea48..cce6ea018a9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64WithSeedAsDouble.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Hash64WithSeedAsDouble.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/HashHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/HashHelper.java index 22d0d821763..c84bc92dc02 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/HashHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/HashHelper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsFalse.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsFalse.java index 15c3c01d4d5..e15e3d25ac7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsFalse.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsFalse.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotFalse.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotFalse.java index 32c91e03b99..11f2b3ce8c1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotFalse.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotFalse.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotTrue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotTrue.java index 2d5e7ef8051..ff419f8d1ff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotTrue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsNotTrue.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsTrue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsTrue.java index 9a1f6e85225..e71a5d7fe29 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsTrue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/IsTrue.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Mappify.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Mappify.java index bbd9e370cfb..703d62e02e0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Mappify.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Mappify.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MappifyUtility.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MappifyUtility.java index 97e009998e2..7c32c525947 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MappifyUtility.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MappifyUtility.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MathFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MathFunctions.java index 52d1a64f359..a39116d4da9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MathFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MathFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MurmurHash3.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MurmurHash3.java index e51c63ce31b..f55602df1d8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MurmurHash3.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/MurmurHash3.java @@ -1,4 +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 @@ -15,9 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - - package org.apache.drill.exec.expr.fn.impl; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/NetworkFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/NetworkFunctions.java index b6073b9212d..448e8b6ae5d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/NetworkFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/NetworkFunctions.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Not.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Not.java index 78390ccc576..cb35761efb9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Not.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/Not.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ParseQueryFunction.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ParseQueryFunction.java index 7dce1fc765d..39e62bb25c8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ParseQueryFunction.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ParseQueryFunction.java @@ -1,7 +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. + */ package org.apache.drill.exec.expr.fn.impl; -//* - import io.netty.buffer.DrillBuf; import org.apache.drill.exec.expr.DrillSimpleFunc; import org.apache.drill.exec.expr.annotations.FunctionTemplate; @@ -12,21 +27,6 @@ import javax.inject.Inject; -/* Copyright 2001-2004 The Apache Software Foundation. -* -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -*/ - @FunctionTemplate( name="parse_query", scope= FunctionTemplate.FunctionScope.SIMPLE, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ParseUrlFunction.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ParseUrlFunction.java index fa339d45ee4..abde5da1f81 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ParseUrlFunction.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/ParseUrlFunction.java @@ -1,13 +1,13 @@ -package org.apache.drill.exec.expr.fn.impl; - /* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * 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 + * 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, @@ -15,6 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.drill.exec.expr.fn.impl; + import io.netty.buffer.DrillBuf; import org.apache.drill.exec.expr.DrillSimpleFunc; import org.apache.drill.exec.expr.annotations.FunctionTemplate; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/RegexpUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/RegexpUtil.java index aed718c3f7a..a7f63cd5a71 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/RegexpUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/RegexpUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java index 7825289a482..9de39288d82 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SimpleRepeatedFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SqlPatternFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SqlPatternFactory.java index 871f6600a05..2e1af8f8a7f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SqlPatternFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/SqlPatternFactory.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import org.apache.drill.exec.expr.fn.impl.RegexpUtil.SqlPatternInfo; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionHelpers.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionHelpers.java index 8a9379e3ca7..4f408827815 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionHelpers.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionHelpers.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ + */ package org.apache.drill.exec.expr.fn.impl; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionUtil.java index dedd89eba70..6ac28e2fa02 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/StringFunctionUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/UnionFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/UnionFunctions.java index 1ff7a9edb7c..0aa9d48541e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/UnionFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/UnionFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/VarHelpers.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/VarHelpers.java index 75fec8134fd..5e5d79621ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/VarHelpers.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/VarHelpers.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/XXHash.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/XXHash.java index b8aefde015e..d7cafa04c13 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/XXHash.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/XXHash.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertFrom.java index 765270df415..7ac368037e7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertFrom.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertTo.java index 07ab89add52..eacf5357641 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntBEConvertTo.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertFrom.java index 2726dd98d3f..7738a745499 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertTo.java index 67442c9287d..81834798b73 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertFrom.java index ab7d46c36a5..c2dadc91876 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertFrom.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertTo.java index fbc5b66d6b2..26c2033fdb4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BigIntVLongConvertTo.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertFrom.java index 23636d55b4a..895edc593b3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertTo.java index f33be9361b7..c7a96e8a647 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/BooleanByteConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/ConvertFromImpalaTimestamp.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/ConvertFromImpalaTimestamp.java index 4d3d46b2a09..0acc186ee44 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/ConvertFromImpalaTimestamp.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/ConvertFromImpalaTimestamp.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertFrom.java index 8b88670ff79..409e22c65d2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertFrom.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertTo.java index 8a9e1016c0c..69aab45da71 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochBEConvertTo.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertFrom.java index eb7ec289697..4bec3e8c304 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertTo.java index cbaf7324ce6..990ebea03db 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DateEpochConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertFrom.java index 91bde9d9cd0..e9863451446 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertTo.java index 1e856d10d1c..e0b5cb1c916 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleBEConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertFrom.java index 727ccbc9431..254f2e344a1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertTo.java index 92a1ee23023..cd183d8d140 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DoubleConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertFrom.java index 57a55060072..aac66155c41 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertTo.java index efee025d566..ba350c537bd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyFlatten.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyFlatten.java index 7b0dfd423c7..943a3531fb8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyFlatten.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/DummyFlatten.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertFrom.java index a4cb6279866..b295cb0425b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertTo.java index e978e3fd10d..0589d8d14e1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatBEConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertFrom.java index 04ffa86cffc..f2db61d0cc7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertTo.java index 88c2a3e0103..b624471631a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/FloatConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntBEConvertFrom.java index 177ae52f086..8609cad906c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntBEConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntBEConvertFrom.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntBEConvertTo.java index ba0883deaea..2f1751a8fe2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntBEConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntBEConvertTo.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntConvertFrom.java index 831b96ab8b0..d435edb7d38 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntConvertTo.java index b257b1325db..a32ab4dc9ee 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntVIntConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntVIntConvertFrom.java index 0b1276c38d7..fbf98a1e8c4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntVIntConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntVIntConvertFrom.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntVIntConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntVIntConvertTo.java index b7b3d02f538..bc0347d5db0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntVIntConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/IntVIntConvertTo.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java index 8a379a02d79..9b36e57425c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertFrom.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl.conv; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertTo.java index 379af20a0ec..41c42117017 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/JsonConvertTo.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/RoundFunctions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/RoundFunctions.java index 9c5db1e7cdd..367031b9a57 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/RoundFunctions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/RoundFunctions.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntBEConvertFrom.java index afef6947055..27ba38d92aa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntBEConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntBEConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntBEConvertTo.java index 35c1cd88fef..420fe3452cf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntBEConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntBEConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntConvertFrom.java index d20a160cd28..f44d032ef0e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntConvertTo.java index dbe98fc897b..c228d9655c3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/SmallIntConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochBEConvertFrom.java index 59bb76224ff..8ae8acc6a66 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochBEConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochBEConvertFrom.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochBEConvertTo.java index e05ca1f5545..8effc8992c5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochBEConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochBEConvertTo.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochConvertFrom.java index 97e6870da74..2f99b735b6b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochConvertTo.java index baa16b7f68e..39fe3b687e0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeEpochConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochBEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochBEConvertFrom.java index eec715992cd..8e27db116d7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochBEConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochBEConvertFrom.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochBEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochBEConvertTo.java index 504cb455ef7..a34c6f8ddef 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochBEConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochBEConvertTo.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochConvertFrom.java index e68d3016dda..c97644a2373 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochConvertTo.java index 40224874b9f..0fbfa0d296e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TimeStampEpochConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TinyIntConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TinyIntConvertFrom.java index 750eb954566..e0203e3fa8d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TinyIntConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TinyIntConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TinyIntConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TinyIntConvertTo.java index 040fa609bc3..fa7ccb09e03 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TinyIntConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/TinyIntConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4BEConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4BEConvertFrom.java index dd2c29ccc88..2eccfc6a7a5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4BEConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4BEConvertFrom.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4BEConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4BEConvertTo.java index 302f18cf276..c18d2817a0a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4BEConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4BEConvertTo.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4ConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4ConvertFrom.java index fba2b97525c..81a556e5b68 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4ConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4ConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4ConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4ConvertTo.java index a362bd8994e..ea574c21c37 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4ConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt4ConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt8ConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt8ConvertFrom.java index 0f607d368b3..ed7036d6b1b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt8ConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt8ConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt8ConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt8ConvertTo.java index ab387efde75..446fe72e503 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt8ConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UInt8ConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF16ConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF16ConvertFrom.java index 4d46e5b36e4..baad4f82e11 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF16ConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF16ConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF16ConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF16ConvertTo.java index a7797ca62ca..71dddb35568 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF16ConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF16ConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF8ConvertFrom.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF8ConvertFrom.java index ceabaa373aa..08de915b24f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF8ConvertFrom.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF8ConvertFrom.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF8ConvertTo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF8ConvertTo.java index 5b1123df52c..1eef114ef0f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF8ConvertTo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/impl/conv/UTF8ConvertTo.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl.conv; import org.apache.drill.exec.expr.DrillSimpleFunc; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/interpreter/InterpreterEvaluator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/interpreter/InterpreterEvaluator.java index 2b9ac0a30fb..4d837d838fa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/interpreter/InterpreterEvaluator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/interpreter/InterpreterEvaluator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/ConcatReturnTypeInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/ConcatReturnTypeInference.java index eea02e79925..a9d70c1126b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/ConcatReturnTypeInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/ConcatReturnTypeInference.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DecimalReturnTypeInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DecimalReturnTypeInference.java index ba43b3911b8..ab9c3185cc7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DecimalReturnTypeInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DecimalReturnTypeInference.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DefaultReturnTypeInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DefaultReturnTypeInference.java index 02e6b1ee8c9..030ea3de927 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DefaultReturnTypeInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/DefaultReturnTypeInference.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/PadReturnTypeInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/PadReturnTypeInference.java index aac470343ac..b3346e53f3a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/PadReturnTypeInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/PadReturnTypeInference.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/ReturnTypeInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/ReturnTypeInference.java index 05375a00660..f56deaee3ae 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/ReturnTypeInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/ReturnTypeInference.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/SameInOutLengthReturnTypeInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/SameInOutLengthReturnTypeInference.java index 92bfae16ee8..d1e3f79731e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/SameInOutLengthReturnTypeInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/SameInOutLengthReturnTypeInference.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/StringCastReturnTypeInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/StringCastReturnTypeInference.java index 95c30cd970c..f15d660e9fd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/StringCastReturnTypeInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/output/StringCastReturnTypeInference.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionHolder.java index 4b93c88b293..e3f439072a9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionHolder.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolder.java index 1ab6e1928f4..e127391fe71 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolder.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/JarScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/JarScan.java index 4ebb3e2ab29..561a61c87d2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/JarScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/JarScan.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/RemoteFunctionRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/RemoteFunctionRegistry.java index df5e17f85a9..3e7562c9984 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/RemoteFunctionRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/fn/registry/RemoteFunctionRegistry.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/package-info.java index a8095e4f55f..2eda325df09 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetBooleanPredicates.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetBooleanPredicates.java index 9db629d65b5..e5de34fc9d6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetBooleanPredicates.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetBooleanPredicates.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetComparisonPredicates.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetComparisonPredicates.java index 5657215064b..5ba597c2a1c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetComparisonPredicates.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetComparisonPredicates.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetFilterPredicate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetFilterPredicate.java index 2711faab240..898dc71db6f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetFilterPredicate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetFilterPredicate.java @@ -1,4 +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,16 +6,15 @@ * 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 org.apache.drill.exec.expr.stat; public interface ParquetFilterPredicate { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java index bb8f3acb63f..ef2b9406b2f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetIsPredicates.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetPredicatesHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetPredicatesHelper.java index e43acd30bf2..e83d393e2ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetPredicatesHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/ParquetPredicatesHelper.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/RangeExprEvaluator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/RangeExprEvaluator.java index 2cc6a70f13c..d2fa0cf01bf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/RangeExprEvaluator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/expr/stat/RangeExprEvaluator.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/AccountingUserConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/AccountingUserConnection.java index 7a01fcd2e67..c0c1e0b02d9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/AccountingUserConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/AccountingUserConnection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/Consumer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/Consumer.java index 0a1a397cd80..adb1625faff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/Consumer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/Consumer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ContextInformation.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ContextInformation.java index b24ed8f327b..a7e0dc23c0d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ContextInformation.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ContextInformation.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.ops; import org.apache.drill.exec.proto.BitControl.QueryContextInformation; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentStats.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentStats.java index cdad6e4bad4..21294110eb1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentStats.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/FragmentStats.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/MetricDef.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/MetricDef.java index a4a667c8b58..d085cccec9b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/MetricDef.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/MetricDef.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OpProfileDef.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OpProfileDef.java index b5c8d868a68..8768eb34ce1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OpProfileDef.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OpProfileDef.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java index 0b9aeb6dc38..c703071c55e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OperatorMetricRegistry.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OptimizerRulesContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OptimizerRulesContext.java index 33179f383b4..21052de77a2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OptimizerRulesContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/OptimizerRulesContext.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/SendingAccountor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/SendingAccountor.java index 5db2cc8c9bc..e8ce3c4de48 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/SendingAccountor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/SendingAccountor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/StatusHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/StatusHandler.java index 66e35b408fd..eaf404d0fb9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/StatusHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/StatusHandler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/UdfUtilities.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/UdfUtilities.java index 04d29e887df..f0ad0c53b98 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/UdfUtilities.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/UdfUtilities.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.ops; import com.google.common.base.Function; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java index 57c1a711957..f100bd13284 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/ops/ViewExpansionContext.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java index 2a378ff6e70..9b04e94732b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/BasicOptimizer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/IdentityOptimizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/IdentityOptimizer.java index 9e650b09676..6910f3da4b4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/IdentityOptimizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/IdentityOptimizer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/Optimizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/Optimizer.java index aed6299e0f8..c27f3b5006f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/opt/Optimizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/opt/Optimizer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/package-info.java index 68d74b80dd5..d835af84316 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/DataValidationMode.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/DataValidationMode.java index 9a97e3d1fd5..875adc556d1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/DataValidationMode.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/DataValidationMode.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/EndpointAffinity.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/EndpointAffinity.java index 69f7b51d9fb..687c5f8e70b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/EndpointAffinity.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/EndpointAffinity.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/MinorFragmentEndpoint.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/MinorFragmentEndpoint.java index c33836c6ca2..894c9a4e6da 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/MinorFragmentEndpoint.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/MinorFragmentEndpoint.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/PhysicalOperatorSetupException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/PhysicalOperatorSetupException.java index e8b0799f433..66acec0d47a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/PhysicalOperatorSetupException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/PhysicalOperatorSetupException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/WriteEntry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/WriteEntry.java index 5f45fb38eee..5256db711b5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/WriteEntry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/WriteEntry.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractExchange.java index 688482d669b..78851614513 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractFileGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractFileGroupScan.java index 606aa4da77b..3bb1e540380 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractFileGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractFileGroupScan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractMultiple.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractMultiple.java index 075643d3b7b..9532a031abc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractMultiple.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractMultiple.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractPhysicalVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractPhysicalVisitor.java index 9933ddcc6c9..4e5f262f6c0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractPhysicalVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractPhysicalVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractReceiver.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractReceiver.java index 6bb07600e51..7fa7460169e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractReceiver.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractReceiver.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSender.java index 2e42f26c1ad..8c077f7a1d1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSender.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSingle.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSingle.java index 6d6c5912bc5..1021465c354 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSingle.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSingle.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractStore.java index 4edda22f84e..3edfbe5a86f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractStore.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSubScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSubScan.java index 5ec56983471..923b1d1161f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSubScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/AbstractSubScan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Exchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Exchange.java index 35c371c6a3a..0aa3b70abbd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Exchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Exchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/FileGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/FileGroupScan.java index 9d4767edae9..15a8a60c7de 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/FileGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/FileGroupScan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/FragmentLeaf.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/FragmentLeaf.java index acb6840b6fd..ef356c63a39 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/FragmentLeaf.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/FragmentLeaf.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/HasAffinity.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/HasAffinity.java index 6b191735561..bc2d0269c9c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/HasAffinity.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/HasAffinity.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Leaf.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Leaf.java index c554868eb50..53fec38148d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Leaf.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Leaf.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalOperator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalOperator.java index 7b76194131c..6439403d248 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalOperator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalOperator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalOperatorUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalOperatorUtil.java index 0069ca06e12..2b6c3f1201b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalOperatorUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalOperatorUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalVisitor.java index 0eadb792564..ff9876eaa10 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/PhysicalVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Receiver.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Receiver.java index 4b34205a4f4..d7b5354a500 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Receiver.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Receiver.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Root.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Root.java index e5622404632..441cca23d3c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Root.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Root.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Scan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Scan.java index 9795433062c..6bc2988b08f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Scan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Scan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/ScanStats.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/ScanStats.java index 1886c14dafe..4404a98892c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/ScanStats.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/ScanStats.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java index e0db1aeb676..a65de0aa30c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SchemalessScan.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Sender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Sender.java index e4f2adfff5a..c39cc9b0c6c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Sender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Sender.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Store.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Store.java index 94411ea5a50..ffec99e74d8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Store.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Store.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SubScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SubScan.java index e6c58a3e306..7ea73be221c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SubScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/SubScan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Writer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Writer.java index f33bf0a8350..569ba182a04 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Writer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/base/Writer.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.base; /** Writer physical operator */ diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractDeMuxExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractDeMuxExchange.java index 352e84b247c..078e3487754 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractDeMuxExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractDeMuxExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractMuxExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractMuxExchange.java index 5a76dec274d..aa957c76987 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractMuxExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/AbstractMuxExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/BroadcastExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/BroadcastExchange.java index 89bc3437d3e..73994eb7985 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/BroadcastExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/BroadcastExchange.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.physical.config; import org.apache.drill.exec.physical.PhysicalOperatorSetupException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/BroadcastSender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/BroadcastSender.java index 7ddfa953e02..0cdc72bb7ab 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/BroadcastSender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/BroadcastSender.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.config; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/ComplexToJson.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/ComplexToJson.java index 480f84ee336..b5e8ecab054 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/ComplexToJson.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/ComplexToJson.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Filter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Filter.java index 7a253d180f2..d6eaf769024 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Filter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Filter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java index f3499bf92da..1711f0c2b78 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/FlattenPOP.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.physical.config; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashAggregate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashAggregate.java index 0614dc45da4..f8e6d8e92b3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashAggregate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashAggregate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java index 80613f5ec89..07e59d00531 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashJoinPOP.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.config; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashPartitionSender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashPartitionSender.java index 52db80df23b..e7151ad3739 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashPartitionSender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashPartitionSender.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashToMergeExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashToMergeExchange.java index f004118c67b..592f7c3bfd2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashToMergeExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashToMergeExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashToRandomExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashToRandomExchange.java index fb2f9d8f823..efabe01558d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashToRandomExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/HashToRandomExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/IteratorValidator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/IteratorValidator.java index b8ecae4e85e..6494f9f5773 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/IteratorValidator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/IteratorValidator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Limit.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Limit.java index 0038e4e0aae..f79aa93b50c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Limit.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Limit.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.physical.config; import org.apache.drill.exec.physical.base.AbstractSingle; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java index 47505abb9b5..b8e4f33dc62 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergeJoinPOP.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergingReceiverPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergingReceiverPOP.java index a6bab647a5a..a72ff1b5a8c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergingReceiverPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/MergingReceiverPOP.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/NestedLoopJoinPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/NestedLoopJoinPOP.java index 1d747f74f17..fa44be2d084 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/NestedLoopJoinPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/NestedLoopJoinPOP.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.config; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedMuxExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedMuxExchange.java index 2b9653ade42..01d8eb70dbd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedMuxExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedMuxExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionExchange.java index 2463bc79473..888fb598d77 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/OrderedPartitionExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/PartitionRange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/PartitionRange.java index 25e184341a9..550856bfe57 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/PartitionRange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/PartitionRange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/ProducerConsumer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/ProducerConsumer.java index 3159ef8529f..e31f4179689 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/ProducerConsumer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/ProducerConsumer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Project.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Project.java index b0188ea3472..7c40a9c4563 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Project.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Project.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/RangeSender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/RangeSender.java index e53fc0ed96f..ef27ef6131d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/RangeSender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/RangeSender.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Screen.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Screen.java index 4eda79e2d88..13dbbb700ed 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Screen.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Screen.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SelectionVectorRemover.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SelectionVectorRemover.java index 194c46f66e3..1dcf913c341 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SelectionVectorRemover.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SelectionVectorRemover.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleMergeExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleMergeExchange.java index 5da3900912a..8016eb13f42 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleMergeExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleMergeExchange.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.config; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleSender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleSender.java index 9745ae74f0f..140af28e612 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleSender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/SingleSender.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Sort.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Sort.java index 1aa53d92313..85ef7da2c4e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Sort.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Sort.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StreamingAggregate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StreamingAggregate.java index 56691666490..c928b15db18 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StreamingAggregate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/StreamingAggregate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/TopN.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/TopN.java index 4d2f1f051df..54d1b4d72bc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/TopN.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/TopN.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Trace.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Trace.java index fb24881347e..c777e0d4ec8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Trace.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Trace.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.config; import org.apache.drill.exec.physical.base.AbstractSingle; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnionAll.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnionAll.java index 54ba58890ce..df5d3284ba8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnionAll.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnionAll.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedDeMuxExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedDeMuxExchange.java index 700a21b4831..b8e0d3e4c28 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedDeMuxExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedDeMuxExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedMuxExchange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedMuxExchange.java index fed8e540db5..98949f5e659 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedMuxExchange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedMuxExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedReceiver.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedReceiver.java index 77d718e5864..32912830210 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedReceiver.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/UnorderedReceiver.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Values.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Values.java index ab3952af46a..f32ed3ac24d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Values.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/Values.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/WindowPOP.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/WindowPOP.java index e98585dd45f..543c09f41da 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/WindowPOP.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/config/WindowPOP.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.config; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BaseRootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BaseRootExec.java index bf52d048d42..76fd64262ea 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BaseRootExec.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BaseRootExec.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BatchCreator.java index e9113ce6730..1aab6537d1b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/BatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/OperatorCreatorRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/OperatorCreatorRegistry.java index 862aec7f4ef..9150f91da1e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/OperatorCreatorRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/OperatorCreatorRegistry.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/OutputMutator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/OutputMutator.java index e109ec07faf..b25b001bcbd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/OutputMutator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/OutputMutator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/PhysicalConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/PhysicalConfig.java index 84955369935..1913100e55f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/PhysicalConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/PhysicalConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootCreator.java index 17e402765d1..869eec073e9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java index ddeb3e8e08e..df0f89b9c1e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/RootExec.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java index 46dc4503870..899f1be1835 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/ScreenCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SingleSenderCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SingleSenderCreator.java index 9231aef0d08..55e7cd5e558 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SingleSenderCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/SingleSenderCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/PriorityQueue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/PriorityQueue.java index 9d9020aea33..e398f47485f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/PriorityQueue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/PriorityQueue.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNSortBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNSortBatchCreator.java index d4777449aa0..94631880a28 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNSortBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TopN/TopNSortBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TraceInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TraceInjector.java index 0aac91eabed..026326363e9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TraceInjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/TraceInjector.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/WriterRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/WriterRecordBatch.java index e98a7c6adb6..b58cb555520 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/WriterRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/WriterRecordBatch.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/BatchIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/BatchIterator.java index 8a9259e95cf..3c287c83e50 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/BatchIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/BatchIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatchCreator.java index ed203e56a73..bfb282177da 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggregator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggregator.java index 3384e671d53..e5167d85441 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggregator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/HashAggregator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatchCreator.java index 864271ee6ec..b8fefeeab7e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggregator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggregator.java index 7e13eb346eb..a300924e4ca 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggregator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/aggregate/StreamingAggregator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderCreator.java index 6c42a1ac9d7..837bade8f9b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderRootExec.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderRootExec.java index bd4a1ec4292..6c17ff6f852 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderRootExec.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/broadcastsender/BroadcastSenderRootExec.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.physical.impl.broadcastsender; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/ChainedHashTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/ChainedHashTable.java index 703868e9465..e061bdd6186 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/ChainedHashTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/ChainedHashTable.java @@ -1,11 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/Comparator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/Comparator.java index fa9b45c2fff..6b45c47ec67 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/Comparator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/Comparator.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTable.java index d28fe498e4e..a5eb1f2949e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableConfig.java index 1e3d7e91ad6..aa2497cb3fb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableStats.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableStats.java index 7baa9d91f92..8f0b7abcb47 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableStats.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/HashTableStats.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/IndexPointer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/IndexPointer.java index 020c5d8a041..68092d6b537 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/IndexPointer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/common/IndexPointer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/EvalSetupException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/EvalSetupException.java index fa92ab0d8cc..a39d8a1fddf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/EvalSetupException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/EvalSetupException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/EvaluationPredicate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/EvaluationPredicate.java index dc0abd961af..6f48efb2af6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/EvaluationPredicate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/EvaluationPredicate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterBatchCreator.java index ace4f24f3a7..d79379ec168 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterSignature.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterSignature.java index db62d3693d7..af3d87dc47f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterSignature.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterSignature.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterTemplate4.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterTemplate4.java index 4850cff41df..e09ed75a0f9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterTemplate4.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/FilterTemplate4.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/ReturnValueExpression.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/ReturnValueExpression.java index c81fb2c9355..b6587894aad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/ReturnValueExpression.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/filter/ReturnValueExpression.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenBatchCreator.java index bfda4f43afa..d369ff6bff8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/FlattenBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/Flattener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/Flattener.java index b1d93c1ef80..645a11826c4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/Flattener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/flatten/Flattener.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatchCreator.java index a005559cdca..96b8778ce9d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelper.java index a3c33ed241a..e8d747e80dc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinHelper.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.join; import io.netty.buffer.ByteBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbe.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbe.java index c54747e80e7..36d9baa00cc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbe.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbe.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.join; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbeTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbeTemplate.java index 3d4812bc66b..1a852776dc6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbeTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/HashJoinProbeTemplate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinTemplate.java index 37cf0ed5596..e13fd850c47 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinTemplate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinUtils.java index 1f849655188..036f3cdcdf8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinUtils.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.join; import org.apache.calcite.rel.core.Join; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinWorker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinWorker.java index 95f7c3d8437..9dcc0e2c454 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinWorker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/JoinWorker.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinCreator.java index b24624eb976..db077e68a0f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/MergeJoinCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/NestedLoopJoinBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/NestedLoopJoinBatchCreator.java index ef4cab10a7f..1803c8c4728 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/NestedLoopJoinBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/join/NestedLoopJoinBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitBatchCreator.java index 15e52758f44..d30d4db69c4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java index 254a297ef0e..f5443da8710 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/limit/LimitRecordBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/QueryWritableBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/QueryWritableBatch.java index 44a348941c4..e69bd51f97c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/QueryWritableBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/QueryWritableBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/RecordMaterializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/RecordMaterializer.java index acb17eac3b5..75de5925c15 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/RecordMaterializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/RecordMaterializer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/VectorRecordMaterializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/VectorRecordMaterializer.java index ba8df92607c..2d8c2310011 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/VectorRecordMaterializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/materialize/VectorRecordMaterializer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionProjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionProjector.java index 3213d1146cb..4a129dea7a1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionProjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionProjector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionSenderCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionSenderCreator.java index 5705aca0a02..f569fdb2d59 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionSenderCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/OrderedPartitionSenderCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleCopier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleCopier.java index 3af35723f2f..1fa60bb6a72 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleCopier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleCopier.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleCopierTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleCopierTemplate.java index 1371e1ce23b..4ce10c8e382 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleCopierTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleCopierTemplate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleSortTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleSortTemplate.java index 3d5c548b28e..a04887e8e6d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleSortTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleSortTemplate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleSorter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleSorter.java index 1eb5790ad04..69177eb6ce5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleSorter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/orderedpartitioner/SampleSorter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionOutgoingBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionOutgoingBatch.java index 71a1590bdff..35e474fb8bf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionOutgoingBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionOutgoingBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderCreator.java index e0b7b9a91bc..3d200bc0b75 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionSenderCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/Partitioner.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/Partitioner.java index 5d1b08cc586..316c2625cf5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/Partitioner.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/Partitioner.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerDecorator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerDecorator.java index 78b8d033efc..bb69f39a1f9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerDecorator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/partitionsender/PartitionerDecorator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatchCreator.java index 779728a91f4..5212f4235eb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/producer/ProducerConsumerBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ComplexToJsonBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ComplexToJsonBatchCreator.java index 73ab4412723..899628e60e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ComplexToJsonBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ComplexToJsonBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchCreator.java index 37753cd819e..5b61eb44a0d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/ProjectBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/Projector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/Projector.java index ebfce4100ce..455d6435da6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/Projector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/project/Projector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatchCreator.java index ccd55619e24..50b5f387a4d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortTemplate.java index edb704f2ca6..d06cf127ea4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/SortTemplate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/Sorter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/Sorter.java index eb8dfdf3e21..22cc24fd6e7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/Sorter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/sort/Sorter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/SVRemoverCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/SVRemoverCreator.java index 4bf5b5cbc57..c49634097a7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/SVRemoverCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/svremover/SVRemoverCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/trace/TraceBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/trace/TraceBatchCreator.java index dd2f6db9f61..49a77d64422 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/trace/TraceBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/trace/TraceBatchCreator.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.trace; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/trace/TraceRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/trace/TraceRecordBatch.java index 209624bbefb..61d3214ed38 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/trace/TraceRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/trace/TraceRecordBatch.java @@ -1,5 +1,5 @@ -/** - * Licensed to th7e Apache Software Foundation (ASF) under one +/* + * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information * regarding copyright ownership. The ASF licenses this file @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.trace; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllBatchCreator.java index bdc1a3d26af..0084e12be42 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAller.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAller.java index 9cd9cdcad8a..3853b75695c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAller.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAller.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllerTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllerTemplate.java index a1fe727bc01..f6a8c154bcb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllerTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/union/UnionAllerTemplate.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.union; import com.google.common.collect.ImmutableList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/BatchValidator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/BatchValidator.java index e0f3ff2b9db..11f2efb23bb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/BatchValidator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/BatchValidator.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.physical.impl.validate; import java.util.ArrayList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorInjector.java index 2f7f531e83a..689b23f36bb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorInjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/validate/IteratorValidatorInjector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/FrameSupportTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/FrameSupportTemplate.java index 656c75edd4f..5cd6de775d6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/FrameSupportTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/FrameSupportTemplate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/Partition.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/Partition.java index 92bff6e0d84..55fa6474050 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/Partition.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/Partition.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowDataBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowDataBatch.java index 7e9f11561d6..f90974898d4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowDataBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowDataBatch.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.physical.impl.window; import com.google.common.collect.Lists; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameBatchCreator.java index 6ca9652c336..b1d267dbbe8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFrameBatchCreator.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.window; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFunction.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFunction.java index 5630ccfcc41..ea61a53b726 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFunction.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/window/WindowFunction.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/BatchGroup.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/BatchGroup.java index 09d6baea7d0..cf53677b1d1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/BatchGroup.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/BatchGroup.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/ExternalSortBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/ExternalSortBatchCreator.java index 6a601963bd0..7352df9b2a0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/ExternalSortBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/ExternalSortBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/MSorter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/MSorter.java index af8cbfb3759..3b9577ca5ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/MSorter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/MSorter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopier.java index ec590c26db8..13293cf553c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopier.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierTemplate.java index 5090b335dc9..958732573b2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/impl/xsort/PriorityQueueCopierTemplate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/package-info.java index 4c114996de4..7fac072b736 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/impl/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Handles the details of the result set loader implementation. *

    diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/package-info.java index 433231eacb6..ebf3b1d1425 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/hyper/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Implementation of a row set model for hyper-batches. A hyper batch is * one that contains a list of batches. The batch is logically comprised diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/package-info.java index 6f24d33393e..79207049a00 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/physical/rowSet/model/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * The "row set model" provides a "dual" of the vector structure used to create, * allocate and work with a collection of vectors. The model provides an enhanced diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/AbstractOpWrapperVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/AbstractOpWrapperVisitor.java index 26398d2b0a8..dbe4366dab4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/AbstractOpWrapperVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/AbstractOpWrapperVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/AbstractPartitionDescriptor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/AbstractPartitionDescriptor.java index ed62c91c504..412841a219b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/AbstractPartitionDescriptor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/AbstractPartitionDescriptor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSDirPartitionLocation.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSDirPartitionLocation.java index a4d2b8163c1..48aafcd68eb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSDirPartitionLocation.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSDirPartitionLocation.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Class defines a single partition corresponding to a directory in a DFS table. */ diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSFilePartitionLocation.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSFilePartitionLocation.java index cac5d93eb30..228ae6be8af 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSFilePartitionLocation.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DFSFilePartitionLocation.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DrillRelBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DrillRelBuilder.java index 9010e3082f8..1ec300dafbd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DrillRelBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/DrillRelBuilder.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionDescriptor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionDescriptor.java index 534eb5ca4bf..a183e51e3f0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionDescriptor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionDescriptor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionLocation.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionLocation.java index 70e5f865adb..49e51094dd0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionLocation.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/ParquetPartitionLocation.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PartitionDescriptor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PartitionDescriptor.java index daee24920ab..c671daa3d5d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PartitionDescriptor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PartitionDescriptor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PartitionLocation.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PartitionLocation.java index b6396b2bc75..22088f7eecc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PartitionLocation.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PartitionLocation.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java index e275d3c7700..08f7d0fb58c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PhysicalPlanReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerType.java index d1abbd7c058..0f65338c095 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/PlannerType.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java index 67ddf0691b6..592aae031be 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/RuleInstance.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/SimplePartitionLocation.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/SimplePartitionLocation.java index 7c4c22f064f..d72d94216e3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/SimplePartitionLocation.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/SimplePartitionLocation.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner; import com.google.common.collect.ImmutableList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelNode.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelNode.java index a59b5cdb10a..e681f4b4d91 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelNode.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillRelNode.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.common; import org.apache.calcite.rel.RelNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillUnionRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillUnionRelBase.java index bb977c6446a..39f7ba48406 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillUnionRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillUnionRelBase.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillValuesRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillValuesRelBase.java index a182d356cec..96702ebf205 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillValuesRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillValuesRelBase.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWindowRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWindowRelBase.java index f32e4c70d88..0fcdaf8f5c5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWindowRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWindowRelBase.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.common; import org.apache.calcite.rel.RelNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java index 9ccaeb206f4..1c6f51350c1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/common/DrillWriterRelBase.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillCostBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillCostBase.java index e2259771009..ba55faeb75e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillCostBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillCostBase.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.cost; import org.apache.calcite.plan.RelOptCost; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelOptCost.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelOptCost.java index 8c4db17a484..faf09afe6ed 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelOptCost.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelOptCost.java @@ -1,4 +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 @@ -14,8 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ - + */ package org.apache.drill.exec.planner.cost; import org.apache.calcite.plan.RelOptCost; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelOptCostFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelOptCostFactory.java index f8c09432934..473f0357e1c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelOptCostFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/cost/DrillRelOptCostFactory.java @@ -1,4 +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 @@ -14,9 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ - - + */ package org.apache.drill.exec.planner.cost; import org.apache.calcite.plan.RelOptCost; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributionAffinity.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributionAffinity.java index d26d413cb7a..5ebea255f30 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributionAffinity.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/DistributionAffinity.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java index bc9ed74f921..af0339d8ae1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Fragment.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/FragmentParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/FragmentParallelizer.java index 52370988ac8..8e20b991fdc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/FragmentParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/FragmentParallelizer.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/FragmentVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/FragmentVisitor.java index e2dd6dd43c8..95d7cbe1d3b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/FragmentVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/FragmentVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/HardAffinityFragmentParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/HardAffinityFragmentParallelizer.java index 9c635e9adea..d35c7de427f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/HardAffinityFragmentParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/HardAffinityFragmentParallelizer.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/MakeFragmentsVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/MakeFragmentsVisitor.java index 027169290bb..a9be6f398f1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/MakeFragmentsVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/MakeFragmentsVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationInfo.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationInfo.java index ffa843c3d4a..62953e08052 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationInfo.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationInfo.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationParameters.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationParameters.java index ea5d9e8d507..c26e78d3b72 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationParameters.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/ParallelizationParameters.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SoftAffinityFragmentParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SoftAffinityFragmentParallelizer.java index 1549a6bb459..ec8b6746d9f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SoftAffinityFragmentParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/SoftAffinityFragmentParallelizer.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Stats.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Stats.java index 03f16b04eb7..cbdb014e51a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Stats.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Stats.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/StatsCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/StatsCollector.java index 74031e7dec0..ec47f8e40c5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/StatsCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/StatsCollector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java index 75b1e3bce58..3ff00ca6eab 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/Wrapper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/ExchangeRemoverMaterializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/ExchangeRemoverMaterializer.java index e2cffd8ea71..94fa752b6dd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/ExchangeRemoverMaterializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/ExchangeRemoverMaterializer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/OperatorIdVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/OperatorIdVisitor.java index 0a0f2152f48..84d8bf25156 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/OperatorIdVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/OperatorIdVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java index 1eb12967d22..f431d6c48ed 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/fragment/contrib/SplittingParallelizer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/CreateTableEntry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/CreateTableEntry.java index 593ba17a16c..10577c62861 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/CreateTableEntry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/CreateTableEntry.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.logical; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DirPrunedEnumerableTableScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DirPrunedEnumerableTableScan.java index af53a1fdab3..2202986a4b9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DirPrunedEnumerableTableScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DirPrunedEnumerableTableScan.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.logical; import com.google.common.base.Supplier; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java index a8649da008a..68beea250fd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillConstExecutor.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ + */ package org.apache.drill.exec.planner.logical; import com.google.common.base.Function; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java index 8a6c0aaf711..9f2088d9ba5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterAggregateTransposeRule.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.logical; import org.apache.calcite.plan.Contexts; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterRel.java index 7e649df405e..b95fff9c7cd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillFilterRel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java index fed7e06c276..9aaa36cbc15 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillImplementor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRel.java index 18abdd5e2a6..b6b5c03105c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillJoinRel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillLimitRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillLimitRel.java index bef8b2ba41f..4d376a8b2e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillLimitRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillLimitRel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillMergeFilterRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillMergeFilterRule.java index 951edccf9de..93503fb53d7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillMergeFilterRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillMergeFilterRule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillParseContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillParseContext.java index 63b38f6f2b1..921179278fe 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillParseContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillParseContext.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectRel.java index 3d27bef21bc..a4fa1c1f46b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectRel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectSetOpTransposeRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectSetOpTransposeRule.java index 86a39dd3e8c..91c6dc0d7a3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectSetOpTransposeRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillProjectSetOpTransposeRule.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.logical; import org.apache.calcite.plan.RelOptRule; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java index 99d51e27665..2d33d3842af 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillPushLimitToScanRule.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.logical; import com.google.common.collect.ImmutableList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java index 8ef4923bfe0..496ac1a97e4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillReduceAggregatesRule.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.logical; import java.math.BigDecimal; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRel.java index 9996dfb33a6..2de63ab29ff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRelFactories.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRelFactories.java index ce35612ee31..5166dfff94f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRelFactories.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillRelFactories.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.logical; import org.apache.calcite.plan.Contexts; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillScreenRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillScreenRel.java index d26c3b0dbdd..aea010b3e42 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillScreenRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillScreenRel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewInfoProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewInfoProvider.java index 50e1d8faf23..e56f85b86fe 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewInfoProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillViewInfoProvider.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRel.java index b49f846c234..44a1fed4b3c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRel.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.logical; import com.google.common.collect.Lists; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRule.java index 3c3ac6e22f8..b8eb68ee7d9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWindowRule.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.logical; import org.apache.calcite.rel.RelNode; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWriterRel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWriterRel.java index 94de6809788..06967b8fc59 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWriterRel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DrillWriterRel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DynamicDrillTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DynamicDrillTable.java index a7dad353881..e35bff311b6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DynamicDrillTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/DynamicDrillTable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/EnumerableDrillRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/EnumerableDrillRule.java index 87d2493425c..eabb10ac8b3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/EnumerableDrillRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/EnumerableDrillRule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ExprHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ExprHelper.java index 57968391101..e1c6f5f9933 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ExprHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ExprHelper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ExtendableRelDataType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ExtendableRelDataType.java index 5a3526e3a33..f41ad2a7dfa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ExtendableRelDataType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ExtendableRelDataType.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/RelOptHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/RelOptHelper.java index 9c72f21fb48..9a9268ec513 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/RelOptHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/RelOptHelper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ScanFieldDeterminer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ScanFieldDeterminer.java index 1178ebd1d8a..3be02c81eaf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ScanFieldDeterminer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/ScanFieldDeterminer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/StoragePlugins.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/StoragePlugins.java index d8fd11cd9c1..d234854221b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/StoragePlugins.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/StoragePlugins.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/FindPartitionConditions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/FindPartitionConditions.java index 87732c393f7..957f514960a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/FindPartitionConditions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/FindPartitionConditions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/ParquetPruneScanRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/ParquetPruneScanRule.java index f5dbb9d87d6..3153b9d4859 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/ParquetPruneScanRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/ParquetPruneScanRule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteAsBinaryOperators.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteAsBinaryOperators.java index 04ab23e959e..09da1fabe49 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteAsBinaryOperators.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteAsBinaryOperators.java @@ -1,20 +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. + */ package org.apache.drill.exec.planner.logical.partition; import java.util.ArrayList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteCombineBinaryOperators.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteCombineBinaryOperators.java index be818d39d24..4d74717264b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteCombineBinaryOperators.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/logical/partition/RewriteCombineBinaryOperators.java @@ -1,20 +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. + */ package org.apache.drill.exec.planner.logical.partition; import com.google.common.collect.ImmutableList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPruleBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPruleBase.java index 6863967bc31..abd52143e5a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPruleBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/AggPruleBase.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/BroadcastExchangePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/BroadcastExchangePrel.java index 0e87c9b663a..2c043689b60 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/BroadcastExchangePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/BroadcastExchangePrel.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ComplexToJsonPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ComplexToJsonPrel.java index 73817e76f07..1a96d605c9d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ComplexToJsonPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ComplexToJsonPrel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ConvertCountToDirectScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ConvertCountToDirectScan.java index 961816e2757..62e40a54089 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ConvertCountToDirectScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ConvertCountToDirectScan.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.util.ArrayList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DirectScanPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DirectScanPrule.java index 5c2fd29285d..5e64fc6ce85 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DirectScanPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DirectScanPrule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillDistributionTrait.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillDistributionTrait.java index c1e241dffb0..d10021cc7c4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillDistributionTrait.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillDistributionTrait.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillDistributionTraitDef.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillDistributionTraitDef.java index 60f2ebf92ba..94f1b61ed49 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillDistributionTraitDef.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillDistributionTraitDef.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillScanPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillScanPrel.java index ae236c4cd35..0b950d68401 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillScanPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/DrillScanPrel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ExchangePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ExchangePrel.java index f3f87ba116c..cf9383999e1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ExchangePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ExchangePrel.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import org.apache.drill.exec.planner.physical.visitor.PrelVisitor; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrel.java index 233adbe85e9..9b7c6bb50f3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrel.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrule.java index 50b760b6b43..c1ece60c6e8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FilterPrule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FlattenPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FlattenPrel.java index f6a2b7a28e0..4eb1fde097e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FlattenPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/FlattenPrel.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.planner.physical; import org.apache.drill.common.expression.LogicalExpression; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HasDistributionAffinity.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HasDistributionAffinity.java index 42eed197ec2..6c9bd830f21 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HasDistributionAffinity.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HasDistributionAffinity.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashPrelUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashPrelUtil.java index 9c12cc59cdc..9a60e4657c8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashPrelUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/HashPrelUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPrel.java index e2f49c95e31..40ac60e5b25 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPrel.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPruleBase.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPruleBase.java index 8b0d69aed50..751ccb1bc11 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPruleBase.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/JoinPruleBase.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitPrel.java index 6cfbe2fcffb..baf80d11a6c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitPrel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitPrule.java index 439578191d5..f65c9ad3c52 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitPrule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitUnionExchangeTransposeRule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitUnionExchangeTransposeRule.java index 25a7ce46600..6412357fb03 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitUnionExchangeTransposeRule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/LimitUnionExchangeTransposeRule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/OrderedMuxExchangePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/OrderedMuxExchangePrel.java index de9ff25be7c..5672b9f942b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/OrderedMuxExchangePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/OrderedMuxExchangePrel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProducerConsumerPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProducerConsumerPrel.java index 5d5e57a106c..4d320eb137d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProducerConsumerPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProducerConsumerPrel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectAllowDupPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectAllowDupPrel.java index 3c5c045a645..8a8e911fdde 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectAllowDupPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ProjectAllowDupPrel.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PushLimitToTopN.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PushLimitToTopN.java index cf606124054..12f7c3efef3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PushLimitToTopN.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/PushLimitToTopN.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import org.apache.drill.exec.planner.logical.RelOptHelper; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScanPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScanPrule.java index d74edf1737d..4f66e90aaf7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScanPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScanPrule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrel.java index f2d10d22237..047f7430daf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrule.java index 72e87ada6de..937c2e5837c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/ScreenPrule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SelectionVectorRemoverPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SelectionVectorRemoverPrel.java index d9dc6799865..591261907ec 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SelectionVectorRemoverPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SelectionVectorRemoverPrel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SinglePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SinglePrel.java index e62d86c245b..a3190c84c50 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SinglePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SinglePrel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrule.java index 4b6d1fbf8db..1f9423ca922 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/SortPrule.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionPrel.java index f0440ad4a4f..79d5611c801 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnionPrel.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.util.Iterator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnorderedDeMuxExchangePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnorderedDeMuxExchangePrel.java index 9f032204725..44ba1c73263 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnorderedDeMuxExchangePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnorderedDeMuxExchangePrel.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnorderedMuxExchangePrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnorderedMuxExchangePrel.java index d08b09389d1..6d11d129cf3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnorderedMuxExchangePrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/UnorderedMuxExchangePrel.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java index bf523660818..275dd48697a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrel.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import com.google.common.collect.Lists; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java index 475acec91f0..d41a1473b42 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WindowPrule.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical; import com.google.common.base.Predicate; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java index 513776d0816..a4f283db6ec 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/WriterPrel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/PrelSequencer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/PrelSequencer.java index afa61e9ba4b..88c705a4be2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/PrelSequencer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/explain/PrelSequencer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/BasePrelVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/BasePrelVisitor.java index b84b345308f..02c4709b96e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/BasePrelVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/BasePrelVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ComplexToJsonPrelVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ComplexToJsonPrelVisitor.java index fc115d99f3a..eb596118e76 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ComplexToJsonPrelVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ComplexToJsonPrelVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/FinalColumnReorderer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/FinalColumnReorderer.java index ef738fad883..22f812dabe8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/FinalColumnReorderer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/FinalColumnReorderer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/InsertLocalExchangeVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/InsertLocalExchangeVisitor.java index 3d6e0be2fac..5863f0003aa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/InsertLocalExchangeVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/InsertLocalExchangeVisitor.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/JoinPrelRenameVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/JoinPrelRenameVisitor.java index 6726f1bb537..cddac410616 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/JoinPrelRenameVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/JoinPrelRenameVisitor.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical.visitor; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/PrelVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/PrelVisitor.java index 0e4d05c52a2..bd81e98cda1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/PrelVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/PrelVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ProducerConsumerPrelVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ProducerConsumerPrelVisitor.java index 79758f5d783..b46263853cd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ProducerConsumerPrelVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/ProducerConsumerPrelVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RelUniqifier.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RelUniqifier.java index 0bcfba5f1e9..334a55cc974 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RelUniqifier.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RelUniqifier.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RewriteProjectToFlatten.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RewriteProjectToFlatten.java index a5457fe4938..78bf1c1516d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RewriteProjectToFlatten.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RewriteProjectToFlatten.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.planner.physical.visitor; import java.util.ArrayList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RexVisitorComplexExprSplitter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RexVisitorComplexExprSplitter.java index 7d4a8e54b68..c29fe2005ca 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RexVisitorComplexExprSplitter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/RexVisitorComplexExprSplitter.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.planner.physical.visitor; import java.util.ArrayList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SelectionVectorPrelVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SelectionVectorPrelVisitor.java index 58e29f0963b..8282b9bf1d5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SelectionVectorPrelVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SelectionVectorPrelVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SplitUpComplexExpressions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SplitUpComplexExpressions.java index 32241f58688..a89d61dd0d8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SplitUpComplexExpressions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SplitUpComplexExpressions.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ + */ package org.apache.drill.exec.planner.physical.visitor; import java.util.ArrayList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java index 2ee46f0f406..6e860cca14c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/StarColumnConverter.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical.visitor; import java.util.Collections; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java index d84cbb4d6dd..d3dd2a87528 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/SwapHashJoinVisitor.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.physical.visitor; import com.google.common.collect.Lists; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/TopProjectVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/TopProjectVisitor.java index 6b81b70b3b4..29a75aa4900 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/TopProjectVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/physical/visitor/TopProjectVisitor.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java index c130e1424c4..c1bec0f8c5b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/Checker.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillCalciteSqlWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillCalciteSqlWrapper.java index 8410e6778a7..1fd7b634312 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillCalciteSqlWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillCalciteSqlWrapper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillExtractConvertlet.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillExtractConvertlet.java index 5a85369aec0..62857563b51 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillExtractConvertlet.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillExtractConvertlet.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java index 9d7fdce0676..15d0a2aafb7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperator.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperatorWithoutInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperatorWithoutInference.java index 6e53a561baf..ca7b5a3a036 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperatorWithoutInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlAggOperatorWithoutInference.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperator.java index a203673271c..55f9d9580f9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperator.java @@ -1,4 +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,16 +6,15 @@ * 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 org.apache.drill.exec.planner.sql; import java.util.ArrayList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperatorWithoutInference.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperatorWithoutInference.java index 52fca5a7c19..1194fd1c953 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperatorWithoutInference.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DrillSqlOperatorWithoutInference.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DynamicReturnType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DynamicReturnType.java index c43a8a24bd9..1720e941db7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DynamicReturnType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DynamicReturnType.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DynamicType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DynamicType.java index 8bd5532a014..7967ed79ba5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DynamicType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/DynamicType.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/ExpandingConcurrentMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/ExpandingConcurrentMap.java index 44649b9802c..9d495966387 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/ExpandingConcurrentMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/ExpandingConcurrentMap.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/FixedRange.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/FixedRange.java index 16527452bda..edc44090b19 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/FixedRange.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/FixedRange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/QueryInputException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/QueryInputException.java index 22727f0fe72..7842e2defaf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/QueryInputException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/QueryInputException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/AbstractSqlHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/AbstractSqlHandler.java index 6ce25a46d2b..9e6180f79bd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/AbstractSqlHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/AbstractSqlHandler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateFunctionHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateFunctionHandler.java index 526a741a260..994a4b51fb4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateFunctionHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/CreateFunctionHandler.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeSchemaHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeSchemaHandler.java index b41f880acc1..f97696e26db 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeSchemaHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeSchemaHandler.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeTableHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeTableHandler.java index 4d01424153a..d96f3e14026 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeTableHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DescribeTableHandler.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.sql.handlers; import static org.apache.drill.exec.store.ischema.InfoSchemaConstants.COLS_COL_COLUMN_NAME; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DropFunctionHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DropFunctionHandler.java index b5d0b23bc46..b22282304d1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DropFunctionHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/DropFunctionHandler.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/FindHardDistributionScans.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/FindHardDistributionScans.java index 7ad72aabe9c..6af8aa4a125 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/FindHardDistributionScans.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/FindHardDistributionScans.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandler.java index 5e87f44d34c..c7b7510c5fa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SetOptionHandler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowFilesCommandResult.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowFilesCommandResult.java index 949d972cfd4..7d163884493 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowFilesCommandResult.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowFilesCommandResult.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.sql.handlers; import java.sql.Timestamp; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowSchemasHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowSchemasHandler.java index d759d1ebb99..79fa7f7ab42 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowSchemasHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowSchemasHandler.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.sql.handlers; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowTablesHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowTablesHandler.java index 7084877b426..58f205bd4a4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowTablesHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/ShowTablesHandler.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.sql.handlers; import static org.apache.drill.exec.store.ischema.InfoSchemaConstants.IS_SCHEMA_NAME; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SimpleCommandResult.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SimpleCommandResult.java index 07d26b483a1..fdb6ecb9855 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SimpleCommandResult.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SimpleCommandResult.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerConfig.java index 493b0970917..ce9987d6d79 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/SqlHandlerConfig.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.sql.handlers; import java.util.Collection; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/UseSchemaHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/UseSchemaHandler.java index 0ec6eb593d7..24b26c0561f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/UseSchemaHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/handlers/UseSchemaHandler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCalciteWrapperUtility.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCalciteWrapperUtility.java index 265f361975a..dc2a4c44522 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCalciteWrapperUtility.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillCalciteWrapperUtility.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.sql.parser; import org.apache.calcite.sql.SqlAggFunction; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java index 39656e43542..9180a598200 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillParserUtil.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.sql.parser; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlCall.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlCall.java index 007b754067b..c59abf8d208 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlCall.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlCall.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlDescribeTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlDescribeTable.java index c97d8c31bd2..7464a593d46 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlDescribeTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/DrillSqlDescribeTable.java @@ -1,19 +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. + */ package org.apache.drill.exec.planner.sql.parser; import org.apache.calcite.sql.SqlCall; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateFunction.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateFunction.java index c14f468ce3f..d567b522c4a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateFunction.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateFunction.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java index e7ee9c90a75..4aa8630e7e3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlCreateView.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropFunction.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropFunction.java index 77d2b761513..bb24e9a2c19 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropFunction.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropFunction.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropTable.java index c5e9ce390dc..070568d2fca 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropTable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java index 6fa6dbe9332..9df9f0e9ff4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlDropView.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlRefreshMetadata.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlRefreshMetadata.java index 01050b83cd0..378d057511b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlRefreshMetadata.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlRefreshMetadata.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowFiles.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowFiles.java index 8df33241ba7..b2a0dcddf21 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowFiles.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowFiles.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java index 6e95e100ca4..21b4c73db0b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowSchemas.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java index 4d4ab09e718..7deb5868e5d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlShowTables.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlUseSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlUseSchema.java index 2f8eeb8ee64..df2bc1d7098 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlUseSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/SqlUseSchema.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillParserWithCompoundIdConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillParserWithCompoundIdConverter.java index 6048d847ab1..9e7d85195bd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillParserWithCompoundIdConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/sql/parser/impl/DrillParserWithCompoundIdConverter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/AbstractRelDataTypeHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/AbstractRelDataTypeHolder.java index 3c90ce901b8..3eea5399794 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/AbstractRelDataTypeHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/AbstractRelDataTypeHolder.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillFixedRelDataTypeImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillFixedRelDataTypeImpl.java index 1e1c18c1d24..1ab6c8f9e94 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillFixedRelDataTypeImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillFixedRelDataTypeImpl.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillRelDataTypeSystem.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillRelDataTypeSystem.java index d4c868bdc64..7f3db667103 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillRelDataTypeSystem.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/DrillRelDataTypeSystem.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.planner.types; import org.apache.calcite.rel.type.RelDataTypeSystem; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/ExtendableRelDataTypeHolder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/ExtendableRelDataTypeHolder.java index 67704327d41..ce024e2273f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/ExtendableRelDataTypeHolder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/planner/types/ExtendableRelDataTypeHolder.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/proto/helper/QueryIdHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/proto/helper/QueryIdHelper.java index 5e0cd828c94..18748dc3262 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/proto/helper/QueryIdHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/proto/helper/QueryIdHelper.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.proto.helper; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractBinaryRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractBinaryRecordBatch.java index 1ce5fdeb553..94aef07fbfd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractBinaryRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractBinaryRecordBatch.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.record; import org.apache.drill.exec.exception.OutOfMemoryException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractSingleRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractSingleRecordBatch.java index 4cae92dcd26..592999372f6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractSingleRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/AbstractSingleRecordBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/CloseableRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/CloseableRecordBatch.java index c52c3ee6d8f..d9172614b41 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/CloseableRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/CloseableRecordBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/DeadBuf.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/DeadBuf.java index ac26969c011..271da412b1b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/DeadBuf.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/DeadBuf.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java index 4f99081508e..5606d754669 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/FragmentWritableBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/MajorTypeSerDe.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/MajorTypeSerDe.java index 328f6ee70a4..16c638339f6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/MajorTypeSerDe.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/MajorTypeSerDe.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/MaterializeVisitor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/MaterializeVisitor.java index 8858e176bd3..196a1bfc0ca 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/MaterializeVisitor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/MaterializeVisitor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RawFragmentBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RawFragmentBatch.java index 732129a60b1..7ba247aa931 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RawFragmentBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RawFragmentBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RawFragmentBatchProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RawFragmentBatchProvider.java index 7a0be5ee747..15f6e30852b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RawFragmentBatchProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RawFragmentBatchProvider.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java index a8bb2594c94..c5f31a9125e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/RecordBatchMemoryManager.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.record; import com.google.common.base.Preconditions; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaBuilder.java index fc08f05e60d..701ec8d039e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaBuilder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaUtil.java index 67b25220b52..5acb1735805 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemaUtil.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemalessBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemalessBatch.java index ff0cfafcd82..40447bedafa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemalessBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SchemalessBatch.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.record; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleRecordBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleRecordBatch.java index 9bcea50738a..b6b7b2187c2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleRecordBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleRecordBatch.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.record; import org.apache.drill.common.expression.SchemaPath; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleVectorWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleVectorWrapper.java index 0a9f3d6e129..48317b41eba 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleVectorWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/SimpleVectorWrapper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/TypedFieldId.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/TypedFieldId.java index 615c7a28398..9a4e0da84e3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/TypedFieldId.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/TypedFieldId.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorAccessible.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorAccessible.java index acf94e1bd30..63dab62d56a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorAccessible.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorAccessible.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorAccessibleComplexWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorAccessibleComplexWriter.java index 08ba9a180ad..d989ddc6b75 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorAccessibleComplexWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorAccessibleComplexWriter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorWrapper.java index 65ea4570e8e..8d95701460d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/VectorWrapper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/record/selection/SelectionVector4Builder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/record/selection/SelectionVector4Builder.java index c0f8ebaa308..3f1de330ea1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/record/selection/SelectionVector4Builder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/record/selection/SelectionVector4Builder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/DefaultFunctionResolver.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/DefaultFunctionResolver.java index bf125d7c884..c8fb65db40e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/DefaultFunctionResolver.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/DefaultFunctionResolver.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.resolver; import java.util.LinkedList; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ExactFunctionResolver.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ExactFunctionResolver.java index 72e27efb4d9..73776b1faa2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ExactFunctionResolver.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ExactFunctionResolver.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/FunctionResolver.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/FunctionResolver.java index e2a9622d6b7..963b88da0ba 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/FunctionResolver.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/FunctionResolver.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.resolver; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/FunctionResolverFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/FunctionResolverFactory.java index ab6934bbfd3..84a61119996 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/FunctionResolverFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/FunctionResolverFactory.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.resolver; import org.apache.drill.common.expression.FunctionCall; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ResolverTypePrecedence.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ResolverTypePrecedence.java index a28c95a103e..5ec36c77c88 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ResolverTypePrecedence.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/ResolverTypePrecedence.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.resolver; import java.util.HashMap; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/TypeCastRules.java b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/TypeCastRules.java index f0e6602dfcb..b4cf61ea858 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/TypeCastRules.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/resolver/TypeCastRules.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.resolver; import java.util.HashMap; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractClientConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractClientConnection.java index ab13c2adfef..4e891c73171 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractClientConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractClientConnection.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractConnectionConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractConnectionConfig.java index 76c17e5e3c1..f0e093e8a1d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractConnectionConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractConnectionConfig.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractDisposableUserClientConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractDisposableUserClientConnection.java index 33536c65c60..654b8a0bcd6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractDisposableUserClientConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractDisposableUserClientConnection.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractRpcMetrics.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractRpcMetrics.java index a1fd308b4d0..7068b6e7187 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractRpcMetrics.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractRpcMetrics.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractServerConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractServerConnection.java index f10f6d0c32b..00a3c64be40 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractServerConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/AbstractServerConnection.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitConnectionConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitConnectionConfig.java index 4f49993a955..4c5c37cecc0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitConnectionConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitConnectionConfig.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitRpcUtility.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitRpcUtility.java index c71363dc732..c3980336f71 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitRpcUtility.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/BitRpcUtility.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/ConnectionConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/ConnectionConfig.java index 5b8a70b9ce8..5f95752c7d7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/ConnectionConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/ConnectionConfig.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/FailingRequestHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/FailingRequestHandler.java index 13733ee7735..984be8cfd90 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/FailingRequestHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/FailingRequestHandler.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/UserClientConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/UserClientConnection.java index 43247f83f38..1372b296e4c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/UserClientConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/UserClientConnection.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnection.java index c7d4d8ec00e..7f414b5300d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnectionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnectionManager.java index b31ffa7b245..6bfcbd5d6e4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnectionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlConnectionManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlProtobufLengthDecoder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlProtobufLengthDecoder.java index 36573b53e39..38955092863 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlProtobufLengthDecoder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlProtobufLengthDecoder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlRpcConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlRpcConfig.java index 562cd3adef4..5055cbe67a5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlRpcConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlRpcConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlRpcMetrics.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlRpcMetrics.java index 344e807b0e3..ab2213e8c9c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlRpcMetrics.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlRpcMetrics.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlTunnel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlTunnel.java index bb0fda39bf9..1a4af9054f2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlTunnel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/ControlTunnel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/Controller.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/Controller.java index 6b2ee4d7e22..9bb574ce251 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/Controller.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/Controller.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java index 97e855c3d7f..04ff9a0c270 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/CustomHandlerRegistry.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/DefaultInstanceHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/DefaultInstanceHandler.java index 5360cc0e0fa..9428404d8b2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/DefaultInstanceHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/DefaultInstanceHandler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java index c889e07e056..cb5b1f946da 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/control/WorkEventBus.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/AckSender.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/AckSender.java index 839ebc5cc5f..de048d592ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/AckSender.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/AckSender.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataClientConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataClientConnection.java index 6ada2f4801c..3f16e668c1f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataClientConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataClientConnection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionConfig.java index 0d03d7fdc17..4ea9b626aa2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionConfig.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java index 27b22501f15..8d59c19dc18 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionManager.java index f620a80cc4a..6501f003be0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataConnectionManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataDefaultInstanceHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataDefaultInstanceHandler.java index 1dfe4c05330..12a575cf641 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataDefaultInstanceHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataDefaultInstanceHandler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataProtobufLengthDecoder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataProtobufLengthDecoder.java index a74a5a7e250..98e6f953c8a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataProtobufLengthDecoder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataProtobufLengthDecoder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataRpcConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataRpcConfig.java index 88bd37944a7..5c37907e47f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataRpcConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataRpcConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataRpcMetrics.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataRpcMetrics.java index 017b8035e9b..c4c4b17e7f2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataRpcMetrics.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataRpcMetrics.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataServerConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataServerConnection.java index 41a4b1cf363..84650ede426 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataServerConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataServerConnection.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataServerRequestHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataServerRequestHandler.java index ff2e4a0822d..f0185ce7604 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataServerRequestHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataServerRequestHandler.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataTunnel.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataTunnel.java index 381071ffe5e..7e286fa3200 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataTunnel.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/DataTunnel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/IncomingDataBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/IncomingDataBatch.java index a9bc305f750..e19ca8298a4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/IncomingDataBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/data/IncomingDataBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthenticatorProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthenticatorProvider.java index 66ed98fcb29..fce82c461f2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthenticatorProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/AuthenticatorProvider.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ClientAuthenticatorProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ClientAuthenticatorProvider.java index 697fb5ad133..70bea8c376a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ClientAuthenticatorProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ClientAuthenticatorProvider.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslClientFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslClientFactory.java index c8699b46481..3a45b640e82 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslClientFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslClientFactory.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslServerFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslServerFactory.java index 0fe15af2059..3a499348d1f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslServerFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/FastSaslServerFactory.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/SecurityConfiguration.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/SecurityConfiguration.java index ca9033275d0..fb1bb7c15e4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/SecurityConfiguration.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/SecurityConfiguration.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java index ddd216f83eb..42e3d15c02f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/ServerAuthenticationHandler.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/kerberos/KerberosFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/kerberos/KerberosFactory.java index cc4146eaba2..3fe4bc87793 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/kerberos/KerberosFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/kerberos/KerberosFactory.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/package-info.java index 5c6eff38057..f7a5e418fee 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/package-info.java @@ -7,7 +7,7 @@ * "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, @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Communication security. *

    diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/plain/PlainServer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/plain/PlainServer.java index 417fca1c86e..7ae85caa390 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/plain/PlainServer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/security/plain/PlainServer.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/AwaitableUserResultsListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/AwaitableUserResultsListener.java index 347d0767e38..461d8aa076e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/AwaitableUserResultsListener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/AwaitableUserResultsListener.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/InboundImpersonationManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/InboundImpersonationManager.java index cf2baafb052..60d2938b713 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/InboundImpersonationManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/InboundImpersonationManager.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryDataBatch.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryDataBatch.java index e2413a93f17..ad3423ed970 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryDataBatch.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryDataBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryResultHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryResultHandler.java index d337be0876c..458f68f581e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryResultHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/QueryResultHandler.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserProtobufLengthDecoder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserProtobufLengthDecoder.java index 266f112f8ca..f5d1b3e3749 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserProtobufLengthDecoder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserProtobufLengthDecoder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserResultsListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserResultsListener.java index 1a55716af1c..1d864f22d9e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserResultsListener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserResultsListener.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcConfig.java index 357f633dc89..4f4ed264f0b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcMetrics.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcMetrics.java index 4c4506db5d7..7c03d63b5bc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcMetrics.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/UserRpcMetrics.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/Pam4jUserAuthenticator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/Pam4jUserAuthenticator.java index 79aca0015ff..82b4bae7adf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/Pam4jUserAuthenticator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/Pam4jUserAuthenticator.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/PamUserAuthenticator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/PamUserAuthenticator.java index a9e3f5b2ac8..d1f5cd70f54 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/PamUserAuthenticator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/PamUserAuthenticator.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticationException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticationException.java index ae1ce326df7..2939bb16d87 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticationException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticationException.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticator.java index 4d83138b282..52447880860 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticator.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorFactory.java index a79c1df5e5e..8d34d86dde8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorFactory.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorTemplate.java b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorTemplate.java index 04be8d11b2b..8c0142fe1a2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorTemplate.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/rpc/user/security/UserAuthenticatorTemplate.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/BackedRecord.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/BackedRecord.java index 4ff1256212c..6d100dde5ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/BackedRecord.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/BackedRecord.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DataRecord.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DataRecord.java index 3a46e8eb708..5e6f7eb4570 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DataRecord.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DataRecord.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DiffSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DiffSchema.java index af41e9a27e0..3fbb1007609 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DiffSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/DiffSchema.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Field.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Field.java index fd5698ad16d..835e6d5c29f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Field.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Field.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/IdGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/IdGenerator.java index 793c452479e..09334a25e40 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/IdGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/IdGenerator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ListSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ListSchema.java index a8b13a134d5..2e9f3639e1a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ListSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ListSchema.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/NamedField.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/NamedField.java index 20e055dab6a..d6c4b6bdd31 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/NamedField.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/NamedField.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ObjectSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ObjectSchema.java index 19103d3630d..3d9d058b819 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ObjectSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/ObjectSchema.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/OrderedField.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/OrderedField.java index 4df547e3610..5cc51faae1c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/OrderedField.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/OrderedField.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Record.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Record.java index 6fc3e8ffcdb..ab38c1b4e62 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Record.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/Record.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/RecordSchema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/RecordSchema.java index b0fc4ca697b..4175041a17f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/RecordSchema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/RecordSchema.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/SchemaIdGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/SchemaIdGenerator.java index e9f0944d1e6..251e80563ec 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/SchemaIdGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/SchemaIdGenerator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/json/jackson/JacksonHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/json/jackson/JacksonHelper.java index 93228c0ecb6..d47b9ea28fd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/schema/json/jackson/JacksonHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/schema/json/jackson/JacksonHelper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/InstanceSerializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/InstanceSerializer.java index f44d835ebba..730c20d4113 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/InstanceSerializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/InstanceSerializer.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/JacksonSerializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/JacksonSerializer.java index 676929d3c65..2a7e7cc16cc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/JacksonSerializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/JacksonSerializer.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/ProtoSerializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/ProtoSerializer.java index e3ee5f652e5..cb3dc28a51f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/ProtoSerializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/serialization/ProtoSerializer.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitStateManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitStateManager.java index dfffce825d7..48633c7221e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitStateManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/DrillbitStateManager.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server; /* State manager to manage the state of drillbit. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/QueryProfileStoreContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/QueryProfileStoreContext.java index dc2548e5b7a..4f94b101181 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/QueryProfileStoreContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/QueryProfileStoreContext.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/RemoteServiceSet.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/RemoteServiceSet.java index 91c2b20a43e..4133df9cb3f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/RemoteServiceSet.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/RemoteServiceSet.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/StartupOptions.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/StartupOptions.java index 57b1e786179..eac56ca96b9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/StartupOptions.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/StartupOptions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/DrillConfigIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/DrillConfigIterator.java index 7d30b5bd3e9..7dcb6888b55 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/DrillConfigIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/DrillConfigIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FragmentOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FragmentOptionManager.java index f0b72436081..e4ac3930503 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FragmentOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/FragmentOptionManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/InMemoryOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/InMemoryOptionManager.java index cda5c486a9e..c3cd63d94f1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/InMemoryOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/InMemoryOptionManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionDefinition.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionDefinition.java index 8b6234a70e1..4e992701298 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionDefinition.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionDefinition.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server.options; import com.google.common.base.Preconditions; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionList.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionList.java index e99645d2cde..e2161aa3e4c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionList.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionList.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionManager.java index a98bbe9f5d7..769398fbedf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionMetaData.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionMetaData.java index 6d2762fb598..8c38b82ad72 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionMetaData.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionMetaData.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server.options; /** diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java index fc4a9f056e1..a97a3cfcbc4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/PersistedOptionValue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/PersistedOptionValue.java index 720a040a4b6..fe091afc79b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/PersistedOptionValue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/PersistedOptionValue.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server.options; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/QueryOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/QueryOptionManager.java index a111db4f8e9..1c7d2988676 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/QueryOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/QueryOptionManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java index 635a1ae407c..bd1f95cf652 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/SessionOptionManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/GenericExceptionMapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/GenericExceptionMapper.java index 7bf7c90e70a..2637704fc40 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/GenericExceptionMapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/GenericExceptionMapper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java index d24f03a8630..f21684e0699 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/LogsResources.java @@ -1,5 +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 @@ -7,15 +6,14 @@ * 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 org.apache.drill.exec.server.rest; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/MetricsResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/MetricsResources.java index db363b69238..8e6505eb3a1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/MetricsResources.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/MetricsResources.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/PluginConfigWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/PluginConfigWrapper.java index ba54781372d..9d223939da3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/PluginConfigWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/PluginConfigWrapper.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server.rest; import javax.xml.bind.annotation.XmlRootElement; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java index 2548726709d..6a9294295f4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/QueryWrapper.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server.rest; import com.fasterxml.jackson.annotation.JsonCreator; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ThreadsResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ThreadsResources.java index 08f22d82463..d63deef7b58 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ThreadsResources.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/ThreadsResources.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/UserNameFilter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/UserNameFilter.java index b8c898c2ca9..c3e561d858f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/UserNameFilter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/UserNameFilter.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java index bfb6d90d053..e7aa332822d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServer.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServerConstants.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServerConstants.java index 5650d4399d6..5cd1c5fc1da 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServerConstants.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebServerConstants.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebSessionResources.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebSessionResources.java index 2ca457c02e1..016278faaf6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebSessionResources.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebSessionResources.java @@ -1,4 +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,16 +6,15 @@ * 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 org.apache.drill.exec.server.rest; import io.netty.channel.ChannelPromise; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebUserConnection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebUserConnection.java index f46b5e5e69b..df64259420c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebUserConnection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/WebUserConnection.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/AuthDynamicFeature.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/AuthDynamicFeature.java index 7ca739b167b..7bcf430cbaf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/AuthDynamicFeature.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/AuthDynamicFeature.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpConstraintSecurityHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpConstraintSecurityHandler.java index 0b095fb1bdb..c0dbf2a15a7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpConstraintSecurityHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpConstraintSecurityHandler.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpSecurityHandlerProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpSecurityHandlerProvider.java index 9eda5c4f576..9ed5971f14d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpSecurityHandlerProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillHttpSecurityHandlerProvider.java @@ -6,17 +6,15 @@ * 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 org.apache.drill.exec.server.rest.auth; import com.google.common.base.Preconditions; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoAuthenticator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoAuthenticator.java index 10f21acb7d6..24a684b9d13 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoAuthenticator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoAuthenticator.java @@ -15,8 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - - package org.apache.drill.exec.server.rest.auth; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java index 470d3e88b8f..c8901906560 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/DrillSpnegoLoginService.java @@ -6,17 +6,15 @@ * 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 org.apache.drill.exec.server.rest.auth; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/FormSecurityHanlder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/FormSecurityHanlder.java index 31d7ceccee4..50d9a89439d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/FormSecurityHanlder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/FormSecurityHanlder.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoConfig.java index d8d61ea199b..47146892581 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoConfig.java @@ -6,17 +6,15 @@ * 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 org.apache.drill.exec.server.rest.auth; import org.apache.drill.common.config.DrillConfig; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoSecurityHandler.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoSecurityHandler.java index 9e6acb17068..9ccfa85126d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoSecurityHandler.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/auth/SpnegoSecurityHandler.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Comparators.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Comparators.java index a61522a68dc..ac72d29acd7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Comparators.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Comparators.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Filters.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Filters.java index 7dbe9478e4f..ac0d53960ec 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Filters.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/Filters.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/FragmentWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/FragmentWrapper.java index 5496f83dd4e..7345e072f0b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/FragmentWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/FragmentWrapper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorPathBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorPathBuilder.java index 354cf465ebd..2c46b9faff8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorPathBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorPathBuilder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java index 3a60c71f08c..0a4c4a58dae 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/OperatorWrapper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/SimpleDurationFormat.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/SimpleDurationFormat.java index 00f2b665a03..5a2a37b6c63 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/SimpleDurationFormat.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/SimpleDurationFormat.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java index 0b652545f85..ad89b3f8b62 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/rest/profile/TableBuilder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java b/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java index 3efa054d5e2..9b6e6dd4ee1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/service/ServiceEngine.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractRecordReader.java index 3a95d25b04c..fe81a217cf5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractRecordReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractStoragePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractStoragePlugin.java index 1bd56ae8b88..548518f87e9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractStoragePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/AbstractStoragePlugin.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/BatchExceededException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/BatchExceededException.java index 8f4b7143f68..e3119df27c0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/BatchExceededException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/BatchExceededException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java index dc5a4b527bc..10a9a9eba26 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ColumnExplorer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ColumnExplorer.java index 73b96ce0548..fb86783c269 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ColumnExplorer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ColumnExplorer.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/DistributedStorageEngine.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/DistributedStorageEngine.java index c0731f992bb..ac0d28d28b1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/DistributedStorageEngine.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/DistributedStorageEngine.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/LocalSyncableFileSystem.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/LocalSyncableFileSystem.java index 58db550b85e..220da92344c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/LocalSyncableFileSystem.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/LocalSyncableFileSystem.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/NamedStoragePluginConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/NamedStoragePluginConfig.java index 9a3b5b1eb07..9b2c9287175 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/NamedStoragePluginConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/NamedStoragePluginConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorer.java index fb0ba67b8d4..aeb5278dc83 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorer.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorerImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorerImpl.java index b092ff3744c..c87d8f6f5ea 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorerImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionExplorerImpl.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store; import org.apache.calcite.schema.SchemaPlus; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionNotFoundException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionNotFoundException.java index 0792c8fc344..06a08487607 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionNotFoundException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/PartitionNotFoundException.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store; public class PartitionNotFoundException extends Exception { diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordDataType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordDataType.java index a562b77ce42..017e257f20e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordDataType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordDataType.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordReader.java index 11a84034454..84521074397 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/RecordReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ResourceInputStream.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ResourceInputStream.java index 1aa278ab9af..ec141177aa2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ResourceInputStream.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ResourceInputStream.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaConfig.java index fa720f3b065..715da713923 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaConfig.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaPartitionExplorer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaPartitionExplorer.java index 5281adb10fc..28663aa6dbb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaPartitionExplorer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaPartitionExplorer.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store; import java.util.List; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaTreeProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaTreeProvider.java index 07313873989..c7d0b501a80 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaTreeProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/SchemaTreeProvider.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginMap.java index 2f4a9299cc6..28775c85cff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StoragePluginMap.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StorageStrategy.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StorageStrategy.java index fdb8da85bcd..7df1f4ea404 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/StorageStrategy.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/StorageStrategy.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/TimedRunnable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/TimedRunnable.java index abb3a0409fa..fe0cae19a50 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/TimedRunnable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/TimedRunnable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroFormatConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroFormatConfig.java index 4a2cfb995ba..2551ba5b460 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroFormatConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroFormatConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroRecordReader.java index bbc9b04a93b..c7d2aed27b5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroRecordReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroTypeHelper.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroTypeHelper.java index aeb659f1af8..aee5a1eecc7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroTypeHelper.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/avro/AvroTypeHelper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/bson/BsonRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/bson/BsonRecordReader.java index c0b67263153..b01413e67dd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/bson/BsonRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/bson/BsonRecordReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFSDataInputStream.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFSDataInputStream.java index e97316c838c..ed14e82b44f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFSDataInputStream.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/DrillFSDataInputStream.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatCreator.java index ece34184c11..fe9014b54db 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java index 14f1441e66a..ed3b602144a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPlugin.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionExtractor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionExtractor.java index 8b566a189e2..b0afab4efc7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionExtractor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionExtractor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionsDescriptor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionsDescriptor.java index d3b2d5ec41c..b140fcebc11 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionsDescriptor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatPluginOptionsDescriptor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatSelection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatSelection.java index f802fb47d87..40549cc921e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatSelection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/FormatSelection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/NamedFormatPluginConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/NamedFormatPluginConfig.java index 035ad463e28..99a37284668 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/NamedFormatPluginConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/NamedFormatPluginConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/OpenFileTracker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/OpenFileTracker.java index f99eb8b191e..8aa0fdbf612 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/OpenFileTracker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/OpenFileTracker.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/ReadEntryWithPath.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/ReadEntryWithPath.java index ba8f99c3f1a..4564e159c74 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/ReadEntryWithPath.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/ReadEntryWithPath.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/SubDirectoryList.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/SubDirectoryList.java index 03001149c4a..75237cb2a29 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/SubDirectoryList.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/SubDirectoryList.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.dfs; import org.apache.drill.exec.store.PartitionExplorer; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceConfig.java index 7ac07442cd9..e358c9d7e3a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java index d60b753c281..78a01641da4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyGroupScan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyReaderBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyReaderBatchCreator.java index 4e71795cab7..3b189de46b2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyReaderBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyReaderBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyWriterBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyWriterBatchCreator.java index f3988b12ca5..e4dfc1358fe 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyWriterBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/easy/EasyWriterBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/direct/DirectBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/direct/DirectBatchCreator.java index c7b8cdda5c6..ae4c40e0497 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/direct/DirectBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/direct/DirectBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/direct/DirectSubScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/direct/DirectSubScan.java index ac3fe8dc6d6..af609954ea5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/direct/DirectSubScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/direct/DirectSubScan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader.java index 372a91d0f6d..9c8ea544162 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JSONRecordReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JsonProcessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JsonProcessor.java index 179a1348002..b16bf43124a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JsonProcessor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/JsonProcessor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/BaseJsonProcessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/BaseJsonProcessor.java index 49e0f500845..bc8e49d3323 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/BaseJsonProcessor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/BaseJsonProcessor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/CountingJsonReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/CountingJsonReader.java index cfbe2d7b635..a5e9f1afdaa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/CountingJsonReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/json/reader/CountingJsonReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatConfig.java index bdd6040f029..42e722e4c3e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatPlugin.java index 9393f4a538e..ec480ae0242 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileFormatPlugin.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileRecordReader.java index a7f8c7dacb5..247b281fe81 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/sequencefile/SequenceFileRecordReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/FieldVarCharOutput.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/FieldVarCharOutput.java index b8343d1ebc3..9734c886f80 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/FieldVarCharOutput.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/FieldVarCharOutput.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/StreamFinishedPseudoException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/StreamFinishedPseudoException.java index ab9ee0d31ed..f2a32b9a3bb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/StreamFinishedPseudoException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/StreamFinishedPseudoException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextInput.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextInput.java index 8c7aad0c531..2a5a940bdaf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextInput.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextInput.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextOutput.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextOutput.java index 66b11652e91..1042994bc97 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextOutput.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextOutput.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextParsingContext.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextParsingContext.java index 7b95ee2d973..d286d6d3bdf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextParsingContext.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextParsingContext.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextParsingSettings.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextParsingSettings.java index 41bb33d4a92..6782b66c748 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextParsingSettings.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextParsingSettings.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextReader.java index 7a7ad0a35e1..8f5ddd0893d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/easy/text/compliant/TextReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogRecord.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogRecord.java index 27752853c71..2fccc4b4b6a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogRecord.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdLogRecord.java @@ -1,11 +1,13 @@ /* - * Copyright 2015 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdParser.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdParser.java index a8966389586..1d9962e26cd 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdParser.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdParser.java @@ -1,11 +1,13 @@ /* - * Copyright 2015 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdParserTest.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdParserTest.java index b82b1ee7224..3897136a144 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdParserTest.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/httpd/HttpdParserTest.java @@ -1,11 +1,13 @@ /* - * Copyright 2015 The Apache Software Foundation. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * 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 * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 + * 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/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaBatchCreator.java index 76e3ae2ffb8..d116d54c2a3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaConfig.java index 2adce9f97d2..adf15a21595 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaConstants.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaConstants.java index d73894a1ac4..d9f2ff74526 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaConstants.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaConstants.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaDrillTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaDrillTable.java index 48651b10720..5aa31a76e04 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaDrillTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaDrillTable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilter.java index 92464e740fd..2d2dda69a22 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilter.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilterBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilterBuilder.java index 6262dce7683..d152c77a8dc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilterBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaFilterBuilder.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java index 698004fbd55..f1da0f71322 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaGroupScan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java index 7148262ad58..01406c61882 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaPushFilterIntoRecordGenerator.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.store.ischema; import org.apache.drill.common.expression.LogicalExpression; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java index e59899f06c2..6fab4c159f9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaStoragePlugin.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaSubScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaSubScan.java index 116a026e46a..6aa762fad22 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaSubScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaSubScan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTable.java index 925e066852b..64b8c421bf5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTableType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTableType.java index 8f65b662ec6..37d1a6b046a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTableType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/InfoSchemaTableType.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java index 81ac8b61095..c4f89699afa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/Records.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.store.ischema; import static org.slf4j.LoggerFactory.getLogger; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/package-info.java index ea38e0609ef..bdbf96a0445 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ischema/package-info.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ColumnDataReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ColumnDataReader.java index b1cdfdbe5a2..dcd40cf9107 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ColumnDataReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ColumnDataReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/Metadata.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/Metadata.java index ab3bc1997d0..af98d332aa4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/Metadata.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/Metadata.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/MetadataVersion.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/MetadataVersion.java index 9fd64ac225a..7abb9f13b6d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/MetadataVersion.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/MetadataVersion.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetDirectByteBufferAllocator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetDirectByteBufferAllocator.java index 91183151f65..09f1b26e24a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetDirectByteBufferAllocator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetDirectByteBufferAllocator.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.store.parquet; import io.netty.buffer.ByteBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java index 2d245a1e9cd..9804e2496bb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetFilterBuilder.java @@ -6,7 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java index 21dab5c2688..a53587ce9ae 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetGroupScan.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java index 8d845a5c174..45fa51d58f8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetPushDownFilter.java @@ -6,7 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRGFilterEvaluator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRGFilterEvaluator.java index 337f220e1f3..370988b1c60 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRGFilterEvaluator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetRGFilterEvaluator.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetWriterBatchCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetWriterBatchCreator.java index cfb65d55cfc..aefd6a10185 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetWriterBatchCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/ParquetWriterBatchCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/RowGroupReadEntry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/RowGroupReadEntry.java index 594e12bc4fd..665179f6beb 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/RowGroupReadEntry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/RowGroupReadEntry.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/AsyncPageReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/AsyncPageReader.java index 036b546f578..8d537612d9f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/AsyncPageReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/AsyncPageReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/BitReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/BitReader.java index 9b8a06349d3..8865f0b59fa 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/BitReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/BitReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReaderFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReaderFactory.java index ba5f1decf80..7edfa00e1ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReaderFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ColumnReaderFactory.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet.columnreaders; import org.apache.drill.common.exceptions.ExecutionSetupException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/FixedByteAlignedReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/FixedByteAlignedReader.java index 0416a056804..e6708ec0b39 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/FixedByteAlignedReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/FixedByteAlignedReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/FixedWidthRepeatedReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/FixedWidthRepeatedReader.java index fa21dfaf965..162e50294d0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/FixedWidthRepeatedReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/FixedWidthRepeatedReader.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet.columnreaders; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableBitReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableBitReader.java index 5a58831b006..b97bc826000 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableBitReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableBitReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableColumnReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableColumnReader.java index 2929eb2b6de..fde81844440 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableColumnReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableColumnReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableFixedByteAlignedReaders.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableFixedByteAlignedReaders.java index 759b0f2a452..86cba6e664e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableFixedByteAlignedReaders.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableFixedByteAlignedReaders.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableVarLengthValuesColumn.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableVarLengthValuesColumn.java index 3a7a54b2d70..f236315f062 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableVarLengthValuesColumn.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/NullableVarLengthValuesColumn.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet.columnreaders; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/PageReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/PageReader.java index 35cdb143b43..904a33ae25d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/PageReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/PageReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java index 50330465b0f..5bc9ea11b2d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetFixedWidthDictionaryReaders.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet.columnreaders; import org.apache.drill.common.exceptions.ExecutionSetupException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java index 04e76b8d59a..fc1c4af0553 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/ParquetToDrillTypeConverter.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet.columnreaders; import org.apache.drill.common.types.TypeProtos; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBinaryReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBinaryReader.java index 900348f53e2..3e067e40d36 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBinaryReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLenBinaryReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthColumn.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthColumn.java index 17f9fc60091..16ccb859d24 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthColumn.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthColumn.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet.columnreaders; import java.io.IOException; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthColumnReaders.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthColumnReaders.java index 39cad0ee36e..b3f511f0094 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthColumnReaders.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthColumnReaders.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet.columnreaders; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthValuesColumn.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthValuesColumn.java index 6a86cea424a..03fefb0b020 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthValuesColumn.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/columnreaders/VarLengthValuesColumn.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet.columnreaders; import io.netty.buffer.DrillBuf; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ColumnStatCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ColumnStatCollector.java index 8f93c8a3f11..8e366e3956e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ColumnStatCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ColumnStatCollector.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ColumnStatistics.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ColumnStatistics.java index 7bad4919864..972b1d17764 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ColumnStatistics.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ColumnStatistics.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ParquetFooterStatCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ParquetFooterStatCollector.java index e302e7d0a24..ac63bda1dbc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ParquetFooterStatCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet/stat/ParquetFooterStatCollector.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetRecordMaterializer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetRecordMaterializer.java index 784056c908f..04f2d8df5ec 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetRecordMaterializer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/parquet2/DrillParquetRecordMaterializer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapDrillTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapDrillTable.java index 20e7e931760..79512d5c47c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapDrillTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapDrillTable.java @@ -1,13 +1,14 @@ /* - * 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 - *

    + * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatConfig.java index 89b56adadba..08714a2ea97 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatConfig.java @@ -1,13 +1,14 @@ /* - * 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 - *

    + * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatPlugin.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatPlugin.java index 3fa8aa6e5fb..0f24538d364 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatPlugin.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatPlugin.java @@ -1,13 +1,14 @@ /* - * 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 - *

    + * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatUtils.java index bba08bef114..85000176392 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapFormatUtils.java @@ -1,13 +1,14 @@ /* - * 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 - *

    + * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapRecordReader.java index d01b746d477..8b2e2400822 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/PcapRecordReader.java @@ -1,13 +1,14 @@ /* - * 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 - *

    + * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/package-info.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/package-info.java index bb2728334e6..645eaac20f9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/package-info.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/package-info.java @@ -1,13 +1,14 @@ /* - * 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 - *

    + * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/schema/Schema.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/schema/Schema.java index 89bd08f1abe..6c03f55bf5f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/schema/Schema.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pcap/schema/Schema.java @@ -1,13 +1,14 @@ /* - * 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 - *

    + * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/AbstractPojoRecordReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/AbstractPojoRecordReader.java index a85d7fb6ec1..c2e2e6e8e7d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/AbstractPojoRecordReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/AbstractPojoRecordReader.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoDataType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoDataType.java index 9b04fd84e8b..cb68efcb9a9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoDataType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/pojo/PojoDataType.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java index b6114fde27c..d87568e07ee 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AffinityCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AssignmentCreator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AssignmentCreator.java index 198d1ac262a..4fe8826b028 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AssignmentCreator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/AssignmentCreator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java index 6b2e247c8fa..942afa1a43d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/BlockMapBuilder.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/CompleteFileWork.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/CompleteFileWork.java index 819f8958cff..04c4eb0db54 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/CompleteFileWork.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/CompleteFileWork.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/CompleteWork.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/CompleteWork.java index 52cf0f73263..7e22898b541 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/CompleteWork.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/CompleteWork.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMap.java index f543d75234d..e07bba737d1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMap.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMapImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMapImpl.java index 8a9f0a1489b..a64d134a5cc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMapImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/schedule/EndpointByteMapImpl.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/BasePersistentStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/BasePersistentStore.java index 38309bbc228..9a8e4773931 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/BasePersistentStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/BasePersistentStore.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/BitToUserConnectionIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/BitToUserConnectionIterator.java index 554db1094e3..cffb486fb8b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/BitToUserConnectionIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/BitToUserConnectionIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/DrillbitIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/DrillbitIterator.java index 08d3706ab21..5629b3faf96 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/DrillbitIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/DrillbitIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ExtendedOptionIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ExtendedOptionIterator.java index e329de3fcd0..a6c3b371b54 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ExtendedOptionIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ExtendedOptionIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/MemoryIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/MemoryIterator.java index 1140685e5db..f39877d1e60 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/MemoryIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/MemoryIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/OptionIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/OptionIterator.java index 48d8c10cc15..8760d1b5d6f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/OptionIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/OptionIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreConfig.java index 3b5e7cae538..3f15b9943ad 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreMode.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreMode.java index 68d0cb69c41..e099315dfd3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreMode.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreMode.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreProvider.java index c0f70309ad8..4311f48bd45 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreProvider.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreRegistry.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreRegistry.java index b1175130588..7338ccc6ab9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreRegistry.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/PersistentStoreRegistry.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/StaticDrillTable.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/StaticDrillTable.java index 809c072e25a..dbe58917e08 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/StaticDrillTable.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/StaticDrillTable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/Store.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/Store.java index c2b1999131c..ede174f2c5c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/Store.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/Store.java @@ -7,14 +7,13 @@ * "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. + * 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 org.apache.drill.exec.store.sys; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePluginConfig.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePluginConfig.java index 509cfe7ddc6..360182e9696 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePluginConfig.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/SystemTablePluginConfig.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ThreadsIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ThreadsIterator.java index 567d299397e..a1845a259d3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ThreadsIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/ThreadsIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java index 9bfb7002493..f8fbd4111b1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionedPersistentStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionedPersistentStore.java index 24fa78ed865..ea7a2d1e9b1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionedPersistentStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/VersionedPersistentStore.java @@ -7,14 +7,13 @@ * "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. + * 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 org.apache.drill.exec.store.sys; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/local/LocalPStoreProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/local/LocalPStoreProvider.java index cda1180be76..a078a3e1e7a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/local/LocalPStoreProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/local/LocalPStoreProvider.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/DataChangeVersion.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/DataChangeVersion.java index 10c1b8fbc94..d182de33174 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/DataChangeVersion.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/DataChangeVersion.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/InMemoryStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/InMemoryStore.java index f63c4f7ca47..e49e9f64d98 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/InMemoryStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/InMemoryStore.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/VersionedDelegatingStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/VersionedDelegatingStore.java index 23eedd9553d..18e0b826291 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/VersionedDelegatingStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/VersionedDelegatingStore.java @@ -7,14 +7,13 @@ * "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. + * 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 org.apache.drill.exec.store.sys.store; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/BasePersistentStoreProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/BasePersistentStoreProvider.java index e497a4cfcb8..c9c5da16155 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/BasePersistentStoreProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/BasePersistentStoreProvider.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/CachingPersistentStoreProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/CachingPersistentStoreProvider.java index 771005f48d1..d2d355222ec 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/CachingPersistentStoreProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/CachingPersistentStoreProvider.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/LocalPersistentStoreProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/LocalPersistentStoreProvider.java index 0b4a20128f1..af6777111b8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/LocalPersistentStoreProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/LocalPersistentStoreProvider.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/ZookeeperPersistentStoreProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/ZookeeperPersistentStoreProvider.java index a2e30f0fe37..3425a61853a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/ZookeeperPersistentStoreProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/store/provider/ZookeeperPersistentStoreProvider.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/zk/ZkPStoreProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/zk/ZkPStoreProvider.java index 8cc2fde26a7..e15274477a8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/zk/ZkPStoreProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/sys/zk/ZkPStoreProvider.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ControlsInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ControlsInjector.java index cfcb9e0716b..6510833a59e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ControlsInjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ControlsInjector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ControlsInjectorFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ControlsInjectorFactory.java index 45dbcae64c0..7c927ccb293 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ControlsInjectorFactory.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ControlsInjectorFactory.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjection.java index d26e2bbd453..957d79b9ff6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjectionImpl.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjectionImpl.java index e4eeeb78ad7..abb6b1c0494 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjectionImpl.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/CountDownLatchInjectionImpl.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjection.java index aff4dba27d9..9b4d7b01125 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExceptionInjection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControlsInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControlsInjector.java index e5234f318a3..5d11b09c8b0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControlsInjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/ExecutionControlsInjector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/Injection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/Injection.java index 1daf6395f0e..d8349c4bd10 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/Injection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/Injection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionConfigurationException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionConfigurationException.java index 4fcb33a1794..43aa447e0e6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionConfigurationException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionConfigurationException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java index 2bb9acccc0c..9946639b529 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/InjectionSite.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/NoOpControlsInjector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/NoOpControlsInjector.java index ae853d86ac2..1195c1992bf 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/NoOpControlsInjector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/NoOpControlsInjector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/PauseInjection.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/PauseInjection.java index 89f47c769f3..9807c183923 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/PauseInjection.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/PauseInjection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/store/NoWriteLocalStore.java b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/store/NoWriteLocalStore.java index 528705a4a39..4c5f48620a4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/testing/store/NoWriteLocalStore.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/testing/store/NoWriteLocalStore.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ApproximateStringMatcher.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ApproximateStringMatcher.java index 9650bccc792..14d86219f8f 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ApproximateStringMatcher.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ApproximateStringMatcher.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ArrayWrappedIntIntMap.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ArrayWrappedIntIntMap.java index 42775805cdf..034c143775c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ArrayWrappedIntIntMap.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ArrayWrappedIntIntMap.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ByteBufUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ByteBufUtil.java index 37e6040b560..ec04fb0c019 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ByteBufUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ByteBufUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/DrillFileSystemUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/DrillFileSystemUtil.java index 56d93851de1..2fc135d4d37 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/DrillFileSystemUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/DrillFileSystemUtil.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/FileSystemUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/FileSystemUtil.java index 84b22b610c4..f17e215e1a9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/FileSystemUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/FileSystemUtil.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/GuavaPatcher.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/GuavaPatcher.java index 0bb13d82676..3269aa8df7c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/GuavaPatcher.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/GuavaPatcher.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ImpersonationUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ImpersonationUtil.java index 8dab54917b6..b74ce1aee38 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/ImpersonationUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/ImpersonationUtil.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/JarUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/JarUtil.java index 31572235a42..ea40615a3a8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/JarUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/JarUtil.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/StoragePluginTestUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/StoragePluginTestUtils.java index 83e3985b84e..4a90a4e2750 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/StoragePluginTestUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/StoragePluginTestUtils.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/BufferedDirectBufInputStream.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/BufferedDirectBufInputStream.java index d9f14010e39..f208d6e8238 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/BufferedDirectBufInputStream.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/BufferedDirectBufInputStream.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/DirectBufInputStream.java b/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/DirectBufInputStream.java index 265f7a8bd99..ae09a3708c6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/DirectBufInputStream.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/util/filereader/DirectBufInputStream.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/CopyUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/CopyUtil.java index 9aa33e6166d..b62434a6c06 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/CopyUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/CopyUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/VectorValidator.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/VectorValidator.java index 7856fadbe4b..1cabd80e559 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/VectorValidator.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/VectorValidator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/AbstractSqlAccessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/AbstractSqlAccessor.java index e24f39c3d4a..de4f8cb8329 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/AbstractSqlAccessor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/AbstractSqlAccessor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/BoundCheckingAccessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/BoundCheckingAccessor.java index bfef947d0c6..1ae2ca48088 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/BoundCheckingAccessor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/BoundCheckingAccessor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/GenericAccessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/GenericAccessor.java index d8f299560a2..41006e90cd0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/GenericAccessor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/GenericAccessor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/InvalidAccessException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/InvalidAccessException.java index 4a3b06b55dc..e0e586d74ff 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/InvalidAccessException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/InvalidAccessException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/SqlAccessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/SqlAccessor.java index 636456ddb03..70fb90eb4be 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/SqlAccessor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/SqlAccessor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/UnionSqlAccessor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/UnionSqlAccessor.java index 8091c5621d5..bbde74ba228 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/UnionSqlAccessor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/accessor/UnionSqlAccessor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/FieldIdUtil.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/FieldIdUtil.java index 6e72b6e50e6..77b3fde7a3e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/FieldIdUtil.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/FieldIdUtil.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/BasicJsonOutput.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/BasicJsonOutput.java index 364692e1580..db5fbeff9b7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/BasicJsonOutput.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/BasicJsonOutput.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/DateOutputFormat.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/DateOutputFormat.java index fa91b758ad7..879ac6f49bc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/DateOutputFormat.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/DateOutputFormat.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/DrillBufInputStream.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/DrillBufInputStream.java index 4bf61d89c08..a290ac74b1a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/DrillBufInputStream.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/DrillBufInputStream.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedJsonOutput.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedJsonOutput.java index 9ac1dd5f1a9..1bdb9b61999 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedJsonOutput.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedJsonOutput.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedType.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedType.java index 13df44fdd6e..aa2883b0893 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedType.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedType.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedTypeName.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedTypeName.java index e432d56cee0..2760b9ab61e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedTypeName.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/ExtendedTypeName.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonOutput.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonOutput.java index 72720de912e..a921142ab0b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonOutput.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonOutput.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java index 9c77fbf31bb..9f5c45ac4bc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReaderUtils.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReaderUtils.java index 775be023783..fe8c08fd2c2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReaderUtils.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonReaderUtils.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonWriter.java index 498a206abeb..7377184a8b9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/JsonWriter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/SeekableBAIS.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/SeekableBAIS.java index 92eee98d71c..ddc54919d38 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/SeekableBAIS.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/SeekableBAIS.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/WorkingBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/WorkingBuffer.java index 7d10d3b10ac..9e5f8d0a9c0 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/WorkingBuffer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/fn/WorkingBuffer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/impl/VectorContainerWriter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/impl/VectorContainerWriter.java index 5d3f9ce51a5..958781b99d4 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/impl/VectorContainerWriter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/vector/complex/impl/VectorContainerWriter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/EndpointListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/EndpointListener.java index 164f76e5e4d..42e3569000c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/EndpointListener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/EndpointListener.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/ExecErrorConstants.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/ExecErrorConstants.java index 094f6614aba..9c7b9b90a37 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/ExecErrorConstants.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/ExecErrorConstants.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java index 7058c62f52c..662a33609b9 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/WorkManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/AbstractDataCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/AbstractDataCollector.java index 793cc012f9d..b6b4183e771 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/AbstractDataCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/AbstractDataCollector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/BaseRawBatchBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/BaseRawBatchBuffer.java index 382ab1f4a4a..43abd8e705d 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/BaseRawBatchBuffer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/BaseRawBatchBuffer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/DataCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/DataCollector.java index de88d02de65..026fc81e1e1 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/DataCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/DataCollector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/IncomingBuffers.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/IncomingBuffers.java index 51820936bfe..876c8b5b558 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/IncomingBuffers.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/IncomingBuffers.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/MergingCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/MergingCollector.java index 5d13a34adae..c72dec383c6 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/MergingCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/MergingCollector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/PartitionedCollector.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/PartitionedCollector.java index a334d30804b..3190be9f360 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/PartitionedCollector.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/PartitionedCollector.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/RawBatchBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/RawBatchBuffer.java index 0540820aa8e..7f57f95cd33 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/RawBatchBuffer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/RawBatchBuffer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ResponseSenderQueue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ResponseSenderQueue.java index 340ccc7e752..c36b296d342 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ResponseSenderQueue.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/ResponseSenderQueue.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java index 508d9343a3d..2c808af47dc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/SpoolingRawBatchBuffer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java index 0b0ae262969..719f3679dfc 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/batch/UnlimitedRawBatchBuffer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/DrillbitStatusListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/DrillbitStatusListener.java index 2a6d4128d16..e0f6bc1b91b 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/DrillbitStatusListener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/DrillbitStatusListener.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/ForemanException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/ForemanException.java index c9ed31fd150..d5cf28ce216 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/ForemanException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/ForemanException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/ForemanSetupException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/ForemanSetupException.java index 20837537670..03eb759aaa7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/ForemanSetupException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/ForemanSetupException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java index 9e07210f749..5921a70b464 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentData.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentStatusListener.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentStatusListener.java index b2a40aea2e7..03436bf9534 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentStatusListener.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentStatusListener.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentsRunner.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentsRunner.java index b6775765a80..3d051bbdc33 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentsRunner.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/FragmentsRunner.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/LoggedQuery.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/LoggedQuery.java index 4248595f775..ee23fc5705c 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/LoggedQuery.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/LoggedQuery.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/SqlUnsupportedException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/SqlUnsupportedException.java index e3722834ccf..59ffa5fcb93 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/SqlUnsupportedException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/SqlUnsupportedException.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.work.foreman; import org.apache.drill.exec.exception.UnsupportedOperatorCollector; diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedDataTypeException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedDataTypeException.java index ca162837729..030b7771aa2 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedDataTypeException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedDataTypeException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedFunctionException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedFunctionException.java index 797713ebc41..ac13764a661 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedFunctionException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedFunctionException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedRelOperatorException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedRelOperatorException.java index b86c2dec515..c7a2f5dad76 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedRelOperatorException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/foreman/UnsupportedRelOperatorException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/AbstractFragmentManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/AbstractFragmentManager.java index d6ea5011e40..efb0947f519 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/AbstractFragmentManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/AbstractFragmentManager.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java index efdb96a763c..48d8a05b2d8 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentExecutor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentManager.java index aaf80d02270..380809584e3 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentStatusReporter.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentStatusReporter.java index baccd553135..eb57658689a 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentStatusReporter.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/FragmentStatusReporter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java index 17a5965dae2..57714731cf5 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/NonRootFragmentManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/RootFragmentManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/RootFragmentManager.java index 4cbadc29c5c..02687e2e852 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/RootFragmentManager.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/RootFragmentManager.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/StateTransitionException.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/StateTransitionException.java index 0e888c24b55..11ad3dfe0e7 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/StateTransitionException.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/fragment/StateTransitionException.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/MetadataProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/MetadataProvider.java index f26848d66a4..0f717756927 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/MetadataProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/MetadataProvider.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/ServerMetaProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/ServerMetaProvider.java index d107e99d1a6..c4bedc5345e 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/ServerMetaProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/metadata/ServerMetaProvider.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/prepare/PreparedStatementProvider.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/prepare/PreparedStatementProvider.java index c0d57ab4484..b748cdb5976 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/prepare/PreparedStatementProvider.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/prepare/PreparedStatementProvider.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/work/user/UserWorker.java b/exec/java-exec/src/main/java/org/apache/drill/exec/work/user/UserWorker.java index b105b78360c..9c32b5618ea 100644 --- a/exec/java-exec/src/main/java/org/apache/drill/exec/work/user/UserWorker.java +++ b/exec/java-exec/src/main/java/org/apache/drill/exec/work/user/UserWorker.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/parquet/hadoop/ColumnChunkIncReadStore.java b/exec/java-exec/src/main/java/org/apache/parquet/hadoop/ColumnChunkIncReadStore.java index 2118e169f90..6e9db7e947e 100644 --- a/exec/java-exec/src/main/java/org/apache/parquet/hadoop/ColumnChunkIncReadStore.java +++ b/exec/java-exec/src/main/java/org/apache/parquet/hadoop/ColumnChunkIncReadStore.java @@ -1,4 +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 diff --git a/exec/java-exec/src/main/java/org/apache/parquet/hadoop/ParquetColumnChunkPageWriteStore.java b/exec/java-exec/src/main/java/org/apache/parquet/hadoop/ParquetColumnChunkPageWriteStore.java index 2d8e27dbc4e..dd9ea627c8f 100644 --- a/exec/java-exec/src/main/java/org/apache/parquet/hadoop/ParquetColumnChunkPageWriteStore.java +++ b/exec/java-exec/src/main/java/org/apache/parquet/hadoop/ParquetColumnChunkPageWriteStore.java @@ -7,14 +7,13 @@ * "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. + * 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 org.apache.parquet.hadoop; diff --git a/exec/java-exec/src/main/resources/rest/error.ftl b/exec/java-exec/src/main/resources/rest/error.ftl index a07794a1d2e..aafdfc31f50 100644 --- a/exec/java-exec/src/main/resources/rest/error.ftl +++ b/exec/java-exec/src/main/resources/rest/error.ftl @@ -1,14 +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. + +--> back
    diff --git a/exec/java-exec/src/main/resources/rest/generic.ftl b/exec/java-exec/src/main/resources/rest/generic.ftl index d04414fec22..81204f795c1 100644 --- a/exec/java-exec/src/main/resources/rest/generic.ftl +++ b/exec/java-exec/src/main/resources/rest/generic.ftl @@ -1,14 +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. + +--> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/index.ftl b/exec/java-exec/src/main/resources/rest/index.ftl index 0886fae03e2..e3904a2d774 100644 --- a/exec/java-exec/src/main/resources/rest/index.ftl +++ b/exec/java-exec/src/main/resources/rest/index.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#-- Format comma-delimited string--> diff --git a/exec/java-exec/src/main/resources/rest/login.ftl b/exec/java-exec/src/main/resources/rest/login.ftl index 15888361e41..decf280b8d2 100644 --- a/exec/java-exec/src/main/resources/rest/login.ftl +++ b/exec/java-exec/src/main/resources/rest/login.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/logs/list.ftl b/exec/java-exec/src/main/resources/rest/logs/list.ftl index 3d836dff342..7cde20b9e20 100644 --- a/exec/java-exec/src/main/resources/rest/logs/list.ftl +++ b/exec/java-exec/src/main/resources/rest/logs/list.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/logs/log.ftl b/exec/java-exec/src/main/resources/rest/logs/log.ftl index 4f37beb6b58..ae152cd4c86 100644 --- a/exec/java-exec/src/main/resources/rest/logs/log.ftl +++ b/exec/java-exec/src/main/resources/rest/logs/log.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/mainLogin.ftl b/exec/java-exec/src/main/resources/rest/mainLogin.ftl index 8deb1563522..1e3a5a9a98d 100644 --- a/exec/java-exec/src/main/resources/rest/mainLogin.ftl +++ b/exec/java-exec/src/main/resources/rest/mainLogin.ftl @@ -1,13 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/metrics/metrics.ftl b/exec/java-exec/src/main/resources/rest/metrics/metrics.ftl index dfa5ece3790..d0263d3b240 100644 --- a/exec/java-exec/src/main/resources/rest/metrics/metrics.ftl +++ b/exec/java-exec/src/main/resources/rest/metrics/metrics.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/options.ftl b/exec/java-exec/src/main/resources/rest/options.ftl index e280e813d8b..7a1deac0da4 100644 --- a/exec/java-exec/src/main/resources/rest/options.ftl +++ b/exec/java-exec/src/main/resources/rest/options.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/profile/list.ftl b/exec/java-exec/src/main/resources/rest/profile/list.ftl index e83e093a50f..6a8b51dc72d 100644 --- a/exec/java-exec/src/main/resources/rest/profile/list.ftl +++ b/exec/java-exec/src/main/resources/rest/profile/list.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/profile/profile.ftl b/exec/java-exec/src/main/resources/rest/profile/profile.ftl index 671a57bbc1d..9072f4da388 100644 --- a/exec/java-exec/src/main/resources/rest/profile/profile.ftl +++ b/exec/java-exec/src/main/resources/rest/profile/profile.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/query/errorMessage.ftl b/exec/java-exec/src/main/resources/rest/query/errorMessage.ftl index dbdcc9eabfc..00ad4c8469a 100644 --- a/exec/java-exec/src/main/resources/rest/query/errorMessage.ftl +++ b/exec/java-exec/src/main/resources/rest/query/errorMessage.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/query/list.ftl b/exec/java-exec/src/main/resources/rest/query/list.ftl index 9b64d18874e..cbde814832f 100644 --- a/exec/java-exec/src/main/resources/rest/query/list.ftl +++ b/exec/java-exec/src/main/resources/rest/query/list.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/query/query.ftl b/exec/java-exec/src/main/resources/rest/query/query.ftl index 6a08914ab9e..936b1a53c63 100644 --- a/exec/java-exec/src/main/resources/rest/query/query.ftl +++ b/exec/java-exec/src/main/resources/rest/query/query.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> <#if model?? && model> diff --git a/exec/java-exec/src/main/resources/rest/query/result.ftl b/exec/java-exec/src/main/resources/rest/query/result.ftl index 3e1f49f5baa..37eeca8d306 100644 --- a/exec/java-exec/src/main/resources/rest/query/result.ftl +++ b/exec/java-exec/src/main/resources/rest/query/result.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/status.ftl b/exec/java-exec/src/main/resources/rest/status.ftl index c5992fb865c..5035fa2f677 100644 --- a/exec/java-exec/src/main/resources/rest/status.ftl +++ b/exec/java-exec/src/main/resources/rest/status.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/storage/list.ftl b/exec/java-exec/src/main/resources/rest/storage/list.ftl index ef9756178e5..ca200638355 100644 --- a/exec/java-exec/src/main/resources/rest/storage/list.ftl +++ b/exec/java-exec/src/main/resources/rest/storage/list.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/storage/update.ftl b/exec/java-exec/src/main/resources/rest/storage/update.ftl index b84bfa556a7..a15cc986523 100644 --- a/exec/java-exec/src/main/resources/rest/storage/update.ftl +++ b/exec/java-exec/src/main/resources/rest/storage/update.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/resources/rest/threads/threads.ftl b/exec/java-exec/src/main/resources/rest/threads/threads.ftl index 14d22f21a79..85384e4007a 100644 --- a/exec/java-exec/src/main/resources/rest/threads/threads.ftl +++ b/exec/java-exec/src/main/resources/rest/threads/threads.ftl @@ -1,14 +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. + +--> <#include "*/generic.ftl"> <#macro page_head> diff --git a/exec/java-exec/src/main/sh/drill-config.sh b/exec/java-exec/src/main/sh/drill-config.sh index fa62da88936..4022cc2341f 100644 --- a/exec/java-exec/src/main/sh/drill-config.sh +++ b/exec/java-exec/src/main/sh/drill-config.sh @@ -1,23 +1,20 @@ # -#/** -# * Copyright 2013 The Apache Software Foundation -# * -# * Licensed to the Apache Software Foundation (ASF) under one -# * or more contributor license agreements. See the NOTICE file -# * distributed with this work for additional information -# * 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. +# # included in all the drill scripts with source command # should not be executable directly diff --git a/exec/java-exec/src/main/sh/drillbit.sh b/exec/java-exec/src/main/sh/drillbit.sh index f5293a61628..2c1607bf1c4 100755 --- a/exec/java-exec/src/main/sh/drillbit.sh +++ b/exec/java-exec/src/main/sh/drillbit.sh @@ -1,25 +1,22 @@ #!/usr/bin/env bash # -#/** -# * Copyright 2013 The Apache Software Foundation -# * -# * Licensed to the Apache Software Foundation (ASF) under one -# * or more contributor license agreements. See the NOTICE file -# * distributed with this work for additional information -# * 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. +# + # Environment Variables # # DRILL_CONF_DIR Alternate drill conf dir. Default is ${DRILL_HOME}/conf. diff --git a/exec/java-exec/src/test/java/org/apache/drill/ParquetSchemaMerge.java b/exec/java-exec/src/test/java/org/apache/drill/ParquetSchemaMerge.java index 204eeb0a0c5..301a1f725f9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/ParquetSchemaMerge.java +++ b/exec/java-exec/src/test/java/org/apache/drill/ParquetSchemaMerge.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java index 47a86236008..553972ae402 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/PlanTestBase.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill; import static org.junit.Assert.assertFalse; diff --git a/exec/java-exec/src/test/java/org/apache/drill/SingleRowListener.java b/exec/java-exec/src/test/java/org/apache/drill/SingleRowListener.java index 4b3c008b130..65c900c5989 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/SingleRowListener.java +++ b/exec/java-exec/src/test/java/org/apache/drill/SingleRowListener.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestAggNullable.java b/exec/java-exec/src/test/java/org/apache/drill/TestAggNullable.java index 95e011b045a..865aae4343c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestAggNullable.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestAggNullable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestAltSortQueries.java b/exec/java-exec/src/test/java/org/apache/drill/TestAltSortQueries.java index 3631ccfb573..3e0d8870b16 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestAltSortQueries.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestAltSortQueries.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestCTASJson.java b/exec/java-exec/src/test/java/org/apache/drill/TestCTASJson.java index d0743970b14..332de099d50 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestCTASJson.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestCTASJson.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestCTASPartitionFilter.java b/exec/java-exec/src/test/java/org/apache/drill/TestCTASPartitionFilter.java index fee29e09243..0cbda0387cb 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestCTASPartitionFilter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestCTASPartitionFilter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestCaseSensitivity.java b/exec/java-exec/src/test/java/org/apache/drill/TestCaseSensitivity.java index 1779078ed90..e183cadb383 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestCaseSensitivity.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestCaseSensitivity.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill; import org.apache.drill.categories.SqlTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestCorrelation.java b/exec/java-exec/src/test/java/org/apache/drill/TestCorrelation.java index 133e5bead4e..47f0ae8cbd1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestCorrelation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestCorrelation.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestDisabledFunctionality.java b/exec/java-exec/src/test/java/org/apache/drill/TestDisabledFunctionality.java index 4f8c16fa22b..bfbc1741076 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestDisabledFunctionality.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestDisabledFunctionality.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestDynamicUDFSupport.java b/exec/java-exec/src/test/java/org/apache/drill/TestDynamicUDFSupport.java index d68dc0d961f..e1692ebf64e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestDynamicUDFSupport.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestDynamicUDFSupport.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestExampleQueries.java b/exec/java-exec/src/test/java/org/apache/drill/TestExampleQueries.java index 732884ca50b..3e17a7a6963 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestExampleQueries.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestExampleQueries.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java b/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java index 1b551ec1c3a..419e639e45e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestFrameworkTest.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill; import static org.apache.drill.test.TestBuilder.listOf; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsQuery.java b/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsQuery.java index f49c8ccc649..5ae0c380dcb 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsQuery.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestFunctionsQuery.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestImplicitCasting.java b/exec/java-exec/src/test/java/org/apache/drill/TestImplicitCasting.java index 8b47016dd80..610ca924b0c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestImplicitCasting.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestImplicitCasting.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestInList.java b/exec/java-exec/src/test/java/org/apache/drill/TestInList.java index 08f3d9a27d2..98496e837e5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestInList.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestInList.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestMergeFilterPlan.java b/exec/java-exec/src/test/java/org/apache/drill/TestMergeFilterPlan.java index 4ac8580d8c3..b35966635f0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestMergeFilterPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestMergeFilterPlan.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill; import org.apache.drill.categories.PlannerTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestOutOfMemoryOutcome.java b/exec/java-exec/src/test/java/org/apache/drill/TestOutOfMemoryOutcome.java index a37fbeb9e09..b7a3cd253f3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestOutOfMemoryOutcome.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestOutOfMemoryOutcome.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java b/exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java index 6f9f088eedd..86001f6e180 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestPartitionFilter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestPlanVerificationUtilities.java b/exec/java-exec/src/test/java/org/apache/drill/TestPlanVerificationUtilities.java index 54c4c42a561..3f781088ed1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestPlanVerificationUtilities.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestPlanVerificationUtilities.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill; import org.apache.drill.categories.PlannerTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestProjectPushDown.java b/exec/java-exec/src/test/java/org/apache/drill/TestProjectPushDown.java index 013c954d00e..ced105c0cd6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestProjectPushDown.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestProjectPushDown.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill; import org.apache.drill.categories.PlannerTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestSchemaChange.java b/exec/java-exec/src/test/java/org/apache/drill/TestSchemaChange.java index f404db4eb43..879592e30cc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestSchemaChange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestSchemaChange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestSelectivity.java b/exec/java-exec/src/test/java/org/apache/drill/TestSelectivity.java index de49a5fad90..c7002ec1357 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestSelectivity.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestSelectivity.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTextJoin.java b/exec/java-exec/src/test/java/org/apache/drill/TestTextJoin.java index d427a3d0b49..a0f0b2df3fc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTextJoin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTextJoin.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java index e01857650c8..54f7250762c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributed.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java index 9b9d917119a..7cc4954e57f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedConcurrent.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java index 10068e0ed7d..56287c90629 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchDistributedStreaming.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchExplain.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchExplain.java index 204684bb73a..3cbe5eff860 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchExplain.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchExplain.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchLimit0.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchLimit0.java index 940b4af74ce..9400c7c99ae 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchLimit0.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchLimit0.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchPlanning.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchPlanning.java index 8299e6c2860..1745301708c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchPlanning.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchPlanning.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestTpchSingleMode.java b/exec/java-exec/src/test/java/org/apache/drill/TestTpchSingleMode.java index a76ec8a1d67..2863bbb6612 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestTpchSingleMode.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestTpchSingleMode.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestUtf8SupportInQueryString.java b/exec/java-exec/src/test/java/org/apache/drill/TestUtf8SupportInQueryString.java index a515763d89d..d6a02f87bd7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/TestUtf8SupportInQueryString.java +++ b/exec/java-exec/src/test/java/org/apache/drill/TestUtf8SupportInQueryString.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/test/java/org/apache/drill/common/scanner/TestClassPathScanner.java b/exec/java-exec/src/test/java/org/apache/drill/common/scanner/TestClassPathScanner.java index c7bcee9f3a4..f4dc837acec 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/common/scanner/TestClassPathScanner.java +++ b/exec/java-exec/src/test/java/org/apache/drill/common/scanner/TestClassPathScanner.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java index 2b3b475bc50..494549ebd62 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/DrillSystemTestBase.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/HyperVectorValueIterator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/HyperVectorValueIterator.java index 29165999fc7..a6e9763027a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/HyperVectorValueIterator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/HyperVectorValueIterator.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec; import java.util.Iterator; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/RunRootExec.java b/exec/java-exec/src/test/java/org/apache/drill/exec/RunRootExec.java index a3fd2e746e2..a65f5fe5ad2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/RunRootExec.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/RunRootExec.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/SortTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/SortTest.java index 0a3ad74e176..5286348abf9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/SortTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/SortTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestEmptyInputSql.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestEmptyInputSql.java index 5bf31cd28d7..e79d75de4d3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestEmptyInputSql.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestEmptyInputSql.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec; import com.google.common.collect.Lists; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java index 67bd347177e..b8154c2f916 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestOpSerialization.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec; import static org.junit.Assert.assertEquals; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java index c15a8fff95b..d41eb92f2fe 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestQueriesOnLargeFile.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec; import static org.junit.Assert.assertTrue; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestRepeatedReaders.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestRepeatedReaders.java index 6c00d81a24a..da65bcbf117 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestRepeatedReaders.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestRepeatedReaders.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec; import org.apache.drill.test.BaseTestQuery; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestSSLConfig.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestSSLConfig.java index f783673b61e..8508080c0a7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestSSLConfig.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestSSLConfig.java @@ -1,4 +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,16 +6,15 @@ * 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 org.apache.drill.exec; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/TestWithZookeeper.java b/exec/java-exec/src/test/java/org/apache/drill/exec/TestWithZookeeper.java index 842a4e112cb..e32e0d57106 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/TestWithZookeeper.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/TestWithZookeeper.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperTestUtil.java b/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperTestUtil.java index 20d14def434..7256a6082df 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperTestUtil.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/ZookeeperTestUtil.java @@ -1,19 +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. + */ package org.apache.drill.exec; import org.apache.drill.exec.coord.zk.PathUtils; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/client/ConnectTriesPropertyTestClusterBits.java b/exec/java-exec/src/test/java/org/apache/drill/exec/client/ConnectTriesPropertyTestClusterBits.java index f6336e6df32..0fea090913f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/client/ConnectTriesPropertyTestClusterBits.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/client/ConnectTriesPropertyTestClusterBits.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientSystemTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientSystemTest.java index e27ce13d3e8..ae106a1abc5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientSystemTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientSystemTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientTest.java index 8c3f21fbf8e..51447d901bc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DrillClientTest.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java index 8aba833e98a..6c7f437d7ee 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/client/DumpCatTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/CodeCompilerTestFactory.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/CodeCompilerTestFactory.java index 7b74a3acad2..3bab1887b79 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/CodeCompilerTestFactory.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/CodeCompilerTestFactory.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/ExampleExternalInterface.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/ExampleExternalInterface.java index cbc8a0df12b..d544d884a1a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/ExampleExternalInterface.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/ExampleExternalInterface.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/ExampleTemplate.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/ExampleTemplate.java index 4fc5b3a172c..7ff278e1a2d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/ExampleTemplate.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/ExampleTemplate.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestClassCompilationTypes.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestClassCompilationTypes.java index e88d65badeb..0905ff55b3e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestClassCompilationTypes.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/TestClassCompilationTypes.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java index 1c36c46d649..879dc4d1561 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/compile/bytecode/ReplaceMethodInvoke.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEphemeralStore.java b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEphemeralStore.java index 3e945894202..03baf3fb556 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEphemeralStore.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEphemeralStore.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEventDispatcher.java b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEventDispatcher.java index f83ec006954..f1465a23a2c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEventDispatcher.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestEventDispatcher.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestPathUtils.java b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestPathUtils.java index d9667446e2c..f086e5f978c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestPathUtils.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestPathUtils.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestZookeeperClient.java b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestZookeeperClient.java index a43cee28eb5..87cf72d30f7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestZookeeperClient.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/coord/zk/TestZookeeperClient.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/EscapeTest1.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/EscapeTest1.java index 3f22da4a3b9..e97e100fd41 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/EscapeTest1.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/EscapeTest1.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/ExpressionTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/ExpressionTest.java index a5a53895bfd..aa8a3840e97 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/ExpressionTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/ExpressionTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/TestLogicalExprSerDe.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/TestLogicalExprSerDe.java index bd465df053d..7ba0296c42f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/TestLogicalExprSerDe.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/TestLogicalExprSerDe.java @@ -1,6 +1,4 @@ -package org.apache.drill.exec.expr; - -/** +/* * 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 @@ -17,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.drill.exec.expr; import org.apache.drill.test.BaseTestQuery; import org.apache.drill.categories.UnlikelyTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/FunctionInitializerTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/FunctionInitializerTest.java index edbd341a9fc..c25162c9e81 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/FunctionInitializerTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/FunctionInitializerTest.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestSimpleRepeatedFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestSimpleRepeatedFunctions.java index 7e6ec05ebfa..e3ca8ff0ac2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestSimpleRepeatedFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestSimpleRepeatedFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestSqlPatterns.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestSqlPatterns.java index 7d85719355b..31da5c92127 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestSqlPatterns.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/impl/TestSqlPatterns.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolderTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolderTest.java index f1e1e85f83d..883b94a97c2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolderTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/expr/fn/registry/FunctionRegistryHolderTest.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunction.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunction.java index e7cdf449fe3..045c24d8f8b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunction.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestAggregateFunction.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestByteComparisonFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestByteComparisonFunctions.java index 30aec9e244e..0318bda0e1b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestByteComparisonFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestByteComparisonFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCastEmptyStrings.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCastEmptyStrings.java index 576dd489b4e..ab47b327722 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCastEmptyStrings.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCastEmptyStrings.java @@ -1,4 +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,16 +6,15 @@ * 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 org.apache.drill.exec.fn.impl; import org.apache.drill.test.BaseTestQuery; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestContextFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestContextFunctions.java index 2e3996659c3..bfab3cde118 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestContextFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestContextFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCryptoFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCryptoFunctions.java index 77b4fb7fa46..d7d6047ec64 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCryptoFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestCryptoFunctions.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * @@ -14,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.fn.impl; import org.apache.drill.test.BaseTestQuery; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateAddFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateAddFunctions.java index 0c8f6d2dab1..b96a32a739c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateAddFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateAddFunctions.java @@ -1,19 +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. + */ package org.apache.drill.exec.fn.impl; import org.apache.drill.test.BaseTestQuery; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateFunctions.java index b1adcc90326..a3eec9eea75 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateFunctions.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateTruncFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateTruncFunctions.java index 9af4e52bcd8..0ef9928a5df 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateTruncFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestDateTruncFunctions.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctions.java index ffaa9e95318..ba9eb044958 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.fn.impl; import static org.junit.Assert.assertEquals; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctionsWithNanInf.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctionsWithNanInf.java index 81311953d76..d2b6c3f3480 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctionsWithNanInf.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMathFunctionsWithNanInf.java @@ -1,20 +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. + */ package org.apache.drill.exec.fn.impl; import org.apache.commons.io.FileUtils; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java index 472c76a466c..8fb64a54c78 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestMultiInputAdd.java @@ -1,4 +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,16 +6,15 @@ * 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 org.apache.drill.exec.fn.impl; import static org.junit.Assert.assertTrue; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNetworkFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNetworkFunctions.java index 737dacedfc9..8733c9afa15 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNetworkFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNetworkFunctions.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.fn.impl; import org.apache.drill.test.BaseTestQuery; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewAggregateFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewAggregateFunctions.java index cf5df1fd810..133c934ad08 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewAggregateFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewAggregateFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewDateFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewDateFunctions.java index 238b048c0e1..a546a502b1b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewDateFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewDateFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewMathFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewMathFunctions.java index 59188d45932..5fd1e25b6d0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewMathFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewMathFunctions.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.fn.impl; import static org.junit.Assert.assertEquals; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewSimpleRepeatedFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewSimpleRepeatedFunctions.java index 6b0a68581ce..552346da051 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewSimpleRepeatedFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestNewSimpleRepeatedFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java index 952a1a39608..f45c28a67b4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestRepeatedFunction.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestTrigFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestTrigFunctions.java index f9bbd29f7c5..6a17219d75a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestTrigFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/TestTrigFunctions.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/GeneratorFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/GeneratorFunctions.java index 93c67cc47fe..2ff6a2825fd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/GeneratorFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/GeneratorFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/TestDateConversions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/TestDateConversions.java index cc1303941ba..05d383123a9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/TestDateConversions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/impl/testing/TestDateConversions.java @@ -1,19 +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. + */ package org.apache.drill.exec.fn.impl.testing; import mockit.integration.junit4.JMockit; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/TestConstantFolding.java b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/TestConstantFolding.java index 0cf62bdf0e9..38d5d89a231 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/TestConstantFolding.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/fn/interp/TestConstantFolding.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.fn.interp; import com.google.common.base.Joiner; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/BaseTestImpersonation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/BaseTestImpersonation.java index f27b511d348..de2ddc1ec4b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/BaseTestImpersonation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/BaseTestImpersonation.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java index 702d14c7272..cebf6492c80 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationDisabledWithMiniDFS.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java index d023610acd3..1ef9c7b75e8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationMetadata.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java index b3977e95d32..c3c1fc58512 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestImpersonationQueries.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java index aa92b08e642..601846af977 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonation.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java index 199b1e1fd66..c83adc93623 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/impersonation/TestInboundImpersonationPrivileges.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/memory/TestAllocators.java b/exec/java-exec/src/test/java/org/apache/drill/exec/memory/TestAllocators.java index b4a655cef91..3501bfc51e6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/memory/TestAllocators.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/memory/TestAllocators.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.memory; import static org.junit.Assert.assertEquals; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestFastComplexSchema.java b/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestFastComplexSchema.java index 6173bb37e77..057c0f23b04 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestFastComplexSchema.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestFastComplexSchema.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestNestedComplexSchema.java b/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestNestedComplexSchema.java index 1754fabc9c4..1936d453e8a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestNestedComplexSchema.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/nested/TestNestedComplexSchema.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/opt/BasicOptimizerTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/opt/BasicOptimizerTest.java index fca9cb42f9c..662099c6683 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/opt/BasicOptimizerTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/opt/BasicOptimizerTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java index f4ae0267caf..1f378484408 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/config/TestParsePhysicalPlan.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java index da3a6d80e69..fd78f366e01 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/SimpleRootExec.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java index 362f86eab3a..fa12d45cb79 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestBroadcastExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastFunctions.java index 96d2944db52..71f83c7dfed 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastVarCharToBigInt.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastVarCharToBigInt.java index 5bf5711f5d7..1f4ad008f4f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastVarCharToBigInt.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestCastVarCharToBigInt.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java index 010acbd876a..8237cc4f640 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestComparisonFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java index 65659a70777..1bdcda5c3b8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDecimal.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java index 1bbe904cdd8..6fc3dbe5af8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestDistributedFragmentRun.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java index 95295826c17..ef7ff3b5b76 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestExtractFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java index 50e0b545612..410cce0b8ce 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestHashToRandomExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestImplicitCastFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestImplicitCastFunctions.java index b40bee8a31e..ae4a7818d97 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestImplicitCastFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestImplicitCastFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestLocalExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestLocalExchange.java index 3c1088459c9..6fe5ba15f17 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestLocalExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestLocalExchange.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOrderedMuxExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOrderedMuxExchange.java index cee36fa2456..50c114ee281 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOrderedMuxExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestOrderedMuxExchange.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestReverseImplicitCast.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestReverseImplicitCast.java index 36cbfc401d8..6f9ae6939e4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestReverseImplicitCast.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestReverseImplicitCast.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java index 192c1ad7aa3..06583d168ff 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestSimpleFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java index 7b5dff38017..e7aac978748 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestStringFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java index 74b3a7e6b53..7c796019a19 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TestUnionExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNSchemaChanges.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNSchemaChanges.java index 031041f8ba1..60f1e677bcd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNSchemaChanges.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/TopN/TestTopNSchemaChanges.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java index e4b1376f5aa..df9853c5159 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestAgg.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggr.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggr.java index 3de55196584..ebd9dc1ea95 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggr.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggr.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.agg; import org.apache.drill.test.BaseTestQuery; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggrSpill.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggrSpill.java index f517b1d0c31..3c24e9f4622 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggrSpill.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/agg/TestHashAggrSpill.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.agg; import ch.qos.logback.classic.Level; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/broadcastsender/TestBroadcast.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/broadcastsender/TestBroadcast.java index 970f4a4b6a7..44e781d2882 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/broadcastsender/TestBroadcast.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/broadcastsender/TestBroadcast.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestLargeInClause.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestLargeInClause.java index a68dffc5947..e74d63cf133 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestLargeInClause.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestLargeInClause.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java index 354343ee7fe..422830e70bd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/filter/TestSimpleFilter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java index 1dc07dfeac2..4ad29870580 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlatten.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.physical.impl.flatten; import static org.apache.drill.test.TestBuilder.listOf; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlattenPlanning.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlattenPlanning.java index 0a28d6927cb..0e2d92c5c22 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlattenPlanning.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/flatten/TestFlattenPlanning.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java index 1abd4e544f3..71bc3e389c7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoin.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinAdvanced.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinAdvanced.java index d4a7814e1c8..6893e8e2a8e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinAdvanced.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestHashJoinAdvanced.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.join; import org.apache.drill.categories.OperatorTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java index 54b7bea33fc..f24c986b1d6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestMergeJoinMulCondition.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java index be4ac347f2f..78f76d363a6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/join/TestNestedLoopJoin.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.join; import org.apache.drill.categories.OperatorTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java index 8bbe914ac97..8729b695925 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestEarlyLimit0Optimization.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitWithExchanges.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitWithExchanges.java index 7a2ee07823c..f33d4ace25e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitWithExchanges.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestLimitWithExchanges.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java index e7a14f8c788..f43d1141cf9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/limit/TestSimpleLimit.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java index 46afb42172a..f40a49c5d75 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/mergereceiver/TestMergingReceiver.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.physical.impl.mergereceiver; import static org.junit.Assert.assertEquals; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java index 5a21ef187f3..a4e680aa902 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/orderedpartitioner/TestOrderedPartitionExchange.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java index 2c360fc6f03..b2a899d7d84 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/project/TestSimpleProjection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java index 4492bde37da..1a54070bb85 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSimpleSort.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSort.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSort.java index 7a6270623ff..b29a94a65b5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSort.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/sort/TestSort.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/svremover/TestSVRemover.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/svremover/TestSVRemover.java index 50b18eafe5d..105e5af6bdd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/svremover/TestSVRemover.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/svremover/TestSVRemover.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java index 9d0877b05b6..98fb25af3c4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceMultiRecordBatch.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java index f3382a2ffde..5295768f937 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/trace/TestTraceOutputDump.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/validate/TestBatchValidator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/validate/TestBatchValidator.java index 484ff7d88fa..ff33c947128 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/validate/TestBatchValidator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/validate/TestBatchValidator.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.physical.impl.validate; import static org.apache.drill.test.rowSet.RowSetUtilities.intArray; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/GenerateTestData.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/GenerateTestData.java index 15b33c9f6c2..f7f891e33ac 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/GenerateTestData.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/GenerateTestData.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/TestWindowFrame.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/TestWindowFrame.java index 7a66f439359..a9c147b5851 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/TestWindowFrame.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/window/TestWindowFrame.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.physical.impl.window; import java.io.IOException; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestCorruptParquetDateCorrection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestCorruptParquetDateCorrection.java index 507e1022635..95820f24d5b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestCorruptParquetDateCorrection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/writer/TestCorruptParquetDateCorrection.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSort.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSort.java index 6e19f2ee81e..3f97fe31063 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSort.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/impl/xsort/TestExternalSort.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/BasicPhysicalOpUnitTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/BasicPhysicalOpUnitTest.java index fb8160a327d..e5e85d4d20f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/BasicPhysicalOpUnitTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/BasicPhysicalOpUnitTest.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/MiniPlanUnitTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/MiniPlanUnitTestBase.java index b81d9b8458a..f45f558dc49 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/MiniPlanUnitTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/MiniPlanUnitTestBase.java @@ -6,16 +6,15 @@ * 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 org.apache.drill.exec.physical.unit; import com.google.common.base.Preconditions; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/PhysicalOpUnitTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/PhysicalOpUnitTestBase.java index 93a7e545bf9..4bab883f1fc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/PhysicalOpUnitTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/PhysicalOpUnitTestBase.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java index f75a85bcfb4..a52a669bf95 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestMiniPlan.java @@ -6,16 +6,15 @@ * 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 org.apache.drill.exec.physical.unit; import java.util.Collections; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestNullInputMiniPlan.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestNullInputMiniPlan.java index 539434b370b..3d99adbc19e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestNullInputMiniPlan.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestNullInputMiniPlan.java @@ -6,16 +6,15 @@ * 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 org.apache.drill.exec.physical.unit; import com.google.common.collect.Lists; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java index 76de3811386..0b4bffa5854 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/physical/unit/TestOutputBatchSize.java @@ -6,16 +6,15 @@ * 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 org.apache.drill.exec.physical.unit; import com.google.common.collect.Lists; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/PhysicalPlanReaderTestFactory.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/PhysicalPlanReaderTestFactory.java index 28f54d7b9b3..5aaeb5f1b9c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/PhysicalPlanReaderTestFactory.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/PhysicalPlanReaderTestFactory.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java index 1a1127d3263..dea4c596acd 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/TestDirectoryExplorerUDFs.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/ + */ package org.apache.drill.exec.planner; import java.io.File; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java index 95363a7e734..18dbec7094c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/fragment/TestHardAffinityFragmentParallelizer.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java index f95f2e77ad5..052dfd6a908 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/FilterSplitTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestCaseNullableTypes.java b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestCaseNullableTypes.java index fe0d4335745..f18821bd0ec 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestCaseNullableTypes.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/planner/logical/TestCaseNullableTypes.java @@ -1,19 +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. + */ package org.apache.drill.exec.planner.logical; import org.apache.drill.test.BaseTestQuery; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java index bbe2b630991..dbabcac8ebf 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/PopUnitTestBase.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java index 4c1f0465508..61d849025e2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmentChecker.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java index fb753d15748..d8c14ba222e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestFragmenter.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java index be326a2f866..64f70df724a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/pop/TestInjectionValue.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestMaterializedField.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestMaterializedField.java index 193ec975338..fc76f1c06d4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestMaterializedField.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestMaterializedField.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java index 7e13dadd57d..2611391b59a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/TestRecordIterator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java index 3fa9541e42e..1da827a1d7a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/record/vector/TestDateTypes.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/control/TestCustomTunnel.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/control/TestCustomTunnel.java index bc9ba9d6ab7..0fa37f7745d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/control/TestCustomTunnel.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/control/TestCustomTunnel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitRpc.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitRpc.java index bd3e60f72e0..e862841d678 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitRpc.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/data/TestBitRpc.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/security/KerberosHelper.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/security/KerberosHelper.java index 79dbc362215..570d20af4e3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/security/KerberosHelper.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/security/KerberosHelper.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/TemporaryTablesAutomaticDropTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/TemporaryTablesAutomaticDropTest.java index bbe3537a87a..5553519db3b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/TemporaryTablesAutomaticDropTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/TemporaryTablesAutomaticDropTest.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestCustomUserAuthenticator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestCustomUserAuthenticator.java index 1c017dca503..b4d44ef4bde 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestCustomUserAuthenticator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestCustomUserAuthenticator.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java index a2a6eaf2e73..edb8bba9a96 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberos.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java index 9c743add3f5..aa604c5264a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitKerberosEncryption.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSL.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSL.java index 0578d71a950..e99bc1ef800 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSL.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSL.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSLServer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSLServer.java index 621309a38b9..3d711462ae6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSLServer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSSLServer.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java index 5a4ebf92694..828ded7c562 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/TestUserBitSaslCompatibility.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/testing/UserAuthenticatorTestImpl.java b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/testing/UserAuthenticatorTestImpl.java index e65eca51f23..731d5a5045b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/testing/UserAuthenticatorTestImpl.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/rpc/user/security/testing/UserAuthenticatorTestImpl.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/DrillClientFactory.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/DrillClientFactory.java index a10a76d7d44..58bfe1a9178 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/DrillClientFactory.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/DrillClientFactory.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/HelloResource.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/HelloResource.java index bfd465125c0..fc7537e53d7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/HelloResource.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/HelloResource.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDurationFormat.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDurationFormat.java index f1d3037642d..1c87eab5fae 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDurationFormat.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestDurationFormat.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptions.java index 0a7f7318e8e..32a913a531a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptionsAuthEnabled.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptionsAuthEnabled.java index 733de1ff8c2..202e869b811 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptionsAuthEnabled.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestOptionsAuthEnabled.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestTpcdsSf1Leaks.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestTpcdsSf1Leaks.java index 926024a0b79..e74df2942b3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestTpcdsSf1Leaks.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/TestTpcdsSf1Leaks.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/OptionValueTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/OptionValueTest.java index 5f674e8b954..9f5eb4b3544 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/OptionValueTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/OptionValueTest.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server.options; import org.junit.Assert; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/PersistedOptionValueTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/PersistedOptionValueTest.java index 165dad6d9c3..9d22121f002 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/PersistedOptionValueTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/PersistedOptionValueTest.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server.options; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/TestConfigLinkage.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/TestConfigLinkage.java index 3b4e14421d2..d76e209e0d4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/TestConfigLinkage.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/options/TestConfigLinkage.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server.options; import org.apache.drill.categories.OptionsTest; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/StatusResourcesTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/StatusResourcesTest.java index fc04f8862d9..0efc12bee13 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/StatusResourcesTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/StatusResourcesTest.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.server.rest; import org.apache.drill.exec.ExecConstants; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestMainLoginPageModel.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestMainLoginPageModel.java index 8e89e0c5756..0da9eba7585 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestMainLoginPageModel.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/TestMainLoginPageModel.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/WebSessionResourcesTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/WebSessionResourcesTest.java index bb990de6ef2..c18f7d8f0e4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/WebSessionResourcesTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/WebSessionResourcesTest.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestDrillSpnegoAuthenticator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestDrillSpnegoAuthenticator.java index 2f078c2b1a8..67bab51bc85 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestDrillSpnegoAuthenticator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestDrillSpnegoAuthenticator.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java index 65ea561460d..7555bd63cc6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoAuthentication.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoConfig.java b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoConfig.java index d3c77c9e07a..c3f3bc676c7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoConfig.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/server/rest/spnego/TestSpnegoConfig.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java index c85cbb66a22..406e2190855 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestBaseViewSupport.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java index b334049f166..318e4c95d3f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestCTTAS.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestInfoSchema.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestInfoSchema.java index 5af030629fc..a702574d93e 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestInfoSchema.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestInfoSchema.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java index 00c7af40873..abedb7a24f9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSimpleCastFunctions.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java index 57ca0c1304f..3d071cb85d2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestSqlBracketlessSyntax.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java index a3cb69a2593..394842d0959 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestViewSupport.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestWithClause.java b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestWithClause.java index 51821e9a468..b9f9c40f9b9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestWithClause.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/sql/TestWithClause.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ByteArrayUtil.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ByteArrayUtil.java index cd29f7c9d9d..c0ea7e701fa 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ByteArrayUtil.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ByteArrayUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java index 01f244a4279..5f8d2e09677 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/CachedSingleFileSystem.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/FormatPluginSerDeTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/FormatPluginSerDeTest.java index ca81eaa3e82..7c781ac7ec0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/FormatPluginSerDeTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/FormatPluginSerDeTest.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/StorageStrategyTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/StorageStrategyTest.java index 8051d720d8a..3ec08224cf1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/StorageStrategyTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/StorageStrategyTest.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java index 16348bcf498..d08a4c3daf3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestAffinityCalculator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestImplicitFileColumns.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestImplicitFileColumns.java index 1629a831626..67cb6c5d887 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestImplicitFileColumns.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestImplicitFileColumns.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java index 25f1a5840f3..27b1ed2d93f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/TestTimedRunnable.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/bson/TestBsonRecordReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/bson/TestBsonRecordReader.java index 1b2801dbbb9..129cfd2508a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/bson/TestBsonRecordReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/bson/TestBsonRecordReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestDrillFileSystem.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestDrillFileSystem.java index 7d66795dd50..5504382dc09 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestDrillFileSystem.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestDrillFileSystem.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestFormatPluginOptionExtractor.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestFormatPluginOptionExtractor.java index 11d29a8c8c6..3ac675b4b56 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestFormatPluginOptionExtractor.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestFormatPluginOptionExtractor.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestGlob.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestGlob.java index 8dae43f105f..2ca2120a390 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestGlob.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/dfs/TestGlob.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestCsv.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestCsv.java index 3d22b2671ab..1bb999645b2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestCsv.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/easy/text/compliant/TestCsv.java @@ -13,7 +13,7 @@ * 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.‰ + * limitations under the License. */ package org.apache.drill.exec.store.easy.text.compliant; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/Drill2283InfoSchemaVarchar1BugTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/Drill2283InfoSchemaVarchar1BugTest.java index 5061346d8f3..df6884c001c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/Drill2283InfoSchemaVarchar1BugTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/Drill2283InfoSchemaVarchar1BugTest.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/TestInfoSchemaFilterPushDown.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/TestInfoSchemaFilterPushDown.java index 84d9b070cdc..a25bd1f6b8d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/TestInfoSchemaFilterPushDown.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/ischema/TestInfoSchemaFilterPushDown.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonRecordReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonRecordReader.java index 7eb725921fd..7a601eb7a0c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonRecordReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/json/TestJsonRecordReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/FieldInfo.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/FieldInfo.java index 98313bcfdd1..f404c62b2c9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/FieldInfo.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/FieldInfo.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet; import org.apache.drill.common.types.TypeProtos; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java index b8e7750e685..abf5a1b0296 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetRecordReaderTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetSimpleTestFileGenerator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetSimpleTestFileGenerator.java index 720498b7054..15dd633152b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetSimpleTestFileGenerator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetSimpleTestFileGenerator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetTestProperties.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetTestProperties.java index 7c68a16fa21..3412aa6c738 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetTestProperties.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/ParquetTestProperties.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet; import java.util.HashMap; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java index 162b5bf384f..88fc0b0efe6 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFileGenerator.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFixedlenDecimal.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFixedlenDecimal.java index af842eb6d02..e6d7c10efa0 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFixedlenDecimal.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestFixedlenDecimal.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetFilterPushDown.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetFilterPushDown.java index 606d4093100..83a4e8e9238 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetFilterPushDown.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/TestParquetFilterPushDown.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.store.parquet; import org.apache.commons.io.FileUtils; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/WrapAroundCounter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/WrapAroundCounter.java index eef856000ea..b433ba40264 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/WrapAroundCounter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/WrapAroundCounter.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.store.parquet; public class WrapAroundCounter { diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/columnreaders/TestColumnReaderFactory.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/columnreaders/TestColumnReaderFactory.java index cf11d5fe742..87adc2654da 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/columnreaders/TestColumnReaderFactory.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/columnreaders/TestColumnReaderFactory.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/columnreaders/TestDateReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/columnreaders/TestDateReader.java index b641707f5a1..34c10da581f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/columnreaders/TestDateReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet/columnreaders/TestDateReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet2/TestDrillParquetReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet2/TestDrillParquetReader.java index 38f0fa03121..6bd8dd66a47 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet2/TestDrillParquetReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/parquet2/TestDrillParquetReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/pcap/TestPcapDecoder.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/pcap/TestPcapDecoder.java index c8cedc101be..b5a3ff1f14f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/pcap/TestPcapDecoder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/pcap/TestPcapDecoder.java @@ -1,13 +1,14 @@ /* - * 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 - *

    + * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/pcap/TestPcapRecordReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/pcap/TestPcapRecordReader.java index 385c0e064b2..47ab015f097 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/pcap/TestPcapRecordReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/pcap/TestPcapRecordReader.java @@ -1,13 +1,14 @@ /* - * 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 - *

    + * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sequencefile/TestSequenceFileReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sequencefile/TestSequenceFileReader.java index 6d3ce64a9d5..7d23b1d3ff3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sequencefile/TestSequenceFileReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sequencefile/TestSequenceFileReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/store/TestAssignment.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/store/TestAssignment.java index aceaf7907b5..979cff2051a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/store/TestAssignment.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/store/TestAssignment.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/PStoreTestUtil.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/PStoreTestUtil.java index d3116c77790..e2ffeedc24c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/PStoreTestUtil.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/PStoreTestUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestPStoreProviders.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestPStoreProviders.java index 73ddfe01bea..98dbe3fe092 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestPStoreProviders.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/sys/TestPStoreProviders.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.store.sys; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestCsvHeader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestCsvHeader.java index 2685496d761..3af06b94aee 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestCsvHeader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestCsvHeader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestNewTextReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestNewTextReader.java index 8aa939eff0a..6eb9bbfbe40 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestNewTextReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestNewTextReader.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestTextColumn.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestTextColumn.java index f106cca02c2..318dac0f61f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestTextColumn.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TestTextColumn.java @@ -1,14 +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 +/* + * 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. */ package org.apache.drill.exec.store.text; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TextRecordReaderTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TextRecordReaderTest.java index d4098f98e88..342ed683445 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TextRecordReaderTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/store/text/TextRecordReaderTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/test/Drill2130JavaExecHamcrestConfigurationTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/test/Drill2130JavaExecHamcrestConfigurationTest.java index 9f1b7dc7a6a..fa599bd8a32 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/test/Drill2130JavaExecHamcrestConfigurationTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/test/Drill2130JavaExecHamcrestConfigurationTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/Controls.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/Controls.java index bb7f7379112..f061904fab9 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/Controls.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/Controls.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/ControlsInjectionUtil.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/ControlsInjectionUtil.java index e3b0b0d7d89..576b101592c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/ControlsInjectionUtil.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/ControlsInjectionUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestCountDownLatchInjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestCountDownLatchInjection.java index f904603becf..5d408fe802f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestCountDownLatchInjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestCountDownLatchInjection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestExceptionInjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestExceptionInjection.java index 44f8727f424..512afc4468d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestExceptionInjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestExceptionInjection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestPauseInjection.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestPauseInjection.java index 053756681f3..dd6da3d6856 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestPauseInjection.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestPauseInjection.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestResourceLeak.java b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestResourceLeak.java index 1098dc46d5e..6efcabce8fa 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestResourceLeak.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/testing/TestResourceLeak.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/util/DrillFileSystemUtilTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/util/DrillFileSystemUtilTest.java index e26c5c6e3f8..175929e9605 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/util/DrillFileSystemUtilTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/util/DrillFileSystemUtilTest.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTest.java index 47883e4ee10..764f1d7af4f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTest.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTestBase.java index 51e92049076..e7e82f973ae 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/util/FileSystemUtilTestBase.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/util/MiniZooKeeperCluster.java b/exec/java-exec/src/test/java/org/apache/drill/exec/util/MiniZooKeeperCluster.java index d0359e1e97c..edfc6e32edc 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/util/MiniZooKeeperCluster.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/util/MiniZooKeeperCluster.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/util/TestApproximateStringMatcher.java b/exec/java-exec/src/test/java/org/apache/drill/exec/util/TestApproximateStringMatcher.java index 930a30bb692..215dba95c4f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/util/TestApproximateStringMatcher.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/util/TestApproximateStringMatcher.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/util/TestArrayWrappedIntIntMap.java b/exec/java-exec/src/test/java/org/apache/drill/exec/util/TestArrayWrappedIntIntMap.java index 8539e595381..da2af9c3b16 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/util/TestArrayWrappedIntIntMap.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/util/TestArrayWrappedIntIntMap.java @@ -1,4 +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 @@ -7,7 +7,7 @@ * "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, diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/TestSplitAndTransfer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/TestSplitAndTransfer.java index 6ac8e976eb3..1553a9a143c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/TestSplitAndTransfer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/TestSplitAndTransfer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java index 14f10fa3f76..c70765fc6ed 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/GenericAccessorTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/TestTimePrintMillis.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/TestTimePrintMillis.java index df106f25e0d..ab6aba77a75 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/TestTimePrintMillis.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/accessor/TestTimePrintMillis.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/TestEmptyPopulation.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/TestEmptyPopulation.java index 8427d494662..c2add4195b8 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/TestEmptyPopulation.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/TestEmptyPopulation.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/fn/TestJsonReaderWithSparseFiles.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/fn/TestJsonReaderWithSparseFiles.java index fafabeb76f2..be04e74d3d5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/fn/TestJsonReaderWithSparseFiles.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/fn/TestJsonReaderWithSparseFiles.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexToJson.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexToJson.java index db3907d342e..49f9f4dd6ac 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexToJson.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexToJson.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeReader.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeReader.java index 5badbdb79ad..3bc35bf6c0b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeReader.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeReader.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.vector.complex.writer; import org.apache.drill.test.BaseTestQuery; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeWriter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeWriter.java index 3c0e1dbd9dc..e9af52fecb1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestComplexTypeWriter.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.vector.complex.writer; import org.apache.drill.test.BaseTestQuery; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestExtendedTypes.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestExtendedTypes.java index b6562bb1590..8c419ce94e1 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestExtendedTypes.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestExtendedTypes.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonNanInf.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonNanInf.java index 3ff5ba2dff2..8457147983a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonNanInf.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestJsonNanInf.java @@ -1,20 +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. + */ package org.apache.drill.exec.vector.complex.writer; import org.apache.commons.io.FileUtils; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestPromotableWriter.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestPromotableWriter.java index 223f4edb085..cbe5a58b5a7 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestPromotableWriter.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestPromotableWriter.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestRepeated.java b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestRepeated.java index bd4731a61a4..667bb7275e4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestRepeated.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/vector/complex/writer/TestRepeated.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/FileTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/FileTest.java index 4f8d86394dc..47462456439 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/FileTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/FileTest.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java index 0f18fba0f73..6fa485a19e3 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/batch/TestSpoolingBuffer.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/fragment/FragmentStatusReporterTest.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/fragment/FragmentStatusReporterTest.java index 7fae7a9c6a9..83c1eca3820 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/fragment/FragmentStatusReporterTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/fragment/FragmentStatusReporterTest.java @@ -1,4 +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 @@ -7,14 +7,13 @@ * "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. + * 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 org.apache.drill.exec.work.fragment; diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/fragment/TestFragmentExecutorCancel.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/fragment/TestFragmentExecutorCancel.java index d2181b49c74..05b263e97d5 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/fragment/TestFragmentExecutorCancel.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/fragment/TestFragmentExecutorCancel.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestMetadataProvider.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestMetadataProvider.java index 463bfe5cbd0..57edfa91a9f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestMetadataProvider.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestMetadataProvider.java @@ -1,4 +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,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestServerMetaProvider.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestServerMetaProvider.java index 7099a378a1b..46f27a6720a 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestServerMetaProvider.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/metadata/TestServerMetaProvider.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/PreparedStatementTestBase.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/PreparedStatementTestBase.java index 6802bc9cfdb..54a1cf2e430 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/PreparedStatementTestBase.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/PreparedStatementTestBase.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestLimit0VsRegularQueriesMetadata.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestLimit0VsRegularQueriesMetadata.java index f6a940195d6..7c1eda8b51d 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestLimit0VsRegularQueriesMetadata.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestLimit0VsRegularQueriesMetadata.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestPreparedStatementProvider.java b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestPreparedStatementProvider.java index 97452970a91..40a46c71e1c 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestPreparedStatementProvider.java +++ b/exec/java-exec/src/test/java/org/apache/drill/exec/work/prepare/TestPreparedStatementProvider.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java b/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java index b5958696341..51a4028a798 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/BaseDirTestWatcher.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.test; import com.google.common.base.Charsets; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixtureBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixtureBuilder.java index dfd63de2f2c..e05a03d82b2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixtureBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterFixtureBuilder.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.test; import java.util.ArrayList; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterTest.java b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterTest.java index 1ae2a87dabf..8dabd0324eb 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ClusterTest.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ClusterTest.java @@ -13,7 +13,7 @@ * 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.‰ + * limitations under the License. */ package org.apache.drill.test; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ConfigBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/ConfigBuilder.java index cdb5eb075e3..02fac0a93c4 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ConfigBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ConfigBuilder.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.test; import java.util.Collection; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/FieldDef.java b/exec/java-exec/src/test/java/org/apache/drill/test/FieldDef.java index 381221785b8..538da07284b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/FieldDef.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/FieldDef.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.test; import java.util.regex.Matcher; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/ProfileParser.java b/exec/java-exec/src/test/java/org/apache/drill/test/ProfileParser.java index d9e344a233b..b24cc9d9b39 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/ProfileParser.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/ProfileParser.java @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.test; import java.io.File; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/QueryTestUtil.java b/exec/java-exec/src/test/java/org/apache/drill/test/QueryTestUtil.java index db3e2ba5edf..96de2de1f49 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/QueryTestUtil.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/QueryTestUtil.java @@ -1,4 +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 diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/RestClientFixture.java b/exec/java-exec/src/test/java/org/apache/drill/test/RestClientFixture.java index 48265d1f648..a2590b6594b 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/RestClientFixture.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/RestClientFixture.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.test; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/TestGracefulShutdown.java b/exec/java-exec/src/test/java/org/apache/drill/test/TestGracefulShutdown.java index 9608e21b4e6..ccd65e41fed 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/TestGracefulShutdown.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/TestGracefulShutdown.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.test; import org.apache.drill.categories.SlowTest; import org.apache.drill.exec.ExecConstants; diff --git a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/file/JsonFileBuilder.java b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/file/JsonFileBuilder.java index 2076b161f65..0b720e8e51f 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/file/JsonFileBuilder.java +++ b/exec/java-exec/src/test/java/org/apache/drill/test/rowSet/file/JsonFileBuilder.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.test.rowSet.file; import com.google.common.base.Preconditions; diff --git a/exec/java-exec/src/test/java/org/apache/drill/vector/TestFillEmpties.java b/exec/java-exec/src/test/java/org/apache/drill/vector/TestFillEmpties.java index 51a1ba4a960..9a9eecc34f2 100644 --- a/exec/java-exec/src/test/java/org/apache/drill/vector/TestFillEmpties.java +++ b/exec/java-exec/src/test/java/org/apache/drill/vector/TestFillEmpties.java @@ -14,8 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ - + */ package org.apache.drill.vector; import static org.junit.Assert.assertEquals; diff --git a/exec/java-exec/src/test/resources/core-site.xml b/exec/java-exec/src/test/resources/core-site.xml index f56d6188041..0392da89148 100644 --- a/exec/java-exec/src/test/resources/core-site.xml +++ b/exec/java-exec/src/test/resources/core-site.xml @@ -1,22 +1,24 @@ + 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. +--> fs.hdfs.impl diff --git a/exec/java-exec/src/test/resources/saffron.properties b/exec/java-exec/src/test/resources/saffron.properties index 9a9134385c9..5812b24f182 100644 --- a/exec/java-exec/src/test/resources/saffron.properties +++ b/exec/java-exec/src/test/resources/saffron.properties @@ -1,9 +1,11 @@ -# 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 +# +# 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 # @@ -12,6 +14,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +# # This properties file is used by Apache Calcite to define allowed charset in string literals, # which is by default ISO-8859-1. diff --git a/exec/java-exec/src/test/resources/ssl-server-invalid.xml b/exec/java-exec/src/test/resources/ssl-server-invalid.xml index 6bfac5bceeb..07d45ecb12c 100644 --- a/exec/java-exec/src/test/resources/ssl-server-invalid.xml +++ b/exec/java-exec/src/test/resources/ssl-server-invalid.xml @@ -1,4 +1,23 @@ + 4.0.0 diff --git a/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/DrillbitClassLoader.java b/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/DrillbitClassLoader.java index 0ff3a9939a3..bc31f99c8f1 100644 --- a/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/DrillbitClassLoader.java +++ b/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/DrillbitClassLoader.java @@ -1,4 +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 diff --git a/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java b/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java index f652a91d534..60d0157f32b 100644 --- a/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java +++ b/exec/jdbc-all/src/test/java/org/apache/drill/jdbc/ITTestShadedJar.java @@ -1,4 +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 diff --git a/exec/jdbc/pom.xml b/exec/jdbc/pom.xml index 0f315782925..b2810746801 100644 --- a/exec/jdbc/pom.xml +++ b/exec/jdbc/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnection.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnection.java index 16ea520726e..a3389d8386f 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnection.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnection.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java index c225895323a..7067caf3d3d 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionConfig.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillDatabaseMetaData.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillDatabaseMetaData.java index 81027c6e195..09781a41711 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillDatabaseMetaData.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillDatabaseMetaData.java @@ -1,10 +1,11 @@ /* - * 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 + * 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 * diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPreparedStatement.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPreparedStatement.java index b1fc0327345..6966011cedf 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPreparedStatement.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillPreparedStatement.java @@ -1,10 +1,11 @@ -/** - * 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 +/* + * 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 * diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillResultSet.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillResultSet.java index 88fd700526e..6cb79d69d10 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillResultSet.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillResultSet.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillStatement.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillStatement.java index 6db5f3acb1b..1bddacb4390 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillStatement.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillStatement.java @@ -1,10 +1,11 @@ -/** - * 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 +/* + * 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 * diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/Driver.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/Driver.java index 0d0300ef9b4..39e0ad1c45c 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/Driver.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/Driver.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/SQLConversionException.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/SQLConversionException.java index 10019996735..5c3445c77a9 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/SQLConversionException.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/SQLConversionException.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/SQLConversionOverflowException.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/SQLConversionOverflowException.java index 1d0cfa866e3..7d29220b2d7 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/SQLConversionOverflowException.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/SQLConversionOverflowException.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/SchemaChangeListener.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/SchemaChangeListener.java index 38a39da8aee..d27b180395d 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/SchemaChangeListener.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/SchemaChangeListener.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/SqlTimeoutException.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/SqlTimeoutException.java index d449916e62b..7087a8c9e84 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/SqlTimeoutException.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/SqlTimeoutException.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/AvaticaDrillSqlAccessor.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/AvaticaDrillSqlAccessor.java index 914e2794c47..082e2941dc4 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/AvaticaDrillSqlAccessor.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/AvaticaDrillSqlAccessor.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/BasicList.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/BasicList.java index 999d7e0e574..ff86cd79523 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/BasicList.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/BasicList.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillAccessorList.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillAccessorList.java index a41c460d767..2d8a946c9f7 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillAccessorList.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillAccessorList.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillCursor.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillCursor.java index 72c36dd9343..15bd24a8bc7 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillCursor.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillCursor.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillFactory.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillFactory.java index 15bc88b690b..b0a53d48b3a 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillFactory.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillFactory.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.jdbc.impl; import org.apache.calcite.avatica.AvaticaConnection; diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillHandler.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillHandler.java index 169c3cd7603..1c795ddd972 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillHandler.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillHandler.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillJdbc40Factory.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillJdbc40Factory.java index fb140a3e4ee..be5535c91e7 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillJdbc40Factory.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillJdbc40Factory.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillJdbc41Factory.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillJdbc41Factory.java index 38715e991da..308a34d7379 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillJdbc41Factory.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillJdbc41Factory.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.jdbc.impl; import java.io.InputStream; diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillRemoteStatement.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillRemoteStatement.java index 9bd1b169ded..e714e637a00 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillRemoteStatement.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillRemoteStatement.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetMetaDataImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetMetaDataImpl.java index ee0fdd0cb45..643f2aa24c2 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetMetaDataImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillResultSetMetaDataImpl.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.jdbc.impl; import java.sql.SQLException; diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillStatementImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillStatementImpl.java index f664b52b482..c2549ece9dc 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillStatementImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillStatementImpl.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillStatementRegistry.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillStatementRegistry.java index 722e26856cb..be05087f977 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillStatementRegistry.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillStatementRegistry.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DriverImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DriverImpl.java index b06a534aa1b..caeec6413e7 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DriverImpl.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DriverImpl.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/GlobalServiceSetReference.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/GlobalServiceSetReference.java index 16e5a769d25..0c6f24d2105 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/GlobalServiceSetReference.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/GlobalServiceSetReference.java @@ -1,4 +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 diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessor.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessor.java index 437e864e0df..204d7d862ba 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessor.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessor.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.jdbc.impl; import java.io.InputStream; diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/WrappedAccessor.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/WrappedAccessor.java index 4cdc2aefa34..8885206e262 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/WrappedAccessor.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/WrappedAccessor.java @@ -1,4 +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 @@ -14,8 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ - + */ package org.apache.drill.jdbc.impl; import java.io.InputStream; diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/package-info.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/package-info.java index 86ce9e7f388..55afdac33e0 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/package-info.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * JDBC driver for Drill. *

    diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/proxy/package-info.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/proxy/package-info.java index 94f52c4185e..33b915bb1d9 100644 --- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/proxy/package-info.java +++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/proxy/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Tracing proxy JDBC driver. Traces calls to another JDBC driver. * diff --git a/exec/jdbc/src/main/resources/apache-drill-jdbc.properties b/exec/jdbc/src/main/resources/apache-drill-jdbc.properties index c39094dc9b4..06170bb0258 100644 --- a/exec/jdbc/src/main/resources/apache-drill-jdbc.properties +++ b/exec/jdbc/src/main/resources/apache-drill-jdbc.properties @@ -15,6 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # + driver.name = Apache Drill JDBC Driver driver.version = ${project.version} driver.version.major = ${project.artifact.selectedVersion.majorVersion} diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/CachingConnectionFactory.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/CachingConnectionFactory.java index 65f993a9ec8..8c1a4b54031 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/CachingConnectionFactory.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/CachingConnectionFactory.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionFactory.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionFactory.java index 07e021ebd98..cfbae38e75d 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionFactory.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionFactory.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfo.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfo.java index 282eba82e46..6b7c3fac2d1 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfo.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionInfo.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java index d64af9217e8..f805354c32b 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTransactionMethodsTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/NonClosableConnection.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/NonClosableConnection.java index 286ebf402bf..725c53d1b1b 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/NonClosableConnection.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/NonClosableConnection.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java index a994a82e6a3..0af4c257703 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetGetMethodConversionsTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetMetaDataTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetMetaDataTest.java index 1ecfba623a6..87327f0c070 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetMetaDataTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ResultSetMetaDataTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementTest.java index d91fc3d25ca..d73077734d9 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/StatementTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessorTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessorTest.java index 7835644b922..f3e4bc4f983 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessorTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/impl/TypeConvertingSqlAccessorTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ConnectionCloseTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ConnectionCloseTest.java index 397d2a42e02..f1427baa387 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ConnectionCloseTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ConnectionCloseTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ResultSetCloseReleasesBuffersTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ResultSetCloseReleasesBuffersTest.java index 94497244ed5..bccfac9f668 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ResultSetCloseReleasesBuffersTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Bug1735ResultSetCloseReleasesBuffersTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java index e167e4b7a68..42b1c642046 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2128GetColumnsDataTypeNotTypeCodeIntBugsTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2130JavaJdbcHamcrestConfigurationTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2130JavaJdbcHamcrestConfigurationTest.java index 05ff667848b..1d6c8fe8d42 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2130JavaJdbcHamcrestConfigurationTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2130JavaJdbcHamcrestConfigurationTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2288GetColumnsMetadataWhenNoRowsTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2288GetColumnsMetadataWhenNoRowsTest.java index c920c41b832..79c37c3f4e6 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2288GetColumnsMetadataWhenNoRowsTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2288GetColumnsMetadataWhenNoRowsTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java index 3fab8ce1856..13cf81e4bcb 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2439GetBooleanFailsSayingWrongTypeBugTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2461IntervalsBreakInfoSchemaBugTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2461IntervalsBreakInfoSchemaBugTest.java index 7e981f44fc7..38c1b8cd726 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2461IntervalsBreakInfoSchemaBugTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2461IntervalsBreakInfoSchemaBugTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java index 66f04468310..09aba4adb2e 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Drill2463GetNullsFailedWithAssertionsBugTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Hook.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Hook.java index 99c75cf3aaf..264a57a9e15 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Hook.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/Hook.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcConnectTriesTestEmbeddedBits.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcConnectTriesTestEmbeddedBits.java index d7edd1ebdda..5ef7fcf1352 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcConnectTriesTestEmbeddedBits.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcConnectTriesTestEmbeddedBits.java @@ -1,4 +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,16 +6,15 @@ * 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 org.apache.drill.jdbc.test; import org.apache.drill.exec.client.InvalidConnectionInfoException; diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java index e4d97af47c3..388f939765d 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcDataTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcNullOrderingAndGroupingTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcNullOrderingAndGroupingTest.java index 9b859736f75..7c9ad90291e 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcNullOrderingAndGroupingTest.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcNullOrderingAndGroupingTest.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java index baabca4d30f..f1d20e1585a 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestActionBase.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java index 6c3289f85d4..a1bcf6d2b04 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcTestQueryBase.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java index 1b78bd5bae1..be862ba8c25 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestAggregateFunctionsQuery.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestBugFixes.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestBugFixes.java index c31648442aa..8dd6b6a144c 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestBugFixes.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestBugFixes.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java index b13b9676ff9..053cabb131e 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcDistQuery.java @@ -1,4 +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 diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java index b5f7d7cc848..e7ce62e3b3e 100644 --- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java +++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestJdbcMetadata.java @@ -1,4 +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 diff --git a/exec/memory/base/pom.xml b/exec/memory/base/pom.xml index 3234b47b08b..f8cdf724030 100644 --- a/exec/memory/base/pom.xml +++ b/exec/memory/base/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/exec/memory/base/src/main/java/io/netty/buffer/ExpandableByteBuf.java b/exec/memory/base/src/main/java/io/netty/buffer/ExpandableByteBuf.java index 7788552872f..59ef645fce3 100644 --- a/exec/memory/base/src/main/java/io/netty/buffer/ExpandableByteBuf.java +++ b/exec/memory/base/src/main/java/io/netty/buffer/ExpandableByteBuf.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/io/netty/buffer/LargeBuffer.java b/exec/memory/base/src/main/java/io/netty/buffer/LargeBuffer.java index 5f5e904fb04..8cbdc972527 100644 --- a/exec/memory/base/src/main/java/io/netty/buffer/LargeBuffer.java +++ b/exec/memory/base/src/main/java/io/netty/buffer/LargeBuffer.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java b/exec/memory/base/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java index 5709473135e..d69d17b4134 100644 --- a/exec/memory/base/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java +++ b/exec/memory/base/src/main/java/io/netty/buffer/MutableWrappedByteBuf.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java b/exec/memory/base/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java index 983ec939a94..ed258cf0294 100644 --- a/exec/memory/base/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java +++ b/exec/memory/base/src/main/java/io/netty/buffer/UnsafeDirectLittleEndian.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package io.netty.buffer; import io.netty.util.internal.PlatformDependent; diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/exception/OutOfMemoryException.java b/exec/memory/base/src/main/java/org/apache/drill/exec/exception/OutOfMemoryException.java index 3fbae6dd8e2..01cf6dee6d9 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/exception/OutOfMemoryException.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/exception/OutOfMemoryException.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationManager.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationManager.java index e9f35cc8556..1585cd42b92 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationManager.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationManager.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationReservation.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationReservation.java index 65a1386a2fd..d6c902f47ee 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationReservation.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocationReservation.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocatorClosedException.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocatorClosedException.java index 8bf2a995f5e..f07bf553aa1 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocatorClosedException.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/AllocatorClosedException.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BoundsChecking.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BoundsChecking.java index 17817722c74..32435e536cc 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BoundsChecking.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BoundsChecking.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BufferAllocator.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BufferAllocator.java index d45c62fb3e3..fe2579b6290 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BufferAllocator.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/BufferAllocator.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/DrillByteBufAllocator.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/DrillByteBufAllocator.java index ec423e22994..33325a5f9ea 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/DrillByteBufAllocator.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/DrillByteBufAllocator.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/RootAllocator.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/RootAllocator.java index 0671702a18c..ea0288630b9 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/RootAllocator.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/RootAllocator.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/package-info.java b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/package-info.java index 3c1b9e5b9d5..65e16351e93 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/memory/package-info.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/memory/package-info.java @@ -1,4 +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 diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/ops/BufferManager.java b/exec/memory/base/src/main/java/org/apache/drill/exec/ops/BufferManager.java index 4df8f0e39f9..e7e4e3c2e5f 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/ops/BufferManager.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/ops/BufferManager.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.ops; import io.netty.buffer.DrillBuf; diff --git a/exec/memory/base/src/main/java/org/apache/drill/exec/util/Pointer.java b/exec/memory/base/src/main/java/org/apache/drill/exec/util/Pointer.java index d315aeddab5..563684ab1dd 100644 --- a/exec/memory/base/src/main/java/org/apache/drill/exec/util/Pointer.java +++ b/exec/memory/base/src/main/java/org/apache/drill/exec/util/Pointer.java @@ -1,4 +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 diff --git a/exec/memory/base/src/test/java/org/apache/drill/exec/memory/BoundsCheckingTest.java b/exec/memory/base/src/test/java/org/apache/drill/exec/memory/BoundsCheckingTest.java index 6213e71974a..5d2853bcc40 100644 --- a/exec/memory/base/src/test/java/org/apache/drill/exec/memory/BoundsCheckingTest.java +++ b/exec/memory/base/src/test/java/org/apache/drill/exec/memory/BoundsCheckingTest.java @@ -7,14 +7,13 @@ * "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. + * 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 org.apache.drill.exec.memory; diff --git a/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestAccountant.java b/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestAccountant.java index 86a6d544241..d977f961bd9 100644 --- a/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestAccountant.java +++ b/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestAccountant.java @@ -1,4 +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 diff --git a/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestBaseAllocator.java b/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestBaseAllocator.java index 00afd98378e..3faa7ead09f 100644 --- a/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestBaseAllocator.java +++ b/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestBaseAllocator.java @@ -1,4 +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 diff --git a/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestEndianess.java b/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestEndianess.java index 09e2cfadbfe..82a91a78ba0 100644 --- a/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestEndianess.java +++ b/exec/memory/base/src/test/java/org/apache/drill/exec/memory/TestEndianess.java @@ -1,4 +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 diff --git a/exec/memory/pom.xml b/exec/memory/pom.xml index 997088d16aa..5cf164ee1fa 100644 --- a/exec/memory/pom.xml +++ b/exec/memory/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/exec/pom.xml b/exec/pom.xml index 402064bc807..8ec88c3a3a6 100644 --- a/exec/pom.xml +++ b/exec/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/exec/rpc/pom.xml b/exec/rpc/pom.xml index 126992fb43e..af4231d8ff5 100644 --- a/exec/rpc/pom.xml +++ b/exec/rpc/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/exec/rpc/src/main/java/org/apache/drill/common/SerializedExecutor.java b/exec/rpc/src/main/java/org/apache/drill/common/SerializedExecutor.java index 8f3a86e3409..ed3edce629a 100644 --- a/exec/rpc/src/main/java/org/apache/drill/common/SerializedExecutor.java +++ b/exec/rpc/src/main/java/org/apache/drill/common/SerializedExecutor.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/AbstractHandshakeHandler.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/AbstractHandshakeHandler.java index 9f426e46a48..f5a379a6e6a 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/AbstractHandshakeHandler.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/AbstractHandshakeHandler.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/Acks.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/Acks.java index 365671770a7..cd1c9724bd2 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/Acks.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/Acks.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BaseRpcOutcomeListener.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BaseRpcOutcomeListener.java index dfc62e0bb3d..df40154a106 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BaseRpcOutcomeListener.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/BaseRpcOutcomeListener.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChannelClosedException.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChannelClosedException.java index b68efae2951..14ee8967909 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChannelClosedException.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChannelClosedException.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChannelListenerWithCoordinationId.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChannelListenerWithCoordinationId.java index 3b95dd8ae7b..1d7fb1cb1f5 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChannelListenerWithCoordinationId.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChannelListenerWithCoordinationId.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChunkCreationHandler.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChunkCreationHandler.java index b0c1ae067eb..6bfa4a311c3 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChunkCreationHandler.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ChunkCreationHandler.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ClientConnection.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ClientConnection.java index 15e5cf84899..7fb9e602d45 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ClientConnection.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ClientConnection.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ConnectionThrottle.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ConnectionThrottle.java index e496dccfb44..552e8fa471e 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ConnectionThrottle.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ConnectionThrottle.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFuture.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFuture.java index d044432f377..8363d1cade9 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFuture.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFuture.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFutureImpl.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFutureImpl.java index cbe63c6e45b..dc7842a785d 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFutureImpl.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/DrillRpcFutureImpl.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/EncryptionContext.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/EncryptionContext.java index dd9acdd617c..727b481cda1 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/EncryptionContext.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/EncryptionContext.java @@ -7,7 +7,7 @@ * "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, @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.rpc; public interface EncryptionContext { diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/EncryptionContextImpl.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/EncryptionContextImpl.java index 471082306fd..e05208d293e 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/EncryptionContextImpl.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/EncryptionContextImpl.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/FutureBitCommand.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/FutureBitCommand.java index 1b19561c9a3..90b2d19f865 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/FutureBitCommand.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/FutureBitCommand.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/InboundRpcMessage.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/InboundRpcMessage.java index d73903457c0..3f5be802583 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/InboundRpcMessage.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/InboundRpcMessage.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ListeningCommand.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ListeningCommand.java index 92022b0dbc7..c9b8b3a5275 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ListeningCommand.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ListeningCommand.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/NamedThreadFactory.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/NamedThreadFactory.java index e7580b2485e..3b1785893d6 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/NamedThreadFactory.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/NamedThreadFactory.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/NonTransientRpcException.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/NonTransientRpcException.java index 014f21b9269..c26752cf911 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/NonTransientRpcException.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/NonTransientRpcException.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutOfMemoryHandler.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutOfMemoryHandler.java index 5d7db478e36..9e0d73e7008 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutOfMemoryHandler.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutOfMemoryHandler.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutboundRpcMessage.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutboundRpcMessage.java index 5eda35050eb..97836eabef8 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutboundRpcMessage.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/OutboundRpcMessage.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ProtobufLengthDecoder.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ProtobufLengthDecoder.java index 3dfe03f5eab..6a1e4080b46 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ProtobufLengthDecoder.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ProtobufLengthDecoder.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java index 3936170e143..fec3962b907 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ReconnectingConnection.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ResettableBarrier.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ResettableBarrier.java index a2a6d2a248c..80ed8863a4f 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ResettableBarrier.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ResettableBarrier.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/Response.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/Response.java index b48adec01a9..3779f628059 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/Response.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/Response.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ResponseSender.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ResponseSender.java index 6dc9ae1ebe3..8b3b917bc51 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ResponseSender.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/ResponseSender.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCheckedFuture.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCheckedFuture.java index 8746a20c6d2..2bf40876ed4 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCheckedFuture.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCheckedFuture.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCommand.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCommand.java index 93b901c56fd..1bb39ac505c 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCommand.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcCommand.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConfig.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConfig.java index 22b253af88e..192f965844f 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConfig.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConfig.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConnectionHandler.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConnectionHandler.java index 7d158c18305..2ca942fbc35 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConnectionHandler.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcConnectionHandler.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcDecoder.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcDecoder.java index ac48187627d..2eb3676a553 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcDecoder.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcDecoder.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcEncoder.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcEncoder.java index 19097bd3c8f..89466302ba2 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcEncoder.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcEncoder.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcException.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcException.java index a6d0e8ee265..4fe9457a4f3 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcException.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcException.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcExceptionHandler.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcExceptionHandler.java index dcf28ff331e..fcff3eeaeb6 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcExceptionHandler.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcExceptionHandler.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcMessage.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcMessage.java index 9712c9a83b2..f578b2448cf 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcMessage.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcMessage.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcMetrics.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcMetrics.java index b7e2e9095f3..a31d5a02570 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcMetrics.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcMetrics.java @@ -6,16 +6,15 @@ * 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 org.apache.drill.exec.rpc; /** diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcOutcome.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcOutcome.java index af9aa0142f5..60822347935 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcOutcome.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcOutcome.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcOutcomeListener.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcOutcomeListener.java index 4485cf95eea..a1c125b2505 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcOutcomeListener.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/RpcOutcomeListener.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslCodec.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslCodec.java index 582b91c2f47..70f870961dc 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslCodec.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslCodec.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.rpc; import javax.security.sasl.SaslException; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslDecryptionHandler.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslDecryptionHandler.java index 52faf516625..19ea8109eb3 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslDecryptionHandler.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslDecryptionHandler.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.rpc; import io.netty.buffer.ByteBuf; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslEncryptionHandler.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslEncryptionHandler.java index 10755c334e2..2587f04a1ab 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslEncryptionHandler.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/SaslEncryptionHandler.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.rpc; import io.netty.buffer.ByteBuf; diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/TransportCheck.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/TransportCheck.java index 4886c989a8f..430da28e370 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/TransportCheck.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/TransportCheck.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/UserRpcException.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/UserRpcException.java index 1d2cc1a161d..f0284375f5f 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/UserRpcException.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/UserRpcException.java @@ -1,4 +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 diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/AuthenticationOutcomeListener.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/AuthenticationOutcomeListener.java index 5c34d012c22..fd3316c462a 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/AuthenticationOutcomeListener.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/AuthenticationOutcomeListener.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/SaslProperties.java b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/SaslProperties.java index 9ed85ce6eee..b4d6b717b3a 100644 --- a/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/SaslProperties.java +++ b/exec/rpc/src/main/java/org/apache/drill/exec/rpc/security/SaslProperties.java @@ -7,7 +7,7 @@ * "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, diff --git a/exec/vector/pom.xml b/exec/vector/pom.xml index 24f41369ccf..79abfa04745 100644 --- a/exec/vector/pom.xml +++ b/exec/vector/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/exec/vector/src/main/codegen/includes/license.ftl b/exec/vector/src/main/codegen/includes/license.ftl index 586b456a7ea..9faaa7299b9 100644 --- a/exec/vector/src/main/codegen/includes/license.ftl +++ b/exec/vector/src/main/codegen/includes/license.ftl @@ -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. + +--> diff --git a/exec/vector/src/main/codegen/includes/vv_imports.ftl b/exec/vector/src/main/codegen/includes/vv_imports.ftl index efca346577a..058621c949d 100644 --- a/exec/vector/src/main/codegen/includes/vv_imports.ftl +++ b/exec/vector/src/main/codegen/includes/vv_imports.ftl @@ -1,14 +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. + +--> import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; diff --git a/exec/vector/src/main/codegen/templates/AbstractFieldReader.java b/exec/vector/src/main/codegen/templates/AbstractFieldReader.java index 0e48853a68b..f2e1eb0dd83 100644 --- a/exec/vector/src/main/codegen/templates/AbstractFieldReader.java +++ b/exec/vector/src/main/codegen/templates/AbstractFieldReader.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/vector/complex/impl/AbstractFieldReader.java" /> diff --git a/exec/vector/src/main/codegen/templates/AbstractFieldWriter.java b/exec/vector/src/main/codegen/templates/AbstractFieldWriter.java index 7ab5dcef987..608420cce87 100644 --- a/exec/vector/src/main/codegen/templates/AbstractFieldWriter.java +++ b/exec/vector/src/main/codegen/templates/AbstractFieldWriter.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/vector/complex/impl/AbstractFieldWriter.java" /> diff --git a/exec/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java b/exec/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java index f2f81934ce5..df7be39bd63 100644 --- a/exec/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java +++ b/exec/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.common.types.TypeProtos.MinorType; <@pp.dropOutputFile /> diff --git a/exec/vector/src/main/codegen/templates/BaseReader.java b/exec/vector/src/main/codegen/templates/BaseReader.java index 771f9b26a20..508f06cfd8e 100644 --- a/exec/vector/src/main/codegen/templates/BaseReader.java +++ b/exec/vector/src/main/codegen/templates/BaseReader.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/vector/complex/reader/BaseReader.java" /> diff --git a/exec/vector/src/main/codegen/templates/BaseWriter.java b/exec/vector/src/main/codegen/templates/BaseWriter.java index f2c6e2227b1..c65a7580903 100644 --- a/exec/vector/src/main/codegen/templates/BaseWriter.java +++ b/exec/vector/src/main/codegen/templates/BaseWriter.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/vector/complex/writer/BaseWriter.java" /> diff --git a/exec/vector/src/main/codegen/templates/BasicTypeHelper.java b/exec/vector/src/main/codegen/templates/BasicTypeHelper.java index c589ed756f1..8160dd59ae3 100644 --- a/exec/vector/src/main/codegen/templates/BasicTypeHelper.java +++ b/exec/vector/src/main/codegen/templates/BasicTypeHelper.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.exec.vector.UntypedNullHolder; import org.apache.drill.exec.vector.UntypedNullVector; diff --git a/exec/vector/src/main/codegen/templates/ComplexCopier.java b/exec/vector/src/main/codegen/templates/ComplexCopier.java index 8255489d56a..91e3ff64546 100644 --- a/exec/vector/src/main/codegen/templates/ComplexCopier.java +++ b/exec/vector/src/main/codegen/templates/ComplexCopier.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/vector/complex/impl/ComplexCopier.java" /> diff --git a/exec/vector/src/main/codegen/templates/ComplexReaders.java b/exec/vector/src/main/codegen/templates/ComplexReaders.java index d662a6fabdd..1f0b92b021a 100644 --- a/exec/vector/src/main/codegen/templates/ComplexReaders.java +++ b/exec/vector/src/main/codegen/templates/ComplexReaders.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import java.lang.Override; import java.util.List; diff --git a/exec/vector/src/main/codegen/templates/ComplexWriters.java b/exec/vector/src/main/codegen/templates/ComplexWriters.java index 71a7f9a0ccb..cfa049d12ff 100644 --- a/exec/vector/src/main/codegen/templates/ComplexWriters.java +++ b/exec/vector/src/main/codegen/templates/ComplexWriters.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import java.lang.Override; import java.util.Vector; diff --git a/exec/vector/src/main/codegen/templates/FixedValueVectors.java b/exec/vector/src/main/codegen/templates/FixedValueVectors.java index 79beb52e05a..ddd69253ae1 100644 --- a/exec/vector/src/main/codegen/templates/FixedValueVectors.java +++ b/exec/vector/src/main/codegen/templates/FixedValueVectors.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <#list vv.types as type> <#list type.minor as minor> diff --git a/exec/vector/src/main/codegen/templates/HolderReaderImpl.java b/exec/vector/src/main/codegen/templates/HolderReaderImpl.java index 7fac563d2a6..0eca723ce8d 100644 --- a/exec/vector/src/main/codegen/templates/HolderReaderImpl.java +++ b/exec/vector/src/main/codegen/templates/HolderReaderImpl.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <#list vv.types as type> <#list type.minor as minor> diff --git a/exec/vector/src/main/codegen/templates/ListWriters.java b/exec/vector/src/main/codegen/templates/ListWriters.java index f10cfc4c8f0..d7a66f75d00 100644 --- a/exec/vector/src/main/codegen/templates/ListWriters.java +++ b/exec/vector/src/main/codegen/templates/ListWriters.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <#list ["Single", "Repeated"] as mode> diff --git a/exec/vector/src/main/codegen/templates/MapWriters.java b/exec/vector/src/main/codegen/templates/MapWriters.java index 93f2edbe8aa..0f055281779 100644 --- a/exec/vector/src/main/codegen/templates/MapWriters.java +++ b/exec/vector/src/main/codegen/templates/MapWriters.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <#list ["Single", "Repeated"] as mode> <@pp.changeOutputFile name="/org/apache/drill/exec/vector/complex/impl/${mode}MapWriter.java" /> diff --git a/exec/vector/src/main/codegen/templates/NullReader.java b/exec/vector/src/main/codegen/templates/NullReader.java index 4da7514ca51..32ee9b9b9ae 100644 --- a/exec/vector/src/main/codegen/templates/NullReader.java +++ b/exec/vector/src/main/codegen/templates/NullReader.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/vector/complex/impl/NullReader.java" /> diff --git a/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java b/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java index 418898bf9e8..412f498c227 100644 --- a/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java +++ b/exec/vector/src/main/codegen/templates/RepeatedValueVectors.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import java.lang.Override; import org.apache.drill.common.types.DataMode; diff --git a/exec/vector/src/main/codegen/templates/UnionListWriter.java b/exec/vector/src/main/codegen/templates/UnionListWriter.java index 81d5f9c2e51..a0d26a020a1 100644 --- a/exec/vector/src/main/codegen/templates/UnionListWriter.java +++ b/exec/vector/src/main/codegen/templates/UnionListWriter.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import java.lang.UnsupportedOperationException; <@pp.dropOutputFile /> diff --git a/exec/vector/src/main/codegen/templates/UnionReader.java b/exec/vector/src/main/codegen/templates/UnionReader.java index 58485ddebf2..40ad89b82ad 100644 --- a/exec/vector/src/main/codegen/templates/UnionReader.java +++ b/exec/vector/src/main/codegen/templates/UnionReader.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.vector.complex.impl.NullReader; diff --git a/exec/vector/src/main/codegen/templates/UnionVector.java b/exec/vector/src/main/codegen/templates/UnionVector.java index 248b0107c21..f428fc1f683 100644 --- a/exec/vector/src/main/codegen/templates/UnionVector.java +++ b/exec/vector/src/main/codegen/templates/UnionVector.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.drill.common.types.TypeProtos.MinorType; import org.apache.drill.exec.vector.ValueVector; diff --git a/exec/vector/src/main/codegen/templates/UnionWriter.java b/exec/vector/src/main/codegen/templates/UnionWriter.java index 58cc4558ddf..961810e3a4d 100644 --- a/exec/vector/src/main/codegen/templates/UnionWriter.java +++ b/exec/vector/src/main/codegen/templates/UnionWriter.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - <@pp.dropOutputFile /> <@pp.changeOutputFile name="/org/apache/drill/exec/vector/complex/impl/UnionWriter.java" /> diff --git a/exec/vector/src/main/codegen/templates/ValueHolders.java b/exec/vector/src/main/codegen/templates/ValueHolders.java index f13404981e7..9982bd4190c 100644 --- a/exec/vector/src/main/codegen/templates/ValueHolders.java +++ b/exec/vector/src/main/codegen/templates/ValueHolders.java @@ -1,4 +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 diff --git a/exec/vector/src/main/codegen/templates/VariableLengthVectors.java b/exec/vector/src/main/codegen/templates/VariableLengthVectors.java index ab995cd5746..58f496868f4 100644 --- a/exec/vector/src/main/codegen/templates/VariableLengthVectors.java +++ b/exec/vector/src/main/codegen/templates/VariableLengthVectors.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import java.lang.Override; import java.util.Set; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/exception/OversizedAllocationException.java b/exec/vector/src/main/java/org/apache/drill/exec/exception/OversizedAllocationException.java index c192359a88c..91428016ead 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/exception/OversizedAllocationException.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/exception/OversizedAllocationException.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/exception/SchemaChangeRuntimeException.java b/exec/vector/src/main/java/org/apache/drill/exec/exception/SchemaChangeRuntimeException.java index f2a7e639152..5ef9c8c83b6 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/exception/SchemaChangeRuntimeException.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/exception/SchemaChangeRuntimeException.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteFunctionHelpers.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteFunctionHelpers.java index 0ecd9d19c90..2bdbb5128aa 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteFunctionHelpers.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/ByteFunctionHelpers.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.expr.fn.impl; import io.netty.buffer.DrillBuf; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/DateUtility.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/DateUtility.java index 67594fe5c0d..a52c95af959 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/DateUtility.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/fn/impl/DateUtility.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.fn.impl; import org.joda.time.format.DateTimeFormat; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ComplexHolder.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ComplexHolder.java index e1025dfb810..e52e4b7d8ff 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ComplexHolder.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ComplexHolder.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ListHolder.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ListHolder.java index ebdbae96871..61397c482a7 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ListHolder.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ListHolder.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/MapHolder.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/MapHolder.java index 8a38bd4237f..70937c67e63 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/MapHolder.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/MapHolder.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ObjectHolder.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ObjectHolder.java index 391a7955308..6df23a85ffa 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ObjectHolder.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ObjectHolder.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.expr.holders; import org.apache.drill.common.types.TypeProtos; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/RepeatedListHolder.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/RepeatedListHolder.java index dc857de5902..52f590ac2a0 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/RepeatedListHolder.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/RepeatedListHolder.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/RepeatedMapHolder.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/RepeatedMapHolder.java index 3db9020f66b..dcccc1a43e6 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/RepeatedMapHolder.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/RepeatedMapHolder.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/UnionHolder.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/UnionHolder.java index 84cdefb7bb0..b7d7cac591d 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/UnionHolder.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/UnionHolder.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ValueHolder.java b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ValueHolder.java index 2431dcb08c7..2212a4b6d6b 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ValueHolder.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/expr/holders/ValueHolder.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/record/TransferPair.java b/exec/vector/src/main/java/org/apache/drill/exec/record/TransferPair.java index 3585a8cae07..c10caca674c 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/record/TransferPair.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/record/TransferPair.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/util/CallBack.java b/exec/vector/src/main/java/org/apache/drill/exec/util/CallBack.java index 0243f8ac293..a0c34605934 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/util/CallBack.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/util/CallBack.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/util/JsonStringArrayList.java b/exec/vector/src/main/java/org/apache/drill/exec/util/JsonStringArrayList.java index 5fcecc6fde1..216c5cc7369 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/util/JsonStringArrayList.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/util/JsonStringArrayList.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/util/JsonStringHashMap.java b/exec/vector/src/main/java/org/apache/drill/exec/util/JsonStringHashMap.java index 4e0e622418e..e4de6d8844f 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/util/JsonStringHashMap.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/util/JsonStringHashMap.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/util/Text.java b/exec/vector/src/main/java/org/apache/drill/exec/util/Text.java index 10746233588..03caa09dc79 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/util/Text.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/util/Text.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/AddOrGetResult.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/AddOrGetResult.java index 7d1f08dabc2..a133d3b82c3 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/AddOrGetResult.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/AddOrGetResult.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/DateUtilities.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/DateUtilities.java index 4ea460b2887..9925f7c3f53 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/DateUtilities.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/DateUtilities.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.vector; import org.joda.time.Period; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/NullableVectorDefinitionSetter.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/NullableVectorDefinitionSetter.java index c418751bf2a..e702ac8d372 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/NullableVectorDefinitionSetter.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/NullableVectorDefinitionSetter.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/SchemaChangeCallBack.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/SchemaChangeCallBack.java index 4c2491ceaa9..c23be160cad 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/SchemaChangeCallBack.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/SchemaChangeCallBack.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.vector; import org.apache.drill.exec.util.CallBack; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullHolder.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullHolder.java index a205edaea0c..90356c11f65 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullHolder.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullHolder.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.vector; import org.apache.drill.common.types.TypeProtos; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullVector.java index 5565fa41a66..48cae7d1491 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/UntypedNullVector.java @@ -14,8 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ - + */ package org.apache.drill.exec.vector; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueHolderHelper.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueHolderHelper.java index 54897d394e5..73b2b551e9b 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueHolderHelper.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/ValueHolderHelper.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/VectorTrimmer.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/VectorTrimmer.java index 7f977f2397e..0fd50cbfa61 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/VectorTrimmer.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/VectorTrimmer.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/dummy/package-info.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/dummy/package-info.java index 9bc654b0f01..183e0f19b51 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/dummy/package-info.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/dummy/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * This package provides a "dummy" set of writers. The dummy writers provide * the same API as the "real" writers, but the dummy writers simply discard diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/package-info.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/package-info.java index f536c09d8d9..accf5ab7dc9 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/package-info.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/accessor/writer/package-info.java @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /** * Implementation of the vector writers. The code will make much more sense if * we start with a review of Drill’s complex vector data model. Drill has 38+ diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ContainerVectorLike.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ContainerVectorLike.java index 999b47dbb6a..69b68451507 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ContainerVectorLike.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/ContainerVectorLike.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/EmptyValuePopulator.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/EmptyValuePopulator.java index fa1de6693d2..41098596dff 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/EmptyValuePopulator.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/EmptyValuePopulator.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/Positionable.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/Positionable.java index 6d86a64387a..b5d77048c42 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/Positionable.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/Positionable.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedFixedWidthVectorLike.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedFixedWidthVectorLike.java index a6967f339fa..97e5825830c 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedFixedWidthVectorLike.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedFixedWidthVectorLike.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedValueVector.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedValueVector.java index 4bcfba6a75b..3bcaa5136a9 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedValueVector.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedValueVector.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedVariableWidthVectorLike.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedVariableWidthVectorLike.java index 67954e7fd64..a2c6f293dc4 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedVariableWidthVectorLike.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/RepeatedVariableWidthVectorLike.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/VectorWithOrdinal.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/VectorWithOrdinal.java index a0c8dd874fa..f1d306adf4d 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/VectorWithOrdinal.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/VectorWithOrdinal.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/AbstractBaseReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/AbstractBaseReader.java index fdcfcd6d200..7c46f0b5f20 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/AbstractBaseReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/AbstractBaseReader.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/AbstractBaseWriter.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/AbstractBaseWriter.java index bd162235ad2..80cf378c687 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/AbstractBaseWriter.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/AbstractBaseWriter.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java index 468c0d57146..8c4e2a5aed0 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/ComplexWriterImpl.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/MapOrListWriterImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/MapOrListWriterImpl.java index 302d99e1e03..b074abd1798 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/MapOrListWriterImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/MapOrListWriterImpl.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/PromotableWriter.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/PromotableWriter.java index 28e90b942cc..b819360bd6e 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/PromotableWriter.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/PromotableWriter.java @@ -6,9 +6,9 @@ * 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. diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/RepeatedListReaderImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/RepeatedListReaderImpl.java index 36e9beedbbb..eb2ce20cbeb 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/RepeatedListReaderImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/RepeatedListReaderImpl.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.vector.complex.impl; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/RepeatedMapReaderImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/RepeatedMapReaderImpl.java index b2fe7b7fc53..95ccdc660e9 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/RepeatedMapReaderImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/RepeatedMapReaderImpl.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.vector.complex.impl; import java.util.Map; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleLikeRepeatedMapReaderImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleLikeRepeatedMapReaderImpl.java index 3f89a9f10aa..9b3cf278b20 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleLikeRepeatedMapReaderImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleLikeRepeatedMapReaderImpl.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.exec.vector.complex.impl; import java.util.Iterator; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleListReaderImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleListReaderImpl.java index 60d8c4e77cd..ec88d997a65 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleListReaderImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleListReaderImpl.java @@ -1,6 +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 @@ -16,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.vector.complex.impl; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleMapReaderImpl.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleMapReaderImpl.java index 1b39775f354..d0c12e6193f 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleMapReaderImpl.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/SingleMapReaderImpl.java @@ -1,7 +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 @@ -17,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.vector.complex.impl; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/UnionListReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/UnionListReader.java index 2d351f270b5..c0a5d0add01 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/UnionListReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/impl/UnionListReader.java @@ -1,5 +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 @@ -15,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.exec.vector.complex.impl; import org.apache.drill.common.types.TypeProtos.MajorType; diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/reader/FieldReader.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/reader/FieldReader.java index caa3aa64bc2..dac0f0d5e6c 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/reader/FieldReader.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/reader/FieldReader.java @@ -1,4 +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 diff --git a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/writer/FieldWriter.java b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/writer/FieldWriter.java index 1a64978aff7..62012d0bbd1 100644 --- a/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/writer/FieldWriter.java +++ b/exec/vector/src/main/java/org/apache/drill/exec/vector/complex/writer/FieldWriter.java @@ -1,4 +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 diff --git a/exec/vector/src/test/java/org/apache/drill/exec/vector/VariableLengthVectorTest.java b/exec/vector/src/test/java/org/apache/drill/exec/vector/VariableLengthVectorTest.java index eaee597b37b..4c6aeedb3dd 100644 --- a/exec/vector/src/test/java/org/apache/drill/exec/vector/VariableLengthVectorTest.java +++ b/exec/vector/src/test/java/org/apache/drill/exec/vector/VariableLengthVectorTest.java @@ -1,4 +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 diff --git a/header b/header index d22b55dae67..8bef243575d 100644 --- a/header +++ b/header @@ -12,4 +12,4 @@ 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. +limitations under the License. \ No newline at end of file diff --git a/logical/pom.xml b/logical/pom.xml index 429baad1c26..d6e27e6d849 100644 --- a/logical/pom.xml +++ b/logical/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/logical/src/main/java/org/apache/drill/common/JSONOptions.java b/logical/src/main/java/org/apache/drill/common/JSONOptions.java index e4321354db8..a9c11013a76 100644 --- a/logical/src/main/java/org/apache/drill/common/JSONOptions.java +++ b/logical/src/main/java/org/apache/drill/common/JSONOptions.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/config/LogicalPlanPersistence.java b/logical/src/main/java/org/apache/drill/common/config/LogicalPlanPersistence.java index ccc4c5a795b..6a3df3a630d 100644 --- a/logical/src/main/java/org/apache/drill/common/config/LogicalPlanPersistence.java +++ b/logical/src/main/java/org/apache/drill/common/config/LogicalPlanPersistence.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/exceptions/ExecutionSetupException.java b/logical/src/main/java/org/apache/drill/common/exceptions/ExecutionSetupException.java index ae70ffa94a8..b05b5f4a271 100644 --- a/logical/src/main/java/org/apache/drill/common/exceptions/ExecutionSetupException.java +++ b/logical/src/main/java/org/apache/drill/common/exceptions/ExecutionSetupException.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/exceptions/ExpressionParsingException.java b/logical/src/main/java/org/apache/drill/common/exceptions/ExpressionParsingException.java index 835182d8730..1c04bc4fef7 100644 --- a/logical/src/main/java/org/apache/drill/common/exceptions/ExpressionParsingException.java +++ b/logical/src/main/java/org/apache/drill/common/exceptions/ExpressionParsingException.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/exceptions/LogicalOperatorValidationException.java b/logical/src/main/java/org/apache/drill/common/exceptions/LogicalOperatorValidationException.java index 3debf28195b..e95bf08698c 100644 --- a/logical/src/main/java/org/apache/drill/common/exceptions/LogicalOperatorValidationException.java +++ b/logical/src/main/java/org/apache/drill/common/exceptions/LogicalOperatorValidationException.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/exceptions/LogicalPlanParsingException.java b/logical/src/main/java/org/apache/drill/common/exceptions/LogicalPlanParsingException.java index c8c0afa3c10..876ed2279d7 100644 --- a/logical/src/main/java/org/apache/drill/common/exceptions/LogicalPlanParsingException.java +++ b/logical/src/main/java/org/apache/drill/common/exceptions/LogicalPlanParsingException.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/BooleanOperator.java b/logical/src/main/java/org/apache/drill/common/expression/BooleanOperator.java index 809d3e20ed1..b107bac052a 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/BooleanOperator.java +++ b/logical/src/main/java/org/apache/drill/common/expression/BooleanOperator.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.common.expression; import java.util.List; diff --git a/logical/src/main/java/org/apache/drill/common/expression/CastExpression.java b/logical/src/main/java/org/apache/drill/common/expression/CastExpression.java index 5d09a242714..d1c45873448 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/CastExpression.java +++ b/logical/src/main/java/org/apache/drill/common/expression/CastExpression.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/ConvertExpression.java b/logical/src/main/java/org/apache/drill/common/expression/ConvertExpression.java index dda97e6e7d7..9c02b7d5d79 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ConvertExpression.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ConvertExpression.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/ErrorCollector.java b/logical/src/main/java/org/apache/drill/common/expression/ErrorCollector.java index f229e533e92..42e2106b61d 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ErrorCollector.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ErrorCollector.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java b/logical/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java index 4f958ec58e0..95da449198b 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ErrorCollectorImpl.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/ExpressionFunction.java b/logical/src/main/java/org/apache/drill/common/expression/ExpressionFunction.java index bc478ddde81..fd16b3c7fe4 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ExpressionFunction.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ExpressionFunction.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/ExpressionPosition.java b/logical/src/main/java/org/apache/drill/common/expression/ExpressionPosition.java index e3f34f434ed..b05c88d97fa 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ExpressionPosition.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ExpressionPosition.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/FunctionCall.java b/logical/src/main/java/org/apache/drill/common/expression/FunctionCall.java index 938ab0aeb52..bc5e3843231 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/FunctionCall.java +++ b/logical/src/main/java/org/apache/drill/common/expression/FunctionCall.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java b/logical/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java index 982819c9d9e..7d9f9a10770 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java +++ b/logical/src/main/java/org/apache/drill/common/expression/FunctionCallFactory.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/FunctionName.java b/logical/src/main/java/org/apache/drill/common/expression/FunctionName.java index 2164cb26cca..1e29a8f9430 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/FunctionName.java +++ b/logical/src/main/java/org/apache/drill/common/expression/FunctionName.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/MajorTypeInLogicalExpression.java b/logical/src/main/java/org/apache/drill/common/expression/MajorTypeInLogicalExpression.java index 5619a69a5e8..203b06a9591 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/MajorTypeInLogicalExpression.java +++ b/logical/src/main/java/org/apache/drill/common/expression/MajorTypeInLogicalExpression.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/NullExpression.java b/logical/src/main/java/org/apache/drill/common/expression/NullExpression.java index e00399fccb6..a3465042caf 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/NullExpression.java +++ b/logical/src/main/java/org/apache/drill/common/expression/NullExpression.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/OutputTypeDeterminer.java b/logical/src/main/java/org/apache/drill/common/expression/OutputTypeDeterminer.java index a03524c55c2..80016816c84 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/OutputTypeDeterminer.java +++ b/logical/src/main/java/org/apache/drill/common/expression/OutputTypeDeterminer.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/TypedNullConstant.java b/logical/src/main/java/org/apache/drill/common/expression/TypedNullConstant.java index bd129d6ea44..675dc66dc3b 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/TypedNullConstant.java +++ b/logical/src/main/java/org/apache/drill/common/expression/TypedNullConstant.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/ValidationError.java b/logical/src/main/java/org/apache/drill/common/expression/ValidationError.java index 195a6d8713a..b4d2e31f199 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/ValidationError.java +++ b/logical/src/main/java/org/apache/drill/common/expression/ValidationError.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/fn/CastFunctions.java b/logical/src/main/java/org/apache/drill/common/expression/fn/CastFunctions.java index c026b9f2f9f..62f9f3d7d90 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/fn/CastFunctions.java +++ b/logical/src/main/java/org/apache/drill/common/expression/fn/CastFunctions.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/fn/FuncHolder.java b/logical/src/main/java/org/apache/drill/common/expression/fn/FuncHolder.java index a8824e06454..372f12bd9fc 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/fn/FuncHolder.java +++ b/logical/src/main/java/org/apache/drill/common/expression/fn/FuncHolder.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/fn/JodaDateValidator.java b/logical/src/main/java/org/apache/drill/common/expression/fn/JodaDateValidator.java index 341af0fdc78..515890f180d 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/fn/JodaDateValidator.java +++ b/logical/src/main/java/org/apache/drill/common/expression/fn/JodaDateValidator.java @@ -1,19 +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. + */ package org.apache.drill.common.expression.fn; import com.google.common.collect.Maps; diff --git a/logical/src/main/java/org/apache/drill/common/expression/fn/package-info.java b/logical/src/main/java/org/apache/drill/common/expression/fn/package-info.java index 6af3f5fcf8d..c9a59663c99 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/fn/package-info.java +++ b/logical/src/main/java/org/apache/drill/common/expression/fn/package-info.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/package-info.java b/logical/src/main/java/org/apache/drill/common/expression/package-info.java index 0c32bf6e008..feffb8aa577 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/package-info.java +++ b/logical/src/main/java/org/apache/drill/common/expression/package-info.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/types/AtomType.java b/logical/src/main/java/org/apache/drill/common/expression/types/AtomType.java index 2918216a5e8..769d60025e6 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/types/AtomType.java +++ b/logical/src/main/java/org/apache/drill/common/expression/types/AtomType.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/types/DataType.java b/logical/src/main/java/org/apache/drill/common/expression/types/DataType.java index 56102ee2c37..1ab7f1d4f2f 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/types/DataType.java +++ b/logical/src/main/java/org/apache/drill/common/expression/types/DataType.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/types/DataTypeFactory.java b/logical/src/main/java/org/apache/drill/common/expression/types/DataTypeFactory.java index c95bf1f1a9b..acf26e3073c 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/types/DataTypeFactory.java +++ b/logical/src/main/java/org/apache/drill/common/expression/types/DataTypeFactory.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/types/LateBindType.java b/logical/src/main/java/org/apache/drill/common/expression/types/LateBindType.java index db0b09ca294..c903d801926 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/types/LateBindType.java +++ b/logical/src/main/java/org/apache/drill/common/expression/types/LateBindType.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/types/package-info.java b/logical/src/main/java/org/apache/drill/common/expression/types/package-info.java index 744b174e7fe..8fe86663895 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/types/package-info.java +++ b/logical/src/main/java/org/apache/drill/common/expression/types/package-info.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/ConditionalExprOptimizer.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/ConditionalExprOptimizer.java index 254926a54b7..05e3a7364ef 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/ConditionalExprOptimizer.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/ConditionalExprOptimizer.java @@ -1,4 +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 @@ -15,7 +15,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package org.apache.drill.common.expression.visitors; import java.util.Collections; diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidationError.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidationError.java index e9056384dfb..bb68e5a6c27 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidationError.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidationError.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidationException.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidationException.java index 3d944dad3e9..11d8bb33e10 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidationException.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/ExpressionValidationException.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/OpVisitor.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/OpVisitor.java index b3c7879dc03..81fe6b48ba6 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/OpVisitor.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/OpVisitor.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/SimpleExprVisitor.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/SimpleExprVisitor.java index 5f83e939c01..6655986f14c 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/SimpleExprVisitor.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/SimpleExprVisitor.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/expression/visitors/package-info.java b/logical/src/main/java/org/apache/drill/common/expression/visitors/package-info.java index b57362eb862..6f14a911e6b 100644 --- a/logical/src/main/java/org/apache/drill/common/expression/visitors/package-info.java +++ b/logical/src/main/java/org/apache/drill/common/expression/visitors/package-info.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/graph/AdjacencyList.java b/logical/src/main/java/org/apache/drill/common/graph/AdjacencyList.java index a4edfc17d8c..17a0c6f21c7 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/AdjacencyList.java +++ b/logical/src/main/java/org/apache/drill/common/graph/AdjacencyList.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/graph/AdjacencyListBuilder.java b/logical/src/main/java/org/apache/drill/common/graph/AdjacencyListBuilder.java index e90d70abd97..05982dc1086 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/AdjacencyListBuilder.java +++ b/logical/src/main/java/org/apache/drill/common/graph/AdjacencyListBuilder.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/graph/Edge.java b/logical/src/main/java/org/apache/drill/common/graph/Edge.java index 7b9ca611f41..f5b28de2636 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/Edge.java +++ b/logical/src/main/java/org/apache/drill/common/graph/Edge.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/graph/Graph.java b/logical/src/main/java/org/apache/drill/common/graph/Graph.java index 3cf4e7a19aa..ea8090c60b5 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/Graph.java +++ b/logical/src/main/java/org/apache/drill/common/graph/Graph.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/graph/GraphAlgos.java b/logical/src/main/java/org/apache/drill/common/graph/GraphAlgos.java index 0b82c7be3f4..39ae952a868 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/GraphAlgos.java +++ b/logical/src/main/java/org/apache/drill/common/graph/GraphAlgos.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/graph/GraphValue.java b/logical/src/main/java/org/apache/drill/common/graph/GraphValue.java index a919008ce71..934c59807d7 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/GraphValue.java +++ b/logical/src/main/java/org/apache/drill/common/graph/GraphValue.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/graph/GraphVisitor.java b/logical/src/main/java/org/apache/drill/common/graph/GraphVisitor.java index 810b738c8ed..1d0d196cdf1 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/GraphVisitor.java +++ b/logical/src/main/java/org/apache/drill/common/graph/GraphVisitor.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/graph/Visitable.java b/logical/src/main/java/org/apache/drill/common/graph/Visitable.java index c97062e6a43..6379f266604 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/Visitable.java +++ b/logical/src/main/java/org/apache/drill/common/graph/Visitable.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/graph/package-info.java b/logical/src/main/java/org/apache/drill/common/graph/package-info.java index 38138d0346e..61b6660a369 100644 --- a/logical/src/main/java/org/apache/drill/common/graph/package-info.java +++ b/logical/src/main/java/org/apache/drill/common/graph/package-info.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/FormatPluginConfig.java b/logical/src/main/java/org/apache/drill/common/logical/FormatPluginConfig.java index e7d3d1f1c3e..3e329778895 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/FormatPluginConfig.java +++ b/logical/src/main/java/org/apache/drill/common/logical/FormatPluginConfig.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/LogicalPlan.java b/logical/src/main/java/org/apache/drill/common/logical/LogicalPlan.java index 8a4a5ab1978..e99a3d3b17a 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/LogicalPlan.java +++ b/logical/src/main/java/org/apache/drill/common/logical/LogicalPlan.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/LogicalPlanBuilder.java b/logical/src/main/java/org/apache/drill/common/logical/LogicalPlanBuilder.java index 28f1402e63c..9bb0754f4cb 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/LogicalPlanBuilder.java +++ b/logical/src/main/java/org/apache/drill/common/logical/LogicalPlanBuilder.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.common.logical; import org.apache.drill.common.logical.PlanProperties.Generator.ResultMode; diff --git a/logical/src/main/java/org/apache/drill/common/logical/PlanProperties.java b/logical/src/main/java/org/apache/drill/common/logical/PlanProperties.java index f4de0eba8fa..d89709df1f4 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/PlanProperties.java +++ b/logical/src/main/java/org/apache/drill/common/logical/PlanProperties.java @@ -1,4 +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 @@ -14,7 +14,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - ******************************************************************************/ + */ package org.apache.drill.common.logical; import org.apache.drill.common.JSONOptions; diff --git a/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java b/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java index a4a0f2bf4f2..96c4036a2e2 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java +++ b/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfig.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfigBase.java b/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfigBase.java index 60754835819..957c4276265 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfigBase.java +++ b/logical/src/main/java/org/apache/drill/common/logical/StoragePluginConfigBase.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/UnexpectedOperatorType.java b/logical/src/main/java/org/apache/drill/common/logical/UnexpectedOperatorType.java index ea3f4b25596..d15726fbe75 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/UnexpectedOperatorType.java +++ b/logical/src/main/java/org/apache/drill/common/logical/UnexpectedOperatorType.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/ValidationError.java b/logical/src/main/java/org/apache/drill/common/logical/ValidationError.java index 54c9c8265f5..7efd1aa511f 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/ValidationError.java +++ b/logical/src/main/java/org/apache/drill/common/logical/ValidationError.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/AbstractBuilder.java b/logical/src/main/java/org/apache/drill/common/logical/data/AbstractBuilder.java index d3e13307a17..bd9b701d1c1 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/AbstractBuilder.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/AbstractBuilder.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/AbstractSingleBuilder.java b/logical/src/main/java/org/apache/drill/common/logical/data/AbstractSingleBuilder.java index 3ed947e2d10..75bdbd47905 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/AbstractSingleBuilder.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/AbstractSingleBuilder.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Filter.java b/logical/src/main/java/org/apache/drill/common/logical/data/Filter.java index 02737f861bf..0c4144979b3 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Filter.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Filter.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Flatten.java b/logical/src/main/java/org/apache/drill/common/logical/data/Flatten.java index 803a4b36ae6..192d587b136 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Flatten.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Flatten.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/GroupingAggregate.java b/logical/src/main/java/org/apache/drill/common/logical/data/GroupingAggregate.java index f554d965b14..7701c9da08e 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/GroupingAggregate.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/GroupingAggregate.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Join.java b/logical/src/main/java/org/apache/drill/common/logical/data/Join.java index bb1159cf60d..2a363485789 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Join.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Join.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/JoinCondition.java b/logical/src/main/java/org/apache/drill/common/logical/data/JoinCondition.java index 611e70b599e..43a93a8cbfe 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/JoinCondition.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/JoinCondition.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Limit.java b/logical/src/main/java/org/apache/drill/common/logical/data/Limit.java index 3cc26035cf0..ad2fcd6ddeb 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Limit.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Limit.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/LogicalOperator.java b/logical/src/main/java/org/apache/drill/common/logical/data/LogicalOperator.java index f1a4928dfdd..dd463737c85 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/LogicalOperator.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/LogicalOperator.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/LogicalOperatorBase.java b/logical/src/main/java/org/apache/drill/common/logical/data/LogicalOperatorBase.java index 2350bb15430..de7e5cc0b04 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/LogicalOperatorBase.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/LogicalOperatorBase.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/NamedExpression.java b/logical/src/main/java/org/apache/drill/common/logical/data/NamedExpression.java index a166c251c8e..4aa2d1f6302 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/NamedExpression.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/NamedExpression.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Project.java b/logical/src/main/java/org/apache/drill/common/logical/data/Project.java index fc981ce0f55..662c8e6a26b 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Project.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Project.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/RunningAggregate.java b/logical/src/main/java/org/apache/drill/common/logical/data/RunningAggregate.java index d71814be555..1ffaeeafa9c 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/RunningAggregate.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/RunningAggregate.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Scan.java b/logical/src/main/java/org/apache/drill/common/logical/data/Scan.java index 68eabbbb116..838f3cb56e4 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Scan.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Scan.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Sequence.java b/logical/src/main/java/org/apache/drill/common/logical/data/Sequence.java index 357c9b8e95d..c9d68ff0e45 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Sequence.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Sequence.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/SingleInputOperator.java b/logical/src/main/java/org/apache/drill/common/logical/data/SingleInputOperator.java index e46cb6b172f..0e9c078d1a0 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/SingleInputOperator.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/SingleInputOperator.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/SinkOperator.java b/logical/src/main/java/org/apache/drill/common/logical/data/SinkOperator.java index 2ca40065201..76faf8fc8b3 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/SinkOperator.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/SinkOperator.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/SourceOperator.java b/logical/src/main/java/org/apache/drill/common/logical/data/SourceOperator.java index d4f8246a6f6..17f78ebcfbc 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/SourceOperator.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/SourceOperator.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Store.java b/logical/src/main/java/org/apache/drill/common/logical/data/Store.java index 8f99eed33e4..961cb8d023b 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Store.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Store.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Transform.java b/logical/src/main/java/org/apache/drill/common/logical/data/Transform.java index 5fc6c70257f..f669e1df937 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Transform.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Transform.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Union.java b/logical/src/main/java/org/apache/drill/common/logical/data/Union.java index 909b1264ba2..134036ac0d8 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Union.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Union.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Values.java b/logical/src/main/java/org/apache/drill/common/logical/data/Values.java index 9276e559532..829ac398043 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Values.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Values.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Window.java b/logical/src/main/java/org/apache/drill/common/logical/data/Window.java index 8a334161d01..4c6bbf3abce 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Window.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Window.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/Writer.java b/logical/src/main/java/org/apache/drill/common/logical/data/Writer.java index 6e51df79ff5..9bc2d665604 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/Writer.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/Writer.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/package-info.java b/logical/src/main/java/org/apache/drill/common/logical/data/package-info.java index fc76c0d2769..c9037922726 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/package-info.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/package-info.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/visitors/AbstractLogicalVisitor.java b/logical/src/main/java/org/apache/drill/common/logical/data/visitors/AbstractLogicalVisitor.java index 165ee663c3f..a04c3a4bc88 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/visitors/AbstractLogicalVisitor.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/visitors/AbstractLogicalVisitor.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/visitors/LogicalVisitor.java b/logical/src/main/java/org/apache/drill/common/logical/data/visitors/LogicalVisitor.java index 1e07dc6c566..5b5ca5ff90e 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/visitors/LogicalVisitor.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/visitors/LogicalVisitor.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/data/visitors/package-info.java b/logical/src/main/java/org/apache/drill/common/logical/data/visitors/package-info.java index 9b82bb3f3c5..abc037638a4 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/data/visitors/package-info.java +++ b/logical/src/main/java/org/apache/drill/common/logical/data/visitors/package-info.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/logical/package-info.java b/logical/src/main/java/org/apache/drill/common/logical/package-info.java index 1f88f068ce3..1eb710ab95c 100644 --- a/logical/src/main/java/org/apache/drill/common/logical/package-info.java +++ b/logical/src/main/java/org/apache/drill/common/logical/package-info.java @@ -1,4 +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 diff --git a/logical/src/main/java/org/apache/drill/common/util/AbstractDynamicBean.java b/logical/src/main/java/org/apache/drill/common/util/AbstractDynamicBean.java index 07a36209dbf..5765a5e218e 100644 --- a/logical/src/main/java/org/apache/drill/common/util/AbstractDynamicBean.java +++ b/logical/src/main/java/org/apache/drill/common/util/AbstractDynamicBean.java @@ -1,4 +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 diff --git a/logical/src/test/java/org/apache/drill/common/expression/PathSegmentTests.java b/logical/src/test/java/org/apache/drill/common/expression/PathSegmentTests.java index 97cd578c9e9..fe9ce0d389e 100644 --- a/logical/src/test/java/org/apache/drill/common/expression/PathSegmentTests.java +++ b/logical/src/test/java/org/apache/drill/common/expression/PathSegmentTests.java @@ -1,4 +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 diff --git a/logical/src/test/java/org/apache/drill/common/expression/fn/JodaDateValidatorTest.java b/logical/src/test/java/org/apache/drill/common/expression/fn/JodaDateValidatorTest.java index 2bd4fd41bd1..d409f957c21 100644 --- a/logical/src/test/java/org/apache/drill/common/expression/fn/JodaDateValidatorTest.java +++ b/logical/src/test/java/org/apache/drill/common/expression/fn/JodaDateValidatorTest.java @@ -1,19 +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. + */ package org.apache.drill.common.expression.fn; import com.google.common.collect.Maps; diff --git a/logical/src/test/java/org/apache/drill/common/expression/parser/TreeTest.java b/logical/src/test/java/org/apache/drill/common/expression/parser/TreeTest.java index fe135371da3..6301a02fb47 100644 --- a/logical/src/test/java/org/apache/drill/common/expression/parser/TreeTest.java +++ b/logical/src/test/java/org/apache/drill/common/expression/parser/TreeTest.java @@ -1,4 +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 diff --git a/logical/src/test/java/org/apache/drill/storage/CheckStorageConfig.java b/logical/src/test/java/org/apache/drill/storage/CheckStorageConfig.java index c628783b5a0..6c0cdebc92d 100644 --- a/logical/src/test/java/org/apache/drill/storage/CheckStorageConfig.java +++ b/logical/src/test/java/org/apache/drill/storage/CheckStorageConfig.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/common/types/DataMode.java b/protocol/src/main/java/org/apache/drill/common/types/DataMode.java index 8fcc851c147..f1187d3c98e 100644 --- a/protocol/src/main/java/org/apache/drill/common/types/DataMode.java +++ b/protocol/src/main/java/org/apache/drill/common/types/DataMode.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/common/types/MajorType.java b/protocol/src/main/java/org/apache/drill/common/types/MajorType.java index e8f1cf5cbc0..104af342760 100644 --- a/protocol/src/main/java/org/apache/drill/common/types/MajorType.java +++ b/protocol/src/main/java/org/apache/drill/common/types/MajorType.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/common/types/MinorType.java b/protocol/src/main/java/org/apache/drill/common/types/MinorType.java index 16bd53e90df..dffc912e0da 100644 --- a/protocol/src/main/java/org/apache/drill/common/types/MinorType.java +++ b/protocol/src/main/java/org/apache/drill/common/types/MinorType.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/common/types/SchemaTypeProtos.java b/protocol/src/main/java/org/apache/drill/common/types/SchemaTypeProtos.java index 1a0c4d1e06c..ae30e40c4f7 100644 --- a/protocol/src/main/java/org/apache/drill/common/types/SchemaTypeProtos.java +++ b/protocol/src/main/java/org/apache/drill/common/types/SchemaTypeProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/common/types/TypeProtos.java b/protocol/src/main/java/org/apache/drill/common/types/TypeProtos.java index 1fa4848de74..b02298a70e6 100644 --- a/protocol/src/main/java/org/apache/drill/common/types/TypeProtos.java +++ b/protocol/src/main/java/org/apache/drill/common/types/TypeProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java b/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java index 29471a8260e..e8096921c51 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/BitControl.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java b/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java index ef07bc9880e..fa45c9fedd6 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/BitData.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java index 2199085658e..1b10e1ef650 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/CoordinationProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java index acfdcb73b7b..35df06f4169 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/ExecProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java index c28cc292aa5..52cfda49d7d 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/GeneralRPCProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitControl.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitControl.java index 04ac2050cf9..475419586ac 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitControl.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitControl.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitData.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitData.java index 65f6de181db..6210f999fc6 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitData.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaBitData.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaCoordinationProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaCoordinationProtos.java index 34b91d60df2..ad5897c35c2 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaCoordinationProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaCoordinationProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java index d7f3536be17..d1c0ef0e6eb 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaDefProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaExecProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaExecProtos.java index bfbbf7a57a8..5b450b63672 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaExecProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaExecProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaGeneralRPCProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaGeneralRPCProtos.java index afe607f47fc..e6383c810cd 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaGeneralRPCProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaGeneralRPCProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaSchemaDefProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaSchemaDefProtos.java index 7d4aa6b35c7..def7f6dab2c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaSchemaDefProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaSchemaDefProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java index 79755dbe4cd..44e4d32cf38 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserBitShared.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserProtos.java index b6c2bf46db2..c1c02ea6f0b 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/SchemaUserProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java index 770ddb4e1e1..bd528aad143 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/UserBitShared.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java b/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java index 32e3d9c9134..6c2685b4bb0 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/UserProtos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Ack.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Ack.java index 6cd729a298d..245aba15863 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Ack.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Ack.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitClientHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitClientHandshake.java index 26c69f0cdb2..3a27f70934c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitClientHandshake.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitClientHandshake.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitControlHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitControlHandshake.java index b49979d3b69..fa6ef82c69f 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitControlHandshake.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitControlHandshake.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitServerHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitServerHandshake.java index ce3a0910cda..b6a18c4edcc 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitServerHandshake.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitServerHandshake.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitStatus.java index 897174a7f3d..0cba0c8f3ad 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitStatus.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitStatus.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitToUserHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitToUserHandshake.java index c22519d44b7..9c87c61f41b 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitToUserHandshake.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/BitToUserHandshake.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CatalogMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CatalogMetadata.java index 30af128ac5d..ea4f9462ca5 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CatalogMetadata.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CatalogMetadata.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CollateSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CollateSupport.java index 599bf8651e8..bc5180605c5 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CollateSupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CollateSupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Collector.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Collector.java index ab9bec5d21b..1cce58ca1be 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Collector.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Collector.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnMetadata.java index 8d31b0dbe93..86eb2c6f1a7 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnMetadata.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnMetadata.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnSearchability.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnSearchability.java index 826a89625ad..508fe884d80 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnSearchability.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnSearchability.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnUpdatability.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnUpdatability.java index 09adb4fe900..9470adbc8f1 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnUpdatability.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ColumnUpdatability.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CompleteRpcMessage.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CompleteRpcMessage.java index 361bc934de0..f6d578ce7ea 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CompleteRpcMessage.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CompleteRpcMessage.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ConvertSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ConvertSupport.java index 1c2396c9fd0..96da4c1b00c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ConvertSupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ConvertSupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java index e7b897d9260..17180a053bb 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CoreOperatorType.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CorrelationNamesSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CorrelationNamesSupport.java index faf46c1eeb2..061ea6debef 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CorrelationNamesSupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CorrelationNamesSupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementReq.java index dc86da5a4c2..c21015fdb41 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementReq.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementReq.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementResp.java index afa3ea81e57..452af4000e9 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementResp.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CreatePreparedStatementResp.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CustomMessage.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CustomMessage.java index af9195ecee6..8be77186788 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/CustomMessage.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/CustomMessage.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DateTimeLiteralsSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DateTimeLiteralsSupport.java index a2330ed2cbe..f965b3381c9 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DateTimeLiteralsSupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DateTimeLiteralsSupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillPBError.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillPBError.java index 1a105f2e66f..172dd96a407 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillPBError.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillPBError.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillServiceInstance.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillServiceInstance.java index b2260032279..6a68b382ae3 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillServiceInstance.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillServiceInstance.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillbitEndpoint.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillbitEndpoint.java index 442c76555ee..2239c5c710b 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillbitEndpoint.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/DrillbitEndpoint.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ExceptionWrapper.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ExceptionWrapper.java index c6e8b35c73c..de0ee101e4b 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ExceptionWrapper.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ExceptionWrapper.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FinishedReceiver.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FinishedReceiver.java index 44a4e444eff..24aa5628e2c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FinishedReceiver.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FinishedReceiver.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentHandle.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentHandle.java index 36cee7cc388..f7088e9e849 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentHandle.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentHandle.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentRecordBatch.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentRecordBatch.java index 4b323610cbf..5bad25c4bec 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentRecordBatch.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentRecordBatch.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentState.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentState.java index 4d3779bcc54..18693182348 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentState.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentState.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentStatus.java index a64d3b66ab7..de916b43615 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentStatus.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/FragmentStatus.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsReq.java index 064cfbd839e..328ad3c50db 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsReq.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsReq.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsResp.java index d6b94758bf7..23981f3e013 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsResp.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetCatalogsResp.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsReq.java index 54a6291245a..276d1624b0c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsReq.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsReq.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsResp.java index f52771984a8..470d02bb7b6 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsResp.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetColumnsResp.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetQueryPlanFragments.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetQueryPlanFragments.java index 4c0109caf8b..7d6e949b33a 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetQueryPlanFragments.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetQueryPlanFragments.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasReq.java index 6e243108f0f..8f820053031 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasReq.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasReq.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasResp.java index f604abcbc82..40baacabc22 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasResp.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetSchemasResp.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetServerMetaResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetServerMetaResp.java index 32c84db1891..41d0c58cfc4 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetServerMetaResp.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetServerMetaResp.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesReq.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesReq.java index e9b768babc7..003ada9df7b 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesReq.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesReq.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesResp.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesResp.java index b06cf0c41cc..317b7d88877 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesResp.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GetTablesResp.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GroupBySupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GroupBySupport.java index 3b4b79e6733..c61a6f767a4 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/GroupBySupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/GroupBySupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/HandshakeStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/HandshakeStatus.java index 264fd0d0494..1bf95e4eb43 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/HandshakeStatus.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/HandshakeStatus.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/IdentifierCasing.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/IdentifierCasing.java index d991cd66ec1..eac0828fb65 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/IdentifierCasing.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/IdentifierCasing.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/InitializeFragments.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/InitializeFragments.java index f6c326de498..d7687970b88 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/InitializeFragments.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/InitializeFragments.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Jar.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Jar.java index 0446aea63d0..aa406b940f4 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Jar.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Jar.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/LikeFilter.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/LikeFilter.java index f54611d2039..c0b184769cb 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/LikeFilter.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/LikeFilter.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MajorFragmentProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/MajorFragmentProfile.java index b2053d72eb5..d07e5f8b8e1 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MajorFragmentProfile.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/MajorFragmentProfile.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MetricValue.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/MetricValue.java index 3b5439f77b6..f749a1e0d7a 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MetricValue.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/MetricValue.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MinorFragmentProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/MinorFragmentProfile.java index fb381a84f26..0eaad100866 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/MinorFragmentProfile.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/MinorFragmentProfile.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NamePart.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/NamePart.java index 2d0b3f7dc40..264915b7111 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NamePart.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/NamePart.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NodeStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/NodeStatus.java index 03224f9443b..910b0143138 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NodeStatus.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/NodeStatus.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NullCollation.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/NullCollation.java index 62a164a16bf..ed830a6994c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/NullCollation.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/NullCollation.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OperatorProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/OperatorProfile.java index e197f54c6e8..d6275fa26c3 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OperatorProfile.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/OperatorProfile.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OrderBySupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/OrderBySupport.java index 5174d8c3c59..54d181de6a1 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OrderBySupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/OrderBySupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OuterJoinSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/OuterJoinSupport.java index 3620416f4bb..a6b9d6e7487 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/OuterJoinSupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/OuterJoinSupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ParsingError.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ParsingError.java index f26b223e80b..71204a45daf 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ParsingError.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ParsingError.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PlanFragment.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/PlanFragment.java index 3a3aea23cdb..ebbdf636805 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PlanFragment.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/PlanFragment.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatement.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatement.java index 9ec4e8fe6f2..1a23c05f370 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatement.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatement.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatementHandle.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatementHandle.java index c35c7cea8ae..226aa772b0c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatementHandle.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/PreparedStatementHandle.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Property.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Property.java index 137c61abeeb..e9bbac67bdc 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Property.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Property.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryContextInformation.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryContextInformation.java index 91f9d5dff92..c175c9f821d 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryContextInformation.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryContextInformation.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryData.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryData.java index 70a642632db..36f27477beb 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryData.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryData.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryId.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryId.java index 5981e431d51..338234f2f8d 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryId.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryId.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryInfo.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryInfo.java index 1a6b1970a18..06cff57d546 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryInfo.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryInfo.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryPlanFragments.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryPlanFragments.java index c64baf811da..f19569dad2a 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryPlanFragments.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryPlanFragments.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryProfile.java index f3ac9669cbc..7986b5fe2d8 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryProfile.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryProfile.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java index a53dc420b9f..b9546ef73ca 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResult.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResultsMode.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResultsMode.java index aed58af26fb..c557488402c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResultsMode.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryResultsMode.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryType.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryType.java index 7a4320d4884..34367b42557 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryType.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/QueryType.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RecordBatchDef.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RecordBatchDef.java index b2a69bebe1e..53bfc91f585 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RecordBatchDef.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RecordBatchDef.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Registry.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Registry.java index 14119a2677c..ff4506de42c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Registry.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Registry.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestResults.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestResults.java index 0abf966d3f3..0ec6fc93d4e 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestResults.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestResults.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestStatus.java index 2e08a4a23bb..0c7cc5d63a0 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestStatus.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RequestStatus.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ResultColumnMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ResultColumnMetadata.java index 7af4ed525ba..7e5fa98e6a4 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ResultColumnMetadata.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ResultColumnMetadata.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Roles.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Roles.java index e24f5161780..e7d44039f1f 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/Roles.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/Roles.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcChannel.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcChannel.java index 9c32dd76fd7..63e9de876d1 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcChannel.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcChannel.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcEndpointInfos.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcEndpointInfos.java index 8a8ffa74173..79e6d9e2db3 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcEndpointInfos.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcEndpointInfos.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcHeader.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcHeader.java index d87a777389a..5a4f561b43b 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcHeader.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcHeader.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcMode.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcMode.java index e34b52da7b0..f25a4d59602 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcMode.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcMode.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcType.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcType.java index 83570885b35..c46b920c7fb 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcType.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RpcType.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RunQuery.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RunQuery.java index d338b4d9106..6d9bfee5430 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/RunQuery.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/RunQuery.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslMessage.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslMessage.java index acb6a2b8690..6dcf15e971d 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslMessage.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslMessage.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslStatus.java index 33adb22fa1f..2bcdbbd9724 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslStatus.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslStatus.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslSupport.java index 8a668ebe38b..dfcf56d2d11 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslSupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SaslSupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SchemaMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SchemaMetadata.java index 29f6e677271..c2f448831ef 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SchemaMetadata.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SchemaMetadata.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java index f4964582721..6f5e962337f 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SerializedField.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerMeta.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerMeta.java index 0a7f02096b4..f05783ad864 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerMeta.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerMeta.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerPreparedStatementState.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerPreparedStatementState.java index ad2118cfbbd..9e88f8202eb 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerPreparedStatementState.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ServerPreparedStatementState.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/StackTraceElementWrapper.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/StackTraceElementWrapper.java index 25681fd3389..f931883ee77 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/StackTraceElementWrapper.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/StackTraceElementWrapper.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/StreamProfile.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/StreamProfile.java index 24807687ae9..ce526b1711d 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/StreamProfile.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/StreamProfile.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SubQuerySupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SubQuerySupport.java index 28d6ff5d2b0..5191cf97270 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/SubQuerySupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/SubQuerySupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/TableMetadata.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/TableMetadata.java index 89dfb91e2cd..c0c11ac1be0 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/TableMetadata.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/TableMetadata.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UnionSupport.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UnionSupport.java index aaeec0d91cf..f751b6168bd 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UnionSupport.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UnionSupport.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserCredentials.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserCredentials.java index 11b42a39842..4c4491b2b4c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserCredentials.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserCredentials.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserProperties.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserProperties.java index ad6bd3f96e9..f189bf81b8c 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserProperties.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserProperties.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserToBitHandshake.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserToBitHandshake.java index b578344a3fa..043d3caa367 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserToBitHandshake.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/UserToBitHandshake.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ValueMode.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ValueMode.java index 0c7e2024b6b..ed538c0ced6 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/ValueMode.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/ValueMode.java @@ -1,4 +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 diff --git a/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java b/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java index 5f0db24237f..89b2bb185e4 100644 --- a/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java +++ b/protocol/src/main/java/org/apache/drill/exec/proto/beans/WorkQueueStatus.java @@ -1,4 +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 diff --git a/src/main/resources/assemblies/source-assembly.xml b/src/main/resources/assemblies/source-assembly.xml index abcfc5ae78b..4ed43f17ac5 100644 --- a/src/main/resources/assemblies/source-assembly.xml +++ b/src/main/resources/assemblies/source-assembly.xml @@ -1,14 +1,23 @@ - + source-release diff --git a/src/main/resources/checkstyle-config.xml b/src/main/resources/checkstyle-config.xml index 32bbbe85b18..5addf380e9d 100644 --- a/src/main/resources/checkstyle-config.xml +++ b/src/main/resources/checkstyle-config.xml @@ -1,19 +1,28 @@ - + - + diff --git a/src/main/resources/checkstyle-suppressions.xml b/src/main/resources/checkstyle-suppressions.xml index 9d4682b9598..17d6d211cb5 100644 --- a/src/main/resources/checkstyle-suppressions.xml +++ b/src/main/resources/checkstyle-suppressions.xml @@ -1,14 +1,23 @@ - + diff --git a/tools/drill-patch-review.py b/tools/drill-patch-review.py index c067ae2d805..9ff4d4d1543 100755 --- a/tools/drill-patch-review.py +++ b/tools/drill-patch-review.py @@ -1,5 +1,5 @@ #!/usr/bin/env python - +# # 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 @@ -7,14 +7,15 @@ # 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. +# # Modified based on Kafka's patch review tool diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml index 708c9b9348d..948cb5214f2 100644 --- a/tools/fmpp/pom.xml +++ b/tools/fmpp/pom.xml @@ -1,14 +1,23 @@ - + 4.0.0 diff --git a/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java b/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java index 2d70c64e509..92247bddd91 100644 --- a/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java +++ b/tools/fmpp/src/main/java/org/apache/drill/fmpp/mojo/FMPPMojo.java @@ -1,4 +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 diff --git a/tools/pom.xml b/tools/pom.xml index 8abfa88e520..fa3da9329cf 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -1,19 +1,22 @@ 4.0.0 diff --git a/tools/verify_release.sh b/tools/verify_release.sh index 90b991d5e6a..360a6d8d30d 100755 --- a/tools/verify_release.sh +++ b/tools/verify_release.sh @@ -1,24 +1,20 @@ #!/usr/bin/env bash # -#/** -# * Copyright 2014 The Apache Software Foundation -# * -# * Licensed to the Apache Software Foundation (ASF) under one -# * or more contributor license agreements. See the NOTICE file -# * distributed with this work for additional information -# * 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_CHECKUM_ALOGRITHMS="sha1 md5"