kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Data binary limit (#3321) 

*  fix "DATA_BINARY" limit VARCHAR(20000)
This commit is contained in:
webb2019 2019-08-26 09:40:37 +08:00 committed by 吴晟 Wu Sheng
parent f0acf9b61f
commit 429c9b3c9c
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/h2/dao/H2TableInstaller.java
View File

@ -19,7 +19,10 @@
package org.apache.skywalking.oap.server.storage.plugin.jdbc.h2.dao;
import java.sql.*;
import org.apache.skywalking.oap.server.core.analysis.manual.segment.SegmentRecord;
import org.apache.skywalking.oap.server.core.analysis.metrics.IntKeyLongValueHashMap;
import org.apache.skywalking.oap.server.core.source.DefaultScopeDefine;
import org.apache.skywalking.oap.server.core.storage.StorageException;
import org.apache.skywalking.oap.server.core.storage.model.*;
import org.apache.skywalking.oap.server.library.client.Client;
@ -90,6 +93,11 @@ public class H2TableInstaller extends ModelInstaller {
} else if (IntKeyLongValueHashMap.class.equals(type)) {
return "VARCHAR(20000)";
} else if (byte[].class.equals(type)) {
if (DefaultScopeDefine.SEGMENT == model.getScopeId()) {
if (name.getName().equals(SegmentRecord.DATA_BINARY)) {
return "MEDIUMTEXT";
}
}
return "VARCHAR(20000)";
} else {
throw new IllegalArgumentException("Unsupported data type: " + type.getName());

3
oap-server/server-storage-plugin/storage-jdbc-hikaricp-plugin/src/main/java/org/apache/skywalking/oap/server/storage/plugin/jdbc/mysql/MySQLTableInstaller.java
View File

@ -71,6 +71,9 @@ public class MySQLTableInstaller extends H2TableInstaller {
if (DefaultScopeDefine.SEGMENT == model.getScopeId()) {
if (name.getName().equals(SegmentRecord.TRACE_ID) || name.getName().equals(SegmentRecord.SEGMENT_ID))
return "VARCHAR(300)";
if (name.getName().equals(SegmentRecord.DATA_BINARY)) {
return "MEDIUMTEXT";
}
}
return "VARCHAR(2000)";
} else if (IntKeyLongValueHashMap.class.equals(type)) {