[Bro-Dev] #997: Merge sqlite reader/writer

Bro Tracker bro at tracker.bro.org
Wed May 15 18:24:32 PDT 2013


#997: Merge sqlite reader/writer
----------------------------+------------------------
  Reporter:  amannb         |      Owner:  robin
      Type:  Merge Request  |     Status:  closed
  Priority:  Low            |  Milestone:  Bro2.2
 Component:  Bro            |    Version:  git/master
Resolution:  fixed          |   Keywords:
----------------------------+------------------------
Changes (by robin):

 * owner:   => robin
 * status:  new => closed
 * resolution:   => fixed


Comment:

 In [changeset:358528732c8ff35aadac121f9dc8eaead61b851d/bro]:
 {{{
 #!CommitTicketReference repository="bro"
 revision="358528732c8ff35aadac121f9dc8eaead61b851d"
 Merge branch 'topic/robin/sqlite-merge'

 Closes #997.

 * topic/robin/sqlite-merge: (25 commits)
   Fix to make sqlite test consistent, and updating coverage baselines
   Avoid a CMake warning about 3rdparty looking like a number.
   Fixing linker error.
   and there is no has-reader.
   make sqlite3 executable required and add test-cases for errors
   Renaming src/external -> src/3rdparty
   fix a few small rough edges (mostly comments that do no longer apply)
   fix bug in input-manager regarding enums that a writer reads without
 0-terminating the string
   actually make sqlite work again (tests passed because the writer was not
 actually defined because of the define.)
   add sqlite distribution.
   fix warnings, update baselines, handle rotation
   add sqlite tests and fix small vector/set escaping bugs
   fix small bug with vectors and sets.
   make work with newer AsciiFormatter.
   start adding a different text for empty records for the sqlite writer.
   no, you will never guess from where I copied this file...
   make sqlite support more or less work for logging and input
   make sqlite-writer more stable.
   make it compile with new version of AsciiInputOutput
   and adapt to AsciiInputOutput - seems to work...
   ...

 Conflicts:
         scripts/base/frameworks/input/__load__.bro
         src/CMakeLists.txt
         src/input.bif
         src/input/Manager.cc
         src/main.cc
         src/types.bif
         testing/btest/Baseline/coverage.bare-load-
 baseline/canonified_loaded_scripts.log
         testing/btest/Baseline/coverage.default-load-
 baseline/canonified_loaded_scripts.log
 }}}

-- 
Ticket URL: <http://tracker.bro.org/bro/ticket/997#comment:1>
Bro Tracker <http://tracker.bro.org/bro>
Bro Issue Tracker



More information about the bro-dev mailing list