diff --git a/src/data/version/mozc_version_template.bzl b/src/data/version/mozc_version_template.bzl index cad03eb..ab14b69 100644 --- a/src/data/version/mozc_version_template.bzl +++ b/src/data/version/mozc_version_template.bzl @@ -1,6 +1,6 @@ MAJOR=2 MINOR=18 -BUILD=2564 +BUILD=2565 REVISION=102 # CAUTION: NACL_DICTIONARY_VERSION is going to be migrated to ENGINE_VERSION. # NACL_DICTIONARY_VERSION is the target version of the system dictionary to be diff --git a/src/engine/engine.cc b/src/engine/engine.cc index 7b2087c..b5f7986 100644 --- a/src/engine/engine.cc +++ b/src/engine/engine.cc @@ -86,7 +86,7 @@ bool ClearUnusedUserPrediction() override; bool ClearUserPredictionEntry( const string &key, const string &value) override; - bool WaitForSyncerForTest() override; + bool Wait() override; private: PredictorInterface *predictor_; @@ -129,8 +129,8 @@ return predictor_->ClearHistoryEntry(key, value); } -bool UserDataManagerImpl::WaitForSyncerForTest() { - return predictor_->WaitForSyncerForTest(); +bool UserDataManagerImpl::Wait() { + return predictor_->Wait(); } } // namespace diff --git a/src/engine/user_data_manager_interface.h b/src/engine/user_data_manager_interface.h index 7db5b6e..f3148d5 100644 --- a/src/engine/user_data_manager_interface.h +++ b/src/engine/user_data_manager_interface.h @@ -40,7 +40,7 @@ class UserDataManagerInterface { public: - virtual ~UserDataManagerInterface() {} + virtual ~UserDataManagerInterface() = default; // Syncs mutable user data to local file system. virtual bool Sync() = 0; @@ -62,10 +62,7 @@ const string &key, const string &value) = 0; // Waits for syncer thread to complete. - virtual bool WaitForSyncerForTest() = 0; - - // TODO(noriyukit): Rename WaitForSyncerForTest() to Wait(). - bool Wait() { return WaitForSyncerForTest(); } + virtual bool Wait() = 0; }; } // namespace mozc diff --git a/src/engine/user_data_manager_mock.cc b/src/engine/user_data_manager_mock.cc index 7db2d48..315ee28 100644 --- a/src/engine/user_data_manager_mock.cc +++ b/src/engine/user_data_manager_mock.cc @@ -68,8 +68,8 @@ return true; } -bool UserDataManagerMock::WaitForSyncerForTest() { - function_counters_["WaitForSyncer"]++; +bool UserDataManagerMock::Wait() { + function_counters_["Wait"]++; return true; } diff --git a/src/engine/user_data_manager_mock.h b/src/engine/user_data_manager_mock.h index 35438a8..c3689ba 100644 --- a/src/engine/user_data_manager_mock.h +++ b/src/engine/user_data_manager_mock.h @@ -44,15 +44,16 @@ class UserDataManagerMock : public UserDataManagerInterface { public: UserDataManagerMock(); - virtual ~UserDataManagerMock(); + ~UserDataManagerMock() override; - virtual bool Sync(); - virtual bool Reload(); - virtual bool ClearUserHistory(); - virtual bool ClearUserPrediction(); - virtual bool ClearUnusedUserPrediction(); - virtual bool ClearUserPredictionEntry(const string &key, const string &value); - virtual bool WaitForSyncerForTest(); + bool Sync() override; + bool Reload() override; + bool ClearUserHistory() override; + bool ClearUserPrediction() override; + bool ClearUnusedUserPrediction() override; + bool ClearUserPredictionEntry(const string &key, + const string &value) override; + bool Wait() override; int GetFunctionCallCount(const string &name); diff --git a/src/prediction/predictor.cc b/src/prediction/predictor.cc index ebc03b8..86cb460 100644 --- a/src/prediction/predictor.cc +++ b/src/prediction/predictor.cc @@ -118,8 +118,8 @@ return user_history_predictor_->ClearHistoryEntry(key, value); } -bool BasePredictor::WaitForSyncerForTest() { - return user_history_predictor_->WaitForSyncerForTest(); +bool BasePredictor::Wait() { + return user_history_predictor_->Wait(); } bool BasePredictor::Sync() { diff --git a/src/prediction/predictor.h b/src/prediction/predictor.h index 1194919..bba7885 100644 --- a/src/prediction/predictor.h +++ b/src/prediction/predictor.h @@ -45,37 +45,36 @@ // instance. BasePredictor(PredictorInterface *dictionary_predictor, PredictorInterface *user_history_predictor); - virtual ~BasePredictor(); - - // Overwrite predictor - virtual bool PredictForRequest(const ConversionRequest &request, - Segments *segments) const = 0; + ~BasePredictor() override; // Hook(s) for all mutable operations. - virtual void Finish(const ConversionRequest &request, Segments *segments); + void Finish(const ConversionRequest &request, Segments *segments) override; // Reverts the last Finish operation. - virtual void Revert(Segments *segments); + void Revert(Segments *segments) override; // Clears all history data of UserHistoryPredictor. - virtual bool ClearAllHistory(); + bool ClearAllHistory() override; // Clears unused history data of UserHistoryPredictor. - virtual bool ClearUnusedHistory(); + bool ClearUnusedHistory() override; // Clears a specific user history data of UserHistoryPredictor. - virtual bool ClearHistoryEntry(const string &key, const string &value); + bool ClearHistoryEntry(const string &key, const string &value) override; // Syncs user history. - virtual bool Sync(); + bool Sync() override; // Reloads usre history. - virtual bool Reload(); + bool Reload() override; // Waits for syncer to complete. - virtual bool WaitForSyncerForTest(); + bool Wait() override; - virtual const string &GetPredictorName() const = 0; + // The following interfaces are implemented in derived classes. + // const string &GetPredictorName() const = 0; + // bool PredictForRequest(const ConversionRequest &request, + // Segments *segments) const = 0; protected: std::unique_ptr dictionary_predictor_; @@ -91,12 +90,12 @@ DefaultPredictor(PredictorInterface *dictionary_predictor, PredictorInterface *user_history_predictor); - virtual ~DefaultPredictor(); + ~DefaultPredictor() override; - virtual bool PredictForRequest(const ConversionRequest &request, - Segments *segments) const; + bool PredictForRequest(const ConversionRequest &request, + Segments *segments) const override; - virtual const string &GetPredictorName() const { return predictor_name_; } + const string &GetPredictorName() const override { return predictor_name_; } private: const ConversionRequest empty_request_; @@ -111,12 +110,12 @@ MobilePredictor(PredictorInterface *dictionary_predictor, PredictorInterface *user_history_predictor); - virtual ~MobilePredictor(); + ~MobilePredictor() override; - virtual bool PredictForRequest(const ConversionRequest &request, - Segments *segments) const; + bool PredictForRequest(const ConversionRequest &request, + Segments *segments) const override; - virtual const string &GetPredictorName() const { return predictor_name_; } + const string &GetPredictorName() const override { return predictor_name_; } private: const ConversionRequest empty_request_; diff --git a/src/prediction/predictor_interface.h b/src/prediction/predictor_interface.h index bcf6da7..09682f0 100644 --- a/src/prediction/predictor_interface.h +++ b/src/prediction/predictor_interface.h @@ -39,7 +39,7 @@ class PredictorInterface { public: - virtual ~PredictorInterface() {} + virtual ~PredictorInterface() = default; // Returns suggestions. // You may need to change the behavior according to the @@ -73,13 +73,13 @@ virtual bool Reload() { return true; } // Waits for syncer thread to complete. - virtual bool WaitForSyncerForTest() { return true; } + virtual bool Wait() { return true; } virtual const string &GetPredictorName() const = 0; protected: // Disable the construction. - PredictorInterface() {} + PredictorInterface() = default; }; } // namespace mozc diff --git a/src/prediction/user_history_predictor.cc b/src/prediction/user_history_predictor.cc index 1113092..63ab9ac 100644 --- a/src/prediction/user_history_predictor.cc +++ b/src/prediction/user_history_predictor.cc @@ -435,7 +435,7 @@ } } -bool UserHistoryPredictor::WaitForSyncerForTest() { +bool UserHistoryPredictor::Wait() { WaitForSyncer(); return true; } diff --git a/src/prediction/user_history_predictor.h b/src/prediction/user_history_predictor.h index a012ac3..7ddba3b 100644 --- a/src/prediction/user_history_predictor.h +++ b/src/prediction/user_history_predictor.h @@ -88,46 +88,46 @@ const dictionary::POSMatcher *pos_matcher, const dictionary::SuppressionDictionary *suppression_dictionary, bool enable_content_word_learning); - virtual ~UserHistoryPredictor(); + ~UserHistoryPredictor() override; void set_content_word_learning_enabled(bool value) { content_word_learning_enabled_ = value; } - virtual bool Predict(Segments *segments) const; - virtual bool PredictForRequest(const ConversionRequest &request, - Segments *segments) const; + bool Predict(Segments *segments) const; + bool PredictForRequest(const ConversionRequest &request, + Segments *segments) const override; // Hook(s) for all mutable operations. - virtual void Finish(const ConversionRequest &request, Segments *segments); + void Finish(const ConversionRequest &request, Segments *segments) override; // Revert last Finish operation. - virtual void Revert(Segments *segments); + void Revert(Segments *segments) override; // Sync user history data to local file. // You can call either Save() or AsyncSave(). - virtual bool Sync(); + bool Sync() override; // Reloads from local disk. // Do not call Sync() before Reload(). - virtual bool Reload(); + bool Reload() override; // Clears LRU data. - virtual bool ClearAllHistory(); + bool ClearAllHistory() override; // Clears unused data. - virtual bool ClearUnusedHistory(); + bool ClearUnusedHistory() override; // Clears a specific history entry. - virtual bool ClearHistoryEntry(const string &key, const string &value); + bool ClearHistoryEntry(const string &key, const string &value) override; // Implements PredictorInterface. - virtual bool WaitForSyncerForTest(); + bool Wait() override; // Gets user history filename. static string GetUserHistoryFileName(); - virtual const string &GetPredictorName() const { return predictor_name_; } + const string &GetPredictorName() const override { return predictor_name_; } // From user_history_predictor.proto typedef user_history_predictor::UserHistory::Entry Entry; diff --git a/src/session/session_handler_scenario_test.cc b/src/session/session_handler_scenario_test.cc index d956ab5..f874f85 100644 --- a/src/session/session_handler_scenario_test.cc +++ b/src/session/session_handler_scenario_test.cc @@ -121,7 +121,7 @@ } void SyncDataToStorage() { - EXPECT_TRUE(engine_->GetUserDataManager()->WaitForSyncerForTest()); + EXPECT_TRUE(engine_->GetUserDataManager()->Wait()); } void ClearUserPrediction() {