Skip to content

Optimize collection creation and memory allocation of supported config #11616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PerfectSlayer wants to merge 1 commit into
base: master
Choose a base branch
from
+48 −43
Open

Optimize collection creation and memory allocation of supported config #11616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 38 additions & 36 deletions buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ParseV2SupportedConfigurationsTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,14 @@ abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
PrintWriter(outFile).use { out ->
out.println("package $packageName;")
out.println()
out.println("import java.util.*;")
out.println("import java.util.HashMap;")
out.println("import java.util.List;")
out.println("import java.util.Map;")
out.println("import static java.util.Arrays.asList;")
out.println("import static java.util.Collections.emptyList;")
out.println("import static java.util.Collections.singletonList;")
out.println("import static java.util.Collections.unmodifiableList;")
out.println("import static java.util.Collections.unmodifiableMap;")
out.println()
out.println("public final class $className {")
out.println()
Expand Down Expand Up @@ -145,7 +152,7 @@ abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
out.println(" Map<String, List<SupportedConfiguration>> supportedMap = new HashMap<>();")
out.println(" initSupported1(supportedMap);")
out.println(" initSupported2(supportedMap);")
out.println(" return Collections.unmodifiableMap(supportedMap);")
out.println(" return unmodifiableMap(supportedMap);")
out.println(" }")
out.println()

Expand All @@ -155,41 +162,15 @@ abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
// initSupported1() - first half
out.println(" private static void initSupported1(Map<String, List<SupportedConfiguration>> supportedMap) {")
for ((key, configList) in sortedSupported.take(midpoint)) {
out.print(" supportedMap.put(\"${esc(key)}\", Collections.unmodifiableList(Arrays.asList(")
val configIter = configList.iterator()
while (configIter.hasNext()) {
val config = configIter.next()
out.print("new SupportedConfiguration(")
out.print("${escNullableString(config.version)}, ")
out.print("${escNullableString(config.type)}, ")
out.print("${escNullableString(config.default)}, ")
out.print("Arrays.asList(${quoteList(config.aliases)}), ")
out.print("Arrays.asList(${quoteList(config.propertyKeys)})")
out.print(")")
if (configIter.hasNext()) out.print(", ")
}
out.println(")));")
out.println(" supportedMap.put(\"${esc(key)}\", ${supportedConfigListLiteral(configList)});")
}
out.println(" }")
out.println()

// initSupported2() - second half
out.println(" private static void initSupported2(Map<String, List<SupportedConfiguration>> supportedMap) {")
for ((key, configList) in sortedSupported.drop(midpoint)) {
out.print(" supportedMap.put(\"${esc(key)}\", Collections.unmodifiableList(Arrays.asList(")
val configIter = configList.iterator()
while (configIter.hasNext()) {
val config = configIter.next()
out.print("new SupportedConfiguration(")
out.print("${escNullableString(config.version)}, ")
out.print("${escNullableString(config.type)}, ")
out.print("${escNullableString(config.default)}, ")
out.print("Arrays.asList(${quoteList(config.aliases)}), ")
out.print("Arrays.asList(${quoteList(config.propertyKeys)})")
out.print(")")
if (configIter.hasNext()) out.print(", ")
}
out.println(")));")
out.println(" supportedMap.put(\"${esc(key)}\", ${supportedConfigListLiteral(configList)});")
}
out.println(" }")
out.println()
Expand All @@ -200,12 +181,12 @@ abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
out.println(" Map<String, List<String>> aliasesMap = new HashMap<>();")
for ((canonical, list) in aliases.toSortedMap()) {
out.printf(
" aliasesMap.put(\"%s\", Collections.unmodifiableList(Arrays.asList(%s)));\n",
" aliasesMap.put(\"%s\", %s);\n",
esc(canonical),
quoteList(list)
unmodifiableListLiteral(list)
)
}
out.println(" return Collections.unmodifiableMap(aliasesMap);")
out.println(" return unmodifiableMap(aliasesMap);")
out.println(" }")
out.println()

Expand All @@ -215,7 +196,7 @@ abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
for ((alias, target) in aliasMapping.toSortedMap()) {
out.printf(" aliasMappingMap.put(\"%s\", \"%s\");\n", esc(alias), esc(target))
}
out.println(" return Collections.unmodifiableMap(aliasMappingMap);")
out.println(" return unmodifiableMap(aliasMappingMap);")
out.println(" }")
out.println()

Expand All @@ -225,7 +206,7 @@ abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
for ((oldKey, note) in deprecated.toSortedMap()) {
out.printf(" deprecatedMap.put(\"%s\", \"%s\");\n", esc(oldKey), esc(note))
}
out.println(" return Collections.unmodifiableMap(deprecatedMap);")
out.println(" return unmodifiableMap(deprecatedMap);")
out.println(" }")
out.println()

Expand All @@ -235,15 +216,36 @@ abstract class ParseV2SupportedConfigurationsTask @Inject constructor(
for ((propertyKey, config) in reversePropertyKeysMap.toSortedMap()) {
out.printf(" reversePropertyKeysMapping.put(\"%s\", \"%s\");\n", esc(propertyKey), esc(config))
}
out.println(" return Collections.unmodifiableMap(reversePropertyKeysMapping);")
out.println(" return unmodifiableMap(reversePropertyKeysMapping);")
out.println(" }")
out.println("}")
}
}

private fun supportedConfigLiteral(config: SupportedConfigurationItem): String =
"new SupportedConfiguration(${escNullableString(config.version)}, ${escNullableString(config.type)}, ${escNullableString(config.default)}, ${listLiteral(config.aliases)}, ${listLiteral(config.propertyKeys)})"

private fun supportedConfigListLiteral(configList: List<SupportedConfigurationItem>): String = when (configList.size) {
0 -> "emptyList()"
1 -> "singletonList(${supportedConfigLiteral(configList[0])})"
else -> "unmodifiableList(asList(${configList.joinToString(", ") { supportedConfigLiteral(it) }}))"
}

private fun quoteList(list: List<String>): String =
list.joinToString(", ") { "\"${esc(it)}\"" }

private fun listLiteral(list: List<String>): String = when (list.size) {
0 -> "emptyList()"
1 -> "singletonList(${quoteList(list)})"
else -> "asList(${quoteList(list)})"
Comment thread
PerfectSlayer marked this conversation as resolved.
}

private fun unmodifiableListLiteral(list: List<String>): String = when (list.size) {
0 -> "emptyList()"
1 -> "singletonList(${quoteList(list)})"
else -> "unmodifiableList(asList(${quoteList(list)}))"
}

private fun esc(s: String): String =
s.replace("\\", "\\\\").replace("\"", "\\\"")

Expand Down
17 changes: 10 additions & 7 deletions buildSrc/src/test/kotlin/datadog/gradle/plugin/config/ParseV2SupportedConfigurationsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ class ParseV2SupportedConfigurationsTest : GradleFixture() {
aliases = listOf("DD_ALIAS")
)

assertTrue(content.contains("""aliasesMap.put("DD_ACTION_EXECUTION_ID", Collections.unmodifiableList(Arrays.asList()))"""))
assertTrue(content.contains("""aliasesMap.put("DD_AGENTLESS_LOG_SUBMISSION_ENABLED", Collections.unmodifiableList(Arrays.asList("DD_ALIAS")))"""))
assertTrue(content.contains("""aliasesMap.put("DD_ACTION_EXECUTION_ID", emptyList())"""))
assertTrue(content.contains("""aliasesMap.put("DD_AGENTLESS_LOG_SUBMISSION_ENABLED", singletonList("DD_ALIAS"))"""))

assertTrue(content.contains("""aliasMappingMap.put("DD_ALIAS", "DD_AGENTLESS_LOG_SUBMISSION_ENABLED")"""))

Expand Down Expand Up @@ -157,9 +157,6 @@ class ParseV2SupportedConfigurationsTest : GradleFixture() {
aliases: List<String>,
propertyKeys: List<String> = emptyList()
) {
val aliasesArray = aliases.joinToString(", ") { "\"$it\"" }
val propertyKeysArray = propertyKeys.joinToString(", ") { "\"$it\"" }

assertTrue(
content.contains("""supportedMap.put("$key""""),
"Should contain supportedMap.put for key: $key"
Expand All @@ -171,9 +168,9 @@ class ParseV2SupportedConfigurationsTest : GradleFixture() {
append("\"$type\", ")
append(if (default == "null") "null" else "\"$default\"")
append(", ")
append("Arrays.asList($aliasesArray)")
append(listExpr(aliases))
append(", ")
append("Arrays.asList($propertyKeysArray)")
append(listExpr(propertyKeys))
append(")")
}

Expand All @@ -182,4 +179,10 @@ class ParseV2SupportedConfigurationsTest : GradleFixture() {
"Should contain SupportedConfiguration: $expectedPattern"
)
}

private fun listExpr(items: List<String>): String = when (items.size) {
0 -> "emptyList()"
1 -> """singletonList("${items[0]}")"""
else -> """asList(${items.joinToString(", ") { "\"$it\"" }})"""
}
}