Commit Graph

736 Commits

Author SHA1 Message Date
Benjamin Kalman a1b824e114 Make List embed the Value interface rather than redefining all methods. 2015-10-16 12:26:29 -07:00
cmasone-attic 2a18c3f499 Merge pull request #411 from cmasone-attic/issue399
Import .noms files by path

.noms files can now import other .noms files by relative or absolute path.

Fixes #399
2015-10-14 15:49:23 -07:00
Chris Masone 3e43c58320 Import .noms files by path
.noms files can now import other .noms files by relative or absolute path.

Fixes #399
2015-10-14 15:03:50 -07:00
cmasone-attic 5cdc537976 Merge pull request #410 from cmasone-attic/fixarv
Fix a few issues with switching from NamedTypes -> Types
2015-10-14 15:03:18 -07:00
Chris Masone 30422eaa33 Fix a few issues with switching from NamedTypes -> Types and re-run go generate
grammar.peg didn't get updated along with grammar.peg.go in arv's last patch,
so that needed to be fixed. Also, pkg.Parsed had its own field named Types, which
shadowed the one it got by embedded types.Package. This only came into play when
generating code for packages pulled out of a dataset. Since arv had to manually
patch up all generated code in his last patch, he never hit this issue and I
missed it in review.

Now, go generate passes once more. Yay
2015-10-14 14:31:06 -07:00
Erik Arvidsson 6185ea1ddb NomDL: Use a list for the types in the package
This does not yet update the serialization to use the ordinal.
2015-10-14 14:49:04 -04:00
Dan Willhite a15e7e9d79 Merge pull request #403 from willhite/dataset-reorg
Remove commit lineage from datastore head.
2015-10-14 11:06:26 -07:00
Dan Willhite 43d9a6f4fb Remove commit lineage from datastore head.
Replace datastore head with a map of datasetID's to commits. Each commit in the map represents that dataset's head. Fixes #402. Fixes #60. Filed #404 about small window of potential conflict with updating root that needs to be resolved at some point. # Please enter the commit message for your changes. Lines starting
2015-10-14 11:04:13 -07:00
Ben Kalman 894871ef0a Merge pull request #407 from kalman/godeps2
Add github.com/djimenez/iconv-go into Godeps.
2015-10-14 11:03:51 -07:00
Benjamin Kalman 22d4c8c386 Add github.com/djimenez/iconv-go into Godeps. 2015-10-14 10:51:02 -07:00
Benjamin Kalman 9dbdd834e3 Install github.com/mikkyang/id3-go into Godeps. 2015-10-14 10:37:48 -07:00
Benjamin Kalman fb3dd22081 Add an mp3_importer client.
This is a simple initial implementation of a music database. It supports
-add for adding a single mp3 file to a noms database, and -ls for
listing all songs added to the database.
2015-10-14 09:45:55 -07:00
Erik Arvidsson 8565f175ee Make sure Chunks includes type.Refs and the TypeRef
Chunks shold return the futures for types.Ref values.

For typed values that have a TypeRef which has a package ref, also
include that.
2015-10-13 11:00:51 -04:00
Erik Arvidsson 9e36e080fd Disable unmarshal test that depends on map iteration order
Towards #396
2015-10-12 19:36:45 -04:00
cmasone-attic c08ee243e6 Merge pull request #398 from cmasone-attic/more_imports
Support compounding types with imported types.
2015-10-12 16:06:47 -07:00
Chris Masone 56cd548328 Support compounding types with imported types.
Sets, Lists, Refs and Maps of imported types work now.

This PR also factors some of codegen.go into a separate package, to slim down
that file a bit.

Towards issue #294
2015-10-12 15:29:45 -07:00
Erik Arvidsson e29d9eeb95 NomDL Blob: Remove redundant test 2015-10-12 17:53:51 -04:00
Erik Arvidsson 0d6f8be3e8 NomDL: Use base64 for Blobs for now
Encode embedded blobs as base64 encoded strings.
2015-10-12 17:47:28 -04:00
Dan Willhite 8b2b46f07b Merge pull request #390 from willhite/dataset
Fix concurrency overwrite on dataset.
2015-10-12 13:10:57 -07:00
Ben Kalman 58e2f3fb9c Merge pull request #394 from kalman/readme.md
Update README.md with accurate Run instructions.
2015-10-12 12:23:59 -07:00
Benjamin Kalman dd3c3b20a9 Update README.md with accurate Run instructions.
The -fs argument doesn't exist and the raw data isn't at /root.
Now it's -ldb and /*.log.
2015-10-12 12:19:11 -07:00
Dan Willhite d6b221444a Simplify logic in doCommit as per Raf's suggestions. Define ref.EmptyRef variable. 2015-10-12 10:53:12 -07:00
Dan Willhite 4852067aad Fix concurrency overwrite on dataset.
When there are two dataset clients working on the same empty dataset. The second one to commit would override the first.
2015-10-12 10:50:28 -07:00
cmasone-attic d1ae467c5e Merge pull request #392 from cmasone-attic/more_imports
check in generated test dependency code
2015-10-09 17:23:28 -07:00
Chris Masone ea34bfaaea check in generated test dependency code 2015-10-09 17:23:03 -07:00
cmasone-attic ce3360da4b Merge pull request #389 from cmasone-attic/more_imports
Initial support for importing type pacakges by ref

Towards #294
2015-10-09 17:10:44 -07:00
Chris Masone bccdcc22ad Remove commented out test code
And replace it with something that verifies that generated dependency code
is imported correctly.

Also address other nits.
2015-10-09 17:09:04 -07:00
Chris Masone cc15992778 Initial support for importing type pacakges by ref
Towards #294
2015-10-09 15:19:06 -07:00
Erik Arvidsson 1180d2aacb Fix build bustage 2015-10-09 14:35:33 -07:00
Erik Arvidsson 9795d49074 Always wrap list, map and set in an array 2015-10-09 14:10:05 -07:00
Erik Arvidsson 37336f41be NomDL serializing
This now handles serializing TypeRef values
2015-10-09 14:09:49 -07:00
Dan Willhite ca3934a718 Merge pull request #387 from willhite/dataset
Add MaybeGet method to generated Map types.
2015-10-07 13:42:17 -07:00
Dan Willhite b20b1c42cd Add MaybeGet method to generated Map types. 2015-10-07 13:40:34 -07:00
Erik Arvidsson 9cb7596409 NomDL: Make NomsValue a Value
This means that when we ReadValue we can now return a NomsValue

Towards #281
2015-10-06 16:38:11 -07:00
Erik Arvidsson 2dec53453e NomDL: Add new serialization format
The new serialization format use "t " as in typed. The rest of the
message is a JSON array describing the typed data. The type is
described by types.TypeRef

Fixes #384
Issues #281, #304
2015-10-06 15:56:10 -07:00
cmasone-attic e64e313498 Merge pull request #383 from cmasone-attic/issue294
Add functions to codegen.go for generating dependency code
2015-10-06 09:06:43 -07:00
Chris Masone 646519131c Address comments 2015-10-05 15:40:35 -07:00
Erik Arvidsson 72f4cd3a7a NomDL Codegen: Make the TypeRef return a package ref
The TypeRef function for a Noms Struct should be the (Name, PkgRef) and
not the description of the struct fields. This is important because
when serializing we need to write the package ref.

Towards #281 #304
2015-10-05 14:24:25 -07:00
Dan Willhite 46307027e1 Merge pull request #381 from willhite/iterallp
Issue #379 - Add IterAllP function to types.go.
2015-10-05 10:53:19 -07:00
Chris Masone 3dc61b673c Add functions to codegen.go for generating dependency code
This adds code for finding imported type packages and generating
code for them, but does not yet handle generating code that uses
those types.

Towards issue #294
2015-10-04 18:05:50 -04:00
Dan Willhite b3ae2f89a9 Issue #379 - Add IterAllP function to types.go. 2015-10-02 11:29:08 -07:00
Erik Arvidsson 096ac4a224 Add index to List Iter, IterAll, Map, MapP
Fixes #376
2015-10-01 17:53:21 -04:00
Dan Willhite a997e7bc95 Merge pull request #378 from willhite/issue-368
Use channel to protect access to datastore_server's connection map.
2015-10-01 09:39:31 -07:00
Dan Willhite 42688454f6 Use channel to protect access to datastore_server's connection map. 2015-10-01 09:17:04 -07:00
Aaron Boodman 8160817ee7 Merge pull request #375 from aboodman/delete
explore: say buh-bye
2015-09-30 20:24:35 -07:00
Aaron Boodman 9189479adf Merge pull request #373 from aboodman/progress
sfcrime_search: print out progress in slow mode
2015-09-30 17:36:58 -07:00
Aaron Boodman a6f7a2b63f Merge pull request #374 from aboodman/fix
sfcrime_importer: sometimes we would close before importing everything
2015-09-30 16:57:34 -07:00
Aaron Boodman 572130f563 Revert "Purposely break the build to test drone integration"
This reverts commit 8909eb5b42.
2015-09-30 16:46:14 -07:00
Aaron Boodman 8909eb5b42 Purposely break the build to test drone integration 2015-09-30 16:45:21 -07:00
Aaron Boodman 00108f1ec2 explore: say buh-bye 2015-09-30 16:43:38 -07:00