EAGLE-301 fix the bug of breaking mysql row size when creating tables fix the bug of breaking mysql row size when creating tables
Author: @anyway1021 <mchl....@gmail.com> Reviewer: @yonzhang <yonzhang2...@gmail.com> Closes: #238 Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/8f12f826 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/8f12f826 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/8f12f826 Branch: refs/heads/master Commit: 8f12f82620b13d69f89ddc8057cd72337920ea31 Parents: cbf3c76 Author: yonzhang <yonzhang2...@gmail.com> Authored: Wed Jun 15 17:29:11 2016 -0700 Committer: yonzhang <yonzhang2...@gmail.com> Committed: Wed Jun 15 17:29:11 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/eagle/storage/jdbc/JdbcConstants.java | 4 +++- .../eagle/storage/jdbc/schema/JdbcEntitySchemaManager.java | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/8f12f826/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/JdbcConstants.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/JdbcConstants.java b/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/JdbcConstants.java index a6d0c93..f7f261c 100644 --- a/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/JdbcConstants.java +++ b/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/JdbcConstants.java @@ -28,7 +28,9 @@ public class JdbcConstants { public static final String ROW_KEY_COLUMN_NAME = "uuid"; public static final int DEFAULT_TYPE_FOR_COMPLEX_TYPE = Types.BLOB; - public static final int DEFAULT_VARCHAR_SIZE =30000; + public static final int DEFAULT_TAG_VARCHAR_SIZE =1024; +// public static final int DEFAULT_VARCHAR_SIZE =30000; + public static final int DEFAULT_VARCHAR_SIZE =7168; // Eagle JDBC Storage Configuration public final static String EAGLE_DB_USERNAME = "eagle.service.storage-username"; http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/8f12f826/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/JdbcEntitySchemaManager.java ---------------------------------------------------------------------- diff --git a/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/JdbcEntitySchemaManager.java b/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/JdbcEntitySchemaManager.java index 4cd1967..808c1d0 100644 --- a/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/JdbcEntitySchemaManager.java +++ b/eagle-core/eagle-query/eagle-storage-jdbc/src/main/java/org/apache/eagle/storage/jdbc/schema/JdbcEntitySchemaManager.java @@ -155,7 +155,7 @@ public class JdbcEntitySchemaManager implements IJdbcEntityDDLManager { tagColumn.setTypeCode(Types.VARCHAR); tagColumn.setJavaName(tagName); // tagColumn.setScale(1024); - tagColumn.setSize(String.valueOf(JdbcConstants.DEFAULT_VARCHAR_SIZE)); + tagColumn.setSize(String.valueOf(JdbcConstants.DEFAULT_TAG_VARCHAR_SIZE)); tagColumn.setDefaultValue(null); tagColumn.setDescription("eagle entity tag column for "+tagName); return tagColumn; @@ -196,7 +196,7 @@ public class JdbcEntitySchemaManager implements IJdbcEntityDDLManager { // Index index = new UniqueIndex(); for (String tag : entityDefinition.getInternal().getTags()) { Column tagColumn = createTagColumn(tag); - tagColumn.setSize(String.valueOf(JdbcConstants.DEFAULT_VARCHAR_SIZE)); +// tagColumn.setSize(String.valueOf(JdbcConstants.DEFAULT_TAG_VARCHAR_SIZE)); table.addColumn(tagColumn); // IndexColumn indexColumn = new IndexColumn(); // indexColumn.setName(tag);
