cyclane
/
teamcity-gitea-test-task
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 3 Activity

Initial library implementations and tests #1

Merged
cyclane merged 3 commits from initial-setup into main 2023-12-01 20:42:08 +00:00
Conversation 0 Commits 3 Files Changed 10 +87 -74
6 changed files with 87 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d5deef82c1 - Show all commits

1
.idea/gradle.xml
View File

@ -5,6 +5,7 @@
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="corretto-19" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />

17
src/main/kotlin/tinyvm/Commit.kt
View File

@ -7,17 +7,19 @@ abstract class Object(
val type: String, val type: String,
) { ) {
abstract val data: String abstract val data: String
fun hash(): String = MessageDigest
.getInstance("SHA-1") fun hash(): String =
.digest("$type ${data.length}\u0000$data".toByteArray()) MessageDigest
.toHex() .getInstance("SHA-1")
.digest("$type ${data.length}\u0000$data".toByteArray())
.toHex()
} }
class Commit( class Commit(
val tree: Tree, val tree: Tree,
val author: Author, val author: Author,
val message: String, val message: String,
val timestamp: Instant val timestamp: Instant,
) : Object("commit") { ) : Object("commit") {
// Use \n\n for end of header in-case additional metadata is implemented in the future. // Use \n\n for end of header in-case additional metadata is implemented in the future.
override val data: String override val data: String
@ -26,8 +28,7 @@ class Commit(
data class Author( data class Author(
val name: String, val name: String,
val email: String val email: String,
) { ) {
override fun toString(): String = override fun toString(): String = "$name <$email>"
"$name <$email>"
} }

3
src/main/kotlin/tinyvm/Extensions.kt
View File

@ -2,5 +2,4 @@ package tinyvm
import java.util.HexFormat import java.util.HexFormat
fun ByteArray.toHex(): String = fun ByteArray.toHex(): String = HexFormat.of().formatHex(this)
HexFormat.of().formatHex(this)

42
src/main/kotlin/tinyvm/Repository.kt
View File

@ -2,9 +2,11 @@ package tinyvm
class HashCollisionException(hash: String) : Exception("Different object types with identical hash '$hash'") class HashCollisionException(hash: String) : Exception("Different object types with identical hash '$hash'")
class CommitTimeComparator: Comparator<Commit> { class CommitTimeComparator : Comparator<Commit> {
override fun compare(o1: Commit, o2: Commit): Int = override fun compare(
(o1.timestamp.epochSecond - o2.timestamp.epochSecond).toInt() o1: Commit,
o2: Commit,
): Int = (o1.timestamp.epochSecond - o2.timestamp.epochSecond).toInt()
} }
class Repository { class Repository {
@ -23,12 +25,13 @@ class Repository {
val hash = commit.hash() val hash = commit.hash()
val obj = findObject<Commit>(hash) val obj = findObject<Commit>(hash)
if (obj != null) return obj if (obj != null) return obj
val newCommit = Commit( val newCommit =
tree = addTree(commit.tree), Commit(
author = commit.author, tree = addTree(commit.tree),
message = commit.message, author = commit.author,
timestamp = commit.timestamp message = commit.message,
) timestamp = commit.timestamp,
)
objects[hash] = newCommit objects[hash] = newCommit
commits.add(newCommit) commits.add(newCommit)
return newCommit return newCommit
@ -47,8 +50,7 @@ class Repository {
/** /**
* Find commit. * Find commit.
*/ */
fun findCommit(predicate: (Commit) -> Boolean): Commit? = fun findCommit(predicate: (Commit) -> Boolean): Commit? = commits.find(predicate)
commits.find(predicate)
/** /**
* Dump repository objects * Dump repository objects
@ -63,14 +65,15 @@ class Repository {
val hash = tree.hash() val hash = tree.hash()
val obj = findObject<Tree>(hash) val obj = findObject<Tree>(hash)
if (obj != null) return obj if (obj != null) return obj
val newTree = Tree( val newTree =
tree.nodes.map { (name, node) -> Tree(
when (node) { tree.nodes.map { (name, node) ->
is Tree -> name to addTree(node) when (node) {
is Blob -> name to addObject(node) is Tree -> name to addTree(node)
} is Blob -> name to addObject(node)
}.toMap() }
) }.toMap(),
)
objects[hash] = newTree objects[hash] = newTree
return tree return tree
} }
cyclane commented 2023-12-01 20:41:24 +00:00
Review
Copy Link

Note we're sort of fine with recursion here since we have to keep track of the state anyway (ie there would just be a big queue instead of a callstack if we didn't have recursion)

Note we're sort of fine with recursion here since we have to keep track of the state anyway (ie there would just be a big queue instead of a callstack if we didn't have recursion)
@ -86,5 +89,4 @@ class Repository {
*/ */
private inline fun <reified T : Object> findObject(hash: String): T? = private inline fun <reified T : Object> findObject(hash: String): T? =
objects[hash]?.let { it as? T ?: throw HashCollisionException(hash) } objects[hash]?.let { it as? T ?: throw HashCollisionException(hash) }
} }

9
src/main/kotlin/tinyvm/Tree.kt
View File

@ -1,13 +1,14 @@
package tinyvm package tinyvm
sealed class Node(type: String): Object(type) sealed class Node(type: String) : Object(type)
class Tree(val nodes: Map<String, Node>) : Node("tree") { class Tree(val nodes: Map<String, Node>) : Node("tree") {
// For simplicity just use the hex-formatted hash, not the actual value like git does. // For simplicity just use the hex-formatted hash, not the actual value like git does.
override val data: String override val data: String
get() = nodes.map { (name, node) -> get() =
"${node.type} $name\u0000${node.hash()}" nodes.map { (name, node) ->
}.sorted().joinToString() "${node.type} $name\u0000${node.hash()}"
}.sorted().joinToString()
} }
class Blob(override val data: String) : Node("blob") class Blob(override val data: String) : Node("blob")

89
src/test/kotlin/tinyvm/RepositoryTest.kt
View File

@ -6,51 +6,60 @@ import kotlin.test.assertEquals
internal class RepositoryTest { internal class RepositoryTest {
private val repository = Repository() private val repository = Repository()
private val commits = listOf( private val commits =
Commit( listOf(
tree = Tree(mapOf("test1.txt" to Blob("Hello World!"))), Commit(
author = Author("Gleb Koval", "gleb@koval.net"), tree = Tree(mapOf("test1.txt" to Blob("Hello World!"))),
message = "Add test1.txt", author = Author("Gleb Koval", "gleb@koval.net"),
timestamp = Instant.ofEpochSecond(0) message = "Add test1.txt",
), Commit( timestamp = Instant.ofEpochSecond(0),
tree = Tree(
mapOf(
"dir1" to Tree(
mapOf(
"test1.txt" to Blob("Hello World!")
)
),
"dir2" to Tree(
mapOf(
"test2.txt" to Blob("This is a second file")
)
)
)
), ),
author = Author("Gleb Koval", "gleb@koval.net"), Commit(
message = "Move test1.txt and add dir2/test2.txt", tree =
timestamp = Instant.ofEpochSecond(50) Tree(
), Commit(
tree = Tree(
mapOf(
"dir1" to Tree(
mapOf( mapOf(
"test1.txt" to Blob("Hello World!") "dir1" to
) Tree(
mapOf(
"test1.txt" to Blob("Hello World!"),
),
),
"dir2" to
Tree(
mapOf(
"test2.txt" to Blob("This is a second file"),
),
),
),
), ),
"dir2" to Tree( author = Author("Gleb Koval", "gleb@koval.net"),
mapOf( message = "Move test1.txt and add dir2/test2.txt",
"test2.txt" to Blob("This is a second file") timestamp = Instant.ofEpochSecond(50),
) ),
), Commit(
"README.md" to Blob("# This is a test repo!") tree =
) Tree(
mapOf(
"dir1" to
Tree(
mapOf(
"test1.txt" to Blob("Hello World!"),
),
),
"dir2" to
Tree(
mapOf(
"test2.txt" to Blob("This is a second file"),
),
),
"README.md" to Blob("# This is a test repo!"),
),
),
author = Author("Gleb Koval", "gleb@koval.net"),
message = "Add README.md",
timestamp = Instant.ofEpochSecond(100),
), ),
author = Author("Gleb Koval", "gleb@koval.net"),
message = "Add README.md",
timestamp = Instant.ofEpochSecond(100)
) )
)
@Test @Test
fun `can commit`() { fun `can commit`() {