Skip to content

Commit

Permalink
DRILL-7910: Bumps commons-io from 2.4 to 2.7 (apache#2205)
Browse files Browse the repository at this point in the history
* Initial Start

* Initial commit
  • Loading branch information
cgivre committed Apr 27, 2021
1 parent 360b080 commit 8433983
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -642,8 +642,8 @@ public static boolean guessRows(RelNode rel) {
/**
* 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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -246,10 +246,7 @@ public ExprNode identifyCandidate(DrillParseContext parseContext, DrillScanRel s
* 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
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions tools/drill-patch-review.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tools/fmpp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 8433983

Please sign in to comment.