2.6.1

ijl · Mar 19, 2020 · 92656d0 · 92656d0
1 parent 70ac702
commit 92656d0
Show file tree

Hide file tree

Showing 13 changed files with 150 additions and 121 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 2.6.1 - 2020-03-19
+
+### Changed
+
+- Serialization is 10-20% faster and uses about 50% less memory by writing
+directly to the returned `bytes` object.
+
 ## 2.6.0 - 2020-03-10
 
 ### Added

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "orjson"
-version = "2.6.0"
+version = "2.6.1"
 authors = ["ijl <ijl@mailbox.org>"]
 description = "Fast, correct Python JSON library supporting dataclasses, datetimes, and numpy"
 edition = "2018"

diff --git a/README.md b/README.md
diff --git a/doc/canada_deserialization.png b/doc/canada_deserialization.png
diff --git a/doc/canada_serialization.png b/doc/canada_serialization.png
diff --git a/doc/citm_catalog_deserialization.png b/doc/citm_catalog_deserialization.png
diff --git a/doc/citm_catalog_serialization.png b/doc/citm_catalog_serialization.png
diff --git a/doc/github_deserialization.png b/doc/github_deserialization.png
diff --git a/doc/github_serialization.png b/doc/github_serialization.png
diff --git a/doc/twitter_deserialization.png b/doc/twitter_deserialization.png
diff --git a/doc/twitter_serialization.png b/doc/twitter_serialization.png
diff --git a/pynumpy b/pynumpy
@@ -9,14 +9,15 @@ import sys
 import time
 from timeit import timeit
 
-import numpy
 import orjson
 import psutil
 import rapidjson
 import simplejson
 from memory_profiler import memory_usage
 from tabulate import tabulate
 
+import numpy
+
 os.sched_setaffinity(os.getpid(), {0, 1})
 
 
@@ -28,15 +29,10 @@ elif kind == "float64":
     array = numpy.random.random(size=(50000, 100))
     assert array.dtype == numpy.float64
 elif kind == "bool":
-    array = numpy.random.choice((True, False), size=(100000, 100))
+    array = numpy.random.choice((True, False), size=(100000, 200))
 else:
     print("usage: pynumpy (bool|int32|float64)")
     sys.exit(1)
-
-output_in_mib = len(orjson.dumps(array.tolist())) / 1024 / 1024
-
-print(f"{output_in_mib:,.1f}MiB {kind} output (orjson)")
-
 proc = psutil.Process()
 
 
@@ -57,6 +53,10 @@ rapidjson_dumps = lambda: rapidjson.dumps(array, default=default).encode("utf-8"
 simplejson_dumps = lambda: simplejson.dumps(array, default=default).encode("utf-8")
 json_dumps = lambda: json.dumps(array, default=default).encode("utf-8")
 
+output_in_mib = len(orjson_dumps()) / 1024 / 1024
+
+print(f"{output_in_mib:,.1f}MiB {kind} output (orjson)")
+
 gc.collect()
 mem_before = proc.memory_full_info().rss / 1024 / 1024