Geo: geo library support

src/CMakeLists.txt

@@ -21,6 +21,7 @@ add_subdirectory(client_lib)
 add_subdirectory(server)
 add_subdirectory(server/test)
 add_subdirectory(shell)
+add_subdirectory(geo)
 add_subdirectory(redis_protocol)
 add_subdirectory(test/function_test)
 add_subdirectory(test/kill_test)

src/geo/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_subdirectory(src)
+add_subdirectory(test)
+add_subdirectory(sample)

src/geo/sample/CMakeLists.txt

@@ -0,0 +1,28 @@
+set(MY_PROJ_NAME pegasus_geo_sample)
+project(${MY_PROJ_NAME} C CXX)
+
+# Source files under CURRENT project directory will be automatically included.
+# You can manually set MY_PROJ_SRC to include source files under other directories.
+set(MY_PROJ_SRC "")
+
+# Search mode for source files under CURRENT project directory?
+# "GLOB_RECURSE" for recursive search
+# "GLOB" for non-recursive search
+set(MY_SRC_SEARCH_MODE "GLOB")
+
+set(MY_PROJ_INC_PATH "../../include")
+
+set(MY_PROJ_LIBS
+        s2
+        s2testing
+        pegasus_geo_lib
+        pegasus_client_static
+        fmt)
+
+set(MY_BOOST_PACKAGES system filesystem)
+
+add_definitions(-Wno-attributes)
+
+set(MY_BINPLACES "config.ini")
+
+dsn_add_executable()

src/geo/sample/config.ini

@@ -0,0 +1,88 @@
+[apps..default]
+run = true
+count = 1
+;network.client.RPC_CHANNEL_TCP = dsn::tools::sim_network_provider, 65536
+;network.client.RPC_CHANNEL_UDP = dsn::tools::sim_network_provider, 65536
+;network.server.0.RPC_CHANNEL_TCP = dsn::tools::sim_network_provider, 65536
+
+[apps.mimic]
+type = dsn.app.mimic
+arguments =
+pools = THREAD_POOL_DEFAULT, THREAD_POOL_GEO
+run = true
+count = 1
+
+[core]
+;tool = simulator
+;tool = fastrun
+tool = nativerun
+;toollets = tracer
+;toollets = tracer, profiler, fault_injector
+pause_on_start = false
+cli_local = false
+cli_remote = false
+
+;aio_factory_name = dsn::tools::native_aio_provider
+start_nfs = false
+
+logging_start_level = LOG_LEVEL_DEBUG
+logging_factory_name = dsn::tools::simple_logger
+;logging_factory_name = dsn::tools::screen_logger
+;logging_factory_name = dsn::tools::hpc_logger
+logging_flush_on_exit = true
+
+enable_default_app_mimic = true
+
+data_dir = ./data
+
+[tools.simple_logger]
+short_header = true
+fast_flush = true
+max_number_of_log_files_on_disk = 10
+stderr_start_level = LOG_LEVEL_ERROR
+
+[tools.hpc_logger]
+per_thread_buffer_bytes = 8192
+max_number_of_log_files_on_disk = 10
+
+[tools.simulator]
+random_seed = 0
+
+[network]
+; how many network threads for network library(used by asio)
+io_service_worker_count = 4
+
+; specification for each thread pool
+[threadpool..default]
+worker_count = 4
+
+[threadpool.THREAD_POOL_DEFAULT]
+name = default
+partitioned = false
+max_input_queue_length = 1024
+worker_priority = THREAD_xPRIORITY_NORMAL
+worker_count = 4
+
+[threadpool.THREAD_POOL_GEO]
+name = default
+partitioned = false
+max_input_queue_length = 1024
+worker_priority = THREAD_xPRIORITY_NORMAL
+worker_count = 4
+
+[task..default]
+is_trace = false
+is_profile = false
+allow_inline = false
+fast_execution_in_network_thread = false
+rpc_call_header_format = NET_HDR_DSN
+rpc_call_channel = RPC_CHANNEL_TCP
+rpc_timeout_milliseconds = 5000
+
+[uri-resolver.dsn://onebox]
+factory = partition_resolver_simple
+arguments = 127.0.0.1:34601,127.0.0.1:34602,127.0.0.1:34603
+
+[geo_client.lib]
+max_level = 16
+max_retry_times = 5

src/geo/sample/sample.cpp

@@ -0,0 +1,89 @@
+// Copyright (c) 2018-present, Xiaomi, Inc.  All rights reserved.
+// This source code is licensed under the Apache License Version 2.0, which
+// can be found in the LICENSE file in the root directory of this source tree.
+
+#include "geo/src/geo_client.h"
+
+#include <iostream>
+#include <s2/s2testing.h>
+#include <s2/s2cell.h>
+#include <dsn/utility/strings.h>
+
+static const int data_count = 10000;
+static const int test_count = 1;
+static const double radius = 5000.0;
+
+// ./pegasus_geo_test onebox temp temp_geo
+int main(int argc, char **argv)
+{
+    if (argc != 4) {
+        std::cerr << "USAGE: " << argv[0] << "<cluster-name> <app-name>" << std::endl;
+        return -1;
+    }
+
+    // value format:
+    // "00:00:00:00:01:5e|2018-04-26|2018-04-28|ezp8xchrr|-0.356396|39.469644|24.043028|4.15921|0|-1"
+    auto extractor = [](const std::string &value, S2LatLng &latlng) {
+        std::vector<std::string> data;
+        dsn::utils::split_args(value.c_str(), data, '|');
+        if (data.size() <= 6) {
+            return pegasus::PERR_INVALID_VALUE;
+        }
+
+        std::string lat = data[4];
+        std::string lng = data[5];
+        latlng = S2LatLng::FromDegrees(strtod(lat.c_str(), nullptr), strtod(lng.c_str(), nullptr));
+
+        return pegasus::PERR_OK;
+    };
+
+    pegasus::geo_client my_geo("config.ini", argv[1], argv[2], argv[3], extractor);
+
+    // cover beijing 5th ring road
+    S2LatLngRect rect(S2LatLng::FromDegrees(39.810151, 116.194511),
+                      S2LatLng::FromDegrees(40.028697, 116.535087));
+    for (int i = 0; i < data_count; ++i) {
+        S2LatLng latlng(S2Testing::SamplePoint(rect));
+        std::string id = std::to_string(i);
+        std::string value = id + "|2018-06-05 12:00:00|2018-06-05 13:00:00|abcdefg|" +
+                            std::to_string(latlng.lat().degrees()) + "|" +
+                            std::to_string(latlng.lng().degrees()) + "|123.456|456.789|0|-1";
+
+        int ret = my_geo.set(id, "", value, 1000);
+        if (ret != pegasus::PERR_OK) {
+            std::cerr << "set data failed. error=" << ret << std::endl;
+        }
+    }
+
+    for (int i = 0; i < test_count; ++i) {
+        S2LatLng latlng(S2Testing::SamplePoint(rect));
+
+        std::list<pegasus::SearchResult> result;
+        my_geo.search_radial(latlng.lat().degrees(),
+                             latlng.lng().degrees(),
+                             radius,
+                             -1,
+                             pegasus::geo_client::SortType::random,
+                             500,
+                             result);
+
+        std::cout << "count: " << result.size() << std::endl;
+        for (auto &data : result) {
+            std::cout << data.to_string() << std::endl;
+        }
+    }
+
+    for (int i = 0; i < test_count; ++i) {
+        std::string id = std::to_string(i);
+        std::list<pegasus::SearchResult> result;
+        my_geo.search_radial(
+            id, "", radius, 20, pegasus::geo_client::SortType::nearest, 500, result);
+
+        std::cout << "count: " << result.size() << std::endl;
+        for (auto &data : result) {
+            std::cout << data.to_string() << std::endl;
+        }
+    }
+
+    return 0;
+}

src/geo/src/CMakeLists.txt

@@ -0,0 +1,27 @@
+set(MY_PROJ_NAME pegasus_geo_lib)
+project(${MY_PROJ_NAME} C CXX)
+
+# Source files under CURRENT project directory will be automatically included.
+# You can manually set MY_PROJ_SRC to include source files under other directories.
+set(MY_PROJ_SRC "")
+
+# Search mode for source files under CURRENT project directory?
+# "GLOB_RECURSE" for recursive search
+# "GLOB" for non-recursive search
+set(MY_SRC_SEARCH_MODE "GLOB")
+
+set(MY_PROJ_INC_PATH "../../include")
+
+set(MY_PROJ_LIBS
+        s2
+        s2testing
+        pegasus_client_static
+        fmt)
+
+set(MY_BOOST_PACKAGES system filesystem)
+
+add_dependencies(pegasus_client_static clientlib_target)
+
+add_definitions(-Wno-attributes)
+
+dsn_add_static_library()