You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2016/07/05 08:50:59 UTC
[1/2] kylin git commit: KYLIN-1817: support date type for
PreparedStatement
Repository: kylin
Updated Branches:
refs/heads/master 13ae6614f -> ff1aec306
KYLIN-1817: support date type for PreparedStatement
Signed-off-by: Li Yang <li...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/56071064
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/56071064
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/56071064
Branch: refs/heads/master
Commit: 56071064f085e72373446bde00143b4e1de7e454
Parents: 13ae661
Author: Yiming Liu <li...@gmail.com>
Authored: Mon Jul 4 21:51:01 2016 +0800
Committer: Li Yang <li...@apache.org>
Committed: Tue Jul 5 16:43:40 2016 +0800
----------------------------------------------------------------------
.../org/apache/kylin/jdbc/KylinPreparedStatement.java | 13 ++++++++-----
.../java/org/apache/kylin/jdbc/KylinResultSet.java | 2 +-
2 files changed, 9 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/56071064/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java
index 1a1deda..167894c 100644
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java
+++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java
@@ -25,12 +25,14 @@ import java.sql.RowId;
import java.sql.SQLException;
import java.sql.SQLXML;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.apache.calcite.avatica.AvaticaConnection;
import org.apache.calcite.avatica.AvaticaPreparedStatement;
import org.apache.calcite.avatica.Meta.Signature;
import org.apache.calcite.avatica.Meta.StatementHandle;
+import org.apache.calcite.avatica.remote.TypedValue;
public class KylinPreparedStatement extends AvaticaPreparedStatement {
@@ -40,12 +42,13 @@ public class KylinPreparedStatement extends AvaticaPreparedStatement {
this.handle.signature = signature;
}
- protected List<Object> getParameterValues2() {
- List<Object> values = new ArrayList<>(slots.length);
- for (int i = 0; i < slots.length; i++) {
- values.add(slots[i].value);
+ protected List<Object> getParameterJDBCValues() {
+ List<TypedValue> typeValues = getParameterValues();
+ List<Object> jdbcValues = new ArrayList<Object>(typeValues.size());
+ for(TypedValue typeValue: typeValues){
+ jdbcValues.add(typeValue.toJdbc(getCalendar()));
}
- return values;
+ return jdbcValues;
}
// ============================================================================
http://git-wip-us.apache.org/repos/asf/kylin/blob/56071064/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java
index a6117cc..1bf2555 100644
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java
+++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinResultSet.java
@@ -53,7 +53,7 @@ public class KylinResultSet extends AvaticaResultSet {
if (!(statement instanceof KylinPreparedStatement)) {
params = null;
} else if (params != null && params.size() > 0) {
- paramValues = ((KylinPreparedStatement) statement).getParameterValues2();
+ paramValues = ((KylinPreparedStatement) statement).getParameterJDBCValues();
}
IRemoteClient client = ((KylinConnection) statement.connection).getRemoteClient();
[2/2] kylin git commit: KYLIN-1817 code reformat
Posted by li...@apache.org.
KYLIN-1817 code reformat
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/ff1aec30
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/ff1aec30
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/ff1aec30
Branch: refs/heads/master
Commit: ff1aec306b5ab1dbdc12accc3e5ca6bd0099778c
Parents: 5607106
Author: Li Yang <li...@apache.org>
Authored: Tue Jul 5 16:50:49 2016 +0800
Committer: Li Yang <li...@apache.org>
Committed: Tue Jul 5 16:50:49 2016 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/ff1aec30/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java
----------------------------------------------------------------------
diff --git a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java
index 167894c..510243b 100644
--- a/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java
+++ b/jdbc/src/main/java/org/apache/kylin/jdbc/KylinPreparedStatement.java
@@ -25,7 +25,6 @@ import java.sql.RowId;
import java.sql.SQLException;
import java.sql.SQLXML;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import org.apache.calcite.avatica.AvaticaConnection;
@@ -45,7 +44,7 @@ public class KylinPreparedStatement extends AvaticaPreparedStatement {
protected List<Object> getParameterJDBCValues() {
List<TypedValue> typeValues = getParameterValues();
List<Object> jdbcValues = new ArrayList<Object>(typeValues.size());
- for(TypedValue typeValue: typeValues){
+ for (TypedValue typeValue : typeValues) {
jdbcValues.add(typeValue.toJdbc(getCalendar()));
}
return jdbcValues;