null+****@clear*****
null+****@clear*****
2011年 11月 17日 (木) 13:35:12 JST
Kouhei Sutou 2011-11-17 04:35:12 +0000 (Thu, 17 Nov 2011)
New Revision: f5720234eafd10f9fe8bda98f0c777d18f522d6e
Log:
groonga storage engine -> mroonga. refs #1170
Modified files:
.gitignore
Makefile.am
configure.ac
ha_mroonga.cc
mrn_version.h.in
packages/debian/changelog
packages/debian/control
packages/rpm/centos/Makefile.am
packages/rpm/fedora/Makefile.am
test/unit/test_mrn_sys.c
Renamed files:
packages/rpm/centos/mysql-mroonga.spec.in
(from packages/rpm/centos/mysql-groonga.spec.in)
packages/rpm/fedora/mysql-mroonga.spec.in
(from packages/rpm/fedora/mysql-groonga.spec.in)
Modified: .gitignore (+1 -1)
===================================================================
--- .gitignore 2011-11-16 13:45:01 +0000 (323d85e)
+++ .gitignore 2011-11-17 04:35:12 +0000 (fc81e61)
@@ -28,7 +28,7 @@ cscope.out
/missing
/stamp-h1
/src/scratch
-/libgroonga_storage_engine.a
+/libha_groonga.a
/packages/rpm/*/*.spec
/packages/yum/fedora/
/packages/yum/centos/
Modified: Makefile.am (+5 -5)
===================================================================
--- Makefile.am 2011-11-16 13:45:01 +0000 (c436a77)
+++ Makefile.am 2011-11-17 04:35:12 +0000 (f3670d9)
@@ -11,10 +11,10 @@ ha_groonga_la_CXXFLAGS = $(AM_CXXFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_groonga_la_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
ha_groonga_la_SOURCES = ha_mroonga.cc mrn_sys.c mrn_table.cc
-plugin_LIBRARIES = libgroonga_storage_engine.a
-libgroonga_storage_engine_a_CXXFLAGS = $(AM_CXXFLAGS) $(MYSQL_CFLAGS)
-libgroonga_storage_engine_a_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS)
-libgroonga_storage_engine_a_SOURCES = ha_mroonga.cc mrn_sys.c mrn_table.cc
+plugin_LIBRARIES = libha_groonga.a
+libha_groonga_a_CXXFLAGS = $(AM_CXXFLAGS) $(MYSQL_CFLAGS)
+libha_groonga_a_CFLAGS = $(AM_CFLAGS) $(MYSQL_CFLAGS)
+libha_groonga_a_SOURCES = ha_mroonga.cc mrn_sys.c mrn_table.cc
SUBDIRS = \
test \
@@ -29,7 +29,7 @@ installcheck-local: install
tag:
cd $(top_srcdir) && \
- git tag v$(VERSION) -a -m 'groonga storage engine $(VERSION)!!!'
+ git tag v$(VERSION) -a -m 'mroonga $(VERSION)!!!'
update-latest-release:
@if test -z "$(OLD_RELEASE)"; then \
Modified: configure.ac (+4 -4)
===================================================================
--- configure.ac 2011-11-16 13:45:01 +0000 (4260806)
+++ configure.ac 2011-11-17 04:35:12 +0000 (2cbbfb0)
@@ -4,7 +4,7 @@ m4_define([mrn_version_micro], [0])
m4_define([mrn_version],
[mrn_version_major.mrn_version_minor[]mrn_version_micro])
-AC_INIT([groonga-storage-engine], [mrn_version], [ikdtt****@gmail*****])
+AC_INIT([mroonga], [mrn_version], [ikdtt****@gmail*****])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([-Wall -Werror foreign tar-pax])
@@ -185,7 +185,7 @@ AC_SUBST(MROONGA_GITHUB_COM_PATH)
# For Debian package release
AC_ARG_WITH(rsync-path,
[AS_HELP_STRING([--with-rsync-path=PATH],
- [specify rsync path to upload groonga storage engine Debian packages.])],
+ [specify rsync path to upload mroonga Debian packages.])],
[RSYNC_PATH="$withval"],
[RSYNC_PATH=""])
AC_SUBST(RSYNC_PATH)
@@ -260,6 +260,6 @@ AC_OUTPUT([
mrn_version.h
test/sql/suite/groonga_storage/r/information_schema.result
test/sql/suite/groonga_storage/r/variables.result
- packages/rpm/centos/mysql-groonga.spec
- packages/rpm/fedora/mysql-groonga.spec
+ packages/rpm/centos/mysql-mroonga.spec
+ packages/rpm/fedora/mysql-mroonga.spec
])
Modified: ha_mroonga.cc (+0 -1)
===================================================================
--- ha_mroonga.cc 2011-11-16 13:45:01 +0000 (d1e2a7b)
+++ ha_mroonga.cc 2011-11-17 04:35:12 +0000 (4ea2006)
@@ -1101,7 +1101,6 @@ mysql_declare_plugin(mroonga)
},i_s_groonga_stats
mysql_declare_plugin_end;
-
static void mrn_generic_ft_close_search(FT_INFO *handler)
{
MRN_DBUG_ENTER_FUNCTION();
Modified: mrn_version.h.in (+5 -5)
===================================================================
--- mrn_version.h.in 2011-11-16 13:45:01 +0000 (c5ca465)
+++ mrn_version.h.in 2011-11-17 04:35:12 +0000 (e7c94c8)
@@ -19,19 +19,19 @@
#ifndef _mrn_version_h
#define _mrn_version_h
-/* Define groonga storage engine version in string */
+/* Define mroonga version in string */
#define MRN_VERSION "@VERSION@"
-/* Define groonga storage engine version in hex */
+/* Define mroonga version in hex */
#define MRN_VERSION_IN_HEX @MRN_VERSION_IN_HEX@
-/* Define groonga storage engine major version */
+/* Define mroonga major version */
#define MRN_VERSION_MAJOR @MRN_VERSION_MAJOR@
-/* Define groonga storage engine minor version */
+/* Define mroonga minor version */
#define MRN_VERSION_MINOR @MRN_VERSION_MINOR@
-/* Define groonga storage engine micro version */
+/* Define mroonga micro version */
#define MRN_VERSION_MICRO @MRN_VERSION_MICRO@
#endif /* _mrn_version_h */
Modified: packages/debian/changelog (+1 -1)
===================================================================
--- packages/debian/changelog 2011-11-16 13:45:01 +0000 (7631def)
+++ packages/debian/changelog 2011-11-17 04:35:12 +0000 (9b66296)
@@ -1,4 +1,4 @@
-groonga-storage-engine (1.0.1-1) unstable; urgency=low
+groonga-storage-engine (1.10-1) unstable; urgency=low
* New upstream release.
Modified: packages/debian/control (+16 -10)
===================================================================
--- packages/debian/control 2011-11-16 13:45:01 +0000 (6f16d91)
+++ packages/debian/control 2011-11-17 04:35:12 +0000 (3b63e5a)
@@ -1,4 +1,4 @@
-Source: groonga-storage-engine
+Source: mroonga
Section: database
Priority: optional
Maintainer: Kouhei Sutou <kou****@clear*****>
@@ -11,27 +11,33 @@ Build-Depends:
Standards-Version: 3.9.1
Homepage: http://mroonga.github.com/
-Package: mysql-server-groonga
+Package: mysql-server-mroonga
Section: database
Architecture: any
+Replaces: mysql-server-groonga (<< 1.0.0-1)
+Breaks: mysql-server-groonga (<< 1.0.0-1)
Depends:
${misc:Depends},
${shlibs:Depends},
libgroonga0 (>= 1.2.7),
mysql-server
-Description: MySQL storage enigne built on groonga.
- The groonga storage engine is a MySQL storage engine built on groonga,
- a fulltext search engine and column store.
+Description: A fast fulltext searchable storage engine for MySQL.
+ Mroonga is a fast fulltext searchable storage engine for MySQL.
+ It is based on groonga, a fast fulltext search engine and column store.
+ Groonga is good at real time update.
.
This package provides a MySQL storage engine as a shared library.
-Package: mysql-server-groonga-doc
+Package: mysql-server-mroonga-doc
Section: doc
Architecture: all
+Replaces: mysql-server-groonga-doc (<< 1.0.0-1)
+Breaks: mysql-server-groonga-doc (<< 1.0.0-1)
Depends:
${misc:Depends}
-Description: Documentation of the groonga storage engine.
- The groonga storage engine is a MySQL storage engine built on groonga,
- a fulltext search engine and column store.
+Description: Documentation of mroonga.
+ Mroonga is a fast fulltext searchable storage engine for MySQL.
+ It is based on groonga, a fast fulltext search engine and column store.
+ Groonga is good at real time update.
.
- This package provides documentation of the groonga storage engine.
+ This package provides documentation of mroonga.
Modified: packages/rpm/centos/Makefile.am (+2 -2)
===================================================================
--- packages/rpm/centos/Makefile.am 2011-11-16 13:45:01 +0000 (4db5682)
+++ packages/rpm/centos/Makefile.am 2011-11-17 04:35:12 +0000 (ecdebe7)
@@ -1,2 +1,2 @@
-EXTRA_DIST = mysql-groonga.spec.in
-noinst_DATA = mysql-groonga.spec
+EXTRA_DIST = mysql-mroonga.spec.in
+noinst_DATA = mysql-mroonga.spec
Renamed: packages/rpm/centos/mysql-mroonga.spec.in (+15 -13) 86%
===================================================================
--- packages/rpm/centos/mysql-groonga.spec.in 2011-11-16 13:45:01 +0000 (5878278)
+++ packages/rpm/centos/mysql-mroonga.spec.in 2011-11-17 04:35:12 +0000 (fcd634e)
@@ -14,15 +14,15 @@
%define groonga_required_version 1.2.7
-Name: mysql-groonga
+Name: mysql-mroonga
Version: @VERSION@
Release: 0%{?dist}
-Summary: A MySQL storage engine powered by groonga.
+Summary: A fast fulltext searchable storage engine for MySQL.
Group: Applications/Databases
License: LGPLv2.1
URL: http://mroonga.github.com/
-Source0: http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-%{version}.tar.gz
+Source0: http://github.com/downloads/mroonga/mroonga/mroonga-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-%(%{__id_u} -n)
BuildRequires: groonga-devel >= %{groonga_required_version}
@@ -37,10 +37,12 @@ Requires: MySQL-client = %{mysql_version}-%{mysql_release}
%endif
%description
-Groonga storage engine is a MySQL storage plugin.
+Mroonga is a fast fulltext searchable storage plugin for MySQL.
+It is based on groonga that is a fast fulltext search engine and
+column store. Groonga is good at real-time update.
%prep
-%setup -q -n groonga-storage-engine-%{version}
+%setup -q -n mroonga-%{version}
mysql_full_version=%{mysql_version}-%{mysql_release}.%{mysql_dist}
%if %{use_system_mysql}
@@ -85,7 +87,7 @@ if [ ! -d ${mysql_source} ]; then
--define 'optflags -O0' \
../../SPECS/${spec_base}
fi
-%configure --with-mysql-source=${mysql_source}
+%configure --disable-static --with-mysql-source=${mysql_source}
make %{?_smp_mflags}
@@ -93,9 +95,8 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/ha_groonga.a
-mv $RPM_BUILD_ROOT%{_datadir}/groonga-storage-engine/ \
- $RPM_BUILD_ROOT%{_datadir}/mysql-groonga/
+mv $RPM_BUILD_ROOT%{_datadir}/mroonga/ \
+ $RPM_BUILD_ROOT%{_datadir}/mysql-mroonga/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -109,7 +110,7 @@ CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_groonga.so';
command="/usr/bin/mysql -u root -e \"$sql\""
echo $command
eval $command || \
- (echo "run the following command to register groonga storage engine:"; \
+ (echo "run the following command to register mroonga:"; \
echo " $command")
fi
@@ -122,18 +123,19 @@ UNINSTALL PLUGIN groonga;
command="/usr/bin/mysql -u root -e \"$sql\""
echo $command
eval $command || \
- (echo "run the following command to unregister groonga storage engine:"; \
+ (echo "run the following command to unregister mroonga:"; \
echo " $command")
fi
%files
%defattr(-,root,root,-)
%{_libdir}/mysql/plugin/
-%doc %{_datadir}/mysql-groonga/doc/
+%doc %{_datadir}/mysql-mroonga/doc/
%changelog
-* Sat Oct 29 2011 Kouhei Sutou <kou****@clear*****> - 1.0.1-0
+* Sat Oct 29 2011 Kouhei Sutou <kou****@clear*****> - 1.10-0
- new upstream release.
+- groonga storage engine -> mroonga.
* Thu Sep 29 2011 Kouhei Sutou <kou****@clear*****> - 1.0.0-0
- new upstream release.
Modified: packages/rpm/fedora/Makefile.am (+2 -2)
===================================================================
--- packages/rpm/fedora/Makefile.am 2011-11-16 13:45:01 +0000 (4db5682)
+++ packages/rpm/fedora/Makefile.am 2011-11-17 04:35:12 +0000 (ecdebe7)
@@ -1,2 +1,2 @@
-EXTRA_DIST = mysql-groonga.spec.in
-noinst_DATA = mysql-groonga.spec
+EXTRA_DIST = mysql-mroonga.spec.in
+noinst_DATA = mysql-mroonga.spec
Renamed: packages/rpm/fedora/mysql-mroonga.spec.in (+15 -12) 81%
===================================================================
--- packages/rpm/fedora/mysql-groonga.spec.in 2011-11-16 13:45:01 +0000 (a9a70b0)
+++ packages/rpm/fedora/mysql-mroonga.spec.in 2011-11-17 04:35:12 +0000 (60f6b44)
@@ -5,15 +5,15 @@
%define groonga_required_version 1.2.7
-Name: mysql-groonga
+Name: mysql-mroonga
Version: @VERSION@
Release: 0%{?dist}
-Summary: A MySQL storage engine powered by groonga.
+Summary: A fast fulltext searchable storage engine for MySQL.
Group: Applications/Databases
License: LGPLv2.1
URL: http://mroonga.github.com/
-Source0: http://github.com/downloads/mroonga/mroonga/groonga-storage-engine-%{version}.tar.gz
+Source0: http://github.com/downloads/mroonga/mroonga/mroonga-%{version}.tar.gz
BuildRequires: groonga-devel >= %{groonga_required_version}
BuildRequires: mysql-devel
@@ -22,10 +22,12 @@ Requires: mysql-server
Requires: mysql
%description
-Groonga storage engine is a MySQL storage plugin.
+Mroonga is a fast fulltext searchable storage plugin for MySQL.
+It is based on groonga that is a fast fulltext search engine and
+column store. Groonga is good at real-time update.
%prep
-%setup -q -n groonga-storage-engine-%{version}
+%setup -q -n mroonga-%{version}
srpm=mysql-%{mysql_version}-%{mysql_release}.src.rpm
if [ ! -f ../../SRPMS/$srpm ]; then
curl --output ../../SRPMS/$srpm %{mysql_download_base_url}/$srpm
@@ -38,6 +40,7 @@ if [ ! -d ../mysql-%{mysql_version} ]; then
../../SPECS/mysql.spec
fi
%configure CPPFLAGS="-DDISABLE_DTRACE" \
+ --disable-static \
--with-mysql-source=../mysql-%{mysql_version} \
--disable-fast-mutexes
make %{?_smp_mflags}
@@ -47,9 +50,8 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/mysql/plugin/ha_groonga.a
-mv $RPM_BUILD_ROOT%{_datadir}/groonga-storage-engine/ \
- $RPM_BUILD_ROOT%{_datadir}/mysql-groonga/
+mv $RPM_BUILD_ROOT%{_datadir}/mroonga/ \
+ $RPM_BUILD_ROOT%{_datadir}/mysql-mroonga/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -63,7 +65,7 @@ CREATE FUNCTION last_insert_grn_id RETURNS INTEGER soname 'ha_groonga.so';
command="/usr/bin/mysql -u root -e \"$sql\""
echo $command
eval $command || \
- (echo "run the following command to register groonga storage engine:"; \
+ (echo "run the following command to register mroonga:"; \
echo " $command")
fi
@@ -76,18 +78,19 @@ UNINSTALL PLUGIN groonga;
command="/usr/bin/mysql -u root -e \"$sql\""
echo $command
eval $command || \
- (echo "run the following command to unregister groonga storage engine:"; \
+ (echo "run the following command to unregister mroonga:"; \
echo " $command")
fi
%files
%defattr(-,root,root,-)
%{_libdir}/mysql/plugin/
-%doc %{_datadir}/mysql-groonga/doc/
+%doc %{_datadir}/mysql-mroonga/doc/
%changelog
-* Sat Oct 29 2011 Kouhei Sutou <kou****@clear*****> - 1.0.1-0
+* Sat Oct 29 2011 Kouhei Sutou <kou****@clear*****> - 1.10-0
- new upstream release.
+- groonga storage engine -> mroonga.
* Thu Sep 29 2011 Kouhei Sutou <kou****@clear*****> - 1.0.0-0
- new upstream release.
Modified: test/unit/test_mrn_sys.c (+1 -1)
===================================================================
--- test/unit/test_mrn_sys.c 2011-11-16 13:45:01 +0000 (f1b6597)
+++ test/unit/test_mrn_sys.c 2011-11-17 04:35:12 +0000 (0314b66)
@@ -69,7 +69,7 @@ void test_mrn_hash_put()
void test_mrn_hash_get()
{
const char *key = "mroonga";
- const char *value = "groonga storage engine";
+ const char *value = "A storage engine based on groonga.";
grn_obj *result;
GRN_TEXT_SETS(ctx, &buffer, value);