Merge branch 'master' into master

Qihoo360 · Mar 6, 2019 · 57425d1 · 57425d1
2 parents 1ef82cf + a257be1
commit 57425d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/assembly/src/main/assembly/assembly-linux.xml b/assembly/src/main/assembly/assembly-linux.xml
@@ -78,7 +78,7 @@
                 <exclude>org.apache.hadoop:*:jar</exclude>
                 <exclude>org.apache.hive:*:jar</exclude>
                 <exclude>org.spark-project.hive:*:jar</exclude>
-                <!--<exclude>org.apache.lucene:*:jar</exclude>-->
+                <exclude>org.antlr:*:jar</exclude>
                 <exclude>org.apache.spark:*:jar</exclude>
             </excludes>
             <outputDirectory>/${qsql.release}/lib</outputDirectory>

diff --git a/core/src/main/java/com/qihoo/qsql/metadata/MetadataClient.java b/core/src/main/java/com/qihoo/qsql/metadata/MetadataClient.java
@@ -287,13 +287,13 @@ private Long getLastInsertPrimaryKey() {
 
     private Connection createConnection() throws SQLException {
         if (! MetaConnectionUtil.isEmbeddedDatabase(properties)) {
-            MetaConnectionUtil.getExternalConnection(properties);
+            return MetaConnectionUtil.getExternalConnection(properties);
         }
 
         try {
             Class.forName("org.sqlite.JDBC");
             return DriverManager.getConnection("jdbc:sqlite://"
-                + new File(properties.getProperty(MetadataParams.META_INTERN_SCHEMA_DIR, "../sqlite/schema.db"))
+                + new File(properties.getProperty(MetadataParams.META_INTERN_SCHEMA_DIR, "../metastore/schema.db"))
                 .getAbsolutePath());
         } catch (ClassNotFoundException | SQLException ex) {
             throw new RuntimeException(ex);

diff --git a/doc/BUILD_doc.md b/doc/BUILD_doc.md
@@ -239,4 +239,4 @@ Initialize the sample data to the MySQL database
 ```shell
 cd $QSQL_HOME/bin/
 ./metadata --dbType mysql --action init
-```
+```