You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by sh...@apache.org on 2018/10/27 13:13:04 UTC
[kylin] branch 2.5.x updated: Minor, drop jdbc log table from mysql
This is an automated email from the ASF dual-hosted git repository.
shaofengshi pushed a commit to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/2.5.x by this push:
new d41ae42 Minor, drop jdbc log table from mysql
d41ae42 is described below
commit d41ae425b1980c4ac1cabd1eade010c2a85f9951
Author: shaofengshi <sh...@apache.org>
AuthorDate: Sat Oct 27 21:12:58 2018 +0800
Minor, drop jdbc log table from mysql
---
.../apache/kylin/common/persistence/JDBCResourceDAO.java | 4 +++-
.../apache/kylin/storage/jdbc/ITJDBCResourceStoreTest.java | 13 +++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/core-common/src/main/java/org/apache/kylin/common/persistence/JDBCResourceDAO.java b/core-common/src/main/java/org/apache/kylin/common/persistence/JDBCResourceDAO.java
index 3cd192e..ddb8f4b 100644
--- a/core-common/src/main/java/org/apache/kylin/common/persistence/JDBCResourceDAO.java
+++ b/core-common/src/main/java/org/apache/kylin/common/persistence/JDBCResourceDAO.java
@@ -68,13 +68,15 @@ public class JDBCResourceDAO {
private FileSystem redirectFileSystem;
+ public static final String LOG_TABLE_SUFFIX = "_log";
+
public JDBCResourceDAO(KylinConfig kylinConfig, String metadataIdentifier) throws SQLException {
this.kylinConfig = kylinConfig;
this.connectionManager = JDBCConnectionManager.getConnectionManager();
this.jdbcSqlQueryFormat = JDBCSqlQueryFormatProvider
.createJDBCSqlQueriesFormat(kylinConfig.getMetadataDialect());
this.tableNames[0] = metadataIdentifier;
- this.tableNames[1] = metadataIdentifier + "_log";
+ this.tableNames[1] = metadataIdentifier + LOG_TABLE_SUFFIX;
for (int i = 0; i < tableNames.length; i++) {
createTableIfNeeded(tableNames[i]);
createIndex("IDX_" + META_TABLE_TS, tableNames[i], META_TABLE_TS);
diff --git a/kylin-it/src/test/java/org/apache/kylin/storage/jdbc/ITJDBCResourceStoreTest.java b/kylin-it/src/test/java/org/apache/kylin/storage/jdbc/ITJDBCResourceStoreTest.java
index ec7d5d3..fb332b2 100644
--- a/kylin-it/src/test/java/org/apache/kylin/storage/jdbc/ITJDBCResourceStoreTest.java
+++ b/kylin-it/src/test/java/org/apache/kylin/storage/jdbc/ITJDBCResourceStoreTest.java
@@ -22,6 +22,7 @@ import org.apache.commons.lang.StringUtils;
import org.apache.kylin.common.KylinConfig;
import org.apache.kylin.common.StorageURL;
import org.apache.kylin.common.persistence.JDBCConnectionManager;
+import org.apache.kylin.common.persistence.JDBCResourceDAO;
import org.apache.kylin.common.persistence.JDBCResourceStore;
import org.apache.kylin.common.persistence.JDBCSqlQueryFormat;
import org.apache.kylin.common.persistence.JDBCSqlQueryFormatProvider;
@@ -88,8 +89,12 @@ public class ITJDBCResourceStoreTest extends HBaseMetadataTestCase {
statement = conn.createStatement();
String sql = MessageFormat.format(sqlQueryFormat.getTestDropSql(), mainIdentifier);
statement.executeUpdate(sql);
+ sql = MessageFormat.format(sqlQueryFormat.getTestDropSql(), mainIdentifier + JDBCResourceDAO.LOG_TABLE_SUFFIX);
+ statement.executeUpdate(sql);
sql = MessageFormat.format(sqlQueryFormat.getTestDropSql(), copyIdentifier);
statement.executeUpdate(sql);
+ sql = MessageFormat.format(sqlQueryFormat.getTestDropSql(), copyIdentifier + JDBCResourceDAO.LOG_TABLE_SUFFIX);
+ statement.executeUpdate(sql);
jdbcConnectable = true;
ResourceTool.copy(configBackup, kylinConfig);
} catch (RuntimeException ex) {
@@ -250,11 +255,11 @@ public class ITJDBCResourceStoreTest extends HBaseMetadataTestCase {
long queryNumAfterCopy = store.getQueriedSqlNum();
JDBCResourceStore resourceStoreCopy = (JDBCResourceStore) ResourceStore.getStore(tmpConfig);
- int executeNum = store.listResources("/execute").size();
- int executeOutputNum = store.listResources("/execute_output").size();
+ int executeNum = store.listResources(ResourceStore.EXECUTE_RESOURCE_ROOT).size();
+ int executeOutputNum = store.listResources(ResourceStore.EXECUTE_OUTPUT_RESOURCE_ROOT).size();
- assertEquals(executeNum, resourceStoreCopy.listResources("/execute").size());
- assertEquals(executeOutputNum, resourceStoreCopy.listResources("/execute_output").size());
+ assertEquals(executeNum, resourceStoreCopy.listResources(ResourceStore.EXECUTE_RESOURCE_ROOT).size());
+ assertEquals(executeOutputNum, resourceStoreCopy.listResources(ResourceStore.EXECUTE_OUTPUT_RESOURCE_ROOT).size());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
String startTime = sdf.format(new Date(Long.parseLong(String.valueOf(startTs))));