You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@drill.apache.org by ad...@apache.org on 2014/10/10 07:47:30 UTC
[01/10] git commit: DRILL-1409: DbVisualizer fails to connect to
Drill using embedded jdbc driver
Repository: incubator-drill
Updated Branches:
refs/heads/master c6ad592a6 -> cd6dd9c6f
DRILL-1409: DbVisualizer fails to connect to Drill using embedded jdbc driver
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/77155433
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/77155433
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/77155433
Branch: refs/heads/master
Commit: 771554335cc3be8329c240baf35c60f4c858faf1
Parents: dd9fce0
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Sat Sep 13 23:02:02 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 13:59:13 2014 -0700
----------------------------------------------------------------------
.../apache/drill/jdbc/DrillConnectionImpl.java | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/77155433/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
index f318227..4c54780 100644
--- a/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
+++ b/exec/jdbc/src/main/java/org/apache/drill/jdbc/DrillConnectionImpl.java
@@ -48,7 +48,6 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
public final DrillStatementRegistry registry = new DrillStatementRegistry();
final DrillConnectionConfig config;
-
static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(DrillConnection.class);
private final DrillClient client;
@@ -56,14 +55,18 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
private Drillbit bit;
private RemoteServiceSet serviceSet;
- protected DrillConnectionImpl(Driver driver, AvaticaFactory factory, String url, Properties info) throws SQLException{
+ protected DrillConnectionImpl(Driver driver, AvaticaFactory factory, String url, Properties info) throws SQLException {
super(driver, factory, url, info);
this.config = new DrillConnectionConfig(info);
-
-
- try{
+ try {
if (config.isLocal()) {
+ try {
+ Class.forName("org.eclipse.jetty.server.Handler");
+ } catch (ClassNotFoundException e1) {
+ throw new SQLException("Running Drill in embedded mode using the JDBC jar alone is not supported.");
+ }
+
DrillConfig dConfig = DrillConfig.create();
this.allocator = new TopLevelAllocator(dConfig);
RemoteServiceSet set = GlobalServiceSetReference.SETS.get();
@@ -72,8 +75,8 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
serviceSet = RemoteServiceSet.getLocalServiceSet();
set = serviceSet;
try {
- bit = new Drillbit(dConfig, serviceSet);
- bit.run();
+ bit = new Drillbit(dConfig, serviceSet);
+ bit.run();
} catch (Exception e) {
throw new SQLException("Failure while attempting to start Drillbit in embedded mode.", e);
}
@@ -94,7 +97,6 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
}
}
-
@Override
public DrillConnectionConfig config() {
return config;
@@ -171,4 +173,5 @@ abstract class DrillConnectionImpl extends AvaticaConnection implements org.apac
}
}
}
+
}
[04/10] git commit: DRILL-1505: Updating Session Value Doesn't
Reflect In 'sys.options' Query Output
Posted by ad...@apache.org.
DRILL-1505: Updating Session Value Doesn't Reflect In 'sys.options' Query Output
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/e93fb456
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/e93fb456
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/e93fb456
Branch: refs/heads/master
Commit: e93fb456a4ed096836dd2a60f98c281c44de34c3
Parents: c6ad592
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Wed Oct 8 11:23:57 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 13:59:13 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/drill/exec/server/options/OptionValue.java | 5 +++++
.../apache/drill/exec/server/options/QueryOptionManager.java | 5 ++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/e93fb456/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java
index 13894ef..bfcbeca 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/OptionValue.java
@@ -172,4 +172,9 @@ public class OptionValue{
return true;
}
+ @Override
+ public String toString() {
+ return "OptionValue [type=" + type + ", name=" + name + ", value=" + getValue() + "]";
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/e93fb456/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/QueryOptionManager.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/QueryOptionManager.java b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/QueryOptionManager.java
index 7eda97e..82fc5ba 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/QueryOptionManager.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/server/options/QueryOptionManager.java
@@ -85,9 +85,8 @@ public class QueryOptionManager implements OptionManager {
@Override
public OptionList getOptionList() {
OptionList list = new OptionList();
- for (OptionValue o : options.values()) {
- list.add(o);
- }
+ list.addAll(sessionOptions.getOptionList());
+ list.addAll(options.values());
return list;
}
[10/10] git commit: DRILL-1516: When searching for the java
executable, ignore directories named "java"
Posted by ad...@apache.org.
DRILL-1516: When searching for the java executable, ignore directories named "java"
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/cd6dd9c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/cd6dd9c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/cd6dd9c6
Branch: refs/heads/master
Commit: cd6dd9c6fb364335df5836af3e1f4aef9a3fe8b5
Parents: eb8c1c2
Author: Patrick Wong <pw...@maprtech.com>
Authored: Thu Oct 9 13:20:57 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 14:09:04 2014 -0700
----------------------------------------------------------------------
distribution/src/resources/drill-config.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/cd6dd9c6/distribution/src/resources/drill-config.sh
----------------------------------------------------------------------
diff --git a/distribution/src/resources/drill-config.sh b/distribution/src/resources/drill-config.sh
index 8afb237..313c568 100644
--- a/distribution/src/resources/drill-config.sh
+++ b/distribution/src/resources/drill-config.sh
@@ -160,7 +160,7 @@ if $is_cygwin; then
else
JAVA_BIN="java"
fi
-JAVA=`find -L "$JAVA_HOME" -name $JAVA_BIN | head -n 1`
+JAVA=`find -L "$JAVA_HOME" -name $JAVA_BIN -type f | head -n 1`
if [ ! -e "$JAVA" ]; then
echo "Java not found at JAVA_HOME=$JAVA_HOME."
exit 1
[07/10] git commit: DRILL-1493: Upgrade ASM to 5.0
Posted by ad...@apache.org.
DRILL-1493: Upgrade ASM to 5.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/c05dd756
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/c05dd756
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/c05dd756
Branch: refs/heads/master
Commit: c05dd7568ca57285cdfa87cbab975018a601528d
Parents: 3ce0969
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Fri Oct 3 15:32:46 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 13:59:14 2014 -0700
----------------------------------------------------------------------
exec/java-exec/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/c05dd756/exec/java-exec/pom.xml
----------------------------------------------------------------------
diff --git a/exec/java-exec/pom.xml b/exec/java-exec/pom.xml
index 6e8e704..d05e4c6 100644
--- a/exec/java-exec/pom.xml
+++ b/exec/java-exec/pom.xml
@@ -24,12 +24,12 @@
<!-- <dependency> -->
<!-- <groupId>org.ow2.asm</groupId> -->
<!-- <artifactId>asm-util</artifactId> -->
- <!-- <version>4.1</version> -->
+ <!-- <version>5.0.3</version> -->
<!-- </dependency> -->
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm-debug-all</artifactId>
- <version>4.1</version>
+ <version>5.0.3</version>
<!-- <scope>test</scope> -->
</dependency>
<dependency>
@@ -47,7 +47,7 @@
<!-- <dependency> -->
<!-- <groupId>org.ow2.asm</groupId> -->
<!-- <artifactId>asm-commons</artifactId> -->
- <!-- <version>4.1</version> -->
+ <!-- <version>5.0.3</version> -->
<!-- </dependency> -->
<dependency>
<groupId>org.apache.commons</groupId>
[08/10] git commit: DRILL-1497: Fix test failure in
o.a.drill.jdbc.test.TestMetadataDDL
Posted by ad...@apache.org.
DRILL-1497: Fix test failure in o.a.drill.jdbc.test.TestMetadataDDL
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/d29c7c4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/d29c7c4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/d29c7c4a
Branch: refs/heads/master
Commit: d29c7c4ad02462a0d005363393a599a869b09d89
Parents: 7715543
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Fri Oct 3 18:37:01 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 13:59:14 2014 -0700
----------------------------------------------------------------------
.../org/apache/drill/jdbc/test/JdbcAssert.java | 45 ++++-
.../apache/drill/jdbc/test/TestMetadataDDL.java | 168 +++++++++----------
2 files changed, 127 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d29c7c4a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
index 8f2ddd9..49d7c11 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/JdbcAssert.java
@@ -26,6 +26,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Properties;
+import java.util.Set;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -39,6 +40,8 @@ import org.junit.Assert;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.ImmutableSet.Builder;
import com.google.common.collect.Iterables;
/**
@@ -93,6 +96,19 @@ public class JdbcAssert {
return buf.toString();
}
+ static Set<String> toStringSet(ResultSet resultSet) throws SQLException {
+ Builder<String> builder = ImmutableSet.builder();
+ final List<Ord<String>> columns = columnLabels(resultSet);
+ while (resultSet.next()) {
+ StringBuilder buf = new StringBuilder();
+ for (Ord<String> column : columns) {
+ buf.append(column.i == 1 ? "" : "; ").append(column.e).append("=").append(resultSet.getObject(column.i));
+ }
+ builder.add(buf.toString());
+ buf.setLength(0);
+ }
+ return builder.build();
+ }
static List<String> toStrings(ResultSet resultSet) throws SQLException {
final List<String> list = new ArrayList<>();
@@ -173,10 +189,35 @@ public class JdbcAssert {
ResultSet resultSet = statement.executeQuery(sql);
expected = expected.trim();
String result = JdbcAssert.toString(resultSet).trim();
+ resultSet.close();
- Assert.assertTrue(String.format("Generated string:\n%s\ndoes not match:\n%s", result, expected), expected.equals(result));
- Assert.assertEquals(expected, result);
+ if (!expected.equals(result)) {
+ Assert.fail(String.format("Generated string:\n%s\ndoes not match:\n%s", result, expected));
+ }
+ return this;
+ } finally {
+ if (statement != null) {
+ statement.close();
+ }
+ if (connection != null) {
+ connection.close();
+ }
+ }
+ }
+
+ public TestDataConnection returnsSet(Set<String> expected) throws Exception {
+ Connection connection = null;
+ Statement statement = null;
+ try {
+ connection = connectionFactory.createConnection();
+ statement = connection.createStatement();
+ ResultSet resultSet = statement.executeQuery(sql);
+ Set<String> result = JdbcAssert.toStringSet(resultSet);
resultSet.close();
+
+ if (!expected.equals(result)) {
+ Assert.fail(String.format("Generated set:\n%s\ndoes not match:\n%s", result, expected));
+ }
return this;
} finally {
if (statement != null) {
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d29c7c4a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java
----------------------------------------------------------------------
diff --git a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java
index 4dad7b3..918a547 100644
--- a/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java
+++ b/exec/jdbc/src/test/java/org/apache/drill/jdbc/test/TestMetadataDDL.java
@@ -22,12 +22,14 @@ import static org.junit.Assert.assertTrue;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.Statement;
+import java.util.Set;
import org.apache.drill.exec.store.hive.HiveTestDataGenerator;
import org.junit.BeforeClass;
import org.junit.Test;
import com.google.common.base.Function;
+import com.google.common.collect.ImmutableSet;
/**
* Contains tests for
@@ -56,18 +58,18 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
public void testSchemata() throws Exception{
JdbcAssert.withNoDefaultSchema()
.sql("SELECT * FROM INFORMATION_SCHEMA.SCHEMATA")
- .returns(
- "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.default; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.root; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.tmp; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=YES\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=sys; SCHEMA_OWNER=<owner>; TYPE=system-tables; IS_MUTABLE=NO\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.home; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.default; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.tmp; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=YES\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=cp.default; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=hive_test.default; SCHEMA_OWNER=<owner>; TYPE=hive; IS_MUTABLE=NO\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=hive_test.db1; SCHEMA_OWNER=<owner>; TYPE=hive; IS_MUTABLE=NO\n" +
- "CATALOG_NAME=DRILL; SCHEMA_NAME=INFORMATION_SCHEMA; SCHEMA_OWNER=<owner>; TYPE=ischema; IS_MUTABLE=NO\n"
+ .returnsSet(ImmutableSet.of(
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.default; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.root; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs.tmp; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=YES",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=sys; SCHEMA_OWNER=<owner>; TYPE=system-tables; IS_MUTABLE=NO",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.home; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.default; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=dfs_test.tmp; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=YES",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=cp.default; SCHEMA_OWNER=<owner>; TYPE=file; IS_MUTABLE=NO",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=hive_test.default; SCHEMA_OWNER=<owner>; TYPE=hive; IS_MUTABLE=NO",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=hive_test.db1; SCHEMA_OWNER=<owner>; TYPE=hive; IS_MUTABLE=NO",
+ "CATALOG_NAME=DRILL; SCHEMA_NAME=INFORMATION_SCHEMA; SCHEMA_OWNER=<owner>; TYPE=ischema; IS_MUTABLE=NO")
);
}
@@ -75,13 +77,13 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
public void testShowTables() throws Exception{
JdbcAssert.withFull("hive_test.default")
.sql("SHOW TABLES")
- .returns(
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=readtest\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=empty_table\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=infoschematest\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=hiveview\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=kv\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=foodate\n"
+ .returnsSet(ImmutableSet.of(
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=readtest",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=empty_table",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=infoschematest",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=hiveview",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=kv",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=foodate")
);
}
@@ -89,23 +91,22 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
public void testShowTablesFromDb() throws Exception{
JdbcAssert.withNoDefaultSchema()
.sql("SHOW TABLES FROM INFORMATION_SCHEMA")
- .returns(
- "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=VIEWS\n" +
- "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=COLUMNS\n" +
- "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=TABLES\n" +
- "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=CATALOGS\n" +
- "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=SCHEMATA\n"
- );
+ .returnsSet(ImmutableSet.of(
+ "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=VIEWS",
+ "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=COLUMNS",
+ "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=TABLES",
+ "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=CATALOGS",
+ "TABLE_SCHEMA=INFORMATION_SCHEMA; TABLE_NAME=SCHEMATA"));
JdbcAssert.withFull("dfs_test.tmp")
.sql("SHOW TABLES IN hive_test.`default`")
- .returns(
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=readtest\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=empty_table\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=infoschematest\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=hiveview\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=kv\n" +
- "TABLE_SCHEMA=hive_test.default; TABLE_NAME=foodate\n");
+ .returnsSet(ImmutableSet.of(
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=readtest",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=empty_table",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=infoschematest",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=hiveview",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=kv",
+ "TABLE_SCHEMA=hive_test.default; TABLE_NAME=foodate"));
}
@Test
@@ -124,21 +125,21 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
@Test
public void testShowDatabases() throws Exception{
- String expected =
- "SCHEMA_NAME=dfs.default\n" +
- "SCHEMA_NAME=dfs.root\n" +
- "SCHEMA_NAME=dfs.tmp\n" +
- "SCHEMA_NAME=sys\n" +
- "SCHEMA_NAME=dfs_test.home\n" +
- "SCHEMA_NAME=dfs_test.default\n" +
- "SCHEMA_NAME=dfs_test.tmp\n" +
- "SCHEMA_NAME=cp.default\n" +
- "SCHEMA_NAME=hive_test.default\n" +
- "SCHEMA_NAME=hive_test.db1\n" +
- "SCHEMA_NAME=INFORMATION_SCHEMA\n";
-
- JdbcAssert.withNoDefaultSchema().sql("SHOW DATABASES").returns(expected);
- JdbcAssert.withNoDefaultSchema().sql("SHOW SCHEMAS").returns(expected);
+ Set<String> expected = ImmutableSet.of(
+ "SCHEMA_NAME=dfs.default",
+ "SCHEMA_NAME=dfs.root",
+ "SCHEMA_NAME=dfs.tmp",
+ "SCHEMA_NAME=sys",
+ "SCHEMA_NAME=dfs_test.home",
+ "SCHEMA_NAME=dfs_test.default",
+ "SCHEMA_NAME=dfs_test.tmp",
+ "SCHEMA_NAME=cp.default",
+ "SCHEMA_NAME=hive_test.default",
+ "SCHEMA_NAME=hive_test.db1",
+ "SCHEMA_NAME=INFORMATION_SCHEMA");
+
+ JdbcAssert.withNoDefaultSchema().sql("SHOW DATABASES").returnsSet(expected);
+ JdbcAssert.withNoDefaultSchema().sql("SHOW SCHEMAS").returnsSet(expected);
}
@Test
@@ -152,19 +153,19 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
public void testShowDatabasesLike() throws Exception{
JdbcAssert.withNoDefaultSchema()
.sql("SHOW DATABASES LIKE '%i%'")
- .returns(
- "SCHEMA_NAME=hive_test.default\n"+
- "SCHEMA_NAME=hive_test.db1");
+ .returnsSet(ImmutableSet.of(
+ "SCHEMA_NAME=hive_test.default",
+ "SCHEMA_NAME=hive_test.db1"));
}
@Test
public void testDescribeTable() throws Exception{
JdbcAssert.withFull("INFORMATION_SCHEMA")
.sql("DESCRIBE CATALOGS")
- .returns(
- "COLUMN_NAME=CATALOG_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
- "COLUMN_NAME=CATALOG_DESCRIPTION; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
- "COLUMN_NAME=CATALOG_CONNECT; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n");
+ .returnsSet(ImmutableSet.of(
+ "COLUMN_NAME=CATALOG_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=CATALOG_DESCRIPTION; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=CATALOG_CONNECT; DATA_TYPE=VARCHAR; IS_NULLABLE=NO"));
}
@@ -172,21 +173,20 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
public void testDescribeTableNullableColumns() throws Exception{
JdbcAssert.withNoDefaultSchema()
.sql("DESCRIBE hive_test.`default`.kv")
- .returns(
- "COLUMN_NAME=key; DATA_TYPE=INTEGER; IS_NULLABLE=YES\n" +
- "COLUMN_NAME=value; DATA_TYPE=VARCHAR; IS_NULLABLE=YES\n"
- );
+ .returnsSet(ImmutableSet.of(
+ "COLUMN_NAME=key; DATA_TYPE=INTEGER; IS_NULLABLE=YES",
+ "COLUMN_NAME=value; DATA_TYPE=VARCHAR; IS_NULLABLE=YES"));
}
@Test
public void testDescribeTableWithSchema() throws Exception{
JdbcAssert.withNoDefaultSchema()
.sql("DESCRIBE INFORMATION_SCHEMA.`TABLES`")
- .returns(
- "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
- "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
- "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
- "COLUMN_NAME=TABLE_TYPE; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n");
+ .returnsSet(ImmutableSet.of(
+ "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=TABLE_TYPE; DATA_TYPE=VARCHAR; IS_NULLABLE=NO"));
}
@Test
@@ -202,20 +202,20 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
// Test describe of `TABLES` with no schema qualifier
ResultSet resultSet = statement.executeQuery("DESCRIBE `TABLES`");
- String result = JdbcAssert.toString(resultSet).trim();
+ Set<String> result = JdbcAssert.toStringSet(resultSet);
resultSet.close();
- String expected = "COLUMN_NAME=key; DATA_TYPE=INTEGER; IS_NULLABLE=NO";
+ ImmutableSet<String> expected = ImmutableSet.of("COLUMN_NAME=key; DATA_TYPE=INTEGER; IS_NULLABLE=NO");
assertTrue(String.format("Generated string:\n%s\ndoes not match:\n%s", result, expected), expected.equals(result));
// Test describe of `TABLES` with a schema qualifier which is not in default schema
resultSet = statement.executeQuery("DESCRIBE INFORMATION_SCHEMA.`TABLES`");
- result = JdbcAssert.toString(resultSet).trim();
+ result = JdbcAssert.toStringSet(resultSet);
resultSet.close();
- expected =
- "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n" +
- "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n" +
- "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n" +
- "COLUMN_NAME=TABLE_TYPE; DATA_TYPE=VARCHAR; IS_NULLABLE=NO";
+ expected = ImmutableSet.of(
+ "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=TABLE_TYPE; DATA_TYPE=VARCHAR; IS_NULLABLE=NO");
assertTrue(String.format("Generated string:\n%s\ndoes not match:\n%s", result, expected), expected.equals(result));
// drop created view
@@ -248,19 +248,19 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
public void testDescribeTableWithColQualifier() throws Exception{
JdbcAssert.withFull("INFORMATION_SCHEMA")
.sql("DESCRIBE COLUMNS 'TABLE%'")
- .returns(
- "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
- "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
- "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n");
+ .returnsSet(ImmutableSet.of(
+ "COLUMN_NAME=TABLE_CATALOG; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=TABLE_SCHEMA; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=TABLE_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO"));
}
@Test
public void testDescribeTableWithSchemaAndColQualifier() throws Exception{
JdbcAssert.withNoDefaultSchema()
.sql("DESCRIBE INFORMATION_SCHEMA.SCHEMATA 'SCHEMA%'")
- .returns(
- "COLUMN_NAME=SCHEMA_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n"+
- "COLUMN_NAME=SCHEMA_OWNER; DATA_TYPE=VARCHAR; IS_NULLABLE=NO\n");
+ .returnsSet(ImmutableSet.of(
+ "COLUMN_NAME=SCHEMA_NAME; DATA_TYPE=VARCHAR; IS_NULLABLE=NO",
+ "COLUMN_NAME=SCHEMA_OWNER; DATA_TYPE=VARCHAR; IS_NULLABLE=NO"));
}
@Test
@@ -271,11 +271,11 @@ public class TestMetadataDDL extends JdbcTestQueryBase {
"WHERE TABLE_SCHEMA = 'hive_test.default' AND TABLE_NAME = 'infoschematest' AND " +
"(COLUMN_NAME = 'stringtype' OR COLUMN_NAME = 'varchartype' OR " +
"COLUMN_NAME = 'inttype' OR COLUMN_NAME = 'decimaltype')")
- .returns(
- "COLUMN_NAME=inttype; DATA_TYPE=INTEGER; CHARACTER_MAXIMUM_LENGTH=-1; NUMERIC_PRECISION=-1\n" +
- "COLUMN_NAME=decimaltype; DATA_TYPE=DECIMAL; CHARACTER_MAXIMUM_LENGTH=-1; NUMERIC_PRECISION=38\n" +
- "COLUMN_NAME=stringtype; DATA_TYPE=VARCHAR; CHARACTER_MAXIMUM_LENGTH=65535; NUMERIC_PRECISION=-1\n" +
- "COLUMN_NAME=varchartype; DATA_TYPE=VARCHAR; CHARACTER_MAXIMUM_LENGTH=20; NUMERIC_PRECISION=-1");
+ .returnsSet(ImmutableSet.of(
+ "COLUMN_NAME=inttype; DATA_TYPE=INTEGER; CHARACTER_MAXIMUM_LENGTH=-1; NUMERIC_PRECISION=-1",
+ "COLUMN_NAME=decimaltype; DATA_TYPE=DECIMAL; CHARACTER_MAXIMUM_LENGTH=-1; NUMERIC_PRECISION=38",
+ "COLUMN_NAME=stringtype; DATA_TYPE=VARCHAR; CHARACTER_MAXIMUM_LENGTH=65535; NUMERIC_PRECISION=-1",
+ "COLUMN_NAME=varchartype; DATA_TYPE=VARCHAR; CHARACTER_MAXIMUM_LENGTH=20; NUMERIC_PRECISION=-1"));
}
@Test
[05/10] git commit: DRILL-1494: Fix annoying and unnecessary warning
'Failure while trying to load .drill file'
Posted by ad...@apache.org.
DRILL-1494: Fix annoying and unnecessary warning 'Failure while trying to load .drill file'
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/919baa0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/919baa0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/919baa0b
Branch: refs/heads/master
Commit: 919baa0b2f17feffd1736a835ba5d35c6c2fa2aa
Parents: e93fb45
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Fri Oct 3 15:36:32 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 13:59:13 2014 -0700
----------------------------------------------------------------------
.../main/java/org/apache/drill/exec/store/ClassPathFileSystem.java | 2 +-
.../org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/919baa0b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java
index 5e00f08..d5c92f5 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/ClassPathFileSystem.java
@@ -102,7 +102,7 @@ public class ClassPathFileSystem extends FileSystem{
@Override
public FileStatus[] listStatus(Path arg0) throws IOException {
- throw new IOException("ClassPathFileSystem doesn't currently support listing files.");
+ throw new UnsupportedOperationException("ClassPathFileSystem doesn't currently support listing files.");
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/919baa0b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java
index 03a6966..68f380c 100644
--- a/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java
+++ b/exec/java-exec/src/main/java/org/apache/drill/exec/store/dfs/WorkspaceSchemaFactory.java
@@ -253,6 +253,8 @@ public class WorkspaceSchemaFactory implements ExpandingConcurrentMap.MapValueFa
return new DrillViewTable(schemaPath, getView(f));
}
}
+ } catch (UnsupportedOperationException e) {
+ logger.debug("The filesystem for this workspace does not support this operation.", e);
} catch (Exception e) {
logger.warn("Failure while trying to load .drill file.", e);
}
[03/10] git commit: DRILL-1495: Test cases should log relevant
message in case of expected failures
Posted by ad...@apache.org.
DRILL-1495: Test cases should log relevant message in case of expected failures
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/d752487a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/d752487a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/d752487a
Branch: refs/heads/master
Commit: d752487a8298c7a2afda45392246829f97a6e57c
Parents: 919baa0
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Fri Oct 3 15:42:26 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 13:59:13 2014 -0700
----------------------------------------------------------------------
.../src/test/java/org/apache/drill/TestBugFixes.java | 7 ++++++-
.../src/test/java/org/apache/drill/TestExampleQueries.java | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d752487a/exec/java-exec/src/test/java/org/apache/drill/TestBugFixes.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestBugFixes.java b/exec/java-exec/src/test/java/org/apache/drill/TestBugFixes.java
index 743aeae..bfa97d1 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestBugFixes.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestBugFixes.java
@@ -67,7 +67,12 @@ public class TestBugFixes extends BaseTestQuery {
// Should be "Failure while parsing sql. Node [rel#26:Subset#6.LOGICAL.ANY([]).[]] could not be implemented;".
// Drill will hit CanNotPlan, until we add code fix to transform the local LHS filter in left outer join properly.
public void testDRILL1337_LocalLeftFilterLeftOutJoin() throws Exception {
- test("select count(*) from cp.`tpch/nation.parquet` n left outer join cp.`tpch/region.parquet` r on n.n_regionkey = r.r_regionkey and n.n_nationkey > 10;");
+ try {
+ test("select count(*) from cp.`tpch/nation.parquet` n left outer join cp.`tpch/region.parquet` r on n.n_regionkey = r.r_regionkey and n.n_nationkey > 10;");
+ } catch (RpcException e) {
+ logger.info("***** Test resulted in expected failure: " + e.getMessage());
+ throw e;
+ }
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/d752487a/exec/java-exec/src/test/java/org/apache/drill/TestExampleQueries.java
----------------------------------------------------------------------
diff --git a/exec/java-exec/src/test/java/org/apache/drill/TestExampleQueries.java b/exec/java-exec/src/test/java/org/apache/drill/TestExampleQueries.java
index 8ac7c7d..8efd6bd 100644
--- a/exec/java-exec/src/test/java/org/apache/drill/TestExampleQueries.java
+++ b/exec/java-exec/src/test/java/org/apache/drill/TestExampleQueries.java
@@ -457,7 +457,12 @@ public class TestExampleQueries extends BaseTestQuery{
@Test(expected = RpcException.class) // Should get "At line 1, column 8: Column 'n_nationkey' is ambiguous"
public void testSelStarAmbiguousJoin() throws Exception {
- test("select x.n_nationkey, x.n_name, x.n_regionkey, x.r_name from (select * from cp.`tpch/nation.parquet` n, cp.`tpch/region.parquet` r where n.n_regionkey = r.r_regionkey) x " ) ;
+ try {
+ test("select x.n_nationkey, x.n_name, x.n_regionkey, x.r_name from (select * from cp.`tpch/nation.parquet` n, cp.`tpch/region.parquet` r where n.n_regionkey = r.r_regionkey) x " ) ;
+ } catch (RpcException e) {
+ logger.info("***** Test resulted in expected failure: " + e.getMessage());
+ throw e;
+ }
}
@Test // select star for a SchemaTable.
[06/10] git commit: DRILL-1492: Update readme with supported versions
of Java
Posted by ad...@apache.org.
DRILL-1492: Update readme with supported versions of Java
* Keeping the supported Java version to 7 until we get all issues around Java 8 resolved.
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/eb8c1c2e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/eb8c1c2e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/eb8c1c2e
Branch: refs/heads/master
Commit: eb8c1c2e1a706eb7854dedb09cc113eb22f49932
Parents: c05dd75
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Fri Oct 3 13:44:11 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 13:59:14 2014 -0700
----------------------------------------------------------------------
INSTALL.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/eb8c1c2e/INSTALL.md
----------------------------------------------------------------------
diff --git a/INSTALL.md b/INSTALL.md
index aeab9f4..ed6129f 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -3,8 +3,8 @@
## Prerequisites
Currently, the Apache Drill build process is known to work on Linux, Windows and OSX. To build, you need to have the following software installed on your system to successfully complete a build.
- * Java 7+
- * Maven 3.0+
+ * Java 7
+ * Maven 3.x
## Confirm settings
# java -version
[02/10] git commit: DRILL-1485: tools/verify_release.sh does not have
execute permission bit set
Posted by ad...@apache.org.
DRILL-1485: tools/verify_release.sh does not have execute permission bit set
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/dd9fce0e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/dd9fce0e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/dd9fce0e
Branch: refs/heads/master
Commit: dd9fce0e8c480fe0ee3fdffc13b8368fd8de1f0f
Parents: d752487
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Thu Oct 2 16:11:04 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 13:59:13 2014 -0700
----------------------------------------------------------------------
tools/verify_release.sh | 0
1 file changed, 0 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/dd9fce0e/tools/verify_release.sh
----------------------------------------------------------------------
diff --git a/tools/verify_release.sh b/tools/verify_release.sh
old mode 100644
new mode 100755
[09/10] git commit: DRILL-1490: Upgrade to ProGaurd 5.0
Posted by ad...@apache.org.
DRILL-1490: Upgrade to ProGaurd 5.0
Project: http://git-wip-us.apache.org/repos/asf/incubator-drill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-drill/commit/3ce09697
Tree: http://git-wip-us.apache.org/repos/asf/incubator-drill/tree/3ce09697
Diff: http://git-wip-us.apache.org/repos/asf/incubator-drill/diff/3ce09697
Branch: refs/heads/master
Commit: 3ce096977af7ae3339e719469ba7358e63b1bb16
Parents: d29c7c4
Author: Aditya Kishore <ad...@maprtech.com>
Authored: Fri Oct 3 13:39:03 2014 -0700
Committer: Aditya Kishore <ad...@maprtech.com>
Committed: Thu Oct 9 13:59:14 2014 -0700
----------------------------------------------------------------------
exec/jdbc-all/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-drill/blob/3ce09697/exec/jdbc-all/pom.xml
----------------------------------------------------------------------
diff --git a/exec/jdbc-all/pom.xml b/exec/jdbc-all/pom.xml
index 805046b..349366b 100644
--- a/exec/jdbc-all/pom.xml
+++ b/exec/jdbc-all/pom.xml
@@ -203,12 +203,12 @@
<dependency>
<groupId>net.sf.proguard</groupId>
<artifactId>proguard-base</artifactId>
- <version>4.11</version>
+ <version>5.0</version>
<scope>runtime</scope>
</dependency>
</dependencies>
<configuration>
- <proguardVersion>4.11</proguardVersion>
+ <proguardVersion>5.0</proguardVersion>
<obfuscate>false</obfuscate>
<includeDependencyInjar>true</includeDependencyInjar>
<outjar>${project.build.finalName}-dirty.jar</outjar>