Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@man-zhang
man-zhang committed Jan 2, 2025
1 parent 5707132 commit 434bef4
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 21 deletions.
39 changes: 24 additions & 15 deletions core/src/main/kotlin/org/evomaster/core/problem/util/inference/SimpleDeriveR2T.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import org.evomaster.core.problem.rest.resource.RestResourceCalls
import org.evomaster.core.problem.rest.resource.RestResourceNode
import org.evomaster.core.problem.rest.resource.dependency.*
import org.evomaster.core.problem.util.ParamUtil
import org.evomaster.core.problem.util.SimilarityAlgorithm
import org.evomaster.core.problem.util.inference.model.MatchedInfo
import org.evomaster.core.problem.util.inference.model.ParamGeneBindMap
import org.evomaster.core.problem.util.StringSimilarityComparator
import org.evomaster.core.problem.util.StringSimilarityComparator.stringSimilarityScore
import org.evomaster.core.search.action.ActionFilter
import org.evomaster.core.search.gene.ObjectGene
import org.evomaster.core.sql.SqlActionUtils.SCHEMA_TABLE_SEPARATOR
Expand Down Expand Up @@ -52,7 +52,7 @@ object SimpleDeriveResourceBinding : DeriveResourceBinding {
table name might contain schema,
*/
val matchedMap = allTables.keys.map {
Pair(it, StringSimilarityComparator.stringSimilarityScore(it, token))
Pair(it, calculateStringSimilarityScoreWithTableName(it, token))
}.asSequence().sortedBy { e->e.second }

if(matchedMap.lastOrNull()!= null && matchedMap.last().second >= StringSimilarityComparator.SimilarityThreshold){
Expand All @@ -65,7 +65,9 @@ object SimpleDeriveResourceBinding : DeriveResourceBinding {
}

val matchedPropertyMap = allTables.flatMap { t->t.value.columns.filter { c-> !ParamUtil.isGeneralName(c.name) }.map { c->Pair(t.value.name, c.name) } }
.map { p-> Pair(p.first, Pair(p.second,StringSimilarityComparator.stringSimilarityScore(p.second, token))) }.asSequence().sortedBy { e->e.second.second }
.map { p-> Pair(p.first,
Pair(p.second, calculateStringSimilarityScoreWithTableName(p.second, token)
)) }.asSequence().sortedBy { e->e.second.second }

if(matchedPropertyMap.lastOrNull() != null && matchedPropertyMap.last().second.second >= StringSimilarityComparator.SimilarityThreshold){
matchedPropertyMap.filter { it.second.second == matchedPropertyMap.last().second.second }.forEach {
Expand Down Expand Up @@ -122,11 +124,18 @@ object SimpleDeriveResourceBinding : DeriveResourceBinding {
* then return the higher similarity
*/
private fun calculateStringSimilarityScoreWithTableName(tableName: String, content: String): Double{
val score = StringSimilarityComparator.stringSimilarityScore(tableName, content)
if (!tableName.contains(SCHEMA_TABLE_SEPARATOR)) return score

val lastScore = StringSimilarityComparator.stringSimilarityScore(tableName.split(SCHEMA_TABLE_SEPARATOR).last(), content)
return max(score, lastScore)
var score = stringSimilarityScore(tableName, content) // full A vs full B
val shortContent = if (content.contains(SCHEMA_TABLE_SEPARATOR)) content.split(SCHEMA_TABLE_SEPARATOR).last() else null
val shortTable = if (tableName.contains(SCHEMA_TABLE_SEPARATOR)) tableName.split(SCHEMA_TABLE_SEPARATOR).last() else null
if (shortContent == null && shortTable == null) return score

if (shortContent != null)
score = max(score, stringSimilarityScore(tableName, shortContent)) // full A vs short B
if (shortTable != null)
score = max(score, stringSimilarityScore(shortTable, content)) // short A vs full B
if (shortTable != null && shortContent != null)
score = max(score, stringSimilarityScore(shortTable, shortContent))
return score
}

fun deriveParamsToTable(mapParamInfo : Map<String, ParamInfo>, r: RestResourceNode, allTables : Map<String, Table>){
Expand Down Expand Up @@ -211,16 +220,16 @@ object SimpleDeriveResourceBinding : DeriveResourceBinding {
.map {
Pair(it.name,
if(ParamUtil.isGeneralName(it.name))
t.foreignKeys.map { f-> StringSimilarityComparator.stringSimilarityScore(paramName, "${f.targetTable}${it.name}")}
.plus(StringSimilarityComparator.stringSimilarityScore(paramName, it.name))
.plus(StringSimilarityComparator.stringSimilarityScore(paramName, "$tableName${it.name}"))
t.foreignKeys.map { f-> calculateStringSimilarityScoreWithTableName(paramName, "${f.targetTable}${it.name}")}
.plus(calculateStringSimilarityScoreWithTableName(paramName, it.name))
.plus(calculateStringSimilarityScoreWithTableName(paramName, "$tableName${it.name}"))
.asSequence().sorted().last()
else if(ParamUtil.isGeneralName(paramName))
t.foreignKeys.map { f-> StringSimilarityComparator.stringSimilarityScore("${f.targetTable}$paramName", it.name)}
.plus(StringSimilarityComparator.stringSimilarityScore(paramName, it.name))
.plus(StringSimilarityComparator.stringSimilarityScore("$tableName$paramName", it.name))
t.foreignKeys.map { f-> calculateStringSimilarityScoreWithTableName("${f.targetTable}$paramName", it.name)}
.plus(calculateStringSimilarityScoreWithTableName(paramName, it.name))
.plus(calculateStringSimilarityScoreWithTableName("$tableName$paramName", it.name))
.asSequence().sorted().last()
else StringSimilarityComparator.stringSimilarityScore(paramName, it.name))
else calculateStringSimilarityScoreWithTableName(paramName, it.name))
}.asSequence().sortedBy { e->e.second }
if(matchedMap.last().second >= StringSimilarityComparator.SimilarityThreshold){
matchedMap.filter { it.second == matchedMap.last().second }.forEach {
Expand Down
14 changes: 8 additions & 6 deletions core/src/test/kotlin/org/evomaster/core/problem/rest/resource/ResourceNodeWithDbTest.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import org.evomaster.core.search.action.ActionFilter
import org.evomaster.core.search.gene.Gene
import org.evomaster.core.search.gene.numeric.LongGene
import org.evomaster.core.search.service.Randomness
import org.evomaster.core.sql.SqlActionUtils.isMatchingTableName
import org.junit.jupiter.api.Assertions.*
import org.junit.jupiter.api.BeforeAll
import org.junit.jupiter.api.Test
Expand Down Expand Up @@ -87,7 +88,8 @@ class ResourceNodeWithDbTest {
fieldsMap.forEach { t, u ->
assertEquals(1, u.derivedMap.size)
u.derivedMap.forEach { ut, uu ->
assertEquals("RFOO", ut)
// assertEquals("RFOO", ut)
assertTrue(isMatchingTableName(ut, "RFOO"))
assertEquals(uu.input.toLowerCase(), uu.targetMatched.toLowerCase())
}
}
Expand All @@ -97,16 +99,16 @@ class ResourceNodeWithDbTest {
val rbarNode = cluster.getResourceNode("/v3/api/rfoo/{rfooId}/rbar/{rbarId}")
assertNotNull(rbarNode)
rbarNode!!.resourceToTable.apply {
assertTrue(derivedMap.keys.contains("RFOO"))
assertTrue(derivedMap.keys.contains("RBAR"))
assertTrue(derivedMap.keys.any { isMatchingTableName(it, "RFOO") })
assertTrue(derivedMap.keys.any { isMatchingTableName(it, "RBAR") })
}

val rxyzNode = cluster.getResourceNode("/v3/api/rfoo/{rfooId}/rbar/{rbarId}/rxyz/{rxyzId}")
assertNotNull(rxyzNode)
rxyzNode!!.resourceToTable.apply {
assertTrue(derivedMap.keys.contains("RFOO"))
assertTrue(derivedMap.keys.contains("RBAR"))
assertTrue(derivedMap.keys.contains("RXYZ"))
assertTrue(derivedMap.keys.any { isMatchingTableName(it, "RFOO") })
assertTrue(derivedMap.keys.any { isMatchingTableName(it, "RBAR") })
assertTrue(derivedMap.keys.any { isMatchingTableName(it, "RXYZ") })
}
}

Expand Down

0 comments on commit 434bef4

Please sign in to comment.