You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@metamodel.apache.org by ka...@apache.org on 2019/02/26 06:21:11 UTC
[metamodel] 09/11: I change the code style,thanks for review.
This is an automated email from the ASF dual-hosted git repository.
kaspersor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/metamodel.git
commit 4ad37b77e3eb3fbe8b072c534aee16c94466f0cc
Author: 李小保 <li...@mininglamp.com>
AuthorDate: Mon Feb 25 08:57:20 2019 +0800
I change the code style,thanks for review.
---
.../java/org/apache/metamodel/jdbc/dialects/HiveQueryRewriter.java | 3 ---
.../org/apache/metamodel/jdbc/dialects/RowNumberQueryRewriter.java | 2 --
.../java/org/apache/metamodel/dialects/HiveQueryRewriterTest.java | 5 +++--
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/HiveQueryRewriter.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/HiveQueryRewriter.java
index f134656..4eed234 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/HiveQueryRewriter.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/HiveQueryRewriter.java
@@ -55,9 +55,6 @@ public class HiveQueryRewriter extends RowNumberQueryRewriter {
}
-
-
-
@Override
public String rewriteColumnType(ColumnType columnType, Integer columnSize) {
if (columnType == ColumnType.INTEGER) {
diff --git a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/RowNumberQueryRewriter.java b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/RowNumberQueryRewriter.java
index 9788d03..aad2c07 100644
--- a/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/RowNumberQueryRewriter.java
+++ b/jdbc/src/main/java/org/apache/metamodel/jdbc/dialects/RowNumberQueryRewriter.java
@@ -49,7 +49,6 @@ public class RowNumberQueryRewriter extends DefaultQueryRewriter {
outerQuery.select(new SelectItem(selectItem, subQuerySelectItem));
}
-
final String rewrittenOrderByClause = rewriteOrderByClause(innerQuery, innerQuery.getOrderByClause());
final String rowOver = "ROW_NUMBER() OVER(" + rewrittenOrderByClause + ")";
innerQuery.select(new SelectItem(rowOver, "metamodel_row_number"));
@@ -64,5 +63,4 @@ public class RowNumberQueryRewriter extends DefaultQueryRewriter {
return baseQueryString + " WHERE metamodel_row_number BETWEEN " + firstRow + " AND "
+ (firstRow - 1 + maxRows);
}
-
}
diff --git a/jdbc/src/test/java/org/apache/metamodel/dialects/HiveQueryRewriterTest.java b/jdbc/src/test/java/org/apache/metamodel/dialects/HiveQueryRewriterTest.java
index c4bc753..2098350 100644
--- a/jdbc/src/test/java/org/apache/metamodel/dialects/HiveQueryRewriterTest.java
+++ b/jdbc/src/test/java/org/apache/metamodel/dialects/HiveQueryRewriterTest.java
@@ -45,7 +45,6 @@ import org.junit.Assert;
public class HiveQueryRewriterTest extends TestCase {
-
@Override
protected void setUp() throws Exception {
super.setUp();
@@ -65,6 +64,7 @@ public class HiveQueryRewriterTest extends TestCase {
Query q = new Query().from(new MutableTable("5_t_kk_kkxx")).select(col1).select(col2)
.where(col1, OperatorType.EQUALS_TO, "5207281832").orderBy(col1).setFirstRow(5).setMaxRows(9);
String sql = qr.rewriteQuery(q);
+
assertEquals(sql,"SELECT metamodel_subquery.kkbh, metamodel_subquery.kkmc FROM (SELECT kkbh, kkmc, ROW_NUMBER() OVER( ORDER BY kkbh ASC) AS metamodel_row_number FROM 5_t_kk_kkxx WHERE kkbh = '5207281832') metamodel_subquery WHERE metamodel_row_number BETWEEN 5 AND 13");
}
@@ -82,6 +82,7 @@ public class HiveQueryRewriterTest extends TestCase {
Query q = new Query().from(new MutableTable("5_t_kk_kkxx")).select(col1).select(col2)
.where(col1, OperatorType.EQUALS_TO, "5207281832").orderBy(col1).setFirstRow(5).setMaxRows(9);
String sql = qr.rewriteQuery(q);
+
assertEquals(sql,"SELECT kkbh, kkmc FROM 5_t_kk_kkxx WHERE kkbh = '5207281832' ORDER BY kkbh ASC LIMIT 9 OFFSET 4");
}
-}
\ No newline at end of file
+}