Skip to content

Instantly share code, notes, and snippets.

@dasl-
dasl- / foo.diff
Created September 30, 2019 03:20
diff --git a/app/package.json b/app/package.json
index 7bf73e9..10a4132 100644
--- a/app/package.json
+++ b/app/package.json
@@ -10,7 +10,8 @@
"react-redux": "^7.1.0",
"react-scripts": "3.0.1",
"react-transition-group": "^4.2.2",
- "redux": "^4.0.4"
+ "redux": "^4.0.4",
@dasl-
dasl- / foo.diff
Created September 30, 2019 05:49
diff --git a/app/package.json b/app/package.json
index 7bf73e9..2c547a9 100644
--- a/app/package.json
+++ b/app/package.json
@@ -10,7 +10,8 @@
"react-redux": "^7.1.0",
"react-scripts": "3.0.1",
"react-transition-group": "^4.2.2",
- "redux": "^4.0.4"
+ "redux": "^4.0.4",
**********
You should use a config file. Please use the --write-config command line flag to help you create one.
**********
0:00.25 INFO: No 'bad' option specified, using 2019-10-07
0:02.49 WARNING: Skipping build 2019-10-07: Unable to find build info for 2019-10-07
0:03.84 INFO: Testing good and bad builds to ensure that they are really good and bad...
0:03.84 INFO: Downloading build from: https://archive.mozilla.org/pub/firefox/nightly/2019/06/2019-06-10-21-48-46-mozilla-central/firefox-69.0a1.en-US.mac.dmg
===== Downloaded 100% =====
0:24.01 INFO: Running mozilla-central build for 2019-06-10
diff --git a/go/vt/vttablet/tabletserver/tx_engine.go b/go/vt/vttablet/tabletserver/tx_engine.go
index 148569a02..37ae52b6b 100644
--- a/go/vt/vttablet/tabletserver/tx_engine.go
+++ b/go/vt/vttablet/tabletserver/tx_engine.go
@@ -118,6 +118,7 @@ func NewTxEngine(checker connpool.MySQLChecker, config tabletenv.TabletConfig) *
config.FoundRowsPoolSize,
config.TxPoolPrefillParallelism,
time.Duration(config.TransactionTimeout*1e9),
+ time.Duration(config.TxPoolTimeout*1e9),
time.Duration(config.IdleTimeout*1e9),
diff --git a/go/vt/vttablet/tabletserver/tx_engine.go b/go/vt/vttablet/tabletserver/tx_engine.go
index 148569a02..37ae52b6b 100644
--- a/go/vt/vttablet/tabletserver/tx_engine.go
+++ b/go/vt/vttablet/tabletserver/tx_engine.go
@@ -118,6 +118,7 @@ func NewTxEngine(checker connpool.MySQLChecker, config tabletenv.TabletConfig) *
config.FoundRowsPoolSize,
config.TxPoolPrefillParallelism,
time.Duration(config.TransactionTimeout*1e9),
+ time.Duration(config.TxPoolTimeout*1e9),
time.Duration(config.IdleTimeout*1e9),
diff --git a/go/pools/resource_pool.go b/go/pools/resource_pool.go
index 945393c79..204ac64d9 100644
--- a/go/pools/resource_pool.go
+++ b/go/pools/resource_pool.go
@@ -23,6 +23,7 @@ import (
"fmt"
"sync"
"time"
+ "vitess.io/vitess/go/vt/log"
**********
You should use a config file. Please use the --write-config command line flag to help you create one.
**********
0:00.30 INFO: No 'bad' option specified, using 2019-10-07
0:02.65 INFO: Testing good and bad builds to ensure that they are really good and bad...
0:02.65 INFO: Downloading build from: https://archive.mozilla.org/pub/firefox/nightly/2019/08/2019-08-14-21-57-52-mozilla-central/firefox-70.0a1.en-US.mac.dmg
===== Downloaded 100% =====
0:20.01 INFO: Running mozilla-central build for 2019-08-14
1:03.99 INFO: Launching /private/var/folders/y1/9d545mh965714rghjglj_ghw0000gn/T/tmp2z1o0lp7/Firefox Nightly.app/Contents/MacOS/firefox
ffmpeg -i 'The Smashing Pumpkins - Today (Official Video)-xmUZ6nCFNoU.mp4' -i 'The Smashing Pumpkins - Today (Official Video)-xmUZ6nCFNoU.mp4' -filter_complex "[0:v]setpts=PTS-STARTPTS[v0];[1:v]setpts=PTS-STARTPTS+4/TB[v1];[v0][v1]overlay=eof_action=pass[out1]" -map '[out1]' final.mp4
ffmpeg \
-i 'The Smashing Pumpkins - Today (Official Video)-xmUZ6nCFNoU.mp4' -i 'The Smashing Pumpkins - Today (Official Video)-xmUZ6nCFNoU.mp4' \
-filter_complex " \
[0:v]setpts=PTS-STARTPTS, scale=480x360[top]; \
[1:v]setpts=PTS-STARTPTS+4/TB, scale=480x360, \
colorchannelmixer=aa=0.5[bottom]; \
[top][bottom]overlay=shortest=1" \
out.mp4
--- from_file
+++ untitled 1
@@ -341,6 +341,7 @@
public static function loadMethodPlugins(CodeBase $code_base) : void
{
$plugin_set = ConfigPluginSet::instance();
+ $codebase_method_set = $code_base->getMethodSet();
foreach ($plugin_set->getReturnTypeOverrides($code_base) as $fqsen_string => $closure) {
try {
if (\stripos($fqsen_string, '::') !== false) {