Skip to content

Commit 788eb0b

Browse files
committed
More fixes
1 parent e7e5545 commit 788eb0b

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

buffer.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -667,13 +667,13 @@ func (b *buffer) Float64ColumnBinary(name string, val float64) *buffer {
667667
}
668668

669669
func (b *buffer) Float64Array1DColumn(name string, values []float64) *buffer {
670-
if !b.prepareForField() {
671-
return b
672-
}
673670
if values == nil {
674671
// Don't write null arrays
675672
return b
676673
}
674+
if !b.prepareForField() {
675+
return b
676+
}
677677
b.lastErr = b.writeColumnName(name)
678678
if b.lastErr != nil {
679679
return b
@@ -699,13 +699,13 @@ func (b *buffer) Float64Array1DColumn(name string, values []float64) *buffer {
699699
}
700700

701701
func (b *buffer) Float64Array2DColumn(name string, values [][]float64) *buffer {
702-
if !b.prepareForField() {
703-
return b
704-
}
705702
if values == nil {
706703
// Don't write null arrays
707704
return b
708705
}
706+
if !b.prepareForField() {
707+
return b
708+
}
709709
b.lastErr = b.writeColumnName(name)
710710
if b.lastErr != nil {
711711
return b
@@ -747,13 +747,13 @@ func (b *buffer) Float64Array2DColumn(name string, values [][]float64) *buffer {
747747
}
748748

749749
func (b *buffer) Float64Array3DColumn(name string, values [][][]float64) *buffer {
750-
if !b.prepareForField() {
751-
return b
752-
}
753750
if values == nil {
754751
// Don't write null arrays
755752
return b
756753
}
754+
if !b.prepareForField() {
755+
return b
756+
}
757757
b.lastErr = b.writeColumnName(name)
758758
if b.lastErr != nil {
759759
return b
@@ -808,13 +808,13 @@ func (b *buffer) Float64Array3DColumn(name string, values [][][]float64) *buffer
808808
}
809809

810810
func (b *buffer) Float64ArrayNDColumn(name string, value *NdArray[float64]) *buffer {
811-
if !b.prepareForField() {
812-
return b
813-
}
814811
if value == nil {
815812
// Don't write null arrays
816813
return b
817814
}
815+
if !b.prepareForField() {
816+
return b
817+
}
818818
b.lastErr = b.writeColumnName(name)
819819
if b.lastErr != nil {
820820
return b

integration_test.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,7 @@ func (suite *integrationTestSuite) TestE2EValidWrites() {
433433

434434
err := s.
435435
Table(testTable).
436+
Int64Column("i", 1).
436437
Float64Array1DColumn("array_1d", values1D).
437438
Float64Array2DColumn("array_2d", values2D).
438439
Float64Array3DColumn("array_3d", values3D).
@@ -445,6 +446,7 @@ func (suite *integrationTestSuite) TestE2EValidWrites() {
445446
emptyNdArray, _ := qdb.NewNDArray[float64](2, 2, 0, 2)
446447
err = s.
447448
Table(testTable).
449+
Int64Column("i", 2).
448450
Float64Array1DColumn("array_1d", []float64{}).
449451
Float64Array2DColumn("array_2d", [][]float64{{}}).
450452
Float64Array3DColumn("array_3d", [][][]float64{{{}}}).
@@ -456,6 +458,7 @@ func (suite *integrationTestSuite) TestE2EValidWrites() {
456458
// null array
457459
return s.
458460
Table(testTable).
461+
Int64Column("i", 3).
459462
Float64Array1DColumn("array_1d", nil).
460463
Float64Array2DColumn("array_2d", nil).
461464
Float64Array3DColumn("array_3d", nil).
@@ -464,6 +467,7 @@ func (suite *integrationTestSuite) TestE2EValidWrites() {
464467
},
465468
tableData{
466469
Columns: []column{
470+
{"i", "LONG"},
467471
{"array_1d", "ARRAY"},
468472
{"array_2d", "ARRAY"},
469473
{"array_3d", "ARRAY"},
@@ -472,18 +476,21 @@ func (suite *integrationTestSuite) TestE2EValidWrites() {
472476
},
473477
Dataset: [][]interface{}{
474478
{
479+
float64(1),
475480
[]interface{}{float64(1), float64(2), float64(3), float64(4), float64(5), nil},
476481
[]interface{}{[]interface{}{float64(1), float64(2)}, []interface{}{float64(3), float64(4)}, []interface{}{float64(5), float64(6)}, []interface{}{nil, nil}},
477482
[]interface{}{[]interface{}{[]interface{}{float64(1), float64(2)}, []interface{}{float64(3), float64(4)}}, []interface{}{[]interface{}{float64(5), float64(6)}, []interface{}{float64(7), nil}}},
478483
[]interface{}{[]interface{}{[]interface{}{[]interface{}{float64(11), float64(11)}}, []interface{}{[]interface{}{float64(11), float64(11)}}}, []interface{}{[]interface{}{[]interface{}{float64(11), float64(11)}}, []interface{}{[]interface{}{float64(11), nil}}}},
479484
"1970-01-01T00:00:00.000001Z"},
480485
{
486+
float64(2),
481487
[]interface{}{},
482488
[]interface{}{},
483489
[]interface{}{},
484490
[]interface{}{},
485491
"1970-01-01T00:00:00.000002Z"},
486492
{
493+
float64(3),
487494
nil,
488495
nil,
489496
nil,

0 commit comments

Comments
 (0)