Skip to content

Commit

Permalink
update proxy of master to merge-master-beyond-8.4 (pingcap#9569)
Browse files Browse the repository at this point in the history 
ref pingcap#4982

Signed-off-by: CalvinNeo <calvinneo1995@gmail.com>

Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
  • Loading branch information
@CalvinNeo @ti-chi-bot
2 people authored and yibin committed Oct 31, 2024
1 parent 002bc93 commit ceaf98d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion contrib/tiflash-proxy
Submodule tiflash-proxy updated 89 files
+7 −4 Cargo.lock
+1 −2 Cargo.toml
+3 −3 components/backup-stream/src/observer.rs
+4 −4 components/cdc/src/observer.rs
+1 −1 components/cdc/tests/failpoints/test_register.rs
+3 −0 components/crossbeam-skiplist/Cargo.toml
+6 −0 components/crossbeam-skiplist/src/lib.rs
+1 −1 components/engine_panic/Cargo.toml
+1 −1 components/engine_panic/src/engine.rs
+1 −1 components/engine_rocks/Cargo.toml
+1 −1 components/engine_traits/Cargo.toml
+0 −13 components/engine_traits/src/engine.rs
+5 −4 components/engine_traits/src/region_cache_engine.rs
+3 −4 components/engine_traits/src/snapshot.rs
+0 −6 components/engine_traits/src/write_batch.rs
+13 −22 components/hybrid_engine/Cargo.toml
+0 −15 components/hybrid_engine/src/cf_names.rs
+0 −21 components/hybrid_engine/src/cf_options.rs
+0 −22 components/hybrid_engine/src/checkpoint.rs
+0 −65 components/hybrid_engine/src/compact.rs
+0 −21 components/hybrid_engine/src/db_options.rs
+2 −2 components/hybrid_engine/src/db_vector.rs
+28 −184 components/hybrid_engine/src/engine.rs
+2 −2 components/hybrid_engine/src/engine_iterator.rs
+0 −23 components/hybrid_engine/src/flow_control_factors.rs
+0 −25 components/hybrid_engine/src/hybrid_metrics.rs
+0 −17 components/hybrid_engine/src/import.rs
+0 −19 components/hybrid_engine/src/iterable.rs
+5 −21 components/hybrid_engine/src/lib.rs
+4 −2 components/hybrid_engine/src/metrics.rs
+0 −222 components/hybrid_engine/src/misc.rs
+0 −23 components/hybrid_engine/src/mvcc_properties.rs
+21 −8 components/hybrid_engine/src/observer/load_eviction.rs
+2 −0 components/hybrid_engine/src/observer/mod.rs
+53 −4 components/hybrid_engine/src/observer/snapshot.rs
+278 −0 components/hybrid_engine/src/observer/test_write_batch.rs
+17 −13 components/hybrid_engine/src/observer/write_batch.rs
+0 −20 components/hybrid_engine/src/perf_context.rs
+0 −60 components/hybrid_engine/src/range_properties.rs
+0 −26 components/hybrid_engine/src/region_cache_engine.rs
+20 −10 components/hybrid_engine/src/snapshot.rs
+0 −53 components/hybrid_engine/src/sst.rs
+0 −21 components/hybrid_engine/src/table_properties.rs
+0 −21 components/hybrid_engine/src/ttl_properties.rs
+1 −1 components/hybrid_engine/src/util.rs
+0 −302 components/hybrid_engine/src/write_batch.rs
+0 −3 components/hybrid_engine/tests/failpoints/mod.rs
+0 −102 components/hybrid_engine/tests/failpoints/test_write_batch.rs
+27 −20 components/in_memory_engine/Cargo.toml
+149 −0 components/in_memory_engine/benches/load_region.rs
+236 −184 components/in_memory_engine/src/background.rs
+10 −10 components/in_memory_engine/src/cross_check.rs
+11 −5 components/in_memory_engine/src/engine.rs
+74 −0 components/in_memory_engine/src/metrics.rs
+2 −3 components/in_memory_engine/src/read.rs
+17 −17 components/in_memory_engine/src/region_manager.rs
+6 −6 components/in_memory_engine/src/region_stats.rs
+114 −29 components/in_memory_engine/src/write_batch.rs
+32 −29 components/in_memory_engine/tests/failpoints/test_memory_engine.rs
+1 −1 components/raft_log_engine/Cargo.toml
+27 −1 components/raftstore/src/coprocessor/dispatcher.rs
+6 −2 components/raftstore/src/coprocessor/mod.rs
+9 −15 components/raftstore/src/coprocessor/read_write/write_batch.rs
+11 −0 components/raftstore/src/store/fsm/apply.rs
+5 −0 components/raftstore/src/store/fsm/peer.rs
+39 −0 components/raftstore/src/store/worker/compact.rs
+18 −8 components/server/src/server.rs
+1 −0 components/server/src/server2.rs
+6 −47 components/test_raftstore/src/cluster.rs
+0 −1 components/test_raftstore/src/lib.rs
+5 −1 components/test_raftstore/src/node.rs
+0 −22 components/test_raftstore/src/region_cache_engine.rs
+7 −9 components/test_raftstore/src/server.rs
+6 −0 components/test_raftstore/src/util.rs
+3 −4 components/tikv_kv/src/lib.rs
+2 −2 components/tikv_kv/src/raftstore_impls.rs
+161 −17 metrics/grafana/tikv_details.dashboard.py
+1,927 −780 metrics/grafana/tikv_details.json
+1 −1 metrics/grafana/tikv_details.json.sha256
+1 −1 src/coprocessor/endpoint.rs
+1 −1 src/coprocessor/metrics.rs
+4 −4 src/coprocessor/tracker.rs
+7 −7 src/server/lock_manager/deadlock.rs
+89 −0 src/server/status_server/mod.rs
+1 −1 tests/failpoints/cases/mod.rs
+242 −97 tests/failpoints/cases/test_in_memory_engine.rs
+0 −2 tests/failpoints/cases/test_merge.rs
+0 −3 tests/integrations/raftstore/test_lease_read.rs
+1 −0 tests/integrations/server/status_server.rs

0 comments on commit ceaf98d

Please sign in to comment.