Merge lp://qastaging/~hingo/drizzle/drizzle-json_server-keyvalue into lp://qastaging/drizzle
Proposed by
Henrik Ingo
Status: | Merged |
---|---|
Merged at revision: | 2557 |
Proposed branch: | lp://qastaging/~hingo/drizzle/drizzle-json_server-keyvalue |
Merge into: | lp://qastaging/drizzle |
Diff against target: |
1576 lines (+1147/-82) 10 files modified
drizzled/plugin/client/cached.h (+7/-4) drizzled/sql/result_set.h (+41/-11) drizzled/sql/result_set_meta_data.h (+24/-7) m4/pandora_have_libevent.m4 (+13/-0) plugin/json_server/docs/index.rst (+373/-11) plugin/json_server/json/json_value.cpp (+41/-4) plugin/json_server/json/value.h (+2/-1) plugin/json_server/json_server.cc (+637/-43) plugin/json_server/plugin.ac (+8/-0) plugin/json_server/plugin.ini (+1/-1) |
To merge this branch: | bzr merge lp://qastaging/~hingo/drizzle/drizzle-json_server-keyvalue |
Related bugs: | |
Related blueprints: |
json server
(Medium)
json-server-refactoring
(Undefined)
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Henrik Ingo | Needs Resubmitting | ||
Review via email:
|
Description of the change
This is 0.2 of json_server plugin. It adds a "pure json" key value api at the uri /json/. (The previous sql-over-http api is at URI /sql/.)
The new functionality still lacks tests, and all of this lacks documentation. We are already working on both, however it would be good to merge this now, because it is easier for us to work against trunk. We will shortly follow up with more tests and docs.
To post a comment you must log in.
Started by upstream project "drizzle-build" build number 1994 11.04-slicehost -174.143. 253.46 in workspace /home/jenkins/ workspace/ drizzle- build-ubuntu- debug
Building remotely on ubuntu-
Deleting project workspace... done
Cleaning workspace... workspace/ drizzle- build-ubuntu- debug workspace/ drizzle- build-ubuntu- debug workspace/ drizzle- build-ubuntu- debug returned 0. Command output: "2556 <email address hidden> build-ubuntu- debug] $ /bin/sh -xe /tmp/hudson1749 308941142382677 .sh pandora- plugin write' autoreconf --install --force --verbose -Wall' libtool. m4:6: PANDORA_LIBTOOL is expanded from... canonical. m4:41: PANDORA_ CANONICAL_ TARGET is expanded from... autoconf/ lang.m4: 126: AC_LANG_SAVE is expanded from... m4sugar/ m4sh.m4: 598: AS_IF is expanded from... autoconf/ general. m4:2019: AC_CACHE_VAL is expanded from... autoconf/ general. m4:2040: AC_CACHE_CHECK is expanded from... header_ stdcxx_ 98.m4:21: AC_CXX_ HEADER_ STDCXX_ 98 is expanded from... check_cxx_ standard. m4:6: PANDORA_ CHECK_CXX_ STANDARD is expanded from... autoconf/ c.m4:252: AC_LANG_CPLUSPLUS is expanded from... autoconf/ general. m4:2602: AC_TRY_COMPILE is expanded from... autoconf/ lang.m4: 135: AC_LANG_RESTORE is expanded from... cstdint. m4:12: PANDORA_CXX_CSTDINT is expanded from... cinttypes. m4:12: PANDORA_ CXX_CINTTYPES is expanded from... visibility. m4:23: PANDORA_ CHECK_VISIBILIT Y is expanded from... visibility. m4:71: PANDORA_ ENABLE_ VISIBILITY is expanded from... autocon. ..
$ bzr branch lp:drizzle/build /home/jenkins/
You have not informed bzr of your Launchpad ID, and you must do this to
write to Launchpad or access private data. See "bzr help launchpad-login".
Branched 2556 revision(s).
Getting local revision...
$ bzr revision-info -d /home/jenkins/
info result: bzr revision-info -d /home/jenkins/
" stderr: ""
RevisionState revno:2556 revid:<email address hidden>
[drizzle-
+ ./config/autorun.sh
: running `python config/
: running `/usr/bin/
autoreconf: Entering directory `.'
autoreconf: configure.ac: not using Gettext
autoreconf: running: aclocal --force --warnings=all -I m4 --force
autoreconf: configure.ac: tracing
configure.ac:27: warning: The macro `AC_PROG_LIBTOOL' is obsolete.
configure.ac:27: You should run autoupdate.
aclocal.m4:123: AC_PROG_LIBTOOL is expanded from...
m4/pandora_
m4/pandora_
configure.ac:27: the top level
configure.ac:27: warning: The macro `AC_LANG_SAVE' is obsolete.
configure.ac:27: You should run autoupdate.
../../lib/
../../lib/
../../lib/
../../lib/
m4/pandora_
m4/pandora_
configure.ac:27: warning: The macro `AC_LANG_CPLUSPLUS' is obsolete.
configure.ac:27: You should run autoupdate.
../../lib/
configure.ac:27: warning: The macro `AC_TRY_COMPILE' is obsolete.
configure.ac:27: You should run autoupdate.
../../lib/
configure.ac:27: warning: The macro `AC_LANG_RESTORE' is obsolete.
configure.ac:27: You should run autoupdate.
../../lib/
m4/pandora_
m4/pandora_
configure.ac:27: warning: The macro `AC_CHECK_LIBM' is obsolete.
configure.ac:27: You should run autoupdate.
aclocal.m4:3301: AC_CHECK_LIBM is expanded from...
m4/pandora_
m4/pandora_
configure.ac:27: warning: AC_RUN_IFELSE called without default to allow cross compiling
../../lib/