Skip to content

Commit

Permalink
Bump up vineyard version to v0.12.2
Browse files Browse the repository at this point in the history
Fixes a bug introduced in 7c09843

Signed-off-by: Tao He <[email protected]>
  • Loading branch information
sighingnow committed Feb 1, 2023
1 parent 7c09843 commit ba2d083
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-vineyardd-and-wheels-linux.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -154,9 +154,9 @@ jobs:
run: |
if [[ "${{ matrix.python }}" == "cp311-cp311" ]];
then
export base=vineyard-manylinux2014:20230115
export base=manylinux2014:20230115
else
export base=vineyard-manylinux1:20220512
export base=manylinux1:20220512
fi
sudo docker build . -f docker/pypa/Dockerfile.manylinux1-wheel \
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.3)

set(VINEYARD_MAJOR_VERSION 0)
set(VINEYARD_MINOR_VERSION 12)
set(VINEYARD_PATCH_VERSION 1)
set(VINEYARD_PATCH_VERSION 2)
set(VINEYARD_VERSION ${VINEYARD_MAJOR_VERSION}.${VINEYARD_MINOR_VERSION}.${VINEYARD_PATCH_VERSION})

message(STATUS "Configuring and building vineyard version '${VINEYARD_VERSION}'.")
Expand Down
4 changes: 2 additions & 2 deletions charts/vineyard-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.12.1
version: 0.12.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
appVersion: 0.12.1
appVersion: 0.12.2

2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[metadata]
version = 0.12.1
version = 0.12.2

[pycodestyle]
max_line_length = 88
Expand Down
4 changes: 2 additions & 2 deletions src/common/util/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ limitations under the License.

#define VINEYARD_VERSION_MAJOR 0
#define VINEYARD_VERSION_MINOR 12
#define VINEYARD_VERSION_PATCH 1
#define VINEYARD_VERSION_PATCH 2

#define VINEYARD_VERSION \
((VINEYARD_VERSION_MAJOR * 1000) + VINEYARD_VERSION_MINOR) * 1000 + \
VINEYARD_VERSION_PATCH
#define VINEYARD_VERSION_STRING "0.12.1"
#define VINEYARD_VERSION_STRING "0.12.2"

#endif // SRC_COMMON_UTIL_CONFIG_H_
3 changes: 2 additions & 1 deletion src/server/async/socket_server.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ SocketConnection::SocketConnection(
if (plasma_bulk_store != nullptr) {
plasma_bulk_store_ = plasma_bulk_store->shared_from_this();
}
// initializing
this->registered_.store(false);
}

bool SocketConnection::Start() {
Expand Down Expand Up @@ -446,7 +448,6 @@ bool SocketConnection::doGetRemoteBuffers(const json& root) {
bool compress = false;
std::vector<std::shared_ptr<Payload>> objects;
std::string message_out;
this->registered_.store(false);

TRY_READ_REQUEST(ReadGetRemoteBuffersRequest, root, ids, unsafe, compress);
RESPONSE_ON_ERROR(bulk_store_->GetUnsafe(ids, unsafe, objects));
Expand Down
2 changes: 1 addition & 1 deletion test/remote_buffer_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ void RemoteCreateTest(Client& ipc_client, RPCClient& rpc_client) {
CHECK_EQ(local_buffer->data()[index], array_data[index]);
}

LOG(INFO) << "Passed remote buffer (local create & remote get) tests...";
LOG(INFO) << "Passed remote buffer (remote create & local get) tests...";
}

void RemoteGetTest(Client& ipc_client, RPCClient& rpc_client) {
Expand Down

0 comments on commit ba2d083

Please sign in to comment.