Skip to content

Commit da7fb0c

Browse files
committed
Release 7.034
1 parent 12c9a96 commit da7fb0c

40 files changed

+62
-44
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Changelog
2+
#7.034
3+
* Reverted transit encoding of instant back to milliseconds since epoch as js api doesn't support microseconds since epoch.
4+
25
# 7.033
36
* [issue-434](https://github.com/techascent/tech.ml.dataset/issues/413) - bad transit encoding - packed instants are microseconds since epoch and have been for a while - not milliseconds since epoch.
47

deps.edn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{:paths ["src" "resources" "target/classes"]
22
:deps {;;org.clojure/clojure {:mvn/version "1.11.1"}
3-
cnuernber/dtype-next {:mvn/version "10.120"}
3+
cnuernber/dtype-next {:mvn/version "10.122"}
44
techascent/tech.io {:mvn/version "4.31"
55
:exclusions [org.apache.commons/commons-compress]}
66
org.apache.datasketches/datasketches-java {:mvn/version "4.2.0"}
@@ -14,7 +14,7 @@
1414
:exec-fn codox.main/-main
1515
:exec-args {:group-id "techascent"
1616
:artifact-id "tech.ml.dataset"
17-
:version "7.033"
17+
:version "7.034"
1818
:name "TMD"
1919
:description "A Clojure high performance data processing system"
2020
:metadata {:doc/format :markdown}

docs/000-getting-started.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/100-walkthrough.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/200-quick-reference.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/columns-readers-and-datatypes.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/index.html

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

docs/nippy-serialization-rocks.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/supported-datatypes.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.categorical.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.clipboard.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.column-filters.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.column.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.io.csv.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.io.datetime.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.io.string-row-parser.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.io.univocity.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.join.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.math.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.metamorph.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.modelling.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.print.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.reductions.apache-data-sketch.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.reductions.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.rolling.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.set.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.tensor.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.dataset.zip.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.libs.arrow.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.libs.clj-transit.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.libs.fastexcel.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.libs.guava.cache.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.libs.parquet.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.libs.poi.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.libs.smile.data.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/tech.v3.libs.tribuo.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

scripts/enable-jdk21-m1

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
4+
VERSION="21.0.2"
5+
6+
if [ ! -e jdk-$VERSION ]; then
7+
echo "Downloading JDK $VERSION"
8+
wget https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_macos-aarch64_bin.tar.gz
9+
tar -xvzf openjdk-21.0.2_macos-aarch64_bin.tar.gz
10+
rm openjdk-21.0.2_macos-aarch64_bin.tar.gz
11+
fi
12+
13+
export PATH=$(pwd)/jdk-$VERSION/bin:$PATH
14+
export JAVA_HOME=$(pwd)/jdk-$VERSION/

src/tech/v3/libs/clj_transit.clj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@
140140
(text-col->data col)
141141
(#{:packed-local-date :local-date} col-dt)
142142
(obj-col->numeric-b64 col :int32 dtype-dt/local-date->days-since-epoch)
143-
(#{:packed-instant :instant} col-dt)
144-
(obj-col->numeric-b64 col :int64 dtype-dt/instant->microseconds-since-epoch)
143+
(#{:packed-instant :instant :packed-milli-instant} col-dt)
144+
(obj-col->numeric-b64 col :int64 dtype-dt/instant->milliseconds-since-epoch)
145145
:else ;;Punt!!
146146
(vec col))}))
147147

@@ -238,7 +238,7 @@
238238
(= :instant dtype)
239239
(-> (b64->numeric-data data :int64)
240240
(dtype/->array-buffer)
241-
(abuf/set-datatype :packed-instant))
241+
(abuf/set-datatype :packed-milli-instant))
242242
:else
243243
(dtype/make-container dtype data))
244244
:name (:name metadata)})))
@@ -260,12 +260,12 @@
260260
(def ^{:doc "Transit write handlers for java.time.LocalDate and java.time.Instant"}
261261
java-time-write-handlers
262262
{LocalDate (t/write-handler "java.time.LocalDate" dtype-dt/local-date->days-since-epoch)
263-
Instant (t/write-handler "java.time.Instant" dtype-dt/instant->microseconds-since-epoch)})
263+
Instant (t/write-handler "java.time.Instant" dtype-dt/instant->milliseconds-since-epoch)})
264264

265265
(def ^{:doc "Transit read handlers for java.time.LocalDate and java.time.Instant"}
266266
java-time-read-handlers
267267
{"java.time.LocalDate" (t/read-handler dtype-dt/days-since-epoch->local-date)
268-
"java.time.Instant" (t/read-handler dtype-dt/microseconds-since-epoch->instant)})
268+
"java.time.Instant" (t/read-handler dtype-dt/milliseconds-since-epoch->instant)})
269269

270270

271271
(defn dataset->transit

test/tech/v3/dataset/parse_test.clj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,8 @@
505505
(deftest issue-434-transit-support
506506
(let [ds (ds/->dataset {:a [1 2 3]
507507
:b [:one :two :three]
508-
:c [(java.time.Instant/now) (java.time.Instant/now)]})
508+
;;transit encoding is milli instants
509+
:c (dtype/make-container :packed-milli-instant [(java.time.Instant/now) (java.time.Instant/now)])})
509510
str-data (ds-transit/dataset->transit-str ds)
510511
nds (ds-transit/transit-str->dataset str-data)]
511512
(is (= (ds :a) (nds :a)))

0 commit comments

Comments
 (0)