vitalif
/
vitastor
5
4
Fork 9
Code Issues 1 Pull Requests 2 Actions Releases 68 Wiki Activity

Fix patch to use "git am" #5

Closed
shaba wants to merge 117 commits from <deleted>:master into master
pull from: <deleted>:master
merge into: vitalif:master
Conversation 1 Commits 117 Files Changed 36

117 Commits (master)

Author SHA1 Message Date
Alexey Shabalin c6b967ce6b Fix patch to use "git am" 2021-07-11 20:34:41 +03:00
Alexey Shabalin e157e1544e 0.6.5-alt1 
- 0.6.5
 2021-07-11 00:56:07 +03:00
Alexey Shabalin c74f8b5c87 Merge tag 'v0.6.5' 2021-07-11 00:54:57 +03:00
Alexey Shabalin d541387172 0.6.4-alt2 
- build master snapshot 30bb602681
- package client header to devel package
- merge blk and client devel packages
 2021-07-02 18:42:53 +03:00
Alexey Shabalin 886ab48d26 Merge remote-tracking branch 'upstream/vitastor/master' 
# Conflicts:
#	src/CMakeLists.txt
 2021-07-02 17:46:18 +03:00
Alexey Shabalin 15e8595b00 0.6.4-alt1 
- 0.6.4
 2021-05-19 18:48:09 +03:00
Alexey Shabalin a6ec1ac7a8 Merge tag 'v0.6.4' 2021-05-19 18:44:08 +03:00
Alexey Shabalin d37b4603dd 0.6.3-alt1 
- 0.6.3
 2021-05-06 00:29:19 +03:00
Alexey Shabalin 5edb0b8607 Merge tag 'v0.6.3' 
# Conflicts:
#	src/CMakeLists.txt
 2021-05-06 00:24:51 +03:00
Alexey Shabalin cc2763d7d8 gear-remotes-save 2021-05-06 00:18:39 +03:00
Alexey Shabalin 04580ce355 0.6.2-alt1 
- 0.6.2
 2021-04-20 00:24:18 +03:00
Alexey Shabalin 7febcabdb5 Do not redefine FLAGS for RelWithDebInfo 2021-04-20 00:24:18 +03:00
Alexey Shabalin 5dfd1cae0c Make with verbose 2021-04-20 00:11:04 +03:00
Alexey Shabalin 8c411e38da Fix undefined symbol 2021-04-20 00:00:10 +03:00
Alexey Shabalin dd8b12d9e4 Update VERSION 2021-04-19 23:08:52 +03:00
Alexey Shabalin 42dd3dce29 Merge tag 'v0.6.2' 2021-04-19 22:03:49 +03:00
Alexey Shabalin 247597e927 0.5.10-alt1 
- Initial build.
 2021-03-19 21:49:36 +03:00
Alexey Shabalin 37d716973d Add SOVERSION to libs 2021-03-19 18:42:02 +03:00
Alexey Shabalin 17c6a562b0 Add VERSION to cmake project() 2021-03-19 18:41:54 +03:00
Alexey Shabalin 278f37c00f Drop build fio driver 2021-03-19 18:41:41 +03:00
Alexey Shabalin 66004b2c8e Drop build qemu driver 2021-03-19 18:41:24 +03:00
Alexey Shabalin b2dbd5fa67 Update node js modules 2021-03-19 01:59:16 +03:00
Alexey Shabalin 0772dea061 Merge branches 'upstream/json11' and 'upstream/cpp-btree' 2021-03-19 01:52:06 +03:00
Vitaliy Filippov 97f06cb20c Add string->number conversions 2020-04-24 02:56:05 +03:00
Vitaliy Filippov 5dc108754a Fix "Dereferencing type-punned pointer will break strict aliasing rules..." 2020-03-14 02:13:05 +03:00
Vitaliy Filippov 88de39206d ull 2019-12-23 14:14:36 +03:00
Zhijiang TAO a4da043b17 update readme 2016-08-16 11:56:09 +08:00
Zhijiang TAO f4ffe052d9 ADDING INT64 UINT64 test cases 2016-08-16 11:10:14 +08:00
Zhijiang TAO eb4d67a68e using longlong for internel storage 2016-08-16 11:00:25 +08:00
Zhijiang TAO f6b4188933 添加int64类型，但是还是会溢出 2016-08-16 00:14:02 +08:00
Andrew Twyman 787809178d Merge pull request #71 from admsyn/fix-cmake-c++11-flag 
Use CXX_STANDARD to specify c++11 compile flags
 2016-08-12 17:10:09 -07:00
Adam Carlucci 580fd44b5f Use CXX_STANDARD to specify c++11 compile flags 2016-08-10 18:16:59 -07:00
Andrew Twyman fb6cc808e0 Merge pull request #69 from dropbox/atwyman/pre-processor-customization 
Allow json11 tests to be customized with pre-processor defines
 2016-07-28 22:54:22 -07:00
Andrew Twyman 7a947c1e2f Remove extraneous parentheses 2016-07-28 22:42:01 -07:00
Andrew Twyman 200c98aede Allow json11 tests to be customized with pre-processor defines 2016-07-28 22:27:43 -07:00
Andrew Twyman 78e43a9ea7 Merge pull request #68 from AustinBrunkhorst/master 
[MSVC 14] int to bool conversion performance warning
 2016-07-25 17:30:21 -07:00
Austin Brunkhorst 40f10bd28d Use `false` instead of `0` + conversion. 2016-07-25 17:28:15 -07:00
Andrew Twyman d9867d8ab3 Merge pull request #66 from 4brunu/master 
Add option to disable unit tests
 2016-07-25 17:00:35 -07:00
Austin Brunkhorst 467dc6ae05 Fixes warning C4800: 'int': forcing value to bool 'true' or 'false' on MSVC 14 2016-07-24 11:34:17 -07:00
Bruno Coelho 3704671508 Add option to disable unit tests 2016-07-05 15:37:44 +01:00
Andrew Twyman 913269c7a4 Merge pull request #64 from shrikant-dropbox/master 
MSVS 2013 compatibility changes.
 2016-06-20 17:58:44 -07:00
Shrikant Kelkar f6c0f68737 MSVS 2013 compatibility changes. 2016-06-20 17:36:17 -07:00
Andrew Twyman a20878aaa5 Make the DR1467 canary test code optional 2016-05-18 18:36:58 -07:00
Andrew Twyman 4597f98abe Fix sign comparison warnings, and parser confusion 2016-05-18 18:31:52 -07:00
j4cbo df1fdbfd79 Merge pull request #57 from ChrisKitching/fixpkgconfigInstall 
Don't assume in-tree builds when installing json11.pc
 2016-05-14 10:52:20 -07:00
Chris Kitching 05b5514400
Don't assume in-tree builds when installing json11.pc 2016-05-05 02:43:43 +01:00
j4cbo 8452587160 Merge pull request #55 from Dushistov/parse_not_full_json 
Parse half ready json
 2016-05-03 07:22:59 -07:00
j4cbo a1409a9a1a Merge pull request #56 from Dushistov/json_parser_anonymous 
make JsonParser invisible from outside
 2016-05-03 07:13:45 -07:00
Evgeniy A. Dushistov 0e4ace7e40 make parser invisible from outside 2016-04-28 01:28:42 +03:00
Evgeniy A. Dushistov 33bca8e178 implement parsing of chunked json 
Update: add more tests + use parser.failed
 2016-04-27 23:37:17 +03:00
Andrew Twyman eefbd630ec Merge pull request #53 from njwhite/master 
Generate pkg-config File & Add Install Target
 2016-04-18 20:04:30 -07:00
Nick White 8076ba74e0 Generate pkg-config File & Add Install 
...to the CMake build script. The pkg-config file needs a version number (which
it takes from the CMakeLists.txt variable), which I've set to 1.0.0. The cmake
project declaration needs to be after the minimum-requirement declaration to
avoid errors from the cmake's change in VERSION semantics.
 2016-04-16 18:43:09 +01:00
Andrew Twyman 3ae180068d Merge pull request #52 from kirisetsz/master 
Update CMakeLists to 3.x style
 2016-04-09 01:06:18 -07:00
kirisetsz 5e664c99d8 Update CMakeLists to 3.x style 2016-04-08 01:16:21 +08:00
j4cbo afcc8d0d82 Merge pull request #47 from PSPDFKit-labs/fix-warnings 
This fixes a “No previous prototype for function” warning.
 2016-01-06 12:05:00 -08:00
Peter Steinberger e1d5bcc94d This fixes a “No previous prototype for function” warning. 2015-12-29 18:55:48 +01:00
Andrew Twyman a6a661e924 Merge pull request #42 from capitalaslash/detect_comments 
Detect and ignore comments
 2015-12-03 14:26:10 -08:00
Antonio Cervone ebc3a6b038 watch out for i+1 to overflow the buffer 2015-12-02 10:01:29 +01:00
Antonio Cervone 988a8fc249 make JsonParser::strategy const 2015-12-02 09:57:25 +01:00
Antonio Cervone 49a6197d08 use an enum to select strategy on comment parsing 2015-12-01 11:08:37 +01:00
Antonio Cervone f9833b1e7d add test for unfinished multi-line comment 2015-12-01 11:01:47 +01:00
Antonio Cervone c6c6fcfeff add test for inline comment without trailing newline 2015-12-01 11:01:27 +01:00
Antonio Cervone aa270ad5b7 fix test where the trailing / was not reached due to a previous error 2015-12-01 11:00:58 +01:00
Antonio Cervone 982b2d8885 improve testing for bad inline comments 2015-12-01 11:00:11 +01:00
Antonio Cervone 4b0f5cfd77 check for end of input on every increment of the cursor 2015-12-01 10:59:22 +01:00
Antonio Cervone f21b8c360e add malformed comment tests. 
add 3 testes for:
- unended multi-line comment,
- malformed single-line comment,
- trailing slash
 2015-11-30 12:43:40 +01:00
Antonio Cervone d292fce9f2 improve comment test. 
test also for nested and mixed comments.
whitespaces/newlines are already intermixed between comments.
 2015-11-30 12:42:24 +01:00
Antonio Cervone 2f5c64225d detect malformed comments 2015-11-30 12:40:20 +01:00
Antonio Cervone b05e655c0a detect multiple comments with a loop instead of using recursion 2015-11-30 12:28:45 +01:00
Antonio Cervone 882feb56ac add bool to detect comments as run-time option. 2015-11-30 12:27:35 +01:00
Antonio Cervone de098c4d52 add testing for comment functionality 2015-11-27 16:46:18 +01:00
Antonio Cervone 08c391f89a introduce consume_garbage() 
new routine that consumes whitespaces and comments.
activated by JSON11_COMMENTS pre-processor flag.
 2015-11-27 16:41:05 +01:00
Antonio Cervone 2d1d176a55 add routine to detect c-style comments 2015-11-27 16:31:43 +01:00
j4cbo 765cee3ed1 Merge pull request #39 from PollRobots/use-cmake 
Add cmake support
 2015-10-19 16:30:01 -07:00
j4cbo b1e78cb1e4 Merge pull request #40 from PollRobots/fix-stdin-test 
Fixes bug in parse_from_stdin
 2015-08-24 11:24:01 -07:00
Paul C Roberts a021c3fbe2 Fixes bug in parse_from_stdin 
Handles end of file correctly
 2015-08-19 15:00:12 -07:00
Paul C Roberts 0c6e9d77a4 Add cmake support 
This uses cmake to allow building as a static library and to build the tests

To use `cmake`

```
$ mkdir build
$ cd build
$ cmake ..
 .
 .
-- Build files have been written to: ~/json11/build
$ make
Scanning dependencies of target json11
[ 20%] Building CXX object CMakeFiles/json11.dir/json11.cpp.o
[ 40%] Linking CXX static library libjson11.a
[ 40%] Built target json11
Scanning dependencies of target json11_test
[ 60%] Building CXX object CMakeFiles/json11_test.dir/json11.cpp.o
[ 80%] Building CXX object CMakeFiles/json11_test.dir/test.cpp.o
[100%] Linking CXX executable json11_test
[100%] Built target json11_test
$ make test
running tests...
Test project /Users/paul/dev/json11/build
    Start 1: json11_test
    1/1 Test #1: json11_test ......................   Passed    0.00 sec

    100% tests passed, 0 tests failed out of 1

    Total Test time (real) =   0.01 sec
$
```
 2015-08-19 14:53:28 -07:00
Andrew Twyman 61ba0a1dd2 Make test.cpp compilable with GCC. 
Add clean rule to Makefile.
 2015-06-17 18:02:34 -07:00
Andrew Twyman 50ed8c90e5 Test to demonstrate compiler behavior change in Xcode 7 / clang 3.7. 2015-06-17 15:02:22 -07:00
j4cbo 2aa22aab4b Merge pull request #36 from jcmonnin/master 
When dumping non-finite floating point values, output 'null'.
 2015-06-12 09:10:26 -07:00
Jean-Claude Monnin 0e8c5ba68f When dumping non-finite floating point values, output 'null'. 
In JSON the float point special values NaN and Infinity should serialised to 'null'.
Previously, 'snprintf' in 'dump' was giving a string that isn't compliant to the JSON standard.
 2015-06-04 10:35:12 +02:00
j4cbo 0193642bf8 Merge pull request #35 from akrieger/working 
For extra safety, add an explicit bounds check in utf8 parsing.
 2015-04-22 16:36:27 -07:00
Andrew Krieger e15ff418dd For extra safety, add an explicit bounds check in utf8 parsing. 2015-04-22 16:09:18 -07:00
Steven Kabbes cfdd67577c Use strtod not atof 2015-04-08 11:37:06 -07:00
Steve Carroll ae9542cc35 in encode_utf8, there is an implicit truncating cast that VS2015CTP6 is 
warning about.  I've added static_cast<char> to silence the warning and
express the intent.
 2015-04-08 10:24:36 -07:00
j4cbo 51166ddca6 Merge pull request #27 from k0zmo/const-pair 
iterate over pair of const string and Json
 2015-01-08 13:41:49 -08:00
k0zmo 7fd738ae42 iterate over pair of const string and Json 2014-12-30 10:31:43 +01:00
j4cbo be631169db Merge pull request #24 from masamitsu-murase/use_compare 
Use string::compare to improve performance.
 2014-12-04 10:14:07 -08:00
j4cbo e31ac4ebb4 Merge pull request #23 from masamitsu-murase/use_static_cast_for_hierarchy_navigation 
Use static_cast instead of reinterpret_cast for hierarchy navigation.
 2014-12-03 16:29:28 -08:00
Masamitsu MURASE 37ca641d82 Use static_cast instead of reinterpret_cast for hierarchy navigation. 2014-11-30 03:49:23 +09:00
Masamitsu MURASE c6a8736171 Use string::compare to improve performance. 2014-11-30 03:36:23 +09:00
Jacob Potter 6de4c29e76 fix int->double->int conversion in JsonInt 2014-09-22 12:07:43 -07:00
Jacob Potter 73baf7e677 Style fixes 2014-09-22 10:19:33 -07:00
Jacob Potter 679e4b83d2 Another VS14 fix 2014-08-14 12:14:21 -07:00
Jacob Potter 7103522344 Identify map- and vector-like objects in a VS14-compatible way 2014-08-13 15:12:44 -07:00
Jacob Potter d9bdd84c76 Limit maximum nesting depth (issue reported by Jeff Larson) 2014-06-04 16:24:02 -07:00
j4cbo 80578664de Merge pull request #1 from CodeFridge/feature/const 
Add const to comparisons
 2014-03-27 08:42:43 -07:00
Steven Kabbes 731322c2b8 Add const to comparisons 2014-03-27 03:55:52 -07:00
Jacob Potter 277e1b166f Make Json safe to use during static initialization. 2014-01-29 15:01:41 -08:00
Jacob Potter d2e5485973 Spacing fix 2014-01-27 10:59:17 -08:00
Jacob Potter 979cb4ca76 Add LICENSE.txt; some minor cleanups 
- Add LICENSE.txt
- Add a comment about how we handle numbers
- Add more test code
- Fix a narrowing-conversion issue
- Fix a comment typo
 2013-10-01 19:05:12 -07:00
Jacob Potter fe5e2167a5 Initial commit 2013-09-06 15:07:12 -07:00
Joshua MacDonald 92ec61e4b8 Fix the printf problem -- use std::cout :) 2013-02-08 23:14:47 -08:00
Joshua MacDonald 54f346f981 Update README / CMakeLists.txt; fix for -Wformat warning in btree_bench.cc 2013-02-08 22:56:25 -08:00
josh macdonald f85129d4d7 Fixes for open-source build following upstream bug fix 2013-02-05 22:12:13 -08:00
Joshua MacDonald c790956d18 Fix several range constructor bugs: (a) btree_multiset's range constructor did not compile (b) btree_map's range constructor ignored the inputs! These bugs were masked by the test, which due to an oversight skipped the use of range constructors as part of the {base,unique,multi}_checker testing types. Verified that the corrected test fails without the fix, added an additional sanity check (which made the problem stand out independent of the problems discovered in btree_test.h) 2013-02-05 22:04:33 -08:00
Joshua MacDonald 5633058db4 Update copyright notices; scrub a few references to Cord, StringPiece 2013-01-25 00:46:48 -08:00
sername=jmacd 7aad0f28fd Update README; remove benchmarks.awk 2013-01-22 15:57:34 -08:00
josh macdonald ce6c9fd34c Build fixes 2013-01-14 02:08:38 -08:00
josh macdonald 2fd7ed36a9 Make btree_bench work; compiled & tested on OS X 10.7.5 using gcc 4.7.2 -std=c++11 2013-01-13 00:16:02 -08:00
Josh MacDonald 88853fbc9e Build outside of Google; add CMakeLists.txt, README 2012-07-17 17:25:01 -07:00
Josh MacDonald 9783752d62 Remove files that are very google-specific 2012-07-17 17:22:55 -07:00
Josh MacDonald eaf6eb103d Updates from google3; adding safe_btree comments, container (in)equality operators 2012-07-17 17:20:45 -07:00
Josh MacDonald 89a0af9086 Simplify btree_base_field_type<> 2011-12-14 13:47:35 -08:00
Josh MacDonald 9fe3bb3b33 support for >= 256 values per node 2011-12-14 10:14:35 -08:00
Josh MacDonald dd97f135d0 Fix for kTargetNodeSize too large 2011-12-13 10:48:14 -08:00
Josh MacDonald 1a14ff58c9 Initial checkin of C++ btree code, has some useless google3-specific 
bits to be removed and needs a Makefile.
 2011-12-12 13:46:12 -08:00