optimize: only supported to store integer index. (#18)

* optimize: only supported to store integer index.

Author: membphis

Makefile

@@ -4,7 +4,7 @@ INST_LUADIR ?= $(INST_PREFIX)/share/lua/5.1
 INSTALL ?= install
 UNAME ?= $(shell uname)
 
-CFLAGS := -O2 -g -Wall -fpic -std=c99
+CFLAGS := -O2 -g -Wall -fpic -std=c99 -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
 
 C_SO_NAME := librestyradixtree.so
 LDFLAGS := -shared

README.md

@@ -19,6 +19,7 @@ Table of Contents
     * [dispatch](#dispatch)
 * [Install](#install)
 * [DEV ENV](#dev-env)
+* [Benchmark](#benchmark)
 
 Status
 ======
@@ -148,3 +149,34 @@ DEV ENV
 ```
 make dev
 ```
+
+Benchmark
+=========
+
+This is a test example and the result, on my laptop, a single core CPU can match 1 million times in 1.4 seconds (based on 100,000 routes).
+
+```shell
+$ cat test.lua
+local radix = require("resty.radixtree")
+
+local routes = {}
+for i = 1, 1000 * 100 do
+    routes[i] = {paths = {"/" .. ngx.md5(i) .. "/*"}, metadata = i}
+end
+
+local rx = radix.new(routes)
+
+local res
+local uri = "/" .. ngx.md5(300) .. "/a"
+for _ = 1, 1000 * 1000 do
+    res = rx:match(uri)
+end
+
+ngx.say(res)
+
+$ time resty test.lua
+800
+resty test.lua  1.31s user 0.07s system 100% cpu 1.378 total
+```
+
+[Back to TOC](#table-of-contents)

lib/resty/radixtree.lua

@@ -71,12 +71,11 @@ ffi_cdef[[
     void *radix_tree_new();
     int radix_tree_destroy(void *t);
     int radix_tree_insert(void *t, const unsigned char *buf, size_t len,
-        void *data);
+        int idx);
     void *radix_tree_find(void *t, const unsigned char *buf, size_t len);
     void *radix_tree_search(void *t, void *it, const unsigned char *buf,
         size_t len);
-    void *radix_tree_pcre(void *it, const unsigned char *buf, size_t len);
-    void *radix_tree_next(void *it, const unsigned char *buf, size_t len);
+    int radix_tree_pcre(void *it, const unsigned char *buf, size_t len);
     int radix_tree_stop(void *it);
 
     void *radix_tree_new_it();
@@ -156,9 +155,8 @@ local function insert_route(self, opts)
     self.match_data_index = self.match_data_index + 1
     self.match_data[self.match_data_index] = {opts}
 
-    local dataptr = ffi_cast('void *', self.match_data_index)
-    radix.radix_tree_insert(self.tree, path, #path, dataptr)
-    log_info("insert route path: ", path, " dataprt: ", tostring(dataptr))
+    radix.radix_tree_insert(self.tree, path, #path, self.match_data_index)
+    log_info("insert route path: ", path, " dataprt: ", self.match_data_index)
     return true
 end
 
@@ -467,15 +465,12 @@ local function match_route(self, path, opts)
     end
 
     while true do
-        local data_idx = radix.radix_tree_pcre(it, path, #path)
-        log_info("path: ", path, " data_idx: ", tostring(data_idx))
-        if data_idx == nil then
+        local idx = radix.radix_tree_pcre(it, path, #path)
+        if idx <= 0 then
             break
         end
 
-        local idx = tonumber(ffi_cast('intptr_t', data_idx))
         routes = self.match_data[idx]
-        -- log_info("route: ", require("cjson").encode(routes))
         if routes then
             local route = _match_from_routes(routes, path, opts)
             if route then

src/easy_rax.c

@@ -25,8 +25,10 @@ radix_tree_destroy(void *t)
 
 
 int
-radix_tree_insert(void *t, const unsigned char *buf, size_t len, void *data)
+radix_tree_insert(void *t, const unsigned char *buf, size_t len, int idx)
 {
+    void *data = (void *)idx;
+
     if (t == NULL) {
         return -1;
     }
@@ -80,29 +82,29 @@ radix_tree_search(void *t, void *it, const unsigned char *buf, size_t len)
 }
 
 
-void *
+int
 radix_tree_next(void *it, const unsigned char *buf, size_t len)
 {
     raxIterator    *iter = it;
 
     int res = raxNext(iter);
     if (!res) {
-        return NULL;
+        return -1;
     }
 
     // fprintf(stderr, "it key len: %lu buf len: %lu, key: %.*s\n",
     //         iter->key_len, len, (int)iter->key_len, iter->key);
 
     if (iter->key_len > len ||
         memcmp(buf, iter->key, iter->key_len) != 0) {
-        return NULL;
+        return -1;
     }
 
-    return iter->data;
+    return (int)iter->data;
 }
 
 
-void *
+int
 radix_tree_pcre(void *it, const unsigned char *buf, size_t len)
 {
     raxIterator    *iter = it;
@@ -111,7 +113,7 @@ radix_tree_pcre(void *it, const unsigned char *buf, size_t len)
     while (1) {
         res = raxPrev(iter);
         if (!res) {
-            return NULL;
+            return -1;
         }
 
         if (iter->key_len > len ||
@@ -122,7 +124,7 @@ radix_tree_pcre(void *it, const unsigned char *buf, size_t len)
         break;
     }
 
-    return iter->data;
+    return (int)iter->data;
 }
 
 

src/easy_rax.h

@@ -32,11 +32,11 @@ extern "C" {
 void *radix_tree_new();
 int radix_tree_destroy(void *t);
 int radix_tree_insert(void *t, const unsigned char *buf, size_t len,
-    void *data);
+    int idx);
 void *radix_tree_find(void *t, const unsigned char *buf, size_t len);
 void *radix_tree_search(void *t, void *it, const unsigned char *buf, size_t len);
-void *radix_tree_pcre(void *it, const unsigned char *buf, size_t len);
-void *radix_tree_next(void *it, const unsigned char *buf, size_t len);
+int radix_tree_pcre(void *it, const unsigned char *buf, size_t len);
+int radix_tree_next(void *it, const unsigned char *buf, size_t len);
 int radix_tree_stop(void *it);
 
 void *radix_tree_new_it();