eed40fef75
Extend hashtable scripts, fix hashtable with size of less than 1; correct text in spinlock tests.
2014-08-27 09:31:34 +01:00
25c5d1af25
fixed some warnings about const -> non-const conversions
2014-08-26 18:25:28 +02:00
584d3039ba
dcb_remove_callback() still had the old callback prototype
2014-08-26 18:20:59 +02:00
cf5821d4ef
Added expected results for missing queries.
2014-08-26 11:14:51 +03:00
69104d7dee
skygw_utils.cc:replace_literal: Fixed regular expression which, for example, accepted "200" with needle "2"
...
query_classifier.cc: fixed invalid argument list in logging command.
input.sql: added a few previously failed cases for canonical query test
2014-08-26 11:08:05 +03:00
fd125f4a42
Merge branch 'MAX-160' of https://github.com/skysql/MaxScale into MAX-160
...
Conflicts:
query_classifier/test/canonical_tests/input.sql
2014-08-25 22:22:44 +03:00
c5fbb1f295
query_classifier.cc:parsing_info_done: calling mysql_thread_end caused segfauls when same thread tried next time call free_embedded_thd because thread's sysvar was set to NULL in mysql_thread_end.
...
Added a few lines to canonical query test's input script which are not handled correctly.
2014-08-25 22:17:21 +03:00
4ab7112db7
more test cases for canonical queries and makefile typo fixes
2014-08-25 15:24:23 +03:00
2694c69186
Merge pull request #30 from skysql/canonical_query_tests
...
Canonical query tests
2014-08-25 09:48:16 +03:00
662b4b00ee
the errmsg.sys file is now copied during test building
2014-08-22 20:50:54 +03:00
73707cc9da
canonical query tests for query classifier
2014-08-22 20:44:26 +03:00
ee52ac64a9
query_classifier.cc:skygw_get_canonical: if the item to be replaced is an empty string "", it is processed differently from the other cases due to difficulties to get wanted result by adding special rule for that to regex.
...
query_classifier.h: added parsing information structure to query classifier away from buffer.h.
buffer.c:introduced a buffer object which includes object pointer and a clean-up call-back function. Buffer objects form a list which is cleaned up by the last referrer of the buffer, as a part of gwbuf_free. Buffer object list is protected by a spinlock gwbuf_lock.
Also added identifier type, bufobj_id_t which is enumerated type and currently includes one value only, GWBUF_PARSING_INFO. Added also a bitfield for information about the buffer. It currently has one type only, GWBUF_INFO_PARSED indicating that buffer content is parsed and there is buffer object of type GWBUF_PARSING_INFO.
skygw_utils.cc:replace_literal:changed regexec matching to case insensitive because user-defined literals are sometimes converted to upper-case ones.
2014-08-22 19:01:56 +03:00
493feb49ba
Fix for bug 410 - MaxScale.cnf server option is not parsed for spaces
2014-08-22 14:46:26 +01:00
c133c6ef4a
Fix for bug 479 - Undefined filter reference in MaxScale.cnf causes a crash
2014-08-22 14:33:14 +01:00
3476558f52
Fixed soem errors from a cppcheck run
...
mbrampton@martin-office:~/Dropbox/development/skygit/MaxScale/server$ cppcheck -q core/*.c
[core/adminusers.c:302]: (error) Resource leak: fp_tmp
[core/filter.c:382]: (error) Uninitialized variable: me
[core/service.c:1071]: (error) Uninitialized variable: succp
2014-08-22 14:25:27 +01:00
40c2846887
Merge branch 'develop' into release-1.0beta
2014-08-22 13:34:00 +01:00
3bc88e4eb9
skygw_get_canonical didn't return NULL pointerin cases where parsing info didn't exist or something went wrong.
2014-08-21 23:31:23 +03:00
3a5b8ef64c
query_classifier.cc: cleaned up and simplified skygw_get_canonical
...
skygw_util.cc:fixed memory allocation issue where terminating byte wasn't counted. Added some error checks.
2014-08-21 23:08:21 +03:00
8d1eae6fde
Fixed comment.
2014-08-21 22:34:50 +03:00
fa2189373d
query_classifier.cc: query_is_parsed is now global function and can be used to check whether parsing information already exists in the buffer.
...
skygw_utils.cc: removed replace_str and implemented replace_literal which replaces user-provided literals in query with predefined string "?". Replacing is done one by one, so it is suboptimal ipmlementation since all literals could be passed to replacement function in one call and processed all before returning.
2014-08-21 22:28:23 +03:00
4a2d81e066
Merge branch 'MAX-160' of https://github.com/skysql/MaxScale into MAX-160
2014-08-20 22:19:51 +03:00
c501d4d4e1
Changes related to canonical query format implementation.
...
query_classifier.cc: Now query can be parsed outside query_classifier_get_type by calling function parse_query. It creates parsing_info_t struct which is then added to the GWBUF which also includes the query. Parsing information follows the buffered query and it is freed at the same time with query buffer, in gwbuf_free.
buffer.c: additions of parsing information to gwbuf struct.
modutil.c: added function which returns query from GWBUF in plain text string.
readwritesplit.c:routeQuery now only calls query_classifier_get_type to get the query type instead of extracting plain text query from the GWBUF buffer.
2014-08-20 22:10:36 +03:00
a853b72baf
Modify build_gateway.inc so that variables are used, thus avoiding a need for editing. Please review the file to see the variables that are used - they should be obvious.
2014-08-20 17:22:58 +01:00
65b25a825a
Addition of adminusers unit test
...
Fix to filters unit test
2014-08-20 14:50:44 +01:00
c432d052e5
Merge pull request #29 from skysql/null_filter_fix
...
Fix to bug #479 , http://bugs.skysql.com/show_bug.cgi?id=479
2014-08-20 15:37:05 +03:00
e329d8cf13
Fix to bug #479 , http://bugs.skysql.com/show_bug.cgi?id=479
...
service.c was counting unfound filters towards the filter chain size.
2014-08-20 15:15:45 +03:00
baa655182c
Merge branch 'master' into develop
2014-08-20 11:07:55 +01:00
24e16e97ed
Updates for unit tests
2014-08-20 11:07:28 +01:00
d6a2ef6996
Misc fixes to doxygen comments
2014-08-19 13:22:40 +01:00
13dfd34d5d
Test use for cacnonical query function. Effective in debug build only.
2014-08-19 09:39:40 +03:00
fb3a950a18
Completed skygw_get_canonical by adding NULL checks and debug assertions. Replacable literal types are now INT_ITEM, STRING_ITEM, DECIMAL_ITEM, REAL_ITEM, VARBIN_ITEM and NULL_ITEM.
2014-08-19 09:07:18 +03:00
3dc09dfe43
Addition of spinlock unit test
2014-08-18 18:26:14 +01:00
544e64a301
query_classifier: implemented skygw_get_canonical which returns a copy of original string with given substrings being replaced with questionmarks.
...
skygw_utils.cc: added string replacement function for use of skygw_get_canonical
2014-08-18 14:19:46 +03:00
13b79d4124
comment header
2014-08-18 09:43:38 +00:00
d355e07e2d
gitignore cleanup
...
* ignore typical backup files created by common editors
* move general ignore rules like "*.o" or "depend.mk" to top level gitignore
* ignore executables and test directories in target dir gitignore
as these are local and there's no general catch-all pattern for them
2014-08-18 09:39:29 +00:00
34f6884920
Merge pull request #24 from hholzgra/hartmut-DEL
...
Hartmut del
2014-08-18 09:20:30 +03:00
087c4720bb
Merge pull request #23 from hholzgra/hartmut-DEL
...
Hartmut del
2014-08-18 09:20:03 +03:00
85c88dbd6b
Merge pull request #22 from hholzgra/hartmut-DEL
...
consistently use DEL instead of rm in Makefiles
2014-08-18 09:10:58 +03:00
fb87f68368
consistently use DEL instead of rm in Makefiles
2014-08-17 21:02:24 +00:00
dcb2070736
Merge branch 'release-1.0beta' of https://github.com/skysql/MaxScale into release-1.0beta
...
Conflicts:
server/modules/protocol/mysql_common.c
2014-08-15 18:43:05 +03:00
677a44f497
Merge from release-1.0beta to Z2
2014-08-15 18:00:39 +03:00
85ebc6d543
add gcov patch
2014-08-15 17:41:46 +03:00
2d7439d490
Merge remote-tracking branch 'origin/Z2' into filter_harness
2014-08-15 14:14:06 +03:00
b04dc8e4d7
documentation for the filter testing harness
2014-08-15 14:11:55 +03:00
c2bee45a10
Merge pull request #19 from skysql/session_variable_test
...
more stress tests for rwsplit router
2014-08-15 13:55:01 +03:00
d174740b08
Merge remote-tracking branch 'origin/release-1.0beta' into session_variable_test
2014-08-15 13:48:04 +03:00
be52b3a71e
more stress tests for rwsplit router
2014-08-15 13:41:56 +03:00
285605b33f
Merge pull request #18 from hholzgra/hartmut_README
...
fixed wrong server port in README
2014-08-15 08:31:21 +03:00
7f18914d90
fixed wrong server port in README
2014-08-15 02:51:16 +02:00
cefadaeb75
add gcov patch
2014-08-14 23:35:29 +03:00
