Skip to content

APP-141: report Longevity's crashes to Logger #59

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
Nov 17, 2017
Merged

APP-141: report Longevity's crashes to Logger #59

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
948bd67
fix(longevity): report Longevity's crashes to Logger (APP-141)
asurkov Nov 14, 2017
767c31c
minor fix
asurkov Nov 17, 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
22 changes: 15 additions & 7 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 @@ -143,7 +143,8 @@ class CodeLineAges : Serializable {
*/
class CodeLongevity(private val serverRepo: Repo,
private val emails: HashSet<String>,
git: Git) {
git: Git,
private val onError: (Throwable) -> Unit) {
val repo: Repository = git.repository
val revWalk = RevWalk(repo)
val head: RevCommit =
Expand Down Expand Up @@ -330,7 +331,7 @@ class CodeLongevity(private val serverRepo: Repo,
}
}

getDiffsObservable(tail).blockingSubscribe { (commit, diffs) ->
getDiffsObservable(tail).blockingSubscribe( { (commit, diffs) ->
// A step back in commits history. Update the files map according
// to the diff. Traverse the diffs backwards to handle double
// renames properly.
Expand Down Expand Up @@ -383,10 +384,17 @@ class CodeLongevity(private val serverRepo: Repo,
for (idx in insStart .. insEnd - 1) {
val from = RevCommitLine(commit, newId,
newPath, idx, false)
val to = lines.get(idx)
val cl = CodeLine(repo, from, to)
Logger.trace { "Collected: ${cl}" }
subscriber.onNext(cl)
try {
val to = lines.get(idx)
val cl = CodeLine(repo, from, to)
Logger.trace { "Collected: ${cl}" }
subscriber.onNext(cl)
}
catch(e: IndexOutOfBoundsException) {
Logger.error(e,
"No line at ${idx}; commit: ${commit.getName()}; '${commit.getShortMessage()}'")
throw e
}
}
lines.subList(insStart, insEnd).clear()
}
Expand Down Expand Up @@ -416,7 +424,7 @@ class CodeLongevity(private val serverRepo: Repo,
files.set(oldPath, files.remove(newPath)!!)
}
}
}
}, onError)

// If a tail revision was given then the map has to contain unclaimed
// code lines, i.e. the lines added before the tail revision. Push
Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/app/hashers/RepoHasher.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ class RepoHasher(private val localRepo: LocalRepo, private val api: Api,

// TODO(anatoly): CodeLongevity hash from observable.
try {
CodeLongevity(serverRepo, filteredEmails, git).updateStats(api)
CodeLongevity(serverRepo, filteredEmails, git, onError)
.updateStats(api)
}
catch (e: Throwable) {
onError(e)
Expand Down
59 changes: 37 additions & 22 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 @@ -14,6 +14,7 @@ import test.utils.TestRepo

import kotlin.test.assertEquals
import kotlin.test.assertTrue
import kotlin.test.fail

import org.eclipse.jgit.revwalk.RevCommit

Expand Down Expand Up @@ -68,7 +69,8 @@ class CodeLongevityTest : Spek({
// t1: initial insertion
testRepo.createFile(fileName, listOf("line1", "line2"))
val rev1 = testRepo.commit("initial commit")
val lines1 = CodeLongevity(Repo(), emails, testRepo.git).getLinesList()
val lines1 = CodeLongevity(Repo(), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList()

it("'t1: initial insertion'") {
assertEquals(2, lines1.size)
Expand All @@ -85,7 +87,8 @@ class CodeLongevityTest : Spek({
// t2: subsequent insertion
testRepo.insertLines(fileName, 1, listOf("line in the middle"))
val rev2 = testRepo.commit("insert line")
val lines2 = CodeLongevity(Repo(), emails, testRepo.git).getLinesList()
val lines2 = CodeLongevity(Repo(), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList()

it("'t2: subsequent insertion'") {
assertEquals(3, lines2.size)
Expand All @@ -106,7 +109,8 @@ class CodeLongevityTest : Spek({
// t3: subsequent deletion
testRepo.deleteLines(fileName, 2, 2)
val rev3 = testRepo.commit("delete line")
val lines3 = CodeLongevity(Repo(), emails, testRepo.git).getLinesList()
val lines3 = CodeLongevity(Repo(), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList()

it("'t3: subsequent deletion'") {
assertEquals(3, lines3.size)
Expand All @@ -127,7 +131,8 @@ class CodeLongevityTest : Spek({
// t4: file deletion
testRepo.deleteFile(fileName)
val rev4 = testRepo.commit("delete file")
val lines4 = CodeLongevity(Repo(), emails, testRepo.git).getLinesList()
val lines4 = CodeLongevity(Repo(), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList()

it("'t4: file deletion'") {
assertEquals(3, lines4.size)
Expand Down Expand Up @@ -181,7 +186,8 @@ class CodeLongevityTest : Spek({
)
testRepo.createFile(fileName, fileContent)
val rev1 = testRepo.commit("initial commit")
val lines1 = CodeLongevity(Repo(), emails, testRepo.git).getLinesList()
val lines1 = CodeLongevity(Repo(), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList()

it("'t2.1: initial insertion'") {
assertEquals(fileContent.size, lines1.size)
Expand Down Expand Up @@ -227,7 +233,8 @@ class CodeLongevityTest : Spek({
testRepo.insertLines(fileName, 11, listOf("Proof addition 3"))
val rev2 = testRepo.commit("insert+delete")

val lines2 = CodeLongevity(Repo(), emails, testRepo.git).getLinesList()
val lines2 = CodeLongevity(Repo(), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList()

it("'t2.2: ins+del'") {
assertEquals(22, lines2.size)
Expand Down Expand Up @@ -299,7 +306,8 @@ class CodeLongevityTest : Spek({
testRepo.deleteLines(fileName, 2, 2)
val rev3 = testRepo.commit("delete line2")

val lines1 = CodeLongevity(Repo(), emails, testRepo.git).getLinesList()
val lines1 = CodeLongevity(Repo(), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList()
val lines1_line15 = lines1[0]
val lines1_line1 = lines1[1]
val lines1_line2 = lines1[2]
Expand All @@ -323,8 +331,8 @@ class CodeLongevityTest : Spek({
testRepo.deleteLines(fileName, 0, 0)
val rev4 = testRepo.commit("delete line1")

val lines2 =
CodeLongevity(Repo(), emails, testRepo.git).getLinesList(rev3)
val lines2 = CodeLongevity(Repo(), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList(rev3)
val lines2_line1 = lines2[0]
val lines2_line15 = lines2[1]

Expand Down Expand Up @@ -367,10 +375,12 @@ class CodeLongevityTest : Spek({
val t1_rev = testRepo.commit(message = "insert line",
date = Calendar.Builder().setTimeOfDay(0, 1, 0).build().time)

val t1_ages = CodeLongevity(Repo(rehash = testRehash),
emails, testRepo.git).scan()!!
val t1_lines = CodeLongevity(Repo(rehash = testRehash),
emails, testRepo.git).getLinesList()
val t1_ages = CodeLongevity(
Repo(rehash = testRehash), emails, testRepo.git,
{ _ -> fail("exception") }).scan()!!
val t1_lines = CodeLongevity(
Repo(rehash = testRehash), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList()

it("'t1'") {
assertTrue(t1_ages.aggrAges.isEmpty(),
Expand All @@ -387,10 +397,12 @@ class CodeLongevityTest : Spek({
testRepo.commit(message = "delete line2",
date = Calendar.Builder().setTimeOfDay(0, 3, 0).build().time)

val t2_ages = CodeLongevity(Repo(rehash = testRehash),
emails, testRepo.git).scan()!!
val t2_lines = CodeLongevity(Repo(rehash = testRehash),
emails, testRepo.git).getLinesList(t1_rev)
val t2_ages = CodeLongevity(
Repo(rehash = testRehash), emails, testRepo.git,
{ _ -> fail("exception") }).scan()!!
val t2_lines = CodeLongevity(
Repo(rehash = testRehash), emails, testRepo.git,
{ _ -> fail("exception") }).getLinesList(t1_rev)

it("'t2'") {
assertEquals(1, t2_ages.aggrAges[email]!!.count,
Expand All @@ -408,8 +420,9 @@ class CodeLongevityTest : Spek({
}

afterGroup {
CodeLongevity(Repo(rehash = testRehash),
emails, testRepo.git).dropSavedData()
CodeLongevity(
Repo(rehash = testRehash), emails, testRepo.git,
{ _ -> fail("exception") }).dropSavedData()
testRepo.destroy()
}
}
Expand Down Expand Up @@ -446,7 +459,8 @@ class CodeLongevityTest : Spek({
author = author1,
date = Calendar.Builder().setTimeOfDay(0, 4, 0).build().time)

CodeLongevity(serverRepo, emails, testRepo.git).updateStats(mockApi)
CodeLongevity(serverRepo, emails, testRepo.git,
{ _ -> fail("exception") }).updateStats(mockApi)

it("'t1'") {
assertTrue(mockApi.receivedFacts.contains(
Expand All @@ -464,8 +478,9 @@ class CodeLongevityTest : Spek({
}

afterGroup {
CodeLongevity(Repo(rehash = testRehash),
emails, testRepo.git).dropSavedData()
CodeLongevity(
Repo(rehash = testRehash), emails, testRepo.git,
{ _ -> fail("exception") }).dropSavedData()
testRepo.destroy()
}
}
Expand Down