mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-20 18:10:07 +00:00
Miller assumes 64-bit integers, but in Go, the int type varies in size depending on the architecture: 32-bit architectures have int equivalent to int32. As a result, the supported range of integer values is greatly reduced on 32-bit architectures compared to what is suggested by the documentation. This patch explicitly uses int64 wherever 64-bit integers are assumed. Test cases affected by the behaviour of the random generator are updated to reflect the new values (the existing seed doesn't produce the same behaviour since the way random values are generated has changed). Signed-off-by: Stephen Kitt <steve@sk2.org>
206 lines
5.8 KiB
Go
206 lines
5.8 KiB
Go
package input
|
|
|
|
import (
|
|
"container/list"
|
|
"fmt"
|
|
|
|
"github.com/johnkerl/miller/internal/pkg/bifs"
|
|
"github.com/johnkerl/miller/internal/pkg/cli"
|
|
"github.com/johnkerl/miller/internal/pkg/mlrval"
|
|
"github.com/johnkerl/miller/internal/pkg/types"
|
|
)
|
|
|
|
type PseudoReaderGen struct {
|
|
readerOptions *cli.TReaderOptions
|
|
recordsPerBatch int64 // distinct from readerOptions.RecordsPerBatch for join/repl
|
|
}
|
|
|
|
func NewPseudoReaderGen(
|
|
readerOptions *cli.TReaderOptions,
|
|
recordsPerBatch int64,
|
|
) (*PseudoReaderGen, error) {
|
|
return &PseudoReaderGen{
|
|
readerOptions: readerOptions,
|
|
recordsPerBatch: recordsPerBatch,
|
|
}, nil
|
|
}
|
|
|
|
func (reader *PseudoReaderGen) Read(
|
|
filenames []string, // ignored
|
|
context types.Context,
|
|
readerChannel chan<- *list.List, // list of *types.RecordAndContext
|
|
errorChannel chan error,
|
|
downstreamDoneChannel <-chan bool, // for mlr head
|
|
) {
|
|
reader.process(&context, readerChannel, errorChannel, downstreamDoneChannel)
|
|
readerChannel <- types.NewEndOfStreamMarkerList(&context)
|
|
}
|
|
|
|
func (reader *PseudoReaderGen) process(
|
|
context *types.Context,
|
|
readerChannel chan<- *list.List, // list of *types.RecordAndContext
|
|
errorChannel chan error,
|
|
downstreamDoneChannel <-chan bool, // for mlr head
|
|
) {
|
|
context.UpdateForStartOfFile("(gen-pseudo-reader)")
|
|
recordsPerBatch := reader.recordsPerBatch
|
|
|
|
start, err := reader.tryParse("start", reader.readerOptions.GeneratorOptions.StartAsString)
|
|
if err != nil {
|
|
errorChannel <- err
|
|
return
|
|
}
|
|
|
|
step, err := reader.tryParse("step", reader.readerOptions.GeneratorOptions.StepAsString)
|
|
if err != nil {
|
|
errorChannel <- err
|
|
return
|
|
}
|
|
|
|
stop, err := reader.tryParse("stop", reader.readerOptions.GeneratorOptions.StopAsString)
|
|
if err != nil {
|
|
errorChannel <- err
|
|
return
|
|
}
|
|
|
|
var doneComparator mlrval.CmpFuncBool = mlrval.GreaterThan
|
|
if step.GetNumericNegativeorDie() {
|
|
doneComparator = mlrval.LessThan
|
|
}
|
|
|
|
key := reader.readerOptions.GeneratorOptions.FieldName
|
|
value := start.Copy()
|
|
|
|
recordsAndContexts := list.New()
|
|
|
|
eof := false
|
|
for !eof {
|
|
|
|
if doneComparator(value, stop) {
|
|
break
|
|
}
|
|
|
|
record := mlrval.NewMlrmap()
|
|
record.PutCopy(key, value)
|
|
|
|
context.UpdateForInputRecord()
|
|
recordsAndContexts.PushBack(types.NewRecordAndContext(record, context))
|
|
|
|
if int64(recordsAndContexts.Len()) >= recordsPerBatch {
|
|
readerChannel <- recordsAndContexts
|
|
recordsAndContexts = list.New()
|
|
|
|
// See if downstream processors will be ignoring further data (e.g.
|
|
// mlr head). If so, stop reading. This makes 'mlr head hugefile'
|
|
// exit quickly, as it should. Check this only every so often to
|
|
// avoid goroutine-scheduler thrash.
|
|
eof := false
|
|
select {
|
|
case _ = <-downstreamDoneChannel:
|
|
eof = true
|
|
break
|
|
default:
|
|
break
|
|
}
|
|
if eof {
|
|
break
|
|
}
|
|
|
|
}
|
|
|
|
value = bifs.BIF_plus_binary(value, step)
|
|
}
|
|
|
|
if recordsAndContexts.Len() > 0 {
|
|
readerChannel <- recordsAndContexts
|
|
recordsAndContexts = list.New()
|
|
}
|
|
}
|
|
|
|
func (reader *PseudoReaderGen) tryParse(
|
|
name string,
|
|
svalue string,
|
|
) (*mlrval.Mlrval, error) {
|
|
mvalue := mlrval.FromDeferredType(svalue)
|
|
if mvalue == nil || !mvalue.IsNumeric() {
|
|
return nil, fmt.Errorf("mlr: gen: %s \"%s\" is not parseable as number", name, svalue)
|
|
}
|
|
return mvalue, nil
|
|
}
|
|
|
|
//#include <stdio.h>
|
|
//#include <stdlib.h>
|
|
//#include "lib/mlr_globals.h"
|
|
//#include "lib/mlrutil.h"
|
|
//#include "input/lrec_readers.h"
|
|
//
|
|
//typedef struct _lrec_reader_gen_state_t {
|
|
// char* field_name;
|
|
// unsigned long long start;
|
|
// unsigned long long stop;
|
|
// unsigned long long step;
|
|
// unsigned long long current_value;
|
|
//} lrec_reader_gen_state_t;
|
|
//
|
|
//static void lrec_reader_gen_free(lrec_reader_t* preader);
|
|
//static void* lrec_reader_gen_open(void* pvstate, char* prepipe, char* filename);
|
|
//static void lrec_reader_gen_close(void* pvstate, void* pvhandle, char* prepipe);
|
|
//static void lrec_reader_gen_sof(void* pvstate, void* pvhandle);
|
|
//static lrec_t* lrec_reader_gen_process(void* pvstate, void* pvhandle, context_t* pctx);
|
|
//
|
|
//// ----------------------------------------------------------------
|
|
//lrec_reader_t* lrec_reader_gen_alloc(char* field_name,
|
|
// unsigned long long start, unsigned long long stop, unsigned long long step)
|
|
//{
|
|
// lrec_reader_t* plrec_reader = mlr_malloc_or_die(sizeof(lrec_reader_t));
|
|
//
|
|
// lrec_reader_gen_state_t* pstate = mlr_malloc_or_die(sizeof(lrec_reader_gen_state_t));
|
|
// pstate->field_name = field_name;
|
|
// pstate->start = start;
|
|
// pstate->stop = stop;
|
|
// pstate->step = step;
|
|
// pstate->current_value = start;
|
|
//
|
|
// plrec_reader->pvstate = (void*)pstate;
|
|
// plrec_reader->popen_func = lrec_reader_gen_open;
|
|
// plrec_reader->pclose_func = lrec_reader_gen_close;
|
|
// plrec_reader->pprocess_func = lrec_reader_gen_process;
|
|
// plrec_reader->psof_func = lrec_reader_gen_sof;
|
|
// plrec_reader->pfree_func = lrec_reader_gen_free;
|
|
//
|
|
// return plrec_reader;
|
|
//}
|
|
//
|
|
//static void* lrec_reader_gen_open(void* pvstate, char* prepipe, char* filename) {
|
|
// return NULL;
|
|
//}
|
|
//
|
|
//static void lrec_reader_gen_close(void* pvstate, void* pvhandle, char* prepipe) {
|
|
//}
|
|
//
|
|
//static void lrec_reader_gen_free(lrec_reader_t* preader) {
|
|
// free(preader->pvstate);
|
|
// free(preader);
|
|
//}
|
|
//
|
|
//static void lrec_reader_gen_sof(void* pvstate, void* pvhandle) {
|
|
// lrec_reader_gen_state_t* pstate = pvstate;
|
|
// pstate->current_value = pstate->start;
|
|
//}
|
|
//
|
|
//// ----------------------------------------------------------------
|
|
//static lrec_t* lrec_reader_gen_process(void* pvstate, void* pvhandle, context_t* pctx) {
|
|
// lrec_reader_gen_state_t* pstate = pvstate;
|
|
// if (pstate->current_value > pstate->stop) {
|
|
// return NULL;
|
|
// }
|
|
//
|
|
// lrec_t* prec = lrec_unbacked_alloc();
|
|
// char* key = pstate->field_name;
|
|
// char* value = mlr_alloc_string_from_ll(pstate->current_value);
|
|
// pstate->current_value += pstate->step;
|
|
//
|
|
// lrec_put(prec, key, value, FREE_ENTRY_VALUE);
|
|
//
|
|
// return prec;
|
|
//}
|