You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2016/02/07 20:45:48 UTC
[11/21] lucene-solr git commit: SOLR-8652: Lower case the limit clause
SOLR-8652: Lower case the limit clause
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/3d47612b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/3d47612b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/3d47612b
Branch: refs/heads/jira/lucene-5438-nrt-replication
Commit: 3d47612b04dae27080a5960088aa5e7303f14874
Parents: 75a8179
Author: jbernste <jb...@apache.org>
Authored: Sat Feb 6 21:42:01 2016 -0500
Committer: jbernste <jb...@apache.org>
Committed: Sat Feb 6 21:42:01 2016 -0500
----------------------------------------------------------------------
.../java/org/apache/solr/client/solrj/io/sql/StatementImpl.java | 2 +-
.../src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3d47612b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
index e236c83..f859831 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/sql/StatementImpl.java
@@ -361,6 +361,6 @@ class StatementImpl implements Statement {
private boolean containsLimit(String sql) {
String[] tokens = sql.split("\\s+");
String secondToLastToken = tokens[tokens.length-2];
- return ("limit").equals(secondToLastToken);
+ return ("limit").equals(secondToLastToken.toLowerCase(Locale.getDefault()));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3d47612b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
index b3d7ae9..6d9c51a 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
@@ -177,8 +177,8 @@ public class JdbcTest extends AbstractFullDistribZkTestBase {
assert(!rs.next());
stmt.close();
- //Test simple loop. Since limit is set it will override the statement maxRows
- rs = stmt.executeQuery("select id, a_i, a_s, a_f from collection1 order by a_i asc limit 100");
+ //Test simple loop. Since limit is set it will override the statement maxRows.
+ rs = stmt.executeQuery("select id, a_i, a_s, a_f from collection1 order by a_i asc LIMIT 100");
int count = 0;
while(rs.next()) {
++count;