wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Resolver merge conflicts

This commit is contained in:
Jingyu Zhou 2020-12-23 14:33:30 -08:00
parent bbb56e4089
commit a167016378
6 changed files with 1 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -18,11 +18,7 @@
# limitations under the License.
cmake_minimum_required(VERSION 3.13)
project(foundationdb
<<<<<<< HEAD
VERSION 6.3.10
=======
VERSION 6.2.30
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
DESCRIPTION "FoundationDB is a scalable, fault-tolerant, ordered key-value store with full ACID transactions."
HOMEPAGE_URL "http://www.foundationdb.org/"
LANGUAGES C CXX ASM)

4
documentation/sphinx/source/command-line-interface.rst
View File

@ -393,7 +393,6 @@ status json
``status json`` will provide the cluster status in its JSON format. For a detailed description of this format, see :doc:`mr-status`.
<<<<<<< HEAD
.. _cli-throttle:
throttle
@ -469,12 +468,11 @@ list
Prints a list of currently active transaction tag throttles.
``LIMIT`` - The number of throttles to print. Defaults to 100.
=======
triggerddteaminfolog
--------------------
The ``triggerddteaminfolog`` command would trigger the data distributor to log very detailed teams information into trace event logs.
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
unlock
------

36
documentation/sphinx/source/downloads.rst
View File

@ -10,61 +10,38 @@ macOS
The macOS installation package is supported on macOS 10.7+. It includes the client and (optionally) the server.
<<<<<<< HEAD
* `FoundationDB-6.3.9.pkg <https://www.foundationdb.org/downloads/6.3.9/macOS/installers/FoundationDB-6.3.9.pkg>`_
=======
* `FoundationDB-6.2.29.pkg <https://www.foundationdb.org/downloads/6.2.29/macOS/installers/FoundationDB-6.2.29.pkg>`_
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
Ubuntu
------
The Ubuntu packages are supported on 64-bit Ubuntu 12.04+, but beware of the Linux kernel bug in Ubuntu 12.x.
<<<<<<< HEAD
* `foundationdb-clients-6.3.9-1_amd64.deb <https://www.foundationdb.org/downloads/6.3.9/ubuntu/installers/foundationdb-clients_6.3.9-1_amd64.deb>`_
* `foundationdb-server-6.3.9-1_amd64.deb <https://www.foundationdb.org/downloads/6.3.9/ubuntu/installers/foundationdb-server_6.3.9-1_amd64.deb>`_ (depends on the clients package)
=======
* `foundationdb-clients-6.2.29-1_amd64.deb <https://www.foundationdb.org/downloads/6.2.29/ubuntu/installers/foundationdb-clients_6.2.29-1_amd64.deb>`_
* `foundationdb-server-6.2.29-1_amd64.deb <https://www.foundationdb.org/downloads/6.2.29/ubuntu/installers/foundationdb-server_6.2.29-1_amd64.deb>`_ (depends on the clients package)
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
RHEL/CentOS EL6
---------------
The RHEL/CentOS EL6 packages are supported on 64-bit RHEL/CentOS 6.x.
<<<<<<< HEAD
* `foundationdb-clients-6.3.9-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/6.3.9/rhel6/installers/foundationdb-clients-6.3.9-1.el6.x86_64.rpm>`_
* `foundationdb-server-6.3.9-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/6.3.9/rhel6/installers/foundationdb-server-6.3.9-1.el6.x86_64.rpm>`_ (depends on the clients package)
=======
* `foundationdb-clients-6.2.29-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/6.2.29/rhel6/installers/foundationdb-clients-6.2.29-1.el6.x86_64.rpm>`_
* `foundationdb-server-6.2.29-1.el6.x86_64.rpm <https://www.foundationdb.org/downloads/6.2.29/rhel6/installers/foundationdb-server-6.2.29-1.el6.x86_64.rpm>`_ (depends on the clients package)
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
RHEL/CentOS EL7
---------------
The RHEL/CentOS EL7 packages are supported on 64-bit RHEL/CentOS 7.x.
<<<<<<< HEAD
* `foundationdb-clients-6.3.9-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/6.3.9/rhel7/installers/foundationdb-clients-6.3.9-1.el7.x86_64.rpm>`_
* `foundationdb-server-6.3.9-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/6.3.9/rhel7/installers/foundationdb-server-6.3.9-1.el7.x86_64.rpm>`_ (depends on the clients package)
=======
* `foundationdb-clients-6.2.29-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/6.2.29/rhel7/installers/foundationdb-clients-6.2.29-1.el7.x86_64.rpm>`_
* `foundationdb-server-6.2.29-1.el7.x86_64.rpm <https://www.foundationdb.org/downloads/6.2.29/rhel7/installers/foundationdb-server-6.2.29-1.el7.x86_64.rpm>`_ (depends on the clients package)
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
Windows
-------
The Windows installer is supported on 64-bit Windows XP and later. It includes the client and (optionally) the server.
<<<<<<< HEAD
* `foundationdb-6.3.9-x64.msi <https://www.foundationdb.org/downloads/6.3.9/windows/installers/foundationdb-6.3.9-x64.msi>`_
=======
* `foundationdb-6.2.29-x64.msi <https://www.foundationdb.org/downloads/6.2.29/windows/installers/foundationdb-6.2.29-x64.msi>`_
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
API Language Bindings
=====================
@ -81,31 +58,18 @@ On macOS and Windows, the FoundationDB Python API bindings are installed as part
If you need to use the FoundationDB Python API from other Python installations or paths, use the Python package manager ``pip`` (``pip install foundationdb``) or download the Python package:
<<<<<<< HEAD
* `foundationdb-6.3.9.tar.gz <https://www.foundationdb.org/downloads/6.3.9/bindings/python/foundationdb-6.3.9.tar.gz>`_
=======
* `foundationdb-6.2.29.tar.gz <https://www.foundationdb.org/downloads/6.2.29/bindings/python/foundationdb-6.2.29.tar.gz>`_
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
Ruby 1.9.3/2.0.0+
-----------------
<<<<<<< HEAD
* `fdb-6.3.9.gem <https://www.foundationdb.org/downloads/6.3.9/bindings/ruby/fdb-6.3.9.gem>`_
=======
* `fdb-6.2.29.gem <https://www.foundationdb.org/downloads/6.2.29/bindings/ruby/fdb-6.2.29.gem>`_
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
Java 8+
-------
<<<<<<< HEAD
* `fdb-java-6.3.9.jar <https://www.foundationdb.org/downloads/6.3.9/bindings/java/fdb-java-6.3.9.jar>`_
* `fdb-java-6.3.9-javadoc.jar <https://www.foundationdb.org/downloads/6.3.9/bindings/java/fdb-java-6.3.9-javadoc.jar>`_
=======
* `fdb-java-6.2.29.jar <https://www.foundationdb.org/downloads/6.2.29/bindings/java/fdb-java-6.2.29.jar>`_
* `fdb-java-6.2.29-javadoc.jar <https://www.foundationdb.org/downloads/6.2.29/bindings/java/fdb-java-6.2.29-javadoc.jar>`_
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
Go 1.11+
--------

7
fdbserver/MasterProxyServer.actor.cpp
View File

@ -1509,20 +1509,13 @@ ACTOR Future<Void> commitBatch(
// Dynamic batching for commits
double target_latency = (now() - t1) * SERVER_KNOBS->COMMIT_TRANSACTION_BATCH_INTERVAL_LATENCY_FRACTION;
<<<<<<< HEAD
self->commitBatchInterval = std::max(
SERVER_KNOBS->COMMIT_TRANSACTION_BATCH_INTERVAL_MIN,
std::min(SERVER_KNOBS->COMMIT_TRANSACTION_BATCH_INTERVAL_MAX,
target_latency * SERVER_KNOBS->COMMIT_TRANSACTION_BATCH_INTERVAL_SMOOTHER_ALPHA +
self->commitBatchInterval * (1 - SERVER_KNOBS->COMMIT_TRANSACTION_BATCH_INTERVAL_SMOOTHER_ALPHA)));
=======
self->commitBatchInterval =
std::max(SERVER_KNOBS->COMMIT_TRANSACTION_BATCH_INTERVAL_MIN,
std::min(SERVER_KNOBS->COMMIT_TRANSACTION_BATCH_INTERVAL_MAX,
target_latency * SERVER_KNOBS->COMMIT_TRANSACTION_BATCH_INTERVAL_SMOOTHER_ALPHA + self->commitBatchInterval * (1-SERVER_KNOBS->COMMIT_TRANSACTION_BATCH_INTERVAL_SMOOTHER_ALPHA)));
self->stats.commitBatchingWindowSize.addMeasurement(self->commitBatchInterval);
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
self->commitBatchesMemBytesCount -= currentBatchMemBytesCount;
ASSERT_ABORT(self->commitBatchesMemBytesCount >= 0);

4
packaging/msi/FDBInstaller.wxs
View File

@ -32,11 +32,7 @@
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Product Name='$(var.Title)'
<<<<<<< HEAD
Id='{4F01CFD6-596A-4224-BF7D-4AEF30BA2083}'
=======
Id='{93D340E4-E837-47D1-BA77-4D2A462BE31C}'
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
UpgradeCode='{A95EA002-686E-4164-8356-C715B7F8B1C8}'
Version='$(var.Version)'
Manufacturer='$(var.Manufacturer)'

5
versions.target
View File

@ -1,12 +1,7 @@
<?xml version="1.0"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<<<<<<< HEAD
<Version>6.3.10</Version>
<PackageName>6.3</PackageName>
=======
<Version>6.2.30</Version>
<PackageName>6.2</PackageName>
>>>>>>> 5a2b1ab258ecb3cb8992823e6ffe50637ff7e545
</PropertyGroup>
</Project>