projects
/
lightning.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix diff case
[lightning.git]
/
merge.go
diff --git
a/merge.go
b/merge.go
index 904db8e4d27f5f0b6cc2adff2c2613e850a89ee9..68560edbd0ae62af9fd203ba9aa6d2867a1fe883 100644
(file)
--- a/
merge.go
+++ b/
merge.go
@@
-1,8
+1,11
@@
-package main
+// Copyright (C) The Lightning Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package lightning
import (
"bufio"
import (
"bufio"
- "compress/gzip"
"context"
"encoding/gob"
"errors"
"context"
"encoding/gob"
"errors"
@@
-17,13
+20,14
@@
import (
"sync"
"git.arvados.org/arvados.git/sdk/go/arvados"
"sync"
"git.arvados.org/arvados.git/sdk/go/arvados"
+ "github.com/klauspost/pgzip"
log "github.com/sirupsen/logrus"
)
type merger struct {
stdin io.Reader
inputs []string
log "github.com/sirupsen/logrus"
)
type merger struct {
stdin io.Reader
inputs []string
- output io.Write
Close
r
+ output io.Writer
tagSet [][]byte
tilelib *tileLibrary
mapped map[string]map[tileLibRef]tileVariantID
tagSet [][]byte
tilelib *tileLibrary
mapped map[string]map[tileLibRef]tileVariantID
@@
-70,9
+74,11
@@
func (cmd *merger) RunCommand(prog string, args []string, stdin io.Reader, stdou
Name: "lightning merge",
Client: arvados.NewClientFromEnv(),
ProjectUUID: *projectUUID,
Name: "lightning merge",
Client: arvados.NewClientFromEnv(),
ProjectUUID: *projectUUID,
- RAM:
64
000000000,
- VCPUs:
2
,
+ RAM:
700
000000000,
+ VCPUs:
16
,
Priority: *priority,
Priority: *priority,
+ APIAccess: true,
+ KeepCache: 1,
}
for i := range cmd.inputs {
err = runner.TranslatePaths(&cmd.inputs[i])
}
for i := range cmd.inputs {
err = runner.TranslatePaths(&cmd.inputs[i])
@@
-102,21
+108,26
@@
func (cmd *merger) RunCommand(prog string, args []string, stdin io.Reader, stdou
}
defer outf.Close()
if strings.HasSuffix(*outputFilename, ".gz") {
}
defer outf.Close()
if strings.HasSuffix(*outputFilename, ".gz") {
- outw = gzip.NewWriter(outf)
+ outw =
p
gzip.NewWriter(outf)
} else {
} else {
- outw =
outf
+ outw =
nopCloser{outf}
}
}
}
}
- cmd.output = outw
+ bufw := bufio.NewWriterSize(outw, 64*1024*1024)
+ cmd.output = bufw
err = cmd.doMerge()
if err != nil {
return 1
}
err = cmd.doMerge()
if err != nil {
return 1
}
+ err = bufw.Flush()
+ if err != nil {
+ return 1
+ }
err = outw.Close()
if err != nil {
return 1
}
err = outw.Close()
if err != nil {
return 1
}
- if outf != nil
&& outf != outw
{
+ if outf != nil {
err = outf.Close()
if err != nil {
return 1
err = outf.Close()
if err != nil {
return 1
@@
-152,22
+163,21
@@
func (cmd *merger) doMerge() error {
var wg sync.WaitGroup
for _, input := range cmd.inputs {
var wg sync.WaitGroup
for _, input := range cmd.inputs {
- var infile io.ReadCloser
- if input == "-" {
- infile = ioutil.NopCloser(cmd.stdin)
- } else {
+ rdr := ioutil.NopCloser(cmd.stdin)
+ if input != "-" {
var err error
var err error
-
infile, err = os.O
pen(input)
+
rdr, err = o
pen(input)
if err != nil {
return err
}
if err != nil {
return err
}
- defer
infile
.Close()
+ defer
rdr
.Close()
}
}
+ rdr = ioutil.NopCloser(bufio.NewReaderSize(rdr, 8*1024*1024))
wg.Add(1)
go func(input string) {
defer wg.Done()
log.Printf("%s: reading", input)
wg.Add(1)
go func(input string) {
defer wg.Done()
log.Printf("%s: reading", input)
- err := cmd.tilelib.LoadGob(ctx,
infile, strings.HasSuffix(input, ".gz"), nil
)
+ err := cmd.tilelib.LoadGob(ctx,
rdr, strings.HasSuffix(input, ".gz")
)
if err != nil {
cmd.setError(fmt.Errorf("%s: load failed: %w", input, err))
cancel()
if err != nil {
cmd.setError(fmt.Errorf("%s: load failed: %w", input, err))
cancel()