Modifications for Apache Doris

masseb974 · eng-dedalus · commit 3ec8c5b1f4ed · 2026-01-12T13:00:18.000+01:00
(cherry picked from commit 8537f86)
diff --git a/knowage-core/src/main/java/it/eng/spagobi/tools/dataset/cache/ICacheMetadata.java b/knowage-core/src/main/java/it/eng/spagobi/tools/dataset/cache/ICacheMetadata.java
@@ -46,6 +46,12 @@ public interface ICacheMetadata {
 	 */
 	BigDecimal getUsedMemory() throws DataBaseException;
 
+	/**
+	 * @return used cache memory in bytes
+	 * @throws DataBaseException
+	 */
+	BigDecimal getUsedMemory(String table) throws DataBaseException;
+
 	/**
 	 * @return available cache memory in bytes
 	 * @throws DataBaseException
diff --git a/knowage-core/src/main/java/it/eng/spagobi/tools/dataset/cache/impl/sqldbcache/SQLDBCache.java b/knowage-core/src/main/java/it/eng/spagobi/tools/dataset/cache/impl/sqldbcache/SQLDBCache.java
@@ -72,8 +72,6 @@
 import it.eng.spagobi.utilities.assertion.Assert;
 import it.eng.spagobi.utilities.cache.CacheItem;
 import it.eng.spagobi.utilities.database.DataBaseException;
-import it.eng.spagobi.utilities.database.DataBaseFactory;
-import it.eng.spagobi.utilities.database.DatabaseUtilities;
 import it.eng.spagobi.utilities.exceptions.SpagoBIRuntimeException;
 import it.eng.spagobi.utilities.locks.DistributedLockFactory;
 
@@ -302,7 +300,7 @@ private IDataStore queryStandardCachedDataset(IDataSet dataSet, String resultset
 			if (mapLocks.tryLock(hashedSignature, getTimeout(), TimeUnit.SECONDS, getLeaseTime(), TimeUnit.SECONDS)) {
 				timing.stop();
 
-				cacheMetadata.updateAllCacheItems(getDataSource());
+				// cacheMetadata.updateAllCacheItems(getDataSource());
 
 				try {
 					timing = MonitorFactory.start("Knowage.SQLDBCache.queryStandardCachedDataset:usingLock[" + hashedSignature + "]");
@@ -413,7 +411,7 @@ public void put(IDataSet dataSet, Set<String> columns) {
 				timing.stop();
 				try {
 					timing = MonitorFactory.start("Knowage.SQLDBCache.putWithIterator:usingLock[" + hashedSignature + "]");
-					cacheMetadata.updateAllCacheItems(getDataSource());
+					// cacheMetadata.updateAllCacheItems(getDataSource());
 
 					// check again it is not already inserted
 					if (!cacheMetadata.containsCacheItem(signature)) {
@@ -433,8 +431,11 @@ public void put(IDataSet dataSet, Set<String> columns) {
 
 						JSONArray parameters = DataSetUtilities.paramsFromXML2JSONObj(dataSet);
 
+						// cacheMetadata.addCacheItem(dataSet.getName(), signature, tableName,
+						// DatabaseUtilities.getUsedMemorySize(DataBaseFactory.getCacheDataBase(getDataSource()), "cache", tableName), parameters);
+
 						cacheMetadata.addCacheItem(dataSet.getName(), signature, tableName,
-								DatabaseUtilities.getUsedMemorySize(DataBaseFactory.getCacheDataBase(getDataSource()), "cache", tableName), parameters);
+								new BigDecimal(0), parameters);
 
 						if (getMetadata().isCleaningEnabled() && getMetadata().getAvailableMemory().compareTo(new BigDecimal(0)) < 0) {
 							deleteToQuota();
@@ -844,7 +845,8 @@ private boolean refreshCacheItem(String signature, boolean isHash) throws Except
 						persistedTableManager.renameTable(tableNameRefresh, tableName, getDataSource());
 
 						ICacheDAO cacheDao = DAOFactory.getCacheDao();
-						cacheItem.setDimension(DatabaseUtilities.getUsedMemorySize(DataBaseFactory.getCacheDataBase(getDataSource()), "cache", tableName));
+						// cacheItem.setDimension(DatabaseUtilities.getUsedMemorySize(DataBaseFactory.getCacheDataBase(getDataSource()), "cache", tableName));
+						cacheItem.setDimension(new BigDecimal(0));
 						cacheDao.updateCacheItem(cacheItem);
 
 						TenantManager.unset();
diff --git a/knowage-core/src/main/java/it/eng/spagobi/tools/dataset/cache/impl/sqldbcache/SQLDBCacheMetadata.java b/knowage-core/src/main/java/it/eng/spagobi/tools/dataset/cache/impl/sqldbcache/SQLDBCacheMetadata.java
@@ -118,6 +118,14 @@ public BigDecimal getUsedMemory() throws DataBaseException {
 		return usedMemory;
 	}
 
+	@Override
+	public BigDecimal getUsedMemory(String table) throws DataBaseException {
+		CacheDataBase dataBase = DataBaseFactory.getCacheDataBase(cacheConfiguration.getCacheDataSource());
+		BigDecimal usedMemory = DatabaseUtilities.getUsedMemorySize(dataBase, cacheConfiguration.getSchema(), table);
+		logger.debug("Used memory is equal to [" + usedMemory + "] in ");
+		return usedMemory;
+	}
+
 	/**
 	 * Returns the number of bytes available in the cache (approximate)
 	 *
diff --git a/knowage/src/main/resources/it/eng/spagobi/commons/initializers/metadata/config/domains.xml b/knowage/src/main/resources/it/eng/spagobi/commons/initializers/metadata/config/domains.xml
@@ -473,6 +473,10 @@
 		valueNm="sbidomains.nm.spanner" domainCd="DIALECT_HIB"
 		domainNm="Predefined hibernate dialect" valueDs="sbidomains.ds.spanner" />
 		
+	<DOMAIN valueCd="doris"
+		valueNm="sbidomains.nm.doris" domainCd="DIALECT_HIB"
+		domainNm="Predefined hibernate dialect" valueDs="sbidomains.ds.doris" />
+		
 	<DOMAIN valueCd="MEASURE" valueNm="sbidomains.nm.measure"
 		domainCd="KPI_RULEOUTPUT_TYPE" domainNm="KPI Rule Output types" valueDs="sbidomains.ds.measure" />
 		
diff --git a/knowagedao/src/main/java/it/eng/spagobi/behaviouralmodel/lov/bo/QueryDetail.java b/knowagedao/src/main/java/it/eng/spagobi/behaviouralmodel/lov/bo/QueryDetail.java
@@ -701,7 +701,7 @@ private String composeStringToDt(DatabaseDialect dialect, String date) {
 		String toReturn = "";
 		date = escapeString(date); // for security reasons
 		if (dialect != null) {
-			if (dialect.equals(DatabaseDialect.MYSQL) || dialect.equals(DatabaseDialect.MYSQL_INNODB)) {
+			if (dialect.equals(DatabaseDialect.MYSQL) || dialect.equals(DatabaseDialect.MYSQL_INNODB) || dialect.equals(DatabaseDialect.DORIS)) {
 				if (date.startsWith("'") && date.endsWith("'")) {
 					toReturn = " STR_TO_DATE(" + date + ",'%d/%m/%Y %h:%i:%s') ";
 				} else {
diff --git a/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/constants/DatasetFunctionsConfig.java b/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/constants/DatasetFunctionsConfig.java
@@ -3,6 +3,7 @@
 import static it.eng.spagobi.tools.dataset.metasql.query.DatabaseDialect.BIGQUERY;
 import static it.eng.spagobi.tools.dataset.metasql.query.DatabaseDialect.CASSANDRA;
 import static it.eng.spagobi.tools.dataset.metasql.query.DatabaseDialect.DB2;
+import static it.eng.spagobi.tools.dataset.metasql.query.DatabaseDialect.DORIS;
 import static it.eng.spagobi.tools.dataset.metasql.query.DatabaseDialect.HIVE;
 import static it.eng.spagobi.tools.dataset.metasql.query.DatabaseDialect.HIVE2;
 import static it.eng.spagobi.tools.dataset.metasql.query.DatabaseDialect.IMPALA;
@@ -49,7 +50,8 @@ public DatasetFunctionsConfig() {
 		availableFunctions.add(NULLIF);
 		map.put(AVAILABLE_FUNCTIONS, availableFunctions);
 
-		Stream.of(HIVE2, MONGO, DB2, IMPALA, MYSQL, MYSQL_INNODB, ORACLE_9I10G, ORACLE, POSTGRESQL, SPARKSQL, SQLSERVER, ORACLE_SPATIAL, TERADATA, VERTICA,
+		Stream.of(HIVE2, MONGO, DB2, IMPALA, MYSQL, DORIS, MYSQL_INNODB, ORACLE_9I10G, ORACLE, POSTGRESQL, SPARKSQL, SQLSERVER, ORACLE_SPATIAL, TERADATA,
+				VERTICA,
 				REDSHIFT, BIGQUERY, SYNAPSE, SPANNER).forEach(e -> functionsConfigurationMap.put(e.getValue(), map));
 	}
 
diff --git a/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/metasql/query/DatabaseDialect.java b/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/metasql/query/DatabaseDialect.java
@@ -35,6 +35,7 @@ public enum DatabaseDialect {
 	DB2("IBM DB2", "org.hibernate.dialect.DB2400Dialect", true, true, false, false),
 	IMPALA("Apache Impala","org.hibernate.dialect.impala", true, true, false,true),
 	MYSQL("MySQL/MariaDB", "org.hibernate.dialect.MySQLDialect", true, true, true, true),
+	DORIS("Doris", "doris", true, true, true, true),
 	MYSQL_INNODB("MySQL/MariaDB (INNODB)", "org.hibernate.dialect.MySQLInnoDBDialect", true, true, true, true),
 	ORACLE_9I10G("Oracle 9i/10g","org.hibernate.dialect.Oracle9Dialect", true, true, true, true),
 	ORACLE("Oracle", "org.hibernate.dialect.OracleDialect", true, true, true, true),
@@ -67,7 +68,7 @@ public enum DatabaseDialect {
 	private final boolean multiColumnInOperatorSupported;
 	private final boolean inLineViewSupported;
 
-	private DatabaseDialect(String name, String value, boolean isSqlLike, boolean isSingleColumnInOperatorSupported, boolean isMultiColumnInOperatorSupported,
+	DatabaseDialect(String name, String value, boolean isSqlLike, boolean isSingleColumnInOperatorSupported, boolean isMultiColumnInOperatorSupported,
 			boolean inLineViewSupported) {
 		Assert.assertTrue(isSingleColumnInOperatorSupported || !isMultiColumnInOperatorSupported,
 				"Dialect can't support multi-column IN operator if it doesn't support single-column IN operator");
diff --git a/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/metasql/query/visitor/SelectQueryVisitorFactory.java b/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/metasql/query/visitor/SelectQueryVisitorFactory.java
@@ -41,6 +41,8 @@ public static ISelectQueryVisitor getVisitor(IDataSource dataSource) throws Data
 		case MYSQL:
 		case MYSQL_INNODB:
 			return new MySqlSelectQueryVisitor(database);
+		case DORIS:
+			return new MySqlSelectQueryVisitor(database);
 		case ORACLE:
 		case ORACLE_9I10G:
 		case ORACLE_SPATIAL:
diff --git a/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/persist/PersistedTableManager.java b/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/persist/PersistedTableManager.java
@@ -1025,6 +1025,9 @@ private String getCreateTableQuery(IMetaData md, IDataSource dataSource) throws
 				toReturn += ((i < l - 1) ? " , " : "");
 			}
 			toReturn += " )";
+			if (dataSource.getDialectName().contains(DatabaseDialect.DORIS.getValue())) {
+				toReturn = toReturn + " ENGINE=OLAP";
+			}
 		} else {
 			LOGGER.debug("Metadata fields object not found! Doesn't create temporary table.");
 		}
@@ -1110,7 +1113,7 @@ public void dropTablesWithPrefix(IDataSource datasource, String prefix) {
 			statement = "SELECT TABLE_NAME " + "FROM USER_TABLES " + "WHERE TABLE_NAME LIKE '" + prefix.toUpperCase()
 					+ "%'";
 		} else if (dialect.equals(DatabaseDialect.SQLSERVER) || dialect.equals(DatabaseDialect.MYSQL)
-				|| dialect.equals(DatabaseDialect.MYSQL_INNODB) || dialect.equals(DatabaseDialect.POSTGRESQL)) {
+				|| dialect.equals(DatabaseDialect.MYSQL_INNODB) || dialect.equals(DatabaseDialect.POSTGRESQL) || dialect.equals(DatabaseDialect.DORIS)) {
 			statement = "SELECT TABLE_NAME " + "FROM INFORMATION_SCHEMA.TABLES " + "WHERE TABLE_NAME LIKE '"
 					+ prefix.toLowerCase() + "%'";
 		}
diff --git a/knowageutils/src/main/java/it/eng/spagobi/utilities/database/DataBaseFactory.java b/knowageutils/src/main/java/it/eng/spagobi/utilities/database/DataBaseFactory.java
@@ -52,6 +52,8 @@ public static IDataBase getDataBase(IDataSource dataSource) throws DataBaseExcep
 				case MYSQL:
 				case MYSQL_INNODB:
 					return new MySQLDataBase(dataSource);
+				case DORIS:
+					return new MySQLDataBase(dataSource);
 				case ORACLE:
 					return new OracleDataBase(dataSource);
 				case ORACLE_9I10G:
diff --git a/knowageutils/src/main/java/it/eng/spagobi/utilities/database/MySQLDataBase.java b/knowageutils/src/main/java/it/eng/spagobi/utilities/database/MySQLDataBase.java
@@ -102,7 +102,7 @@ public String getAliasDelimiter() {
 	 */
 	@Override
 	public String getUsedMemorySizeQuery(String schema, String tableNamePrefix) {
-		String query = "SELECT " + " coalesce(sum(round(((data_length + index_length)),2)),0) as size "
+		String query = "SELECT " + " COALESCE(SUM(COALESCE(data_length, 0) + COALESCE(index_length, 0)), 0) AS size "
 				+ " FROM information_schema.TABLES WHERE table_name like '" + tableNamePrefix + "%'";
 		if ((schema != null) && (!schema.isEmpty())) {
 			query = query + " and table_schema = '" + schema + "'";
diff --git a/knowageutils/src/main/java/it/eng/spagobi/utilities/database/temporarytable/TemporaryTableManager.java b/knowageutils/src/main/java/it/eng/spagobi/utilities/database/temporarytable/TemporaryTableManager.java
@@ -450,7 +450,7 @@ public static void dropTableIfExists(String tableName, IDataSource dataSource) t
 	}
 
 	public static void renameTable(String tableNameOld, String tableNameNew, IDataSource dataSource) throws Exception {
-		executeStatement("ALTER TABLE " + tableNameOld + " RENAME TO " + tableNameNew, dataSource);
+		executeStatement("ALTER TABLE " + tableNameOld + " RENAME " + tableNameNew, dataSource);
 	}
 
 	private static void executeStatement(String sql, IDataSource dataSource) throws Exception {
diff --git a/qbecore/src/main/java/it/eng/qbe/datasource/jpa/JPADataSource.java b/qbecore/src/main/java/it/eng/qbe/datasource/jpa/JPADataSource.java
@@ -60,6 +60,7 @@
 import it.eng.qbe.utility.CustomizedFunctionsReader;
 import it.eng.spago.security.IEngUserProfile;
 import it.eng.spagobi.commons.bo.UserProfile;
+import it.eng.spagobi.tools.dataset.metasql.query.DatabaseDialect;
 import it.eng.spagobi.tools.datasource.bo.IDataSource;
 import it.eng.spagobi.user.UserProfileManager;
 import it.eng.spagobi.utilities.assertion.Assert;
@@ -360,6 +361,8 @@ protected Map<String, Object> buildEmptyConfiguration() {
 		 * TODO : Check if (dialect != null && dialect.contains("SQLServerDialect")) { dialect = "org.hibernate.dialect.ExtendedSQLServerDialect"; } else
 		 */ if (dialect != null && dialect.contains("MySQL")) {
 			dialect = "org.hibernate.dialect.ExtendedMySQLDialect";
+		} else if (dialect != null && dialect.contains(DatabaseDialect.DORIS.getValue())) {
+			dialect = "org.hibernate.dialect.ExtendedMySQLDialect";
 		} else if (dialect != null && dialect.contains("CustomOracleSpatialDialect")) {
 			dialect = "org.hibernatespatial.oracle.CustomOracleSpatialDialect";
 		} else if (dialect != null && dialect.contains("Oracle")) {

Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,14 @@ public BigDecimal getUsedMemory() throws DataBaseException {`
`118`	`118`	`return usedMemory;`
`119`	`119`	`}`
`120`	`120`
	`121`	`+ @Override`
	`122`	`+ public BigDecimal getUsedMemory(String table) throws DataBaseException {`
	`123`	`+ CacheDataBase dataBase = DataBaseFactory.getCacheDataBase(cacheConfiguration.getCacheDataSource());`
	`124`	`+ BigDecimal usedMemory = DatabaseUtilities.getUsedMemorySize(dataBase, cacheConfiguration.getSchema(), table);`
	`125`	`+ logger.debug("Used memory is equal to [" + usedMemory + "] in ");`
	`126`	`+ return usedMemory;`
	`127`	`+ }`
	`128`	`+`
`121`	`129`	`/**`
`122`	`130`	`* Returns the number of bytes available in the cache (approximate)`
`123`	`131`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1025,6 +1025,9 @@ private String getCreateTableQuery(IMetaData md, IDataSource dataSource) throws`
`1025`	`1025`	`toReturn += ((i < l - 1) ? " , " : "");`
`1026`	`1026`	`}`
`1027`	`1027`	`toReturn += " )";`
	`1028`	`+ if (dataSource.getDialectName().contains(DatabaseDialect.DORIS.getValue())) {`
	`1029`	`+ toReturn = toReturn + " ENGINE=OLAP";`
	`1030`	`+ }`
`1028`	`1031`	`} else {`
`1029`	`1032`	`LOGGER.debug("Metadata fields object not found! Doesn't create temporary table.");`
`1030`	`1033`	`}`
`@@ -1110,7 +1113,7 @@ public void dropTablesWithPrefix(IDataSource datasource, String prefix) {`
`1110`	`1113`	`statement = "SELECT TABLE_NAME " + "FROM USER_TABLES " + "WHERE TABLE_NAME LIKE '" + prefix.toUpperCase()`
`1111`	`1114`	`+ "%'";`
`1112`	`1115`	`} else if (dialect.equals(DatabaseDialect.SQLSERVER) \|\| dialect.equals(DatabaseDialect.MYSQL)`
`1113`		`- \|\| dialect.equals(DatabaseDialect.MYSQL_INNODB) \|\| dialect.equals(DatabaseDialect.POSTGRESQL)) {`
	`1116`	`+ \|\| dialect.equals(DatabaseDialect.MYSQL_INNODB) \|\| dialect.equals(DatabaseDialect.POSTGRESQL) \|\| dialect.equals(DatabaseDialect.DORIS)) {`
`1114`	`1117`	`statement = "SELECT TABLE_NAME " + "FROM INFORMATION_SCHEMA.TABLES " + "WHERE TABLE_NAME LIKE '"`
`1115`	`1118`	`+ prefix.toLowerCase() + "%'";`
`1116`	`1119`	`}`