Release v1.0.3

Author: QiumingLu

CMakeLists.txt

@@ -8,7 +8,7 @@ project (Skywalker C CXX)
 
 set(SKYWALKER_VERSION_MAJOR 1)
 set(SKYWALKER_VERSION_MINOR 0)
-set(SKYWALKER_VERSION_PATCH 2)
+set(SKYWALKER_VERSION_PATCH 3)
 set(SKYWALKER_VERSION_STRING ${SKYWALKER_VERSION_MAJOR}.${SKYWALKER_VERSION_MINOR}.${SKYWALKER_VERSION_PATCH})
 
 enable_testing()

Makefile

@@ -53,7 +53,7 @@ default: all
 
 SHARED_VERSION_MAJOR = 1
 SHARED_VERSION_MINOR = 0
-SHARED_VERSION_PATCH = 2
+SHARED_VERSION_PATCH = 3
 SHARED_LIB1 = libskywalker.$(PLATFORM_SHARED_EXT)
 SHARED_LIB2 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR)
 SHARED_LIB3 = $(SHARED_LIB1).$(SHARED_VERSION_MAJOR).$(SHARED_VERSION_MINOR).${SHARED_VERSION_PATCH}

examples/echo/echo.cc

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -27,13 +26,14 @@ int main(int argc, char** argv) {
     return -1;
   }
 
+  skywalker::Checkpoint checkpoint;
   skywalker::GroupOptions g_options;
   g_options.use_master = true;
   g_options.log_sync = true;
   g_options.sync_interval = 0;
   g_options.keep_log_count = 1000;
   g_options.log_storage_path = std::string(path);
-  g_options.checkpoint = new skywalker::Checkpoint();
+  g_options.checkpoint = &checkpoint;
 
   skywalker::Options options;
 
@@ -72,7 +72,6 @@ int main(int argc, char** argv) {
                   });
   }
 
-  delete g_options.checkpoint;
   delete node;
 
   return 0;

examples/journey/CMakeLists.txt

@@ -5,7 +5,7 @@ set_source_files_properties(${proto_srcs} ${proto_hdrs} PROPERTIES COMPILE_FLAGS
 add_executable(journey_client journey_client.cc ${proto_srcs})
 target_link_libraries(journey_client ${Skywalker_LINKER_LIBS} ${Skywalker_LINK})
 
-add_executable(journey_server murmurhash3.cc journey_server.cc 
+add_executable(journey_server journey_server.cc
                               journey_service_impl.cc
                               journey_db_machine.cc journey_db.cc
                               ${proto_srcs})

examples/journey/Makefile

@@ -36,7 +36,7 @@ all: journey_client journey_server
 journey_client: journey.pb.o journey_client.o
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
 
-journey_server: murmurhash3.o journey_db.o journey_db_machine.o \
+journey_server: journey_db.o journey_db_machine.o \
                 journey.pb.o journey_service_impl.o journey_server.o 
 	$(CXX) $(CXXFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
 

examples/journey/checkpoint_impl.h

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -16,7 +15,6 @@
 #include <voyager/rpc/rpc_server.h>
 #include <voyager/util/string_util.h>
 
-#include "checkpoint_impl.h"
 #include "journey_service_impl.h"
 
 int main(int argc, char** argv) {
@@ -30,15 +28,15 @@ int main(int argc, char** argv) {
     printf("getcwd error\n");
     return -1;
   }
-  skywalker::Checkpoint* checkpoint = new journey::CheckpointImpl();
 
+  skywalker::Checkpoint checkpoint;
   skywalker::GroupOptions g_options;
   g_options.use_master = true;
   g_options.log_sync = true;
   g_options.sync_interval = 0;
   g_options.keep_log_count = 1000;
   g_options.log_storage_path = std::string(path);
-  g_options.checkpoint = checkpoint;
+  g_options.checkpoint = &checkpoint;
 
   skywalker::Options options;
 
@@ -82,7 +80,5 @@ int main(int argc, char** argv) {
     loop.Loop();
   }
 
-  delete checkpoint;
-
   return 0;
 }

examples/journey/journey_server.cc

@@ -7,7 +7,7 @@
 #include <functional>
 #include <iostream>
 
-#include "murmurhash3.h"
+#include <voyager/util/hash.h>
 
 namespace journey {
 
@@ -85,9 +85,10 @@ void JourneyServiceImpl::Propose(google::protobuf::RpcController* controller,
 
 uint32_t JourneyServiceImpl::Shard(const std::string& key) {
   assert(group_size_ > 0);
-  uint32_t out;
-  MurmurHash3_x86_32(key.c_str(), static_cast<int>(key.size()), 0, &out);
-  return (out & (group_size_ - 1));
+  if (group_size_ == 1) {
+    return 0;
+  }
+  return voyager::Hash32(key) % group_size_;
 }
 
 }  // namespace journey