You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by cg...@apache.org on 2021/04/27 11:55:03 UTC
[drill] branch master updated: DRILL-7910: Bumps commons-io from
2.4 to 2.7 (#2205)
This is an automated email from the ASF dual-hosted git repository.
cgivre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/drill.git
The following commit(s) were added to refs/heads/master by this push:
new 8433983 DRILL-7910: Bumps commons-io from 2.4 to 2.7 (#2205)
8433983 is described below
commit 8433983671eb75f8565a6cbf5ac12044cdf38920
Author: Charles S. Givre <cg...@apache.org>
AuthorDate: Tue Apr 27 07:54:51 2021 -0400
DRILL-7910: Bumps commons-io from 2.4 to 2.7 (#2205)
* Initial Start
* Initial commit
---
.../org/apache/drill/exec/planner/common/DrillRelOptUtil.java | 4 ++--
.../main/java/org/apache/drill/exec/rpc/UserClientConnection.java | 8 ++++----
.../drill/exec/store/base/filter/FilterPushDownStrategy.java | 3 ---
pom.xml | 2 +-
tools/drill-patch-review.py | 6 +++---
tools/fmpp/pom.xml | 2 +-
6 files changed, 11 insertions(+), 14 deletions(-)
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 af33675..42d7a14 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
@@ -642,8 +642,8 @@ public abstract class DrillRelOptUtil {
/**
* Returns whether the join condition is a simple equi-join or not. A simple equi-join is
* defined as an two-table equality join (no self-join)
- * @param join : input join
- * @param joinFieldOrdinals: join field ordinal w.r.t. the underlying inputs to the join
+ * @param join input join
+ * @param joinFieldOrdinals join field ordinal w.r.t. the underlying inputs to the join
* @return TRUE if the join is a simple equi-join (not a self-join), FALSE otherwise
* */
public static boolean analyzeSimpleEquiJoin(Join join, int[] joinFieldOrdinals) {
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 85d14dc..091b328 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
@@ -46,16 +46,16 @@ public interface UserClientConnection {
/**
* Send query result outcome to client. Outcome is returned through {@code listener}.
*
- * @param listener
- * @param result
+ * @param listener The listener
+ * @param result The query result to be sent
*/
void sendResult(RpcOutcomeListener<Ack> listener, QueryResult result);
/**
* Send query data to client. Outcome is returned through {@code listener}.
*
- * @param listener
- * @param result
+ * @param listener The listener
+ * @param data The data to be sent
*/
void sendData(RpcOutcomeListener<Ack> listener, QueryDataPackage data);
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java
index 2a22b43..d0b4617 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/base/filter/FilterPushDownStrategy.java
@@ -246,10 +246,7 @@ public class FilterPushDownStrategy {
* Rebuilds the query plan subtree to include any substitutions and removals requested
* by the listener.
*
- * @param oldScan the original scan node
* @param newGroupScan the optional replacement scan node given by the listener
- * @param filter the original filter
- * @param project the original optional project node
* @param remainingPreds the Calcite predicates which the listener *does not* handle
* and which should remain in the plan tree
* @return a rebuilt query subtree
diff --git a/pom.xml b/pom.xml
index f65ea39..9c21c85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,7 +69,7 @@
<kerby.version>1.0.0</kerby.version>
<findbugs.version>3.0.0</findbugs.version>
<netty.tcnative.classifier />
- <commons.io.version>2.4</commons.io.version>
+ <commons.io.version>2.7</commons.io.version>
<hamcrest.core.version>1.3</hamcrest.core.version>
<curator.version>5.1.0</curator.version>
<wiremock.standalone.version>2.23.2</wiremock.standalone.version>
diff --git a/tools/drill-patch-review.py b/tools/drill-patch-review.py
index 9ff4d4d..c5501a2 100755
--- a/tools/drill-patch-review.py
+++ b/tools/drill-patch-review.py
@@ -33,9 +33,9 @@ def get_jira():
'server': 'https://issues.apache.org/jira'
}
# read the config file
- home=jira_home=os.getenv('HOME')
- home=home.rstrip('/')
- jira_config = dict(line.strip().split('=') for line in open(home + '/jira.ini'))
+ jira_home=os.getenv('HOME')
+ jira_home=jira_home.rstrip('/')
+ jira_config = dict(line.strip().split('=') for line in open(jira_home + '/jira.ini'))
jira = JIRA(options,basic_auth=(jira_config['user'], jira_config['password']))
return jira
diff --git a/tools/fmpp/pom.xml b/tools/fmpp/pom.xml
index af35f1a..9f3bc98 100644
--- a/tools/fmpp/pom.xml
+++ b/tools/fmpp/pom.xml
@@ -35,7 +35,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.4</version>
+ <version>2.7</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>