Skip to content
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

Reduce memory usage of Thread.interrupted() tests #404

Merged
merged 2 commits into from
May 7, 2021
Merged

Reduce memory usage of Thread.interrupted() tests #404

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
992966a
Reduce memory usage of Thread.interrupted() tests
dlurton May 7, 2021
9ed216c
Removed empty file
dlurton May 7, 2021
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
39 changes: 12 additions & 27 deletions lang/test/org/partiql/lang/thread/ThreadInterruptedTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,29 +45,35 @@ const val WAIT_FOR_THREAD_TERMINATION_MS: Long = 1000
*/
class ThreadInterruptedTests {
private val ion = IonSystemBuilder.standard().build()
private val reallyBigNAry by lazy { makeBigExprNode(20000000) }
private val bigNAry by lazy { makeBigExprNode(10000000) }
private val bigPartiqlAst by lazy { makeBigPartiqlAstExpr(10000000) }
private val reallyBigNAry = makeBigExprNode(20000000)
private val bigNAry = makeBigExprNode(10000000)
private val bigPartiqlAst = makeBigPartiqlAstExpr(10000000)
Comment on lines +48 to +50
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Was the laziness the problem or just a cleanup change?


private val bigSexpAst by lazy {
val nary = makeBigExprNode(1000000)
@Suppress("DEPRECATION")
AstSerializer.serialize(bigNAry, AstVersion.V0, ion)
AstSerializer.serialize(nary, AstVersion.V0, ion)
}


class FakeList<T>(override val size: Int, private val item: T) : AbstractList<T>() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A comment would be helpful but this Fake list is just logically a single item expanded N times, right?

override fun get(index: Int): T = item
}

private fun makeBigExprNode(n: Int): NAry {
val emptyMetas = metaContainerOf()
val variableA = VariableReference("a", CaseSensitivity.INSENSITIVE, ScopeQualifier.UNQUALIFIED, emptyMetas)
return NAry(
NAryOp.ADD,
(0..n).map { variableA },
FakeList(n, variableA),
emptyMetas
)
}

private fun makeBigPartiqlAstExpr(n: Int): PartiqlAst.Expr =
PartiqlAst.build {
val variableA = id("a", caseInsensitive(), unqualified())
plus((0..n).map { variableA })
plus(FakeList(n, variableA))
}

private fun testThreadInterrupt(block: () -> Unit) {
Expand Down Expand Up @@ -100,8 +106,6 @@ class ThreadInterruptedTests {

@Test
fun astChildIterator() {
// force lazy load
reallyBigNAry
testThreadInterrupt {
@Suppress("DEPRECATION")
reallyBigNAry.iterator()
Expand All @@ -110,8 +114,6 @@ class ThreadInterruptedTests {

@Test
fun astWalker() {
// force lazy load
reallyBigNAry
val walker = AstWalker(object : AstVisitor { })
testThreadInterrupt {
walker.walk(reallyBigNAry)
Expand All @@ -120,26 +122,20 @@ class ThreadInterruptedTests {

@Test
fun partiqlAstToExprNode() {
// force lazy load
reallyBigNAry
testThreadInterrupt {
reallyBigNAry.toAstExpr()
}
}

@Test
fun astToPartiqlAst() {
// force lazy load
bigPartiqlAst
testThreadInterrupt {
bigPartiqlAst.toExprNode(ion)
}
}

@Test
fun serialize() {
// force lazy load
bigNAry
testThreadInterrupt {
@Suppress("DEPRECATION")
AstSerializer.serialize(bigNAry, AstVersion.V0, ion)
Expand All @@ -148,9 +144,6 @@ class ThreadInterruptedTests {

@Test
fun deserialize_validate() {
// force lazy load
bigSexpAst

val deserializer = AstDeserializerInternal(AstVersion.V0, ion, emptyMap())

testThreadInterrupt {
Expand All @@ -160,9 +153,6 @@ class ThreadInterruptedTests {

@Test
fun deserialize_deserializeExprNode() {
// force lazy load
bigSexpAst

val deserializer = AstDeserializerInternal(AstVersion.V0, ion, emptyMap())

testThreadInterrupt {
Expand All @@ -172,9 +162,6 @@ class ThreadInterruptedTests {

@Test
fun astRewriterBase() {
// force lazy load
reallyBigNAry

@Suppress("DEPRECATION")
val identityRewriter = AstRewriterBase()
testThreadInterrupt {
Expand All @@ -184,8 +171,6 @@ class ThreadInterruptedTests {

@Test
fun visitorTransformBase() {
// force lazy load
bigPartiqlAst
val identityTransform = object : VisitorTransformBase() {}
testThreadInterrupt {
identityTransform.transformExpr(bigPartiqlAst)
Expand Down