Restructure database folder #721
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
KeyboardNerd
commented
Feb 27, 2019
•
KeyboardNerd
commented
- one pgsql data model per folder, and one table per file
- one data model per file
KeyboardNerd
force-pushed
the
cache
branch
2 times, most recently
from
d3a1e55
to
207646e
Compare
KeyboardNerd
force-pushed
the
cache
branch
3 times, most recently
from
1fe0831
to
f9494d7
Compare
KeyboardNerd
changed the title
KeyboardNerd
added
lifecycle/preserve
kind/cleanup
jzelinskie
suggested changes
Mar 11, 2019
| // features and processors used to scan the ancestry. | ||
| func (tx *pgSession) UpsertAncestry(a database.Ancestry) error { | ||
| return ancestry.UpsertAncestry(tx.Tx, a) | ||
| } |
There was a problem hiding this comment.
Since these are all basically doing the same thing, I'll often keep the entire thing on one line and stack them all up.
func (tx *pgSession) UpsertAncestry(a database.Ancestry) error { return ancestry.UpsertAncestry(tx.Tx, a) }
func (tx *pgSession) FindAncestry(name string) (database.Ancestry, bool, error) { return ancestry.FindAncestry(tx.Tx, name) }
func (tx *pgSession) PersistDetectors(detectors []database.Detector) error { return detector.PersistDetectors(tx.Tx, detectors) }
func (tx *pgSession) PersistFeatures(features []database.Feature) error { return feature.PersistFeatures(tx.Tx, features) }
func (tx *pgSession) PersistNamespacedFeatures(features []database.NamespacedFeature) error { return feature.PersistNamespacedFeatures(tx.Tx, features) }
func (tx *pgSession) CacheAffectedNamespacedFeatures(features []database.NamespacedFeature) error { return vulnerability.CacheAffectedNamespacedFeatures(tx.Tx, features) }
func (tx *pgSession) FindAffectedNamespacedFeatures(features []database.NamespacedFeature) ([]database.NullableAffectedNamespacedFeature, error) { return vulnerability.FindAffectedNamespacedFeatures(tx.Tx, features) }
func (tx *pgSession) PersistNamespaces(namespaces []database.Namespace) error { return namespace.PersistNamespaces(tx.Tx, namespaces) }
...It makes it clear that there isn't really logic going on here, and that everything is boilerplate.
There was a problem hiding this comment.
gofmt doesn't like that idea
There was a problem hiding this comment.
dang, sometimes it does, not sure what the rule is: https://github.com/chihaya/chihaya/blob/master/storage/redis/peer_store_test.go#L35
|
rebased to master, hope no issues because of merge conflict |
- assertion.go assertions used in pgsql tests - data.go contains go representation of data.sql - testdb.go contains test db/tx creation logic - testutil.go contains misc other things
- pgsql/util/error.go contains error handling logic - pgsql/page/page.go contains the page struct - pgsql/monitoring contains the prometheus logic - pgsql/pgsession contains the pgsession struct
- Tests in complex_test.go are now in corresponding test files. - Pgsql_test is partially moved to testutil/testdb.go
jzelinskie
approved these changes
Mar 13, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.