Skip to content

fix: out_cols is wrong for some questions #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tmonster merged 2 commits into from
Jul 27, 2026
Merged

fix: out_cols is wrong for some questions #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33b7124
fix: out_cols is wrong for some questions
mchav Jul 24, 2026
9259e29
feat: Re-enable regression tests for haskell
mchav Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/regression.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
solution: [juliadf, juliads, data.table, collapse, dplyr, pandas, polars, R-arrow, duckdb, datafusion, dask, clickhouse, chdb]
solution: [juliadf, juliads, data.table, collapse, dplyr, pandas, polars, R-arrow, duckdb, datafusion, dask, clickhouse, chdb, haskell]
name: Solo solutions
runs-on: ubuntu-latest
env:
Expand Down
2 changes: 1 addition & 1 deletion haskell/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2.0.0
3.1.0.0
7 changes: 4 additions & 3 deletions haskell/groupby-haskell.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import DataFrame.IO.CSV (
import DataFrame.IO.CSV.Fast
import DataFrame.Internal.DataFrame (DataFrame)
import DataFrame.Internal.Expression (AggStrategy (..), Expr (..))
import DataFrame.Internal.Schema (schemaType)
import DataFrame.Schema (schemaType)
import qualified DataFrame.Operations.Aggregation as D
import qualified DataFrame.Operations.Core as D
import qualified DataFrame.Operations.Subset as D
Expand Down Expand Up @@ -206,6 +206,7 @@ runBenchmark srcFile dataName machineType = do
, "syy" .= F.sum (F.col @Double "v2v2")
]
>>> D.derive "r2" r2Expr
>>> D.select [F.name id2, F.name id4, "r2"]
)
(\res -> [chkSumDbl "r2" res])

Expand All @@ -215,9 +216,9 @@ runBenchmark srcFile dataName machineType = do
df
"sum v3 count by id1:id6"
( D.groupBy (map ((\i n -> i <> (T.pack . show) n) "id") [1 .. 6])
>>> D.aggregate [F.sum v3 `F.as` "v3_sum"]
>>> D.aggregate ["v3" .= F.sum v3, "count" .= F.count v3]
)
(\res -> [chkSumDbl "v3_sum" res])
(\res -> [chkSumDbl "v3" res, chkSumInt "count" res])

writeToLogFile config "finish"
putStrLn "Haskell dataframe groupby benchmark completed!"
Expand Down
10 changes: 5 additions & 5 deletions haskell/haskell-benchmark.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ common df-deps
build-depends: base >= 4.7 && < 5
, bytestring >= 0.11 && < 0.13
, cassava >= 0.1 && < 1
, dataframe-core ^>= 1.0.2
, dataframe-parsing ^>= 1.0
, dataframe-csv ^>= 1.0
, dataframe-operations ^>= 1.1
, dataframe-fastcsv ^>= 1.1
, dataframe-core ^>= 2.1
, dataframe-parsing ^>= 2.1
, dataframe-csv ^>= 2.1
, dataframe-operations ^>= 2.1
, dataframe-fastcsv ^>= 1.3
, text >= 2.1
, vector >= 0.12
, time >= 1.9
Expand Down
2 changes: 1 addition & 1 deletion haskell/join-haskell.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import DataFrame.IO.CSV (
)
import DataFrame.IO.CSV.Fast (fastReadCsvWithOpts)
import DataFrame.Internal.DataFrame (DataFrame)
import DataFrame.Internal.Schema (SchemaType, schemaType)
import DataFrame.Schema (SchemaType, schemaType)
import qualified DataFrame.Operations.Core as D
import qualified DataFrame.Operations.Join as DJ
import Numeric (showEFloat)
Expand Down
2 changes: 1 addition & 1 deletion haskell/timeq.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import DataFrame.IO.CSV (ReadOptions (..), TypeSpec (..), defaultReadOptions)
import DataFrame.IO.CSV.Fast
import DataFrame.Internal.DataFrame (DataFrame, rowToGroup)
import DataFrame.Internal.Expression (AggStrategy (..), Expr (..))
import DataFrame.Internal.Schema (schemaType)
import DataFrame.Schema (schemaType)
import qualified DataFrame.Operations.Aggregation as D
import qualified DataFrame.Operations.Core as D
import qualified DataFrame.Operations.Subset as D
Expand Down
Loading