MOVED - Percona Playback

Merge lp:~stewart/percona-playback/sheduler-to-scheduler-fix into lp:~percona-dev/percona-playback/light

  1. sheduler-to-scheduler-fix
  2. Merge into light
Proposed by Stewart Smith
Status: Merged
Merged at revision: 119
Proposed branch: lp:~stewart/percona-playback/sheduler-to-scheduler-fix
Merge into: lp:~percona-dev/percona-playback/light
Prerequisite: lp:~stewart/percona-playback/add-license
Diff against target: 205 lines (+30/-30)
7 files modified
src/CMakeLists.txt (+1/-1)
src/ppb.cc (+4/-4)
src/ppb.h (+3/-3)
src/scheduler.cc (+7/-7)
src/scheduler.h (+5/-5)
src/slow_query_log_parser.h (+9/-9)
src/worker.cc (+1/-1)
To merge this branch: bzr merge lp:~stewart/percona-playback/sheduler-to-scheduler-fix
Reviewer Review Type Date Requested Status
Percona developers Pending
Review via email: mp+65622@code.launchpad.net

Description of the change

fix spelling error

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/CMakeLists.txt'
2--- src/CMakeLists.txt 2011-05-11 17:12:18 +0000
3+++ src/CMakeLists.txt 2011-06-23 06:42:34 +0000
4@@ -1,5 +1,5 @@
5 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
6-SET(COMMON_FILES common.h common.cc reader.h reader.cc unix_socket.h unix_socket.cc file.h file.cc introspection.h long_string.h long_string.cc mysql_client.h mysql_client.cc options.h options.cc query.h query.cc queue.h sheduler.h sheduler.cc supervisor.h supervisor.cc slow_query_log_parser.h slow_query_log_parser.cc worker.h worker.cc )
7+SET(COMMON_FILES common.h common.cc reader.h reader.cc unix_socket.h unix_socket.cc file.h file.cc introspection.h long_string.h long_string.cc mysql_client.h mysql_client.cc options.h options.cc query.h query.cc queue.h scheduler.h scheduler.cc supervisor.h supervisor.cc slow_query_log_parser.h slow_query_log_parser.cc worker.h worker.cc )
8 ADD_LIBRARY(common ${COMMON_FILES})
9 TARGET_LINK_LIBRARIES(common ${Boost_LIBRARIES} ${MYSQL_LIBRARY} pthread)
10
11
12=== modified file 'src/ppb.cc'
13--- src/ppb.cc 2011-06-23 06:42:34 +0000
14+++ src/ppb.cc 2011-06-23 06:42:34 +0000
15@@ -34,14 +34,14 @@
16 source= create_file_source(file.data());
17 else
18 source= create_file_source();
19- Sheduler_Pointer sheduler;
20+ Scheduler_Pointer scheduler;
21 std::size_t buffer_size= source->page_size() * source->page_count();
22 if (worker_count())
23- sheduler= create_split_by_transaction(buffer_size
24+ scheduler= create_split_by_transaction(buffer_size
25 , worker_count());
26 else
27- sheduler= create_split_by_connection(buffer_size);
28- Replay replay(source, sheduler);
29+ scheduler= create_split_by_connection(buffer_size);
30+ Replay replay(source, scheduler);
31 replay.start();
32 replay.join();
33 return 0;
34
35=== modified file 'src/ppb.h'
36--- src/ppb.h 2011-06-23 06:42:34 +0000
37+++ src/ppb.h 2011-06-23 06:42:34 +0000
38@@ -26,16 +26,16 @@
39 #include "query.h"
40 #include "file.h"
41 #include "slow_query_log_parser.h"
42-#include "sheduler.h"
43+#include "scheduler.h"
44 #include "worker.h"
45
46 class Replay : None_Copyable
47 {
48 public:
49 Replay(Reader_Source_Pointer const& a_reader_source_pointer
50- , Sheduler_Pointer const &a_sheduler) :
51+ , Scheduler_Pointer const &a_scheduler) :
52 m_reader(a_reader_source_pointer)
53- , m_processor(a_sheduler)
54+ , m_processor(a_scheduler)
55 , m_parser(m_reader.queue(), m_reader.page_size(), &m_processor)
56 {
57 set_troubles(this, &Replay::troubles);
58
59=== renamed file 'src/sheduler.cc' => 'src/scheduler.cc'
60--- src/sheduler.cc 2011-06-23 06:42:34 +0000
61+++ src/scheduler.cc 2011-06-23 06:42:34 +0000
62@@ -20,7 +20,7 @@
63 #include <map>
64 #include <queue>
65 #include <memory>
66-#include "sheduler.h"
67+#include "scheduler.h"
68 #include "worker.h"
69 #include "query.h"
70 #include "options.h"
71@@ -141,7 +141,7 @@
72 Split_By_Transaction *m_supervisor;
73 };
74
75-class Split_By_Connection : public Sheduler
76+class Split_By_Connection : public Scheduler
77 {
78 private:
79 typedef std::map<Thread_Id, Task*> Map;
80@@ -387,7 +387,7 @@
81 Map m_map;
82 };
83
84-class Split_By_Transaction : public Sheduler
85+class Split_By_Transaction : public Scheduler
86 {
87 public:
88 Split_By_Transaction(std::size_t a_buffer_size
89@@ -509,13 +509,13 @@
90 m_supervisor->complete(this);
91 }
92
93-Sheduler_Pointer create_split_by_connection (std::size_t a_buffer_size)
94+Scheduler_Pointer create_split_by_connection (std::size_t a_buffer_size)
95 {
96- return Sheduler_Pointer(new Split_By_Connection(a_buffer_size));
97+ return Scheduler_Pointer(new Split_By_Connection(a_buffer_size));
98 }
99-Sheduler_Pointer create_split_by_transaction(std::size_t a_buffer_size
100+Scheduler_Pointer create_split_by_transaction(std::size_t a_buffer_size
101 , std::size_t a_worker_count)
102 {
103- return Sheduler_Pointer(new Split_By_Transaction(a_buffer_size
104+ return Scheduler_Pointer(new Split_By_Transaction(a_buffer_size
105 , a_worker_count));
106 }
107
108=== renamed file 'src/sheduler.h' => 'src/scheduler.h'
109--- src/sheduler.h 2011-06-23 06:42:34 +0000
110+++ src/scheduler.h 2011-06-23 06:42:34 +0000
111@@ -25,16 +25,16 @@
112 #include "query.h"
113 #include "supervisor.h"
114
115-typedef boost::shared_ptr<class Sheduler> Sheduler_Pointer;
116-class Sheduler : public Supervisor
117+typedef boost::shared_ptr<class Scheduler> Scheduler_Pointer;
118+class Scheduler : public Supervisor
119 {
120 public:
121- virtual ~Sheduler() {}
122+ virtual ~Scheduler() {}
123 virtual bool run(Query const &)= 0;
124 };
125
126-Sheduler_Pointer create_split_by_connection (std::size_t a_buffer_size);
127-Sheduler_Pointer create_split_by_transaction(std::size_t a_buffer_size
128+Scheduler_Pointer create_split_by_connection (std::size_t a_buffer_size);
129+Scheduler_Pointer create_split_by_transaction(std::size_t a_buffer_size
130 , std::size_t a_worker_count);
131 //, std::size_t a_transaction_count);
132
133
134=== modified file 'src/slow_query_log_parser.h'
135--- src/slow_query_log_parser.h 2011-06-23 06:42:34 +0000
136+++ src/slow_query_log_parser.h 2011-06-23 06:42:34 +0000
137@@ -27,14 +27,14 @@
138 #include "options.h"
139 #include "queue.h"
140 #include "query.h"
141-#include "sheduler.h"
142+#include "scheduler.h"
143 #include "options.h"
144
145 class Slow_Query_Log_Processor
146 {
147 public:
148-Slow_Query_Log_Processor(Sheduler_Pointer const &a_sheduler) :
149- m_sheduler(a_sheduler)
150+Slow_Query_Log_Processor(Scheduler_Pointer const &a_scheduler) :
151+ m_scheduler(a_scheduler)
152 {
153 m_current_query.query_id= 0;
154 m_current_query.database= ::database();
155@@ -48,23 +48,23 @@
156 }
157 void start()
158 {
159- m_sheduler->start();
160+ m_scheduler->start();
161 }
162 bool run(Query const &query)
163 {
164- return m_sheduler->run(query);
165+ return m_scheduler->run(query);
166 }
167 void flush()
168 {
169- m_sheduler->flush();
170+ m_scheduler->flush();
171 }
172 void join()
173 {
174- m_sheduler->join();
175+ m_scheduler->join();
176 }
177 void stop()
178 {
179- m_sheduler->stop();
180+ m_scheduler->stop();
181 }
182 void database(Database const &a)
183 {
184@@ -99,7 +99,7 @@
185 m_current_query.thread_id= a;
186 }
187 private:
188- Sheduler_Pointer m_sheduler;
189+ Scheduler_Pointer m_scheduler;
190 Query m_current_query;
191 };
192
193
194=== modified file 'src/worker.cc'
195--- src/worker.cc 2011-06-23 06:42:34 +0000
196+++ src/worker.cc 2011-06-23 06:42:34 +0000
197@@ -24,7 +24,7 @@
198 #include "worker.h"
199 #include "mysql_client.h"
200 #include "options.h"
201-#include "sheduler.h"
202+#include "scheduler.h"
203 #include <errno.h>
204
205 void verbose(String &buffer, Query const &q, Query_Result &r)

Subscribers

People subscribed via source and target branches