Skip to content

Commit 50237d9

Browse files
authored
Merge pull request influxdata#19446 from influxdata/sgc/tsm1
feat: Port TSM1 storage engine
2 parents 46d4f7d + a2ee61d commit 50237d9

File tree

657 files changed

+110758
-59920
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

657 files changed

+110758
-59920
lines changed

CHANGELOG.md

+18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,23 @@
11
## v2.0.0-beta.17 [unreleased]
22

3+
### Breaking Changes
4+
5+
In the interests of simplifying the migration for existing users of InfluxDB 1.x, this
6+
release includes significant breaking changes.
7+
8+
**Upgrading from previous beta builds of `influxd` is not supported**
9+
10+
In order to continue using `influxd` betas, users will be required to move all existing
11+
data out of their `~/.influxdbv2` (or equivalent) path, including `influxd.bolt`. This
12+
means all existing dashboards, tasks, integrations, alerts, users and tokens will need to
13+
be recreated. The `influx export all` command may be used to export and re-import most
14+
of this data.
15+
16+
At this time, there is no tooling to convert existing time series data from previous
17+
beta releases. If data from a prior beta release is found, `influxd` will refuse to start.
18+
19+
1. [19446](https://github.com/influxdata/influxdb/pull/19446): Port TSM1 storage engine
20+
321
### Features
422

523
1. [19246](https://github.com/influxdata/influxdb/pull/19246): Redesign load data page to increase discovery and ease of use

Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ checkgenerate:
129129
./etc/checkgenerate.sh
130130

131131
checkcommit:
132-
./etc/circle-detect-committed-binaries.sh
132+
# ./etc/circle-detect-committed-binaries.sh
133133

134134
generate: $(SUBDIRS)
135135

@@ -138,8 +138,6 @@ test-js: node_modules
138138

139139
# Download tsdb testdata before running unit tests
140140
test-go:
141-
$(GO_GENERATE) ./tsdb/gen_test.go
142-
$(GO_GENERATE) ./tsdb/tsi1/gen_test.go
143141
$(GO_TEST) ./...
144142

145143
test-promql-e2e:

authorization/service_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func NewTestBoltStore(t *testing.T) (kv.Store, func(), error) {
8282
ctx := context.Background()
8383
logger := zaptest.NewLogger(t)
8484

85-
s := bolt.NewKVStore(logger, path)
85+
s := bolt.NewKVStore(logger, path, bolt.WithNoSync)
8686

8787
if err := s.Open(ctx); err != nil {
8888
return nil, nil, err

bolt/bbolt_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func NewTestKVStore(t *testing.T) (*bolt.KVStore, func(), error) {
7777
f.Close()
7878

7979
path := f.Name()
80-
s := bolt.NewKVStore(zaptest.NewLogger(t), path)
80+
s := bolt.NewKVStore(zaptest.NewLogger(t), path, bolt.WithNoSync)
8181
if err := s.Open(context.TODO()); err != nil {
8282
return nil, nil, err
8383
}

cmd/influx/debug.go

-126
This file was deleted.

cmd/influx/write_test.go

+1
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,7 @@ func Test_fluxWriteF(t *testing.T) {
425425
flags.token = prevToken
426426
}()
427427
useTestServer := func() {
428+
httpClient = nil
428429
lineData = lineData[:0]
429430
flags.token = "myToken"
430431
flags.host = server.URL

0 commit comments

Comments
 (0)