Accepting request 1007952 from home:matwey:branches:server:database

- Update to version 2.3.0, see
  * https://github.com/influxdata/influxdb/releases/tag/v2.3.0
  Drop 0001-fix-executor-do-not-assume-ints-are-64bits-4652.patch:
  upstreamed

OBS-URL: https://build.opensuse.org/request/show/1007952
OBS-URL: https://build.opensuse.org/package/show/server:database/influxdb2?expand=0&rev=11
This commit is contained in:
Martin Pluskal 2022-10-12 10:28:08 +00:00 committed by Git OBS Bridge
parent 3948eea0a7
commit 9f08b0dc08
9 changed files with 21 additions and 42 deletions

View File

@ -1,27 +0,0 @@
From e2371476454022b1ef9f8b8e53b8dc21b1f2b535 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Tue, 12 Apr 2022 20:18:56 +0200
Subject: [PATCH] fix(executor): do not assume ints are 64bits (#4652)
`getResourceLimits(int64, int)` tries to `return 0, math.MaxInt64` which,
in 32-bit architectures causes an overflow.
---
execute/executor.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/execute/executor.go b/execute/executor.go
index 9da4af71..26f4ec68 100644
--- a/vendor/github.com/influxdata/flux/execute/executor.go
+++ b/vendor/github.com/influxdata/flux/execute/executor.go
@@ -366,7 +366,7 @@ func (es *executionState) validate() error {
func getResourceLimits(ctx context.Context) (int64, int) {
// Initialize resources from the execution dependencies and/or properties of the plan.
if !HaveExecutionDependencies(ctx) {
- return 0, math.MaxInt64
+ return 0, math.MaxInt
}
execOptions := GetExecutionDependencies(ctx).ExecutionOptions
--
2.36.0

View File

@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="url">https://github.com/influxdata/influxdb.git</param> <param name="url">https://github.com/influxdata/influxdb.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="revision">v2.2.0</param> <param name="revision">v2.3.0</param>
<param name="versionformat">@PARENT_TAG@</param> <param name="versionformat">@PARENT_TAG@</param>
<param name="changesgenerate">disable</param> <param name="changesgenerate">disable</param>
<param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-pattern">v(.*)</param>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea1431bc73fd5a22a01d0dbf36b90d25ca5ca9a9a4eacda18413a8973c60b857
size 8985100

3
influxdb2-2.3.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5399876f0519dd5cdab02c43e033bf196bc313ed765ff2aafb239d5e65eb45f5
size 8979436

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Oct 4 16:27:35 UTC 2022 - Matwey Kornilov <matwey.kornilov@gmail.com>
- Update to version 2.3.0, see
* https://github.com/influxdata/influxdb/releases/tag/v2.3.0
Drop 0001-fix-executor-do-not-assume-ints-are-64bits-4652.patch:
upstreamed
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 9 15:54:42 UTC 2022 - Matwey Kornilov <matwey.kornilov@gmail.com> Thu Jun 9 15:54:42 UTC 2022 - Matwey Kornilov <matwey.kornilov@gmail.com>

View File

@ -20,7 +20,7 @@ Name: influxdb2
Summary: Scalable datastore for metrics, events, and real-time analytics Summary: Scalable datastore for metrics, events, and real-time analytics
License: MIT License: MIT
Group: Productivity/Databases/Servers Group: Productivity/Databases/Servers
Version: 2.2.0 Version: 2.3.0
Release: 0 Release: 0
URL: https://github.com/influxdata/influxdb URL: https://github.com/influxdata/influxdb
Source: %{name}-%{version}.tar.xz Source: %{name}-%{version}.tar.xz
@ -30,17 +30,16 @@ Source3: influxdb-user.conf
Source4: config.yaml Source4: config.yaml
# Prebuild UI assets as specified in ./scripts/fetch_ui_assets.sh # Prebuild UI assets as specified in ./scripts/fetch_ui_assets.sh
# https://github.com/influxdata/ui/releases/download/OSS-2.1.2/build.tar.gz # https://github.com/influxdata/ui/releases/download/OSS-2.1.2/build.tar.gz
Source98: ui-assets-2.1.2.tar.xz Source98: ui-assets-2022-09-16.tar.xz
Source99: vendor.tar.xz Source99: vendor.tar.xz
Patch0: 0001-fix-executor-do-not-assume-ints-are-64bits-4652.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: sysuser-tools BuildRequires: sysuser-tools
%{sysusers_requires} %{sysusers_requires}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: go >= 1.17 BuildRequires: go >= 1.18
BuildRequires: golang-packaging >= 15.0.8 BuildRequires: golang-packaging >= 15.0.8
BuildRequires: systemd-rpm-macros BuildRequires: systemd-rpm-macros
BuildRequires: pkgconfig(flux) >= 0.161.0 BuildRequires: pkgconfig(flux) >= 0.171.0
%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} %{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d}
%{systemd_requires} %{systemd_requires}
Requires(post): systemd Requires(post): systemd
@ -61,7 +60,6 @@ Go sources and other development files for InfluxDB
%setup -q %setup -q
%setup -q -T -D -a 99 %setup -q -T -D -a 99
%setup -q -T -D -a 98 %setup -q -T -D -a 98
%patch0 -p1
mv build ui mv build ui
echo 'UI assets predownloaded!' > ui/fetch_ui_assets.sh echo 'UI assets predownloaded!' > ui/fetch_ui_assets.sh

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c209c63e5eca86450470d2bdd2b980f0b37196918c06ab017b4f620b3546bdc
size 42114268

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4d4386ded4179089ed00decb639bfe0eefb4f3f06f0747bc22e55dee13b6822f
size 14588816

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:78970790642f247b0f3fe9c8b5ee78710eeaebb4442c39fe64a48d6d22e19e88 oid sha256:9b9b7131522f48b9c266aa2c16f5c35ab3d7eb787c99d5bd73079e29630ce6f3
size 10841844 size 9444660