Use mrn::PathEncoder

mroonga · Apr 9, 2012 · 01a2dab · 01a2dab
1 parent 6df0484
commit 01a2dab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -20,7 +20,8 @@ sources =					\
 	mrn_table.cpp
 
 libraries =					\
-	$(top_builddir)/lib/libmroonga.la
+	$(top_builddir)/lib/libmroonga.la	\
+	$(top_builddir)/lib/libmrn_need_mysql.la
 
 dynamic_plugin_ldflags  = -module $(GROONGA_LIBS)
 dynamic_plugin_cxxflags = $(AM_CXXFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN

diff --git a/ha_mroonga.cpp b/ha_mroonga.cpp
@@ -44,6 +44,7 @@
 #include "mrn_table.hpp"
 #include "ha_mroonga.hpp"
 #include <mrn_path_mapper.hpp>
+#include <mrn_path_encoder.hpp>
 
 #define MRN_SHORT_TEXT_SIZE (1 << 12) //  4Kbytes
 #define MRN_TEXT_SIZE       (1 << 16) // 64Kbytes
@@ -306,10 +307,8 @@ static char *mrn_index_table_name_create(const char *table_name,
                                          char *dest)
 {
   MRN_DBUG_ENTER_FUNCTION();
-  char encode_name[MRN_MAX_PATH_SIZE];
-  mrn_encode(encode_name, encode_name + MRN_MAX_PATH_SIZE,
-             index_name, index_name + strlen(index_name));
-  mrn_index_table_name_gen(table_name, encode_name, dest);
+  mrn::PathEncoder encoder(index_name);
+  mrn_index_table_name_gen(table_name, encoder.path(), dest);
   DBUG_RETURN(dest);
 }