From f02eae295cd0d32770ceef8804d59a529bfbd627 Mon Sep 17 00:00:00 2001 From: thorfour Date: Tue, 16 May 2023 12:57:09 -0500 Subject: [PATCH 1/2] go.mod: arrow v12 --- go.mod | 5 +++-- go.sum | 5 ++++- pkg/parca/parca.go | 2 +- pkg/parca/parca_test.go | 2 +- pkg/parcacol/arrow.go | 4 ++-- pkg/parcacol/ingest.go | 2 +- pkg/parcacol/ingest_test.go | 2 +- pkg/parcacol/querier.go | 6 +++--- pkg/parcacol/sample.go | 6 +++--- pkg/query/columnquery_test.go | 2 +- pkg/query/query_test.go | 2 +- 11 files changed, 21 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index b41006bf37f..10beff020d3 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.19 require ( cloud.google.com/go/storage v1.30.1 github.com/alecthomas/kong v0.7.1 - github.com/apache/arrow/go/v10 v10.0.1 + github.com/apache/arrow/go/v12 v12.0.0 github.com/cenkalti/backoff/v4 v4.2.1 github.com/cespare/xxhash/v2 v2.2.0 github.com/common-nighthawk/go-figure v0.0.0-20210622060536-734e95fb86be @@ -79,6 +79,7 @@ require ( github.com/RoaringBitmap/roaring v0.9.4 // indirect github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible // indirect github.com/andybalholm/brotli v1.0.4 // indirect + github.com/apache/arrow/go/v10 v10.0.1 // indirect github.com/apache/thrift v0.16.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go v1.44.217 // indirect @@ -113,7 +114,7 @@ require ( github.com/docker/docker v23.0.3+incompatible // indirect github.com/docker/go-connections v0.4.0 // indirect github.com/docker/go-units v0.5.0 // indirect - github.com/dustin/go-humanize v1.0.0 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect github.com/efficientgo/core v1.0.0-rc.0.0.20221201130417-ba593f67d2a4 // indirect github.com/emicklei/go-restful/v3 v3.10.1 // indirect github.com/envoyproxy/go-control-plane v0.11.0 // indirect diff --git a/go.sum b/go.sum index 9c9eabcd658..0f71c1b8f38 100644 --- a/go.sum +++ b/go.sum @@ -111,6 +111,8 @@ github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHG github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/v10 v10.0.1 h1:n9dERvixoC/1JjDmBcs9FPaEryoANa2sCgVFo6ez9cI= github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= +github.com/apache/arrow/go/v12 v12.0.0 h1:xtZE63VWl7qLdB0JObIXvvhGjoVNrQ9ciIHG2OK5cmc= +github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.16.0 h1:qEy6UW60iVOlUy+b9ZR0d5WzUWYGOo4HfopoyBaNmoY= @@ -256,8 +258,9 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= +github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= diff --git a/pkg/parca/parca.go b/pkg/parca/parca.go index e54a84c67bf..c557ea561ce 100644 --- a/pkg/parca/parca.go +++ b/pkg/parca/parca.go @@ -26,7 +26,7 @@ import ( "syscall" "time" - "github.com/apache/arrow/go/v10/arrow/memory" + "github.com/apache/arrow/go/v12/arrow/memory" "github.com/dgraph-io/badger/v3" "github.com/go-kit/log" "github.com/go-kit/log/level" diff --git a/pkg/parca/parca_test.go b/pkg/parca/parca_test.go index c66d1b05f5b..8d419e5a7be 100644 --- a/pkg/parca/parca_test.go +++ b/pkg/parca/parca_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v10/arrow/memory" + "github.com/apache/arrow/go/v12/arrow/memory" "github.com/cenkalti/backoff/v4" "github.com/go-kit/log" "github.com/google/pprof/profile" diff --git a/pkg/parcacol/arrow.go b/pkg/parcacol/arrow.go index 4fd77e7aa08..949365aef04 100644 --- a/pkg/parcacol/arrow.go +++ b/pkg/parcacol/arrow.go @@ -17,8 +17,8 @@ import ( "context" "fmt" - "github.com/apache/arrow/go/v10/arrow" - "github.com/apache/arrow/go/v10/arrow/array" + "github.com/apache/arrow/go/v12/arrow" + "github.com/apache/arrow/go/v12/arrow/array" "go.opentelemetry.io/otel/trace" pb "github.com/parca-dev/parca/gen/proto/go/parca/metastore/v1alpha1" diff --git a/pkg/parcacol/ingest.go b/pkg/parcacol/ingest.go index 56a68a4d6de..ed47fc61d6f 100644 --- a/pkg/parcacol/ingest.go +++ b/pkg/parcacol/ingest.go @@ -22,7 +22,7 @@ import ( "sort" "sync" - "github.com/apache/arrow/go/v10/arrow" + "github.com/apache/arrow/go/v12/arrow" "github.com/go-kit/log" "github.com/go-kit/log/level" "github.com/klauspost/compress/gzip" diff --git a/pkg/parcacol/ingest_test.go b/pkg/parcacol/ingest_test.go index 540a16f53cf..fcbd3c10779 100644 --- a/pkg/parcacol/ingest_test.go +++ b/pkg/parcacol/ingest_test.go @@ -23,7 +23,7 @@ import ( "sync" "testing" - "github.com/apache/arrow/go/v10/arrow" + "github.com/apache/arrow/go/v12/arrow" "github.com/go-kit/log" "github.com/polarsignals/frostdb/dynparquet" "github.com/prometheus/client_golang/prometheus" diff --git a/pkg/parcacol/querier.go b/pkg/parcacol/querier.go index 601300b91f9..7d9689678a9 100644 --- a/pkg/parcacol/querier.go +++ b/pkg/parcacol/querier.go @@ -21,9 +21,9 @@ import ( "strings" "time" - "github.com/apache/arrow/go/v10/arrow" - "github.com/apache/arrow/go/v10/arrow/array" - "github.com/apache/arrow/go/v10/arrow/scalar" + "github.com/apache/arrow/go/v12/arrow" + "github.com/apache/arrow/go/v12/arrow/array" + "github.com/apache/arrow/go/v12/arrow/scalar" "github.com/go-kit/log" "github.com/polarsignals/frostdb/query" "github.com/polarsignals/frostdb/query/logicalplan" diff --git a/pkg/parcacol/sample.go b/pkg/parcacol/sample.go index 3100f2d6ea6..5ba7fde74d4 100644 --- a/pkg/parcacol/sample.go +++ b/pkg/parcacol/sample.go @@ -19,9 +19,9 @@ import ( "io" "strings" - "github.com/apache/arrow/go/v10/arrow" - "github.com/apache/arrow/go/v10/arrow/array" - "github.com/apache/arrow/go/v10/arrow/memory" + "github.com/apache/arrow/go/v12/arrow" + "github.com/apache/arrow/go/v12/arrow/array" + "github.com/apache/arrow/go/v12/arrow/memory" "github.com/polarsignals/frostdb/dynparquet" "github.com/polarsignals/frostdb/pqarrow" "github.com/polarsignals/frostdb/query/logicalplan" diff --git a/pkg/query/columnquery_test.go b/pkg/query/columnquery_test.go index 7cddce1777a..ed9e259da4b 100644 --- a/pkg/query/columnquery_test.go +++ b/pkg/query/columnquery_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v10/arrow/memory" + "github.com/apache/arrow/go/v12/arrow/memory" "github.com/go-kit/log" columnstore "github.com/polarsignals/frostdb" "github.com/polarsignals/frostdb/query" diff --git a/pkg/query/query_test.go b/pkg/query/query_test.go index 99cd532112a..da2e9e0d508 100644 --- a/pkg/query/query_test.go +++ b/pkg/query/query_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/apache/arrow/go/v10/arrow/memory" + "github.com/apache/arrow/go/v12/arrow/memory" "github.com/go-kit/log" "github.com/polarsignals/frostdb" columnstore "github.com/polarsignals/frostdb" From e731ccc9281dc4c344a7630a72bbd3c27e0b662b Mon Sep 17 00:00:00 2001 From: thorfour Date: Tue, 16 May 2023 13:00:53 -0500 Subject: [PATCH 2/2] bump frostdb --- go.mod | 5 ++--- go.sum | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 10beff020d3..74356e3e043 100644 --- a/go.mod +++ b/go.mod @@ -29,7 +29,7 @@ require ( github.com/klauspost/compress v1.16.5 github.com/nanmu42/limitio v1.0.0 github.com/oklog/run v1.1.0 - github.com/polarsignals/frostdb v0.0.0-20230509170248-d7019b7373d7 + github.com/polarsignals/frostdb v0.0.0-20230516175933-552125a71de6 github.com/prometheus/client_golang v1.15.1 github.com/prometheus/common v0.43.0 github.com/prometheus/prometheus v0.43.1 @@ -79,7 +79,6 @@ require ( github.com/RoaringBitmap/roaring v0.9.4 // indirect github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible // indirect github.com/andybalholm/brotli v1.0.4 // indirect - github.com/apache/arrow/go/v10 v10.0.1 // indirect github.com/apache/thrift v0.16.0 // indirect github.com/armon/go-metrics v0.4.1 // indirect github.com/aws/aws-sdk-go v1.44.217 // indirect @@ -204,7 +203,7 @@ require ( github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/polarsignals/wal v0.0.0-20230427102350-18d6223bfbdc // indirect + github.com/polarsignals/wal v0.0.0-20230509073041-6731e243de20 // indirect github.com/prometheus/client_model v0.4.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/rivo/uniseg v0.3.4 // indirect diff --git a/go.sum b/go.sum index 0f71c1b8f38..88a783cb1c3 100644 --- a/go.sum +++ b/go.sum @@ -109,8 +109,6 @@ github.com/aliyun/aliyun-oss-go-sdk v2.2.2+incompatible/go.mod h1:T/Aws4fEfogEE9 github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY= github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig= github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= -github.com/apache/arrow/go/v10 v10.0.1 h1:n9dERvixoC/1JjDmBcs9FPaEryoANa2sCgVFo6ez9cI= -github.com/apache/arrow/go/v10 v10.0.1/go.mod h1:YvhnlEePVnBS4+0z3fhPfUy7W1Ikj0Ih0vcRo/gZ1M0= github.com/apache/arrow/go/v12 v12.0.0 h1:xtZE63VWl7qLdB0JObIXvvhGjoVNrQ9ciIHG2OK5cmc= github.com/apache/arrow/go/v12 v12.0.0/go.mod h1:d+tV/eHZZ7Dz7RPrFKtPK02tpr+c9/PEd/zm8mDS9Vg= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= @@ -788,10 +786,10 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pkg/profile v1.2.1/go.mod h1:hJw3o1OdXxsrSjjVksARp5W95eeEaEfptyVZyv6JUPA= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polarsignals/frostdb v0.0.0-20230509170248-d7019b7373d7 h1:jWS6vc2hhE4PEbdLni4u6U/m9APBleuuxv/mj4QeGq8= -github.com/polarsignals/frostdb v0.0.0-20230509170248-d7019b7373d7/go.mod h1:j7EH7wnQ1M4g67YFR7I+rXg5NWd10u0gP0bOLtLuJ3I= -github.com/polarsignals/wal v0.0.0-20230427102350-18d6223bfbdc h1:MaM3z8W07K24G+mQB9TTbMCF2XZ4weFKbuKhEF/pkmY= -github.com/polarsignals/wal v0.0.0-20230427102350-18d6223bfbdc/go.mod h1:EVDHAAe+7GQ33A1/x+/gE+sBPN4toQ0XG5RoLD49xr8= +github.com/polarsignals/frostdb v0.0.0-20230516175933-552125a71de6 h1:W6osMauT8VuhbyIGgZFHvi8TohuoukZH2yxjvpuSSFs= +github.com/polarsignals/frostdb v0.0.0-20230516175933-552125a71de6/go.mod h1:vTp004VQ2fzpXqlp8bKHQ8CMX+jPCdR3ubIyX78DJD8= +github.com/polarsignals/wal v0.0.0-20230509073041-6731e243de20 h1:YverywcwPHYj5iQq1/Zy/EihWVyw2F0S7j52FvGWK4w= +github.com/polarsignals/wal v0.0.0-20230509073041-6731e243de20/go.mod h1:EVDHAAe+7GQ33A1/x+/gE+sBPN4toQ0XG5RoLD49xr8= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=