You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/02/16 13:47:03 UTC
[13/50] lucene-solr:jira/solr-9858: Merge branch
'apache-https-master' into jira/solr-8593
Merge branch 'apache-https-master' into jira/solr-8593
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/bda84d84
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/bda84d84
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/bda84d84
Branch: refs/heads/jira/solr-9858
Commit: bda84d84420f179118cec0bbf85854724520f755
Parents: 1366fcd c20d129
Author: Kevin Risden <kr...@apache.org>
Authored: Tue Nov 15 21:14:16 2016 -0600
Committer: Kevin Risden <kr...@apache.org>
Committed: Tue Nov 15 21:14:16 2016 -0600
----------------------------------------------------------------------
lucene/CHANGES.txt | 13 +
lucene/benchmark/conf/highlighters-postings.alg | 4 +-
lucene/benchmark/conf/highlighters-tv.alg | 2 +-
lucene/build.xml | 2 +
.../simpletext/SimpleTextSegmentInfoFormat.java | 148 ++-
.../lucene62/Lucene62SegmentInfoFormat.java | 118 +-
.../apache/lucene/index/IndexWriterConfig.java | 3 +-
.../org/apache/lucene/index/MultiSorter.java | 68 +-
.../java/org/apache/lucene/index/Sorter.java | 102 +-
.../lucene/search/SortedNumericSortField.java | 5 +
.../apache/lucene/index/TestIndexSorting.java | 1030 ++++++++++++++++--
.../uhighlight/AnalysisOffsetStrategy.java | 261 ++---
.../CompositeOffsetsPostingsEnum.java | 145 +++
.../search/uhighlight/FieldOffsetStrategy.java | 115 +-
.../uhighlight/MemoryIndexOffsetStrategy.java | 129 +++
.../uhighlight/MultiTermHighlighting.java | 190 ----
.../uhighlight/MultiValueTokenStream.java | 148 ---
.../lucene/search/uhighlight/OffsetsEnum.java | 1 +
.../lucene/search/uhighlight/Passage.java | 2 +-
.../lucene/search/uhighlight/PhraseHelper.java | 2 +-
.../uhighlight/PostingsOffsetStrategy.java | 3 +-
.../PostingsWithTermVectorsOffsetStrategy.java | 8 +-
.../uhighlight/TermVectorOffsetStrategy.java | 15 +-
.../uhighlight/TokenStreamFromTermVector.java | 395 -------
.../uhighlight/TokenStreamOffsetStrategy.java | 173 +++
.../search/uhighlight/UnifiedHighlighter.java | 103 +-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 39 +-
.../TestUnifiedHighlighterRanking.java | 5 +-
.../TestUnifiedHighlighterExtensibility.java | 11 +-
.../index/BaseSegmentInfoFormatTestCase.java | 91 +-
solr/CHANGES.txt | 6 +
.../store/blockcache/BlockDirectoryTest.java | 14 +-
.../solr/client/solrj/io/sql/StatementImpl.java | 9 +-
.../client/solrj/io/stream/CloudSolrStream.java | 54 +-
.../io/stream/FeaturesSelectionStream.java | 8 +-
.../solr/client/solrj/io/stream/JDBCStream.java | 55 +-
.../client/solrj/io/stream/ParallelStream.java | 8 +-
.../solr/client/solrj/io/stream/SolrStream.java | 2 -
.../client/solrj/io/stream/TextLogitStream.java | 12 +-
.../client/solrj/io/stream/TopicStream.java | 41 +-
.../client/solrj/response/LukeResponse.java | 31 +
.../solr/client/solrj/SolrExampleTests.java | 3 +-
.../solr/client/solrj/io/sql/JdbcTest.java | 61 +-
.../client/solrj/io/stream/JDBCStreamTest.java | 61 +-
.../solrj/io/stream/StreamExpressionTest.java | 324 +++---
.../client/solrj/io/stream/StreamingTest.java | 588 +++++-----
46 files changed, 2762 insertions(+), 1846 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bda84d84/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
----------------------------------------------------------------------
diff --cc solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
index bb0ed2c,4039358..143143f
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
@@@ -206,7 -209,8 +209,8 @@@ public class JDBCStream extends TupleSt
try{
resultSet = statement.executeQuery(sqlQuery);
} catch (SQLException e) {
- throw new IOException(String.format(Locale.ROOT, "Failed to execute sqlQuery '%s' against JDBC connection '%s'.\n"+ e.getMessage(), sqlQuery, connectionUrl), e);
- throw new IOException(String.format(Locale.ROOT, "Failed to execute sqlQuery '%s' against JDBC connection '%s'",
- sqlQuery, connectionUrl), e);
++ throw new IOException(String.format(Locale.ROOT, "Failed to execute sqlQuery '%s' against JDBC connection '%s'.\n"
++ + e.getMessage(), sqlQuery, connectionUrl), e);
}
try{
@@@ -221,8 -226,9 +226,8 @@@
ResultSetValueSelector[] valueSelectors = new ResultSetValueSelector[metadata.getColumnCount()];
for(int columnIdx = 0; columnIdx < metadata.getColumnCount(); ++columnIdx){
--
- final int columnNumber = columnIdx + 1; // cause it starts at 1
+ final int columnNumber = columnIdx + 1; // cause it starts at 1
+ // Use getColumnLabel instead of getColumnName to make sure fields renamed with AS as picked up properly
final String columnName = metadata.getColumnLabel(columnNumber);
String className = metadata.getColumnClassName(columnNumber);
String typeName = metadata.getColumnTypeName(columnNumber);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bda84d84/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/bda84d84/solr/solrj/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
----------------------------------------------------------------------