Skip to content

chore(longevity): use observable to iterate over lines (APP-100) #33

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

Merged
merged 2 commits into from
Sep 19, 2017
Merged

chore(longevity): use observable to iterate over lines (APP-100) #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00c181b
chore(longevity): use observable to iterate over lines (APP-100)
asurkov Sep 16, 2017
4eae2d7
address reviewer's comments
asurkov Sep 19, 2017
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
106 changes: 65 additions & 41 deletions src/main/kotlin/app/hashers/CodeLongevity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import app.model.LocalRepo
import app.model.Repo
import app.model.Fact
import app.utils.RepoHelper
import io.reactivex.Observable
import org.eclipse.jgit.diff.DiffFormatter
import org.eclipse.jgit.diff.DiffEntry
import org.eclipse.jgit.diff.RawText
Expand Down Expand Up @@ -87,10 +88,14 @@ class CodeLongevity(private val localRepo: LocalRepo,
val tail: RevCommit? =
if (tailRev != "") RevWalk(repo).parseCommit(repo.resolve(tailRev))
else null
val df = DiffFormatter(DisabledOutputStream.INSTANCE)

fun update() {
val codeLines = compute()
init {
df.setRepository(repo)
df.setDetectRenames(true)
}

fun update() {
// TODO(anatoly): Add emails from server or hashAll.
val emails = hashSetOf(localRepo.author.email)

Expand All @@ -99,20 +104,20 @@ class CodeLongevity(private val localRepo: LocalRepo,
val totals: MutableMap<String, Int> = emails.associate { Pair(it, 0) }
.toMutableMap()

val repoTotal: Int = codeLines.size
var repoTotal: Int = 0
var repoSum: Long = 0
for (line in codeLines) {
getLinesObservable().blockingSubscribe { line ->
repoTotal++
repoSum += line.age

val email = line.from.commit.authorIdent.emailAddress
if (!emails.contains(email)) {
continue
}
Logger.debug(line.toString())
Logger.debug("Age: ${line.age} secs")
if (emails.contains(email)) {
Logger.debug(line.toString())
Logger.debug("Age: ${line.age} secs")

sums[email] = sums[email]!! + line.age
totals[email] = totals[email]!! + 1
sums[email] = sums[email]!! + line.age
totals[email] = totals[email]!! + 1
}
}

val secondsInDay = 86400
Expand Down Expand Up @@ -146,12 +151,23 @@ class CodeLongevity(private val localRepo: LocalRepo,
}

/**
* Scans through the repo for alive and deleted code lines and returns
* a list of all code lines, both alive and deleted, between the given
* revisions.
* Returns a list of code lines, both alive and deleted, between
* the revisions of the repo.
*/
fun compute() : List<CodeLine> {
fun getLinesList() : List<CodeLine> {
val codeLines: MutableList<CodeLine> = mutableListOf()
getLinesObservable().blockingSubscribe { line ->
codeLines.add(line)
}
return codeLines
}

/**
* Returns an observable for for code lines, both alive and deleted, between
* the revisions of the repo.
*/
private fun getLinesObservable(): Observable<CodeLine> =
Observable.create { subscriber ->

val treeWalk = TreeWalk(repo)
treeWalk.setRecursive(true)
Expand All @@ -173,30 +189,9 @@ class CodeLongevity(private val localRepo: LocalRepo,
}
}

val df = DiffFormatter(DisabledOutputStream.INSTANCE)
df.setRepository(repo)
df.setDetectRenames(true)

val revWalk = RevWalk(repo)
revWalk.markStart(head)

var commit: RevCommit? = revWalk.next() // move the walker to the head
while (commit != null && commit != tail) {
val parentCommit: RevCommit? = revWalk.next()

Logger.debug("commit: ${commit.getName()}; " +
"'${commit.getShortMessage()}'")
if (parentCommit != null) {
Logger.debug("parent commit: ${parentCommit.getName()}; "
+ "'${parentCommit.getShortMessage()}'")
}
else {
Logger.debug("parent commit: null")
}

getDiffsObservable().blockingSubscribe { (commit, diffs) ->
// A step back in commits history. Update the files map according
// to the diff.
val diffs = df.scan(parentCommit, commit)
for (diff in diffs) {
val oldPath = diff.getOldPath()
val oldId = diff.getOldId().toObjectId()
Expand Down Expand Up @@ -250,7 +245,7 @@ class CodeLongevity(private val localRepo: LocalRepo,
val from = RevCommitLine(commit, newPath, idx)
var to = lines.get(idx)
val cl = CodeLine(from, to, fileText.getString(idx))
codeLines.add(cl)
subscriber.onNext(cl)
Logger.debug("Collected: ${cl.toString()}")
}
lines.subList(insStart, insEnd).clear()
Expand Down Expand Up @@ -280,7 +275,6 @@ class CodeLongevity(private val localRepo: LocalRepo,
files.set(oldPath, files.remove(newPath)!!)
}
}
commit = parentCommit
}

// If a tail revision was given then the map has to contain unclaimed
Expand All @@ -293,11 +287,41 @@ class CodeLongevity(private val localRepo: LocalRepo,
val from = RevCommitLine(tail, file, idx)
val cl = CodeLine(from, lines[idx],
"no data (too lazy to compute)")
codeLines.add(cl)
subscriber.onNext(cl)
}
}
}

return codeLines
subscriber.onComplete()
}

/**
* Iterates over the diffs between commits in the repo's history.
*/
private fun getDiffsObservable(): Observable<Pair<RevCommit, List<DiffEntry>>> =
Observable.create { subscriber ->

val revWalk = RevWalk(repo)
revWalk.markStart(head)

var commit: RevCommit? = revWalk.next() // move the walker to the head
while (commit != null && commit != tail) {
val parentCommit: RevCommit? = revWalk.next()

Logger.debug("commit: ${commit.getName()}; " +
"'${commit.getShortMessage()}'")
if (parentCommit != null) {
Logger.debug("parent commit: ${parentCommit.getName()}; "
+ "'${parentCommit.getShortMessage()}'")
}
else {
Logger.debug("parent commit: null")
}

subscriber.onNext(Pair(commit, df.scan(parentCommit, commit)))
commit = parentCommit
}

subscriber.onComplete()
}
}
12 changes: 6 additions & 6 deletions src/test/kotlin/test/tests/hashers/CodeLongevityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class CodeLongevityTest : Spek({
testRepo.createFile(fileName, listOf("line1", "line2"))
val rev1 = testRepo.commit("inital commit")
val lines1 = CodeLongevity(
LocalRepo(testRepoPath), Repo(), MockApi(), testRepo.git).compute()
LocalRepo(testRepoPath), Repo(), MockApi(), testRepo.git).getLinesList()

it("'t1: initial insertion'") {
assertEquals(2, lines1.size)
Expand All @@ -80,7 +80,7 @@ class CodeLongevityTest : Spek({
testRepo.insertLines(fileName, 1, listOf("line in the middle"))
val rev2 = testRepo.commit("insert line")
val lines2 = CodeLongevity(
LocalRepo(testRepoPath), Repo(), MockApi(), testRepo.git).compute()
LocalRepo(testRepoPath), Repo(), MockApi(), testRepo.git).getLinesList()

it("'t2: subsequent insertion'") {
assertEquals(3, lines2.size)
Expand All @@ -102,7 +102,7 @@ class CodeLongevityTest : Spek({
testRepo.deleteLines(fileName, 2, 2)
val rev3 = testRepo.commit("delete line")
val lines3 = CodeLongevity(LocalRepo(testRepoPath), Repo(),
MockApi(), testRepo.git).compute()
MockApi(), testRepo.git).getLinesList()

it("'t3: subsequent deletion'") {
assertEquals(3, lines3.size)
Expand All @@ -124,7 +124,7 @@ class CodeLongevityTest : Spek({
testRepo.deleteFile(fileName)
val rev4 = testRepo.commit("delete file")
val lines4 = CodeLongevity(LocalRepo(testRepoPath), Repo(),
MockApi(), testRepo.git).compute()
MockApi(), testRepo.git).getLinesList()

it("'t4: file deletion'") {
assertEquals(3, lines4.size)
Expand Down Expand Up @@ -179,7 +179,7 @@ class CodeLongevityTest : Spek({
testRepo.createFile(fileName, fileContent)
val rev1 = testRepo.commit("inital commit")
val lines1 = CodeLongevity(
LocalRepo(testRepoPath), Repo(), MockApi(), testRepo.git).compute()
LocalRepo(testRepoPath), Repo(), MockApi(), testRepo.git).getLinesList()

it("'t2.1: initial insertion'") {
assertEquals(fileContent.size, lines1.size)
Expand All @@ -201,7 +201,7 @@ class CodeLongevityTest : Spek({
val rev2 = testRepo.commit("insert+delete")

val lines2 = CodeLongevity(
LocalRepo(testRepoPath), Repo(), MockApi(), testRepo.git).compute()
LocalRepo(testRepoPath), Repo(), MockApi(), testRepo.git).getLinesList()

it("'t2.2: ins+del'") {
assertEquals(22, lines2.size)
Expand Down