Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: twitter/flockdb
...
head fork: twitter/flockdb
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Mar 07, 2011
Josh Hull 1.6.13-SNAPSHOT a8460d3
Commits on Mar 14, 2011
Josh Hull bumped gizzard dependency 15aa9f5
Josh Hull 1.6.13 57de4d4
Josh Hull 1.6.14-SNAPSHOT 9c455be
Commits on Mar 24, 2011
eaceaser add more query classes. e5d5c0c
Commits on Mar 29, 2011
eaceaser Convert all imports to ostrich4, cleanup configgy afd7541
eaceaser compiles e0731ec
eaceaser test compiles 0a36761
Commits on Mar 30, 2011
eaceaser test config passes 86a1981
eaceaser all configs work 6bf3d14
eaceaser use new logging proxy 91b5689
Commits on Apr 01, 2011
eaceaser fix level in conf bb2834f
eaceaser switch to UNION ALL to skip a sort. 0a1d5fe
eaceaser 1.6.14 748f67d
eaceaser 1.6.15-SNAPSHOT be428ff
eaceaser Merge branch 'master' into improved_stats
Conflicts:
	project/build.properties
d97e7c3
Commits on Apr 05, 2011
eaceaser get rid of w3c. 745707c
eaceaser use two separate queries instead of a union. 6c32c01
eaceaser 1.6.15 8339a8d
eaceaser 1.6.16-SNAPSHOT 02ec18d
eaceaser Merge branch 'master' into improved_stats
Conflicts:
	project/build.properties
2dc65f4
Commits on Apr 06, 2011
eaceaser exception log d9a691a
Commits on Apr 07, 2011
eaceaser use new stats harness 6b75012
eaceaser Revert "use two separate queries instead of a union."
This reverts commit 6c32c01.
08db396
Commits on Apr 16, 2011
@freels freels update standard-project and sbt-thrift 38258ed
Commits on Apr 26, 2011
eaceaser basic tracing 8be8338
Commits on Apr 27, 2011
eaceaser add more tracing. get rid of json exception logging, it was ass. 8812759
Commits on Apr 28, 2011
eaceaser Add a SelectSmall query class. 870dbf6
Commits on May 12, 2011
eaceaser new querulous. 1abfa2c
eaceaser 1.7.0-SNAPSHOT b4eb598
eaceaser org=com.twitter,name=flockdb,version=1.7.0 875845e
eaceaser org=com.twitter,name=flockdb,version=1.7.1-SNAPSHOT 2f024a0
eaceaser use gizzard version that depends on fixed querulous 0f38db8
eaceaser use new gizzard 8324913
Commits on May 18, 2011
eaceaser new gizzard bd15145
Commits on May 19, 2011
eaceaser new gizzard / querulous b18603e
eaceaser wip 6db5f3d
Commits on May 25, 2011
eaceaser Merge branch 'master' into improved_stats
Conflicts:
	project/build.properties
	project/build/FlockDBProject.scala
114dcd3
Commits on Jun 02, 2011
eaceaser export logging flock service. take out some unnecessary logs e132442
eaceaser alpha release a0e8ef1
eaceaser whitespace, gizzard version 158f34e
eaceaser use topical release ccfa37a
eaceaser rev to new snapshot alpha ff22e95
Commits on Jun 06, 2011
eaceaser depend on new snapshot gizzard 36d1d62
Commits on Jun 13, 2011
eaceaser track select single operations. aeeb70d
eaceaser low latency query evaluator 2d9f269
Commits on Jun 14, 2011
eaceaser improve statscollectingquery, make contains use selectsingle 75c5193
Commits on Jun 16, 2011
@jpinner jpinner Initial refactoring of SelectCompiler acfb682
Commits on Jun 17, 2011
@jpinner jpinner Query refactoring part 2 -- from traits to classes 94fc340
@jpinner jpinner Refactor part 3 -- add timing code to QueryTree d795fc7
Commits on Jul 14, 2011
eaceaser wip a8f8a25
eaceaser get rid of internal/global stats 6e51d7e
Commits on Jul 25, 2011
eaceaser get statscollectingquery to build with new querulous c1bc800
eaceaser use new gizzard. 3f5b64e
Commits on Jul 27, 2011
eaceaser remove snapshot. 282ba56
Commits on Jul 28, 2011
eaceaser back to snapshot. 47b60e8
Commits on Jul 29, 2011
eaceaser new gizzard 21383c6
eaceaser new flockdb e2f578f
Commits on Aug 01, 2011
@freels freels fix development.scala 484305d
Commits on Aug 02, 2011
@freels freels remove withLock, no longer used 43d68b2
@freels freels Merge remote-tracking branch 'origin/improved_stats' into gizzard_3
Conflicts:
	config/development.scala
	project/build/FlockDBProject.scala
	src/main/scala/com/twitter/flockdb/shards/SqlShard.scala
	src/test/scala/com/twitter/flockdb/unit/JobSpec.scala
bb0df95
@freels freels upgrade flockdb to gizzard 3 beta 27e4cc3
@freels freels alpha3 3180457
Commits on Aug 03, 2011
@freels freels ensime project file b4f80e1
@freels freels remove comment 5c52a28
Commits on Aug 04, 2011
eaceaser new snapshot b649ef3
eaceaser make sure the optimistic lock uses the non-low-latency pool cffa050
eaceaser nonsnapshot alpha 3 3d3146b
Commits on Aug 05, 2011
eaceaser new snapshot version 5dbba45
Commits on Aug 09, 2011
eaceaser get rid of "optimization" that was breaking 2nd order intersections 8b01c30
eaceaser fix new alpha release 2e1e70e
Commits on Aug 10, 2011
eaceaser new snapshot release ef762a0
eaceaser Revert "get rid of "optimization" that was breaking 2nd order interse…
…ctions"

This reverts commit 8b01c30.
6c62d62
Commits on Aug 11, 2011
@freels freels gizzard beta 4 d0de213
@freels freels 4 60c9a6d
@freels freels Merge branch 'improved_stats' into gizzard_3
Conflicts:
	project/build.properties
	src/test/scala/com/twitter/flockdb/unit/JobSpec.scala
fd126b6
@freels freels Merge branch 'improved_stats' into gizzard_3
Conflicts:
	project/build.properties
b7668b2
@freels freels alpha5 c132fe8
Commits on Aug 15, 2011
@caniszczyk caniszczyk Modify LICENSE
The previous license was superfluous.
f2c2916
Commits on Aug 16, 2011
@freels freels remove replication future config 419c813
@freels freels remove replicationFuture from config files 7a80487
@freels freels fix stats startup d421b2e
Commits on Aug 20, 2011
@freels freels Merge pull request #60 from caniszczyk/master
The previous license was superfluous.
bfd652c
Commits on Aug 23, 2011
@freels freels disentangle the Optimism trait from everything 6fd8d35
Commits on Aug 26, 2011
yswu upgrade to gizzard 3.0.0-beta6, plug in gauges for throttled connecti…
…on pool, and bump up the version to 1.8.0-alpha6
46778b8
Commits on Aug 30, 2011
@freels freels remove state-specific job types with Single and Multi 16cba05
@freels freels "fix" optimistic locking integration spec 39788a1
@freels freels adapters for old jobs in queue 12ae635
@freels freels test for legacy job support, rip me out, please 96b825d
@freels freels Merge branch 'master' into consolidated_jobs 30624f3
Commits on Aug 31, 2011
@freels freels refactor single job internals eea85eb
@freels freels stray println 673ebc6
@freels freels enable write memoization on single jobs 647805b
@freels freels un-case class Single 8fd19b3
@freels freels track state in a Multi job to prevent replay of multiple pages of work 886f78f
eaceaser new gizzard version d3d4188
eaceaser new snapshot version 33198e4
Commits on Sep 01, 2011
eaceaser Merge remote-tracking branch 'origin/memoize_writes' 7925419
Commits on Sep 10, 2011
eaceaser start logging write transactions in json 48015f7
Commits on Sep 12, 2011
@freels freels gizzard beta 11 ba0c6f2
@freels freels fix override in StatsCollectingQuery to reflect new DatabaseFactory i…
…nterface changes
c942e8d
Commits on Sep 14, 2011
@lenn0x lenn0x Edited doc/demo.markdown via GitHub b25fc23
Commits on Sep 22, 2011
@rcohen rcohen Bump alpha version. e05ff88
Commits on Sep 26, 2011
@rcohen rcohen gizzard beta 13 3b8d88a
@rcohen rcohen Bump alpha version. cfbcd32
eaceaser use the new version of gizzard cc956e2
@rcohen rcohen Bump alpha version. 0b6d8ae
@freels freels refactor atomically to not use exceptions for control flow. should al…
…so avoid rollbacks.
e4af1ee
@freels freels Merge branch 'master' of github.com:twitter/flockdb b6cd936
@boazavital boazavital Update demo to work as intended bcbbd63
Commits on Sep 27, 2011
@boazavital boazavital Use gizzmo create-table instead of dated mkshards script 13beff5
@boazavital boazavital typo 31a1bf8
@freels freels make some test configs lazy ad3112c
Commits on Sep 28, 2011
@boazavital boazavital Demo uses gizzmo topology instead of forwardings. Deprecation warning…
… on mkshards script
0f4ec07
@boazavital boazavital Merge pull request #67 from twitter/boaz_demofix
Update demo to work as intended

Update documentation for current versions and command usage, update mkshards script to use correct commands and be deprecated and dev config for consistency.
684ef53
Commits on Oct 03, 2011
@bmatheny bmatheny TYPE is no longer a supported modifier on 'CREATE TABLE' as of MySQL …
…5.1. ENGINE is a supported modifier as far back as at least 4.0.
8aaa7ac
@rcohen rcohen Merge pull request #68 from bmatheny/patch-1
TYPE is no longer a supported modifier on 'CREATE TABLE' as of MySQL 5.1.
ab0b883
@boazavital boazavital Copy does repairs on any number of shards 426dd74
Commits on Oct 04, 2011
@boazavital boazavital Work in Progress
Change copy to be nonrecursive
Add copy integration test
eb4d185
Commits on Oct 05, 2011
@boazavital boazavital Fix cursor bug in copy, finalize test 829fae9
Commits on Oct 11, 2011
@boazavital boazavital Don't record diffs past the smallest cursor if that shard has more items 8d6b249
Commits on Oct 12, 2011
@boazavital boazavital clear diffs after write 5f8dcd3
Commits on Oct 13, 2011
@boazavital boazavital Explicilty test metadata copying f2e8821
Commits on Oct 21, 2011
@freels freels allow write-only shards to make progress with edge writes. 8900674
Commits on Oct 25, 2011
eaceaser try to make the test config less flaky 448c781
eaceaser switch to new maven repo 8dc669a
eaceaser new alpha 0633a85
Commits on Oct 27, 2011
eaceaser memoize test configs. 89546ba
Commits on Nov 15, 2011
eaceaser new gizzard 7c8a686
eaceaser snapshot 25fb7c5
Commits on Nov 17, 2011
eaceaser new snapshot version 6c19f06
Commits on Dec 05, 2011
@freels freels remove thrift conversions files, use scrooge. 47f7cc8
Commits on Dec 06, 2011
@freels freels compile, no tests 9e5216a
@boazavital boazavital Merge branch 'master' into copy_repair
Conflicts:
	project/build/FlockDBProject.scala
4d491c8
@boazavital boazavital updated CopySpec test 94a6154
@boazavital boazavital correct gizzard snapshot cb35853
@freels freels fix tests 9a9abf1
Commits on Dec 08, 2011
Raghavendra Prabhu Checkpoint: continue chugging through making Flapp code async 75c1c35
Commits on Dec 09, 2011
Raghavendra Prabhu Another checkpoint 87509d7
@boazavital boazavital snapshot 22ac389
@boazavital boazavital snapshot 91ac95e
Commits on Dec 12, 2011
eaceaser kc ver ed8ddd8
Commits on Dec 14, 2011
@stuhood stuhood SqlShard go Future go! f4aafaf
Commits on Dec 15, 2011
eac new gizzard 0b0cae6
eac no more kc release name 72e5bf2
eac Merge branch 'kestrel_collection' fc9de2e
eac no snapshot 3455bcc
eac new snapshot d9f09a9
Commits on Dec 17, 2011
@boazavital boazavital new gizzard snapshot 91ff0cb
@boazavital boazavital Merge branch 'temp_master' into copy_repair
Conflicts:
	project/build.properties
	project/build/FlockDBProject.scala
2788be0
Commits on Jan 04, 2012
@boazavital boazavital Formatting and comments 57747b9
Commits on Jan 10, 2012
@boazavital boazavital Prune unneeded test 0ac70d8
@boazavital boazavital Enforce cursor typing b8a5d1a
@boazavital boazavital Stable flock and gizzard version bbb0609
@boazavital boazavital Merge pull request #72 from twitter/copy_repair
Implement copy/repairs
17b92b5
Alan Liang collect per graph stats 8730216
Commits on Jan 11, 2012
@boazavital boazavital new dev snapshot 303db1a
Commits on Jan 19, 2012
Raghavendra Prabhu Merge from master 483cea6
Alan Liang differentiate between forward and backward read stats 7396220
Alan Liang differentiate between forward and backward read stats for selectEdge 7af11d3
Raghavendra Prabhu Fix a few more compile errors 5b7cf73
Commits on Jan 20, 2012
Raghavendra Prabhu One more minor fix 4489190
Alan Liang Merge remote-tracking branch 'origin/master' into collect_per_graph_s…
…tats
31fa822
Raghavendra Prabhu Get test code to all compile 8106aa0
Alan Liang added -count postfix to stats 23ce75c
@alanliang alanliang Merge pull request #75 from twitter/collect_per_graph_stats
Collect stats on thrift calls per graph id
7f9a623
Raghavendra Prabhu Merge from master e83f167
Raghavendra Prabhu Checkpoint: fix many test issues 884e84f
Commits on Jan 21, 2012
Raghavendra Prabhu Down to 2 test errors\! 41b5e7a
Raghavendra Prabhu Remove some whitespaces f8724ef
Commits on Jan 23, 2012
@freels freels sequence SqlShard materialization queries which were inadvertently be…
…ing run in parallel
2ca695a
Raghavendra Prabhu Minor formatting fixes 79e2037
Raghavendra Prabhu Small fix 90e8dd9
Commits on Feb 01, 2012
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.1-alpha19-SNAPSHOT b1616df
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.0-alpha19 0f6c8d2
Commits on Feb 02, 2012
Raghavendra Prabhu Rename some counters 78f9185
Raghavendra Prabhu Remove a TODO a3ceff2
Raghavendra Prabhu Merge remote branch 'origin/scrooge' 788b4ea
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.1-alpha19 bd177af
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.2-alpha19-SNAPSHOT f7a00b0
Commits on Feb 24, 2012
@hyungoo hyungoo Bump up the version to 1.8.0-alpha20. This cherry-pick the gizzard 3.…
…0.0-beta30 onto 1.8.0-alpha19.
f5aa3ac
Commits on Mar 08, 2012
Raghavendra Prabhu Cleanup some config settings from the Finagle port. 200bcf8
Raghavendra Prabhu Fix how FlockDBServer is used 58a7950
Raghavendra Prabhu Upgrade gizzard to latest published version ed742a0
Raghavendra Prabhu Pull finagle via gizzard 815c10e
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.2-alpha19 ec44fcb
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.3-alpha19-SNAPSHOT c3c43d8
Alan Liang remove bad jobs JsonJobLogger ef14c70
Commits on Mar 09, 2012
Raghavendra Prabhu Upgrade querulous/gizzard, fix audit logging 1e91ab2
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.3-alpha19 502a3cd
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.4-alpha19-SNAPSHOT 2d77131
Raghavendra Prabhu Reintroduce the logging proxy e174279
Raghavendra Prabhu Add a log cefae89
Raghavendra Prabhu Try LoggingProxy fix from Gizzard 440f1bd
Raghavendra Prabhu Increase version 300aeec
Alan Liang Merge branch 'remove_bad_jobs_json_job_logger' into use_gizzard_3_0_2 4aab256
Alan Liang version bumps dacb10d
@alanliang alanliang Merge pull request #84 from twitter/use_gizzard_3_0_2
Use gizzard 3 0 2
4bdf810
Alan Liang new snapshot 3eeb60b
Alan Liang correct snapshot 93c8035
Commits on Mar 11, 2012
Raghavendra Prabhu Cleanup ab7057c
Raghavendra Prabhu Merge 89702db
Raghavendra Prabhu Upgrade gizzard again db1afae
Raghavendra Prabhu Bump version a9c2431
Raghavendra Prabhu Small fix bb2137a
Raghavendra Prabhu Cleanup c741273
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.6 48f3174
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.7-SNAPSHOT f0b3158
Commits on Mar 12, 2012
Raghavendra Prabhu Incorporate code review feedback a130c4c
Raghavendra Prabhu More feedback 660e6e4
Raghavendra Prabhu Merge pull request #85 from twitter/fix_logging
Get LoggingProxy working with the finagle-ized flockdb
9271fa3
Commits on Mar 15, 2012
Raghavendra Prabhu upgrade gizzard version 6f5d156
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.7 126a282
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.8-SNAPSHOT 3277663
@hyungoo hyungoo Make DifferenceQuery obey page size
- It will prevent resources from being wasted.
- It will fix the flaky DifferenceQuerySpec test.
a42f37a
@hyungoo hyungoo Merge branch 'master' into fix_difference_query
Conflicts:
	src/main/scala/com/twitter/flockdb/queries/DifferenceQuery.scala
	src/test/scala/com/twitter/flockdb/unit/IntersectionQuerySpec.scala
0c19c96
Raghavendra Prabhu version bump 00a57da
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.8 e998284
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.9-SNAPSHOT 9f5697b
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.9 361f594
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.10-SNAPSHOT 37e59f8
Commits on Mar 20, 2012
@stuhood stuhood Merge remote branch 'github/1.8.0-alpha20-deploy'
Conflicts:
	project/build.properties
	project/build/FlockDBProject.scala
fe1f6e8
Commits on Mar 21, 2012
Raghavendra Prabhu Fix config per latest querulous 2cdb4c3
Commits on Mar 22, 2012
Raghavendra Prabhu Config updates for the querulous upgrade 6c69a91
Commits on Mar 23, 2012
Raghavendra Prabhu Upgrade to gizzard 3.0.8 e6c258f
Raghavendra Prabhu Fix config 73066f3
Raghavendra Prabhu Merge pull request #87 from twitter/upgrade_querulous
Upgrade querulous
62661eb
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.10 a4de4b6
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.11-SNAPSHOT 83d0cf3
Commits on Mar 27, 2012
Raghavendra Prabhu Upgrade to gizzard 3.0.10 4e74c14
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.11 502b00b
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.12-SNAPSHOT c925263
Commits on Mar 30, 2012
Raghavendra Prabhu Upgrade to gizzard 3.0.11 2d1ad4f
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.12 a5fd2e7
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.13-SNAPSHOT 2fdc874
Raghavendra Prabhu Upgrade to gizzard 3.0.12 a18bfd5
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.13 fc18c68
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.14-SNAPSHOT deeac62
Raghavendra Prabhu Upgrade to gizzard 3.0.13 522fb38
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.14 51950ad
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.15-SNAPSHOT be69af8
Commits on Apr 02, 2012
@hyungoo hyungoo Merge branch 'master' into fix_difference_query e1fb576
Raghavendra Prabhu Fix the select-single Stat which was broken in finagle-ized flockdb 3eb5549
@hyungoo hyungoo Merge pull request #86 from twitter/fix_difference_query
Make DifferenceQuery obey page size
48fcca1
Raghavendra Prabhu Merge pull request #88 from twitter/fix_select_single_counter
Fix the select-single Stat which was broken in finagle-ized flockdb
47ff424
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.15 d005f33
Raghavendra Prabhu org=com.twitter,name=flockdb,version=1.8.16-SNAPSHOT 56ee690
Commits on Apr 04, 2012
Raghavendra Prabhu Add ability to specify maxConcurrentRequests 6cbca0b
Commits on Apr 28, 2012
@ksauzz ksauzz change shard_id to valid format. gizzmo-0.15.1 expanded shard_id
validation.
1d70e2b
@stuhood stuhood Merge pull request #92 from ksauzz/fix-demo
change shard_id to valid format. gizzmo-0.15.1 expanded shard_id validation.
3e35184