You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by jn...@apache.org on 2017/04/05 23:09:54 UTC
drill git commit: DRILL-5413: DrillConnectionImpl.isReadOnly() throws
NullPointerException
Repository: drill
Updated Branches:
refs/heads/master d3718a62e -> 06e1522b5
DRILL-5413: DrillConnectionImpl.isReadOnly() throws NullPointerException
change is in CALCITE-843.
update drill's calcite version to 1.4.0-drill-r21
close #806
Project: http://git-wip-us.apache.org/repos/asf/drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/drill/commit/06e1522b
Tree: http://git-wip-us.apache.org/repos/asf/drill/tree/06e1522b
Diff: http://git-wip-us.apache.org/repos/asf/drill/diff/06e1522b
Branch: refs/heads/master
Commit: 06e1522b5ddf7e15d49921be1d9323f1e09273b0
Parents: d3718a6
Author: Vitalii Diravka <vi...@gmail.com>
Authored: Wed Apr 5 17:59:32 2017 +0000
Committer: Jinfeng Ni <jn...@apache.org>
Committed: Wed Apr 5 16:03:12 2017 -0700
----------------------------------------------------------------------
.../org/apache/drill/jdbc/impl/DrillConnectionImpl.java | 5 +++--
.../test/java/org/apache/drill/jdbc/ConnectionTest.java | 10 ++++++++--
pom.xml | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/drill/blob/06e1522b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillConnectionImpl.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillConnectionImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillConnectionImpl.java
index 94d5dd8..0e4726d 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillConnectionImpl.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/impl/DrillConnectionImpl.java
@@ -93,8 +93,9 @@ class DrillConnectionImpl extends AvaticaConnection
super(driver, factory, url, info);
// Initialize transaction-related settings per Drill behavior.
- super.setTransactionIsolation( TRANSACTION_NONE );
- super.setAutoCommit( true );
+ super.setTransactionIsolation(TRANSACTION_NONE);
+ super.setAutoCommit(true);
+ super.setReadOnly(false);
this.config = new DrillConnectionConfig(info);
http://git-wip-us.apache.org/repos/asf/drill/blob/06e1522b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
index d8ca849..09b75a6 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/ConnectionTest.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -17,9 +17,9 @@
*/
package org.apache.drill.jdbc;
-import org.apache.drill.jdbc.Driver;
import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
@@ -42,6 +42,7 @@ import java.util.concurrent.Executors;
/**
* Test for Drill's implementation of Connection's methods (other than
* main transaction-related methods in {@link ConnectionTransactionMethodsTest}).
+ * TODO: When here will be more tests, they should be sorted according to the {@link Connection} methods order
*/
public class ConnectionTest extends JdbcTestBase {
@@ -332,4 +333,9 @@ public class ConnectionTest extends JdbcTestBase {
}
}
+ @Test
+ public void testIsReadOnly() throws Exception {
+ assertFalse(connection.isReadOnly());
+ }
+
}
http://git-wip-us.apache.org/repos/asf/drill/blob/06e1522b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 59b79d0..5bde19b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
<dep.guava.version>18.0</dep.guava.version>
<forkCount>2</forkCount>
<parquet.version>1.8.1-drill-r0</parquet.version>
- <calcite.version>1.4.0-drill-r20</calcite.version>
+ <calcite.version>1.4.0-drill-r21</calcite.version>
<janino.version>2.7.6</janino.version>
<sqlline.version>1.1.9-drill-r7</sqlline.version>
<jackson.version>2.7.1</jackson.version>