Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependencies and fix minor errors

This commit is contained in:
Kevin Risden 2016-10-27 15:54:58 -05:00
parent 1cd8da9863
commit 6e4924cbfc
9 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lucene/ivy-versions.properties
View File

@ -99,7 +99,8 @@ io.netty.netty-all.version = 4.0.36.Final
/org.apache.avro/avro = 1.7.5
org.apache.calcite.version = 1.10.0
/org.apache.calcite.avatica/avatica = 1.7.1
org.apache.calcite.avatica.version = 1.8.0
/org.apache.calcite.avatica/avatica = ${org.apache.calcite.avatica.version}
/org.apache.calcite/calcite-core = ${org.apache.calcite.version}
/org.apache.calcite/calcite-linq4j = ${org.apache.calcite.version}

2
solr/core/src/test/org/apache/solr/handler/TestSQLHandler.java
View File

@ -679,7 +679,7 @@ public class TestSQLHandler extends AbstractFullDistribZkTestBase {
assert(tuple.getDouble("EXPR$5") == 13.5D); //avg(field_i)
sParams = mapParams(CommonParams.QT, "/sql",
"stmt", "select str_s as myString, 'count(*)', sum(field_i) as sum, min(field_i), max(field_i), cast(avg(1.0 * field_i) as float) from collection1 where text='XXXX' group by str_s order by sum asc limit 2");
"stmt", "select str_s as myString, count(*), sum(field_i) as mySum, min(field_i), max(field_i), cast(avg(1.0 * field_i) as float) from collection1 where text='XXXX' group by str_s order by mySum asc limit 2");
solrStream = new SolrStream(jetty.url, sParams);
tuples = getTuples(solrStream);

1
solr/licenses/avatica-1.7.1.jar.sha1
View File

@ -1 +0,0 @@
9bc0eef759c2e341bfa206cc3e21d685037ad05f

1
solr/licenses/avatica-1.8.0.jar.sha1 Normal file
View File

@ -0,0 +1 @@
8e1ae87c3ff634d0ebeeae69bb715471f433381e

1
solr/licenses/calcite-core-1.10.0.jar.sha1 Normal file
View File

@ -0,0 +1 @@
06550935a70e0d503ae1a11a251066dbb1bc20bb

1
solr/licenses/calcite-core-1.7.0.jar.sha1
View File

@ -1 +0,0 @@
5471bd9acf303dacda789a150c3059a9f9a0f9fc

1
solr/licenses/calcite-linq4j-1.10.0.jar.sha1 Normal file
View File

@ -0,0 +1 @@
cb161081f3cca51d7a2089df746d771a8af2a577

1
solr/licenses/calcite-linq4j-1.7.0.jar.sha1
View File

@ -1 +0,0 @@
00686c73a7b41a1931bdda43952d88bed92dc827

8
solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
View File

@ -223,7 +223,7 @@ public class JDBCStream extends TupleStream implements Expressible {
for(int columnIdx = 0; columnIdx < metadata.getColumnCount(); ++columnIdx){
final int columnNumber = columnIdx + 1; // cause it starts at 1
final String columnName = metadata.getColumnName(columnNumber);
final String columnName = metadata.getColumnLabel(columnNumber);
String className = metadata.getColumnClassName(columnNumber);
String typeName = metadata.getColumnTypeName(columnNumber);
@ -239,7 +239,7 @@ public class JDBCStream extends TupleStream implements Expressible {
}
};
}
else if(Short.class.getName() == className){
else if(Short.class.getName().equals(className)) {
valueSelectors[columnIdx] = new ResultSetValueSelector() {
public Object selectValue(ResultSet resultSet) throws SQLException {
Short obj = resultSet.getShort(columnNumber);
@ -251,7 +251,7 @@ public class JDBCStream extends TupleStream implements Expressible {
}
};
}
else if(Integer.class.getName() == className){
else if(Integer.class.getName().equals(className)) {
valueSelectors[columnIdx] = new ResultSetValueSelector() {
public Object selectValue(ResultSet resultSet) throws SQLException {
Integer obj = resultSet.getInt(columnNumber);
@ -263,7 +263,7 @@ public class JDBCStream extends TupleStream implements Expressible {
}
};
}
else if(Float.class.getName() == className){
else if(Float.class.getName().equals(className)) {
valueSelectors[columnIdx] = new ResultSetValueSelector() {
public Object selectValue(ResultSet resultSet) throws SQLException {
Float obj = resultSet.getFloat(columnNumber);