From 707d2c42ad1652a07fc184ab40d561c7ae1ea50b Mon Sep 17 00:00:00 2001
From: Pavel Kunyavskiy <pavel.kunyavskiy@jetbrains.com>
Date: Fri, 3 Jun 2022 11:01:06 +0200
Subject: [PATCH] [K/N] Fix version parsing in perfomance-server

---
 .../performance-server/src/main/kotlin/routes/route.kt | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/kotlin-native/tools/performance-server/src/main/kotlin/routes/route.kt b/kotlin-native/tools/performance-server/src/main/kotlin/routes/route.kt
index bba0a43380f..7be0f0996d0 100644
--- a/kotlin-native/tools/performance-server/src/main/kotlin/routes/route.kt
+++ b/kotlin-native/tools/performance-server/src/main/kotlin/routes/route.kt
@@ -195,12 +195,14 @@ internal fun <T> orderedValues(values: List<T>, buildElement: (T) -> CompositeBu
                 compareBy(
                         { if (buildElement(it).first != null) 1 else 0 }, // Old builds have no set build type.
                         { buildElement(it).second.substringBefore(".").toInt() },       // Kotlin version
-                        { buildElement(it).second.substringAfter(".").substringBefore("-").toDouble() },
+                        { buildElement(it).second.substringAfter(".").substringBefore("-").substringBefore("(").toDouble() },
                         {  // Milestones and release candidates.
                             val buildNumber = buildElement(it).second
                             if (skipMilestones && buildElement(it).first == null ) 0
                             else if (buildNumber.substringAfter("-").startsWith("M"))
                                 buildNumber.substringAfter("M").substringBefore("-").toInt()
+                            else if (buildNumber.substringAfter("-").startsWith("Beta"))
+                                buildNumber.substringAfter("Beta").substringBefore("-").toIntOrNull() ?: 1
                             else if (buildNumber.substringAfter("-").startsWith("RC"))
                                 Int.MAX_VALUE / 2
                             else
@@ -460,13 +462,15 @@ fun router() {
                             .then { geoMeansValues ->
                         success(orderedValues(geoMeansValues, { it -> it.first }, branch == "master")
                                 .map { it.first.second to it.second })
-                    }.catch {
+                    }.catch { errorResponse ->
                         println("Error during getting samples")
+                        println(errorResponse)
                         reject()
                     }
                 }
-            }.catch {
+            }.catch { errorResponse ->
                 println("Error during getting builds information")
+                println(errorResponse)
                 reject()
             }
         }