mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 02:59:34 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity
1,736 Commits 109 Branches 598 Tags
b58ce977fae8fc54bcba67a70bedc39d1d99d137
Commit Graph

1736 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rafael Weinstein
b58ce977fa Merge pull request #1063 from rafael-atticlabs/datastoreCommit 
DataStore.commit + tests
 2016-03-10 20:10:05 -08:00
Rafael Weinstein
dff5b3471c DataStore.commit + tests 2016-03-10 19:52:42 -08:00
Rafael Weinstein
a89dafdd5b Merge pull request #1066 from rafael-atticlabs/correctCollectionWriting 
Correct collection writing
 2016-03-10 19:41:46 -08:00
Rafael Weinstein
5b3eb45f24 propogate cs 2016-03-10 16:46:40 -08:00
Rafael Weinstein
697066598a write unwritten p-tree chunks 2016-03-10 16:28:58 -08:00
cmasone-attic
12fde71912 Merge pull request #1064 from cmasone-attic/small_fixes 
Some small fixes in chunks/
 2016-03-10 16:19:05 -08:00
Chris Masone
ec3163c7f8 Some small fixes in chunks/ 
Mostly 'go vet' complaints.
 2016-03-10 15:42:37 -08:00
Ben Kalman
11433d0cdd Merge pull request #1061 from kalman/readme 
Update README.md to mention GitHub PR gen hider.
 2016-03-10 14:25:35 -08:00
Benjamin Kalman
d2ad122ed9 Update README.md to mention GitHub PR gen hider. 2016-03-10 10:39:05 -08:00
cmasone-attic
3526f3d31a Merge pull request #1060 from cmasone-attic/issue133 
Use Type() to validate Commit in Dataset.SetNewHead()
 2016-03-09 14:07:20 -08:00
Chris Masone
224215f340 Use Type() to validate Commit in Dataset.SetNewHead() 
Since we put a type system in Noms, we can now use it
to check that a ref that purports to be the new Head
for a Dataset after a pull actually points to a Commit.

Fixes #133
 2016-03-09 14:07:04 -08:00
cmasone-attic
f9e6d3762c Merge pull request #1058 from cmasone-attic/issue1020 
Tag root item in DynamoStore as uncompressed
 2016-03-09 13:48:38 -08:00
cmasone-attic
e45d33ac54 Merge pull request #1059 from cmasone-attic/comments 
Fix up DataStore comments
 2016-03-09 12:57:38 -08:00
Chris Masone
6b4c93a3f7 Fix up DataStore comments 
If I'm going to start refactoring this code, it's important
that I'm sure what all the methods do. So, update the comments
 2016-03-09 12:45:45 -08:00
Chris Masone
3587622f6a Tag root item in DynamoStore as uncompressed 
These items are never compressed, but all other items have a tag
on them, so it makes sense that these should as well. Remain
tolerant of old roots, though, that are not tagged.
 2016-03-09 12:22:56 -08:00
Erik Arvidsson
a1ebfe744d Merge pull request #1055 from arv/csv-lenient-column-count 
noms.io: Make csv reader more lenient
 2016-03-07 16:24:39 -08:00
Erik Arvidsson
fe70aebcee noms.io: Make csv reader more lenient 
Allow the rows to be of different length
 2016-03-07 16:12:18 -08:00
Aaron Boodman
84a01c1823 Merge pull request #1053 from aboodman/splore-ui-fix 
splore: clip width of labels
 2016-03-07 09:24:25 -08:00
Aaron Boodman
9db3ab0b16 splore: clip width of labels 2016-03-04 23:51:24 -08:00
Ben Kalman
02b2a9d5fb Merge pull request #1052 from kalman/maybeParse 
Add Ref.maybeParse.
 2016-03-04 13:43:24 -08:00
Benjamin Kalman
1b3fdbf380 Add Ref.maybeParse. 2016-03-04 13:37:56 -08:00
Ben Kalman
4e849aeb02 Merge pull request #1051 from kalman/flow 
Update flow to 0.22.1.
 2016-03-04 13:37:33 -08:00
Benjamin Kalman
53e468a919 Update flow to 0.22.1. 2016-03-04 13:34:56 -08:00
Erik Arvidsson
0447f0f6af Merge pull request #1050 from arv/assert-kinds-in-struct 
js: Add asserts for the params to Struct constructor
 2016-03-04 13:16:21 -08:00
Erik Arvidsson
5ca41751f5 js: Add asserts for the params to Struct constructor 2016-03-04 12:59:32 -08:00
Aaron Boodman
7a11d8c967 Update README.md 2016-03-03 20:24:10 -08:00
Aaron Boodman
25a70b98a0 Update README.md 2016-03-03 20:23:11 -08:00
cmasone-attic
0c22c5727b Merge pull request #1048 from cmasone-attic/issue1037 
Add -dynamo-stats flag to control printing of DynamoStore stats
 2016-03-03 08:46:20 -08:00
Chris Masone
4f82f47b05 Add -dynamo-stats flag to control printing of DynamoStore stats 
Most people don't want to see these most of the time, so
now there's a flag I can set when I want to see the
read/write stats that DynamoStore keeps.

Fixes #1037
 2016-03-02 17:29:57 -08:00
Erik Arvidsson
1d108d7ee0 Merge pull request #1047 from attic-labs/revert-1041-revert-1040-csv-parser-skip-first-row 
Revert "Revert "Change csv importer API slightly""
 2016-03-02 13:27:25 -08:00
Erik Arvidsson
a8d41ff7cc Revert "Revert "Change csv importer API slightly"" 2016-03-02 11:26:24 -08:00
Erik Arvidsson
8929c63ab2 Merge pull request #1041 from attic-labs/revert-1040-csv-parser-skip-first-row 
Revert "Change csv importer API slightly"
 2016-03-01 17:39:25 -08:00
Erik Arvidsson
2808e0889b Revert "Change csv importer API slightly" 2016-03-01 17:39:04 -08:00
Erik Arvidsson
d9e3160499 Merge pull request #1040 from arv/csv-parser-skip-first-row 
Change csv importer API slightly
 2016-03-01 17:34:23 -08:00
Ben Kalman
565e9e3957 Merge pull request #1039 from kalman/null 
JS: Correctly check for null key in ordered sequences.
 2016-03-01 17:32:34 -08:00
Benjamin Kalman
e214bddb89 JS: Correctly check for null key in ordered sequences. 2016-03-01 17:31:54 -08:00
Erik Arvidsson
d977be86e0 Change csv importer API slightly 
This is in preparation of allowing editing the headers even when
using the first row as headers.

Now the consumer should create a CSVReader and read the first row
as the headers as needed.
 2016-03-01 17:02:46 -08:00
Ben Kalman
75b18d7c0c Merge pull request #1036 from kalman/retry 
Retry failing import requests up to 3 times.
 2016-02-29 17:50:33 -08:00
Benjamin Kalman
127de16799 Retry failing import requests up to 3 times. 2016-02-29 17:44:29 -08:00
Ben Kalman
498d2125fd Merge pull request #1034 from kalman/splore-blob 
Don't crash splore on blobs.
 2016-02-29 10:11:18 -08:00
Benjamin Kalman
afd6f7f0a8 Don't crash splore on blobs. 2016-02-29 10:09:48 -08:00
cmasone-attic
9bcf489053 Merge pull request #1031 from cmasone-attic/putcahce 
Don't pass ChunkStores to collection leaves
 2016-02-26 13:08:47 -08:00
Chris Masone
599fb8b173 Don't pass ChunkStores to collection leaves 
It turns out that the collection leaves don't actually use the
ChunkStore we give them, so stop passing it to them.
 2016-02-26 13:08:16 -08:00
Ben Kalman
477f961700 Merge pull request #1032 from kalman/splore-ref 
Add ref= argument to splore to view specific ref.
 2016-02-25 18:04:09 -08:00
Benjamin Kalman
1c4d4d83da Add ref= argument to splore to view specific ref. 2016-02-25 18:03:26 -08:00
Chris Masone
8eb61455c2 Clean up DataStore interface comments 2016-02-25 17:05:04 -08:00
Ben Kalman
d0fd0ca079 Merge pull request #1030 from kalman/followup 
Add tests for modifying chunked sets/maps/lists read from a chunkstore.
 2016-02-25 15:54:54 -08:00
Benjamin Kalman
b60f1a0e7e Add tests for modifying chunked sets/maps/lists read from a chunkstore. 
This is opposed to chunked sets/maps/lists that were constructed. The
difference is that constructed they will have their chunk values stored
in memory, whereas from a chunkstore they only have refs.

There was a bug fixed in abacc7644a which
caused this to crash. This patch adds tests and an extra assertion.
 2016-02-25 15:53:18 -08:00
Ben Kalman
787d48da79 Merge pull request #1029 from kalman/fb-progress 
Make facebook importer show progress.
 2016-02-25 12:50:54 -08:00
Benjamin Kalman
19fb900b71 Make facebook importer show progress. 2016-02-25 11:32:08 -08:00