From feb8997ca8b638a913a71a4ae4a17350b8545307 Mon Sep 17 00:00:00 2001 From: Samir Patel <48686912+54mir@users.noreply.github.com> Date: Wed, 29 Sep 2021 15:42:50 -0500 Subject: [PATCH 1/3] Add darwin build to roaring-migrate-tool --- cmd/roaring-migrate/ctim_darwin.go | 14 ++++++++++++++ cmd/roaring-migrate/ctim_linux.go | 11 +++++++++++ cmd/roaring-migrate/main.go | 6 +++--- 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 cmd/roaring-migrate/ctim_darwin.go create mode 100644 cmd/roaring-migrate/ctim_linux.go diff --git a/cmd/roaring-migrate/ctim_darwin.go b/cmd/roaring-migrate/ctim_darwin.go new file mode 100644 index 000000000..fe76c74f0 --- /dev/null +++ b/cmd/roaring-migrate/ctim_darwin.go @@ -0,0 +1,14 @@ +// +build darwin + +package main + +import ( + "syscall" + "time" +) + +func CTimeNano(stat *syscall.Stat_t) int64 { + ts := stat.Ctimespec + time.Unix(int64(ts.Sec), int64(ts.Nsec)) + return int64(ts.Sec)*1e9 + int64(ts.Nsec) +} diff --git a/cmd/roaring-migrate/ctim_linux.go b/cmd/roaring-migrate/ctim_linux.go new file mode 100644 index 000000000..0ddf61c5d --- /dev/null +++ b/cmd/roaring-migrate/ctim_linux.go @@ -0,0 +1,11 @@ +// +build linux + +package main + +import ( + "syscall" +) + +func CTimeNano(stat *syscall.Stat_t) int64 { + return stat.Ctim.Nano() +} diff --git a/cmd/roaring-migrate/main.go b/cmd/roaring-migrate/main.go index 60ff5bf7c..8b5b62d6c 100644 --- a/cmd/roaring-migrate/main.go +++ b/cmd/roaring-migrate/main.go @@ -24,7 +24,7 @@ import ( "strings" "syscall" - "github.com/molecula/featurebase/v2" + pilosa "github.com/molecula/featurebase/v2" "github.com/molecula/featurebase/v2/rbf" "github.com/molecula/featurebase/v2/rbf/cfg" "github.com/molecula/featurebase/v2/roaring" @@ -148,7 +148,7 @@ func BuildSchema(dataDir string) ([]byte, error) { l = &local{ Name: index, Fields: make([]*pilosa.FieldInfo, 0), - CreatedAt: uint64(stat.Ctim.Nano()), + CreatedAt: uint64(CTimeNano(stat)), Options: *io, } //index options @@ -158,7 +158,7 @@ func BuildSchema(dataDir string) ([]byte, error) { field := t[2] if field != "_exists" { - fi, err := pilosa.UnmarshalFieldOptions(field, stat.Ctim.Nano(), content) + fi, err := pilosa.UnmarshalFieldOptions(field, CTimeNano(stat), content) if err != nil { return err } From 5d070b47bb76ca73c2d2c50ae6393d9ea6916b79 Mon Sep 17 00:00:00 2001 From: Samir Patel <48686912+54mir@users.noreply.github.com> Date: Wed, 29 Sep 2021 15:57:31 -0500 Subject: [PATCH 2/3] clean up --- cmd/roaring-migrate/ctim_darwin.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/roaring-migrate/ctim_darwin.go b/cmd/roaring-migrate/ctim_darwin.go index fe76c74f0..f79dca111 100644 --- a/cmd/roaring-migrate/ctim_darwin.go +++ b/cmd/roaring-migrate/ctim_darwin.go @@ -4,11 +4,10 @@ package main import ( "syscall" - "time" ) func CTimeNano(stat *syscall.Stat_t) int64 { + NANOS := int64(1e9) // number of nanosecs in 1 sec ts := stat.Ctimespec - time.Unix(int64(ts.Sec), int64(ts.Nsec)) - return int64(ts.Sec)*1e9 + int64(ts.Nsec) + return ts.Sec*NANOS + ts.Nsec } From a845d93a255771ad8d552ec1ce9085ead37b23b2 Mon Sep 17 00:00:00 2001 From: Samir Patel <48686912+54mir@users.noreply.github.com> Date: Thu, 30 Sep 2021 09:28:33 -0500 Subject: [PATCH 3/3] Add license headers --- cmd/roaring-migrate/ctim_darwin.go | 14 ++++++++++++++ cmd/roaring-migrate/ctim_linux.go | 14 ++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/cmd/roaring-migrate/ctim_darwin.go b/cmd/roaring-migrate/ctim_darwin.go index f79dca111..0b50491ab 100644 --- a/cmd/roaring-migrate/ctim_darwin.go +++ b/cmd/roaring-migrate/ctim_darwin.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // +build darwin package main diff --git a/cmd/roaring-migrate/ctim_linux.go b/cmd/roaring-migrate/ctim_linux.go index 0ddf61c5d..b9e5d70e1 100644 --- a/cmd/roaring-migrate/ctim_linux.go +++ b/cmd/roaring-migrate/ctim_linux.go @@ -1,3 +1,17 @@ +// Copyright 2017 Pilosa Corp. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + // +build linux package main