fixtests

com-lihaoyi · Mar 17, 2023 · 3939991 · 3939991
1 parent e896bbb
commit 3939991
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 29 deletions.
diff --git a/bench/src-jvm/Main.scala b/bench/src-jvm/Main.scala
@@ -33,8 +33,8 @@ object Main{
 
       val results = Seq(
         Common.upickleDefault(duration),
-        Common.upickleDefaultByteArray(duration),
-        Common.upickleDefaultBinary(duration),
+//        Common.upickleDefaultByteArray(duration),
+//        Common.upickleDefaultBinary(duration),
         //      Common.upickleLegacy(duration)
         //      Common.upickleBinaryLegacy(duration)
         //      Common.genCodec(duration)
@@ -55,32 +55,32 @@ object Main{
   //      benchParsingRendering(duration, bytes = false, strings = false, streams = true, msgpack = false)
   //      benchParsingRendering(duration, bytes = false, strings = false, streams = false, msgpack = true)
         Common.integers(duration),
-        Common.integersByteArray(duration),
-        Common.integersBinary(duration),
-
-        Common.doubles(duration),
-        Common.doublesByteArray(duration),
-        Common.doublesBinary(duration),
-
-        Common.sequences(duration),
-        Common.sequencesByteArray(duration),
-        Common.sequencesBinary(duration),
-
-        Common.shortStrings(duration),
-        Common.shortStringsByteArray(duration),
-        Common.shortStringsBinary(duration),
-
-        Common.longStrings(duration),
-        Common.longStringsByteArray(duration),
-        Common.longStringsBinary(duration),
-
-        Common.unicodeStrings(duration),
-        Common.unicodeStringsByteArray(duration),
-        Common.unicodeStringsBinary(duration),
-
-        Common.caseClasses(duration),
-        Common.caseClassesByteArray(duration),
-        Common.caseClassesBinary(duration)
+//        Common.integersByteArray(duration),
+//        Common.integersBinary(duration),
+
+//        Common.doubles(duration),
+//        Common.doublesByteArray(duration),
+//        Common.doublesBinary(duration),
+//
+//        Common.sequences(duration),
+//        Common.sequencesByteArray(duration),
+//        Common.sequencesBinary(duration),
+//
+//        Common.shortStrings(duration),
+//        Common.shortStringsByteArray(duration),
+//        Common.shortStringsBinary(duration),
+//
+//        Common.longStrings(duration),
+//        Common.longStringsByteArray(duration),
+//        Common.longStringsBinary(duration),
+//
+//        Common.unicodeStrings(duration),
+//        Common.unicodeStringsByteArray(duration),
+//        Common.unicodeStringsBinary(duration),
+//
+//        Common.caseClasses(duration),
+//        Common.caseClassesByteArray(duration),
+//        Common.caseClassesBinary(duration)
       )
 
       if (save) allResults.appendAll(results.flatten)

diff --git a/core/src/upickle/core/RenderUtils.scala b/core/src/upickle/core/RenderUtils.scala
@@ -216,9 +216,11 @@ object RenderUtils{
       x = -x
     }
     var p: Long = -10
-    for (i <- 1 until 19) {
+    var i = 1
+    while (i <= 18){
       if (x > p) return i + d
       p = 10 * p
+      i += 1
     }
     19 + d
   }