Skip to content

Commit 6319330

Browse files
sprazaspraza
committed
Revert "Update main branch to 8.0 (#11968)"
This reverts commit 710f3f3.
1 parent b66cf62 commit 6319330

Some content is hidden

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

52 files changed

+67
-67
lines changed

‎CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ if(POLICY CMP0135)
2424
endif()
2525

2626
project(foundationdb
27-
VERSION 8.0.0
27+
VERSION 7.4.0
2828
DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
2929
HOMEPAGE_URL "http://www.foundationdb.org/"
3030
LANGUAGES C CXX ASM Swift)
@@ -121,9 +121,9 @@ configure_file(${CMAKE_SOURCE_DIR}/versions.target.cmake ${CMAKE_CURRENT_BINARY_
121121
file(WRITE ${CMAKE_BINARY_DIR}/version.txt ${FDB_VERSION})
122122

123123
set(FDB_CURRENT_VERSION ${PROJECT_VERSION})
124-
set(FDB_FUTURE_VERSION "8.1.0")
125-
set(FDB_PREV_RELEASE_VERSION "7.3.59")
126-
set(FDB_PREV2_RELEASE_VERSION "7.1.61")
124+
set(FDB_FUTURE_VERSION "7.5.0")
125+
set(FDB_PREV_RELEASE_VERSION "7.3.41")
126+
set(FDB_PREV2_RELEASE_VERSION "7.1.33")
127127

128128
set(MULTIREGION_TEST TRUE)
129129
option(NO_MULTIREGION_TEST "Disable multiregion simulation tests" OFF)

‎bindings/bindingtester/bindingtester.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
710,
7777
720,
7878
730,
79-
800,
79+
740,
8080
]
8181

8282
assert (

‎bindings/c/test/fdb_c90_test.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#define FDB_API_VERSION 800
1+
#define FDB_API_VERSION 740
22
#include <foundationdb/fdb_c.h>
33

44
int main(int argc, char* argv[]) {

‎bindings/go/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This package requires:
99
- [Mono](http://www.mono-project.com/) (macOS or Linux) or [Visual Studio](https://www.visualstudio.com/) (Windows) (build-time only)
1010
- FoundationDB C API 2.0.x-6.1.x (part of the [FoundationDB client packages](https://apple.github.io/foundationdb/downloads.html#c))
1111

12-
Use of this package requires the selection of a FoundationDB API version at runtime. This package currently supports FoundationDB API versions 200-800.
12+
Use of this package requires the selection of a FoundationDB API version at runtime. This package currently supports FoundationDB API versions 200-740.
1313

1414
To install this package, you can run the "fdb-go-install.sh" script (for versions 5.0.x and greater):
1515

‎bindings/go/src/fdb/database.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
package fdb
2424

25-
// #define FDB_API_VERSION 800
25+
// #define FDB_API_VERSION 740
2626
// #include <foundationdb/fdb_c.h>
2727
import "C"
2828

‎bindings/go/src/fdb/doc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ import (
4646
4747
func main() {
4848
// Different API versions may expose different runtime behaviors.
49-
fdb.MustAPIVersion(800)
49+
fdb.MustAPIVersion(740)
5050
5151
// Open the default database from the system cluster
5252
db := fdb.MustOpenDefault()

‎bindings/go/src/fdb/errors.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
package fdb
2424

25-
// #define FDB_API_VERSION 800
25+
// #define FDB_API_VERSION 740
2626
// #include <foundationdb/fdb_c.h>
2727
import "C"
2828

‎bindings/go/src/fdb/errors_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"testing"
2929
)
3030

31-
const API_VERSION int = 800
31+
const API_VERSION int = 740
3232

3333
func TestErrorWrapping(t *testing.T) {
3434
MustAPIVersion(API_VERSION)

‎bindings/go/src/fdb/fdb.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
package fdb
2424

25-
// #define FDB_API_VERSION 800
25+
// #define FDB_API_VERSION 740
2626
// #include <foundationdb/fdb_c.h>
2727
// #include <stdlib.h>
2828
import "C"
@@ -121,15 +121,15 @@ func (opt NetworkOptions) setOpt(code int, param []byte) error {
121121
// other functions in the fdb package.
122122
// This function is safe to be called from multiple goroutines.
123123
//
124-
// Currently, this package supports API versions 200 through 800.
124+
// Currently, this package supports API versions 200 through 740.
125125
//
126126
// Warning: When using the multi-version client API, setting an API version that
127127
// is not supported by a particular client library will prevent that client from
128128
// being used to connect to the cluster. In particular, you should not advance
129129
// the API version of your application after upgrading your client until the
130130
// cluster has also been upgraded.
131131
func APIVersion(version int) error {
132-
headerVersion := 800
132+
headerVersion := 740
133133

134134
networkMutex.Lock()
135135
defer networkMutex.Unlock()

‎bindings/go/src/fdb/fdb_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"github.com/apple/foundationdb/bindings/go/src/fdb/subspace"
3232
)
3333

34-
const API_VERSION int = 800
34+
const API_VERSION int = 740
3535

3636
func ExampleOpenDefault() {
3737
var err error

‎bindings/go/src/fdb/futures.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
package fdb
2424

2525
// #cgo LDFLAGS: -lfdb_c -lm
26-
// #define FDB_API_VERSION 800
26+
// #define FDB_API_VERSION 740
2727
// #include <foundationdb/fdb_c.h>
2828
// #include <string.h>
2929
//

‎bindings/go/src/fdb/transaction.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
package fdb
2424

25-
// #define FDB_API_VERSION 800
25+
// #define FDB_API_VERSION 740
2626
// #include <foundationdb/fdb_c.h>
2727
import "C"
2828

‎bindings/java/src/test/com/apple/foundationdb/test/TestApiVersion.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ public class TestApiVersion {
2828
/**
2929
* The current API version to be used by the tests
3030
*/
31-
public static final int CURRENT = 800;
31+
public static final int CURRENT = 740;
3232
}

‎bindings/ruby/lib/fdb.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def self.get_api_version()
3636
end
3737
end
3838
def self.api_version(version)
39-
header_version = 800
39+
header_version = 740
4040
if self.is_api_version_selected?()
4141
if @@chosen_version != version
4242
raise "FDB API already loaded at version #{@@chosen_version}."

‎documentation/sphinx/source/api-c.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ API versioning
134134

135135
Prior to including ``fdb_c.h``, you must define the ``FDB_API_VERSION`` macro. This, together with the :func:`fdb_select_api_version()` function, allows programs written against an older version of the API to compile and run with newer versions of the C library. The current version of the FoundationDB C API is |api-version|. ::
136136

137-
#define FDB_API_VERSION 800
137+
#define FDB_API_VERSION 740
138138
#include <foundationdb/fdb_c.h>
139139

140140
.. function:: fdb_error_t fdb_select_api_version(int version)

‎documentation/sphinx/source/api-common.rst.inc

+1-1
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
.. |atomic-versionstamps-tuple-warning-value| replace::
152152
At this time, versionstamped values are not compatible with the Tuple layer except in Java, Python, and Go. Note that this implies versionstamped values may not be used with the Subspace and Directory layers except in those languages.
153153

154-
.. |api-version| replace:: 800
154+
.. |api-version| replace:: 740
155155

156156
.. |streaming-mode-blurb1| replace::
157157
When using |get-range-func| and similar interfaces, API clients can request large ranges of the database to iterate over. Making such a request doesn't necessarily mean that the client will consume all of the data in the range - sometimes the client doesn't know how far it intends to iterate in advance. FoundationDB tries to balance latency and bandwidth by requesting data for iteration in batches.

‎documentation/sphinx/source/api-python.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ Opening a database
109109
After importing the ``fdb`` module and selecting an API version, you probably want to open a :class:`Database` using :func:`open`::
110110

111111
import fdb
112-
fdb.api_version(800)
112+
fdb.api_version(740)
113113
db = fdb.open()
114114

115115
.. function:: open( cluster_file=None, event_model=None )

‎documentation/sphinx/source/api-ruby.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ Opening a database
9494
After requiring the ``FDB`` gem and selecting an API version, you probably want to open a :class:`Database` using :func:`open`::
9595

9696
require 'fdb'
97-
FDB.api_version 800
97+
FDB.api_version 740
9898
db = FDB.open
9999

100100
.. function:: open( cluster_file=nil ) -> Database

‎documentation/sphinx/source/api-version-upgrade-guide.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ This document provides an overview of changes that an application developer may
99

1010
For more details about API versions, see :ref:`api-versions`.
1111

12-
.. _api-version-upgrade-guide-800:
12+
.. _api-version-upgrade-guide-740:
1313

14-
API version 800
14+
API version 740
1515
===============
1616

1717
General

‎documentation/sphinx/source/class-scheduling-go.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Before using the API, we need to specify the API version. This allows programs t
2929

3030
.. code-block:: go
3131
32-
fdb.MustAPIVersion(800)
32+
fdb.MustAPIVersion(740)
3333
3434
Next, we open a FoundationDB database. The API will connect to the FoundationDB cluster indicated by the :ref:`default cluster file <default-cluster-file>`.
3535

@@ -78,7 +78,7 @@ If this is all working, it looks like we are ready to start building a real appl
7878
7979
func main() {
8080
// Different API versions may expose different runtime behaviors.
81-
fdb.MustAPIVersion(800)
81+
fdb.MustAPIVersion(740)
8282
8383
// Open the default database from the system cluster
8484
db := fdb.MustOpenDefault()
@@ -666,7 +666,7 @@ Here's the code for the scheduling tutorial:
666666
}
667667
668668
func main() {
669-
fdb.MustAPIVersion(800)
669+
fdb.MustAPIVersion(740)
670670
db := fdb.MustOpenDefault()
671671
db.Options().SetTransactionTimeout(60000) // 60,000 ms = 1 minute
672672
db.Options().SetTransactionRetryLimit(100)

‎documentation/sphinx/source/class-scheduling-java.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Before using the API, we need to specify the API version. This allows programs t
3030
private static final Database db;
3131
3232
static {
33-
fdb = FDB.selectAPIVersion(800);
33+
fdb = FDB.selectAPIVersion(740);
3434
db = fdb.open();
3535
}
3636
@@ -66,7 +66,7 @@ If this is all working, it looks like we are ready to start building a real appl
6666
private static final Database db;
6767
6868
static {
69-
fdb = FDB.selectAPIVersion(800);
69+
fdb = FDB.selectAPIVersion(740);
7070
db = fdb.open();
7171
}
7272
@@ -441,7 +441,7 @@ Here's the code for the scheduling tutorial:
441441
private static final Database db;
442442
443443
static {
444-
fdb = FDB.selectAPIVersion(800);
444+
fdb = FDB.selectAPIVersion(740);
445445
db = fdb.open();
446446
db.options().setTransactionTimeout(60000); // 60,000 ms = 1 minute
447447
db.options().setTransactionRetryLimit(100);

‎documentation/sphinx/source/class-scheduling-ruby.rst

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Open a Ruby interactive interpreter and import the FoundationDB API module::
2323

2424
Before using the API, we need to specify the API version. This allows programs to maintain compatibility even if the API is modified in future versions::
2525

26-
> FDB.api_version 800
26+
> FDB.api_version 740
2727
=> nil
2828

2929
Next, we open a FoundationDB database. The API will connect to the FoundationDB cluster indicated by the :ref:`default cluster file <default-cluster-file>`. ::
@@ -46,7 +46,7 @@ If this is all working, it looks like we are ready to start building a real appl
4646
.. code-block:: ruby
4747
4848
require 'fdb'
49-
FDB.api_version 800
49+
FDB.api_version 740
5050
@db = FDB.open
5151
@db['hello'] = 'world'
5252
print 'hello ', @db['hello']
@@ -373,7 +373,7 @@ Here's the code for the scheduling tutorial:
373373
374374
require 'fdb'
375375
376-
FDB.api_version 800
376+
FDB.api_version 740
377377
378378
####################################
379379
## Initialization ##

‎documentation/sphinx/source/class-scheduling.rst

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Open a Python interactive interpreter and import the FoundationDB API module::
3030

3131
Before using the API, we need to specify the API version. This allows programs to maintain compatibility even if the API is modified in future versions::
3232

33-
>>> fdb.api_version(800)
33+
>>> fdb.api_version(740)
3434

3535
Next, we open a FoundationDB database. The API will connect to the FoundationDB cluster indicated by the :ref:`default cluster file <default-cluster-file>`. ::
3636

@@ -48,7 +48,7 @@ When this command returns without exception, the modification is durably stored
4848
If this is all working, it looks like we are ready to start building a real application. For reference, here's the full code for "hello world"::
4949

5050
import fdb
51-
fdb.api_version(800)
51+
fdb.api_version(740)
5252
db = fdb.open()
5353
db[b'hello'] = b'world'
5454
print 'hello', db[b'hello']
@@ -91,7 +91,7 @@ FoundationDB includes a few tools that make it easy to model data using this app
9191
opening a :ref:`directory <developer-guide-directories>` in the database::
9292

9393
import fdb
94-
fdb.api_version(800)
94+
fdb.api_version(740)
9595

9696
db = fdb.open()
9797
scheduling = fdb.directory.create_or_open(db, ('scheduling',))
@@ -337,7 +337,7 @@ Here's the code for the scheduling tutorial::
337337
import fdb
338338
import fdb.tuple
339339

340-
fdb.api_version(800)
340+
fdb.api_version(740)
341341

342342

343343
####################################

‎documentation/sphinx/source/hierarchical-documents-java.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Here’s a basic implementation of the recipe.
6969
private static final long EMPTY_ARRAY = -1;
7070
7171
static {
72-
fdb = FDB.selectAPIVersion(800);
72+
fdb = FDB.selectAPIVersion(740);
7373
db = fdb.open();
7474
docSpace = new Subspace(Tuple.from("D"));
7575
}

‎documentation/sphinx/source/multimaps-java.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Here’s a simple implementation of multimaps with multisets as described:
7474
private static final int N = 100;
7575
7676
static {
77-
fdb = FDB.selectAPIVersion(800);
77+
fdb = FDB.selectAPIVersion(740);
7878
db = fdb.open();
7979
multi = new Subspace(Tuple.from("M"));
8080
}

‎documentation/sphinx/source/priority-queues-java.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ Here's a basic implementation of the model:
7474
private static final Random randno;
7575
7676
static{
77-
fdb = FDB.selectAPIVersion(800);
77+
fdb = FDB.selectAPIVersion(740);
7878
db = fdb.open();
7979
pq = new Subspace(Tuple.from("P"));
8080

‎documentation/sphinx/source/queues-java.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ The following is a simple implementation of the basic pattern:
7373
private static final Random randno;
7474
7575
static{
76-
fdb = FDB.selectAPIVersion(800);
76+
fdb = FDB.selectAPIVersion(740);
7777
db = fdb.open();
7878
queue = new Subspace(Tuple.from("Q"));
7979
randno = new Random();

‎documentation/sphinx/source/simple-indexes-java.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ In this example, we’re storing user data based on user ID but sometimes need t
8787
private static final Subspace index;
8888
8989
static {
90-
fdb = FDB.selectAPIVersion(800);
90+
fdb = FDB.selectAPIVersion(740);
9191
db = fdb.open();
9292
main = new Subspace(Tuple.from("user"));
9393
index = new Subspace(Tuple.from("zipcode_index"));

‎documentation/sphinx/source/tables-java.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ Here’s a simple implementation of the basic table pattern:
6262
private static final Subspace colIndex;
6363
6464
static {
65-
fdb = FDB.selectAPIVersion(800);
65+
fdb = FDB.selectAPIVersion(740);
6666
db = fdb.open();
6767
table = new Subspace(Tuple.from("T"));
6868
rowIndex = table.subspace(Tuple.from("R"));

‎documentation/sphinx/source/vector-java.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Here’s the basic pattern:
7777
private static final Subspace vector;
7878
7979
static {
80-
fdb = FDB.selectAPIVersion(800);
80+
fdb = FDB.selectAPIVersion(740);
8181
db = fdb.open();
8282
vector = new Subspace(Tuple.from("V"));
8383
}

‎fdbclient/NativeAPI.actor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ DatabaseContext::DatabaseContext(Reference<AsyncVar<Reference<IClusterConnection
16051605
smoothMidShardSize.reset(CLIENT_KNOBS->INIT_MID_SHARD_BYTES);
16061606
globalConfig = std::make_unique<GlobalConfig>(this);
16071607

1608-
if (apiVersion.version() >= 800) {
1608+
if (apiVersion.version() >= 740) {
16091609
registerSpecialKeysImpl(
16101610
SpecialKeySpace::MODULE::METRICS,
16111611
SpecialKeySpace::IMPLTYPE::READONLY,

‎flow/ApiVersions.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# API Versions
2-
set(FDB_AV_LATEST_VERSION "800")
3-
set(FDB_AV_LATEST_BINDINGS_VERSION "800")
2+
set(FDB_AV_LATEST_VERSION "740")
3+
set(FDB_AV_LATEST_BINDINGS_VERSION "740")
44

55
# Features
66
set(FDB_AV_SNAPSHOT_RYW "300")

0 commit comments

Comments
 (0)