Petr Onderka has submitted this change and it was merged.
Change subject: Removed ChangeVisitor: it is not used anywhere
......................................................................
Removed ChangeVisitor: it is not used anywhere
Change-Id: Ibeecdfe8f9f0768599c7df67367eebd7c82b1fd5
---
M Diff/ChangeProcessor.h
D Diff/ChangeVisitor.h
M Diff/Changes/Change.h
M Diff/Changes/DeleteRevisionChange.cpp
M Diff/Changes/DeleteRevisionChange.h
M Diff/Changes/FullDeletePageChange.cpp
M Diff/Changes/FullDeletePageChange.h
M Diff/Changes/NewModelFormatChange.cpp
M Diff/Changes/NewModelFormatChange.h
M Diff/Changes/NewPageChange.cpp
M Diff/Changes/NewPageChange.h
M Diff/Changes/NewRevisionChange.cpp
M Diff/Changes/NewRevisionChange.h
M Diff/Changes/PageChange.cpp
M Diff/Changes/PageChange.h
M Diff/Changes/PartialDeletePageChange.cpp
M Diff/Changes/PartialDeletePageChange.h
M Diff/Changes/RevisionChange.cpp
M Diff/Changes/RevisionChange.h
M Diff/Changes/SiteInfoChange.cpp
M Diff/Changes/SiteInfoChange.h
M Incremental dumps.vcxproj
22 files changed, 10 insertions(+), 103 deletions(-)
Approvals:
Petr Onderka: Verified; Looks good to me, approved
diff --git a/Diff/ChangeProcessor.h b/Diff/ChangeProcessor.h
index 8628efd..0d6104a 100644
--- a/Diff/ChangeProcessor.h
+++ b/Diff/ChangeProcessor.h
@@ -1,7 +1,16 @@
#pragma once
-#include "ChangeVisitor.h"
#include "Changes/Change.h"
+#include "Changes/SiteInfoChange.h"
+#include "Changes/NewPageChange.h"
+#include "Changes/PageChange.h"
+#include "Changes/NewModelFormatChange.h"
+#include "Changes/NewRevisionChange.h"
+#include "Changes/RevisionChange.h"
+#include "Changes/DeleteRevisionChange.h"
+#include "Changes/FullDeletePageChange.h"
+#include "Changes/PartialDeletePageChange.h"
+#include "Changes/DiffTextGroup.h"
#include "../DumpObjects/DumpPage.h"
class ChangeProcessor
diff --git a/Diff/ChangeVisitor.h b/Diff/ChangeVisitor.h
deleted file mode 100644
index 26ea54a..0000000
--- a/Diff/ChangeVisitor.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include "Changes/SiteInfoChange.h"
-#include "Changes/NewPageChange.h"
-#include "Changes/PageChange.h"
-#include "Changes/NewModelFormatChange.h"
-#include "Changes/NewRevisionChange.h"
-#include "Changes/RevisionChange.h"
-#include "Changes/DeleteRevisionChange.h"
-#include "Changes/FullDeletePageChange.h"
-#include "Changes/PartialDeletePageChange.h"
-
-class ChangeVisitor
-{
-public:
- virtual void Visit(SiteInfoChange &change) = 0;
- virtual void Visit(NewPageChange &change) = 0;
- virtual void Visit(PageChange &change) = 0;
- virtual void Visit(NewModelFormatChange &change) = 0;
- virtual void Visit(NewRevisionChange &change) = 0;
- virtual void Visit(RevisionChange &change) = 0;
- virtual void Visit(DeleteRevisionChange &change) = 0;
- virtual void Visit(FullDeletePageChange &change) = 0;
- virtual void Visit(PartialDeletePageChange &change) = 0;
-};
\ No newline at end of file
diff --git a/Diff/Changes/Change.h b/Diff/Changes/Change.h
index ef56629..f384efa 100644
--- a/Diff/Changes/Change.h
+++ b/Diff/Changes/Change.h
@@ -2,8 +2,6 @@
#include "../../DumpObjects/DumpObject.h"
-class ChangeVisitor;
-
enum class ChangeKind : std::uint8_t
{
SiteInfo = 0x01,
@@ -24,8 +22,6 @@
{
public:
void Write(std::ostream *stream);
-
- virtual void Accept(ChangeVisitor &visitor) = 0;
virtual ~Change() {}
};
\ No newline at end of file
diff --git a/Diff/Changes/DeleteRevisionChange.cpp
b/Diff/Changes/DeleteRevisionChange.cpp
index 27eeda1..69aaf68 100644
--- a/Diff/Changes/DeleteRevisionChange.cpp
+++ b/Diff/Changes/DeleteRevisionChange.cpp
@@ -1,5 +1,4 @@
#include "DeleteRevisionChange.h"
-#include "../ChangeVisitor.h"
DeleteRevisionChange DeleteRevisionChange::Read(std::istream &stream)
{
@@ -18,9 +17,4 @@
std::uint32_t DeleteRevisionChange::NewLength()
{
return ValueSize(ChangeKind::DeleteRevision) + ValueSize(revisionId);
-}
-
-void DeleteRevisionChange::Accept(ChangeVisitor &visitor)
-{
- visitor.Visit(*this);
}
\ No newline at end of file
diff --git a/Diff/Changes/DeleteRevisionChange.h
b/Diff/Changes/DeleteRevisionChange.h
index 2d871aa..075808a 100644
--- a/Diff/Changes/DeleteRevisionChange.h
+++ b/Diff/Changes/DeleteRevisionChange.h
@@ -14,6 +14,4 @@
static DeleteRevisionChange Read(std::istream &stream);
virtual void WriteInternal() override;
virtual std::uint32_t NewLength() override;
-
- virtual void Accept(ChangeVisitor &visitor) override;
};
\ No newline at end of file
diff --git a/Diff/Changes/FullDeletePageChange.cpp
b/Diff/Changes/FullDeletePageChange.cpp
index a23d918..f0bcb47 100644
--- a/Diff/Changes/FullDeletePageChange.cpp
+++ b/Diff/Changes/FullDeletePageChange.cpp
@@ -1,5 +1,4 @@
#include "FullDeletePageChange.h"
-#include "../ChangeVisitor.h"
FullDeletePageChange FullDeletePageChange::Read(std::istream &stream)
{
@@ -18,9 +17,4 @@
std::uint32_t FullDeletePageChange::NewLength()
{
return ValueSize(ChangeKind::DeletePageFull) + ValueSize(pageId);
-}
-
-void FullDeletePageChange::Accept(ChangeVisitor &visitor)
-{
- visitor.Visit(*this);
}
\ No newline at end of file
diff --git a/Diff/Changes/FullDeletePageChange.h
b/Diff/Changes/FullDeletePageChange.h
index 79761fc..1c69653 100644
--- a/Diff/Changes/FullDeletePageChange.h
+++ b/Diff/Changes/FullDeletePageChange.h
@@ -14,6 +14,4 @@
static FullDeletePageChange Read(std::istream &stream);
virtual void WriteInternal() override;
virtual std::uint32_t NewLength() override;
-
- virtual void Accept(ChangeVisitor &visitor) override;
};
\ No newline at end of file
diff --git a/Diff/Changes/NewModelFormatChange.cpp
b/Diff/Changes/NewModelFormatChange.cpp
index b9d7f41..9cd0609 100644
--- a/Diff/Changes/NewModelFormatChange.cpp
+++ b/Diff/Changes/NewModelFormatChange.cpp
@@ -1,5 +1,4 @@
#include "NewModelFormatChange.h"
-#include "../ChangeVisitor.h"
NewModelFormatChange NewModelFormatChange::Read(std::istream &stream)
{
@@ -25,9 +24,4 @@
{
return ValueSize(ChangeKind::NewModelFormat) + ValueSize(id)
+ ValueSize(model) + ValueSize(format);
-}
-
-void NewModelFormatChange::Accept(ChangeVisitor &visitor)
-{
- visitor.Visit(*this);
}
\ No newline at end of file
diff --git a/Diff/Changes/NewModelFormatChange.h
b/Diff/Changes/NewModelFormatChange.h
index 6ec8759..a3fd9b5 100644
--- a/Diff/Changes/NewModelFormatChange.h
+++ b/Diff/Changes/NewModelFormatChange.h
@@ -16,6 +16,4 @@
static NewModelFormatChange Read(std::istream &stream);
virtual void WriteInternal() override;
virtual std::uint32_t NewLength() override;
-
- virtual void Accept(ChangeVisitor &visitor) override;
};
\ No newline at end of file
diff --git a/Diff/Changes/NewPageChange.cpp b/Diff/Changes/NewPageChange.cpp
index 512c141..6980d48 100644
--- a/Diff/Changes/NewPageChange.cpp
+++ b/Diff/Changes/NewPageChange.cpp
@@ -1,5 +1,4 @@
#include "NewPageChange.h"
-#include "../ChangeVisitor.h"
#include "../../DumpObjects/DumpPage.h"
NewPageChange NewPageChange::Read(std::istream &stream)
@@ -16,9 +15,4 @@
std::uint32_t NewPageChange::NewLength()
{
return ValueSize(ChangeKind::NewPage) + DumpPage::LengthCore(page, false);
-}
-
-void NewPageChange::Accept(ChangeVisitor &visitor)
-{
- visitor.Visit(*this);
}
\ No newline at end of file
diff --git a/Diff/Changes/NewPageChange.h b/Diff/Changes/NewPageChange.h
index 8b1e063..99787da 100644
--- a/Diff/Changes/NewPageChange.h
+++ b/Diff/Changes/NewPageChange.h
@@ -15,6 +15,4 @@
static NewPageChange Read(std::istream &stream);
virtual void WriteInternal() override;
virtual std::uint32_t NewLength() override;
-
- virtual void Accept(ChangeVisitor &visitor) override;
};
\ No newline at end of file
diff --git a/Diff/Changes/NewRevisionChange.cpp
b/Diff/Changes/NewRevisionChange.cpp
index 1305576..ccc9758 100644
--- a/Diff/Changes/NewRevisionChange.cpp
+++ b/Diff/Changes/NewRevisionChange.cpp
@@ -1,5 +1,4 @@
#include "NewRevisionChange.h"
-#include "../ChangeVisitor.h"
#include "../../DumpObjects/DumpRevision.h"
#include "../../SevenZip.h"
@@ -55,9 +54,4 @@
}
return result;
-}
-
-void NewRevisionChange::Accept(ChangeVisitor &visitor)
-{
- visitor.Visit(*this);
}
\ No newline at end of file
diff --git a/Diff/Changes/NewRevisionChange.h b/Diff/Changes/NewRevisionChange.h
index 7b50d9c..732d8f8 100644
--- a/Diff/Changes/NewRevisionChange.h
+++ b/Diff/Changes/NewRevisionChange.h
@@ -23,6 +23,4 @@
static NewRevisionChange Read(std::istream &stream, bool withText);
virtual void WriteInternal() override;
virtual std::uint32_t NewLength() override;
-
- virtual void Accept(ChangeVisitor &visitor) override;
};
\ No newline at end of file
diff --git a/Diff/Changes/PageChange.cpp b/Diff/Changes/PageChange.cpp
index d4ee622..0c8400f 100644
--- a/Diff/Changes/PageChange.cpp
+++ b/Diff/Changes/PageChange.cpp
@@ -1,5 +1,4 @@
#include "PageChange.h"
-#include "../ChangeVisitor.h"
PageChangeFlags operator |(PageChangeFlags first, PageChangeFlags second)
{
@@ -99,9 +98,4 @@
result += ValueSize(pageChanges.RedirectTarget);
return result;
-}
-
-void PageChange::Accept(ChangeVisitor &visitor)
-{
- visitor.Visit(*this);
}
\ No newline at end of file
diff --git a/Diff/Changes/PageChange.h b/Diff/Changes/PageChange.h
index 3dcb2a1..9be3c5e 100644
--- a/Diff/Changes/PageChange.h
+++ b/Diff/Changes/PageChange.h
@@ -33,6 +33,4 @@
static PageChange Read(std::istream &stream);
virtual void WriteInternal() override;
virtual std::uint32_t NewLength() override;
-
- virtual void Accept(ChangeVisitor &visitor) override;
};
\ No newline at end of file
diff --git a/Diff/Changes/PartialDeletePageChange.cpp
b/Diff/Changes/PartialDeletePageChange.cpp
index d3e8247..6784068 100644
--- a/Diff/Changes/PartialDeletePageChange.cpp
+++ b/Diff/Changes/PartialDeletePageChange.cpp
@@ -1,5 +1,4 @@
#include "PartialDeletePageChange.h"
-#include "../ChangeVisitor.h"
PartialDeletePageChange PartialDeletePageChange::Read(std::istream &stream)
{
@@ -18,9 +17,4 @@
std::uint32_t PartialDeletePageChange::NewLength()
{
return ValueSize(ChangeKind::DeletePagePartial) + ValueSize(pageId);
-}
-
-void PartialDeletePageChange::Accept(ChangeVisitor &visitor)
-{
- visitor.Visit(*this);
}
\ No newline at end of file
diff --git a/Diff/Changes/PartialDeletePageChange.h
b/Diff/Changes/PartialDeletePageChange.h
index 65db24e..d088806 100644
--- a/Diff/Changes/PartialDeletePageChange.h
+++ b/Diff/Changes/PartialDeletePageChange.h
@@ -14,6 +14,4 @@
static PartialDeletePageChange Read(std::istream &stream);
virtual void WriteInternal() override;
virtual std::uint32_t NewLength() override;
-
- virtual void Accept(ChangeVisitor &visitor) override;
};
\ No newline at end of file
diff --git a/Diff/Changes/RevisionChange.cpp b/Diff/Changes/RevisionChange.cpp
index 0ec8a36..f72159a 100644
--- a/Diff/Changes/RevisionChange.cpp
+++ b/Diff/Changes/RevisionChange.cpp
@@ -1,5 +1,4 @@
#include "RevisionChange.h"
-#include "../ChangeVisitor.h"
#include "../../DumpObjects/DumpUser.h"
#include "../../SevenZip.h"
@@ -209,9 +208,4 @@
result += ValueSize(newRevisionModelFormatId);
return result;
-}
-
-void RevisionChange::Accept(ChangeVisitor &visitor)
-{
- visitor.Visit(*this);
}
\ No newline at end of file
diff --git a/Diff/Changes/RevisionChange.h b/Diff/Changes/RevisionChange.h
index 593b1d8..b989581 100644
--- a/Diff/Changes/RevisionChange.h
+++ b/Diff/Changes/RevisionChange.h
@@ -45,6 +45,4 @@
static RevisionChange Read(std::istream &stream, bool withText);
virtual void WriteInternal() override;
virtual std::uint32_t NewLength() override;
-
- virtual void Accept(ChangeVisitor &visitor) override;
};
\ No newline at end of file
diff --git a/Diff/Changes/SiteInfoChange.cpp b/Diff/Changes/SiteInfoChange.cpp
index 349c63b..4a807f3 100644
--- a/Diff/Changes/SiteInfoChange.cpp
+++ b/Diff/Changes/SiteInfoChange.cpp
@@ -1,5 +1,4 @@
#include "SiteInfoChange.h"
-#include "../ChangeVisitor.h"
#include "../../DumpObjects/DumpSiteInfo.h"
void SiteInfoChange::WriteInternal()
@@ -33,9 +32,4 @@
SiteInfo siteInfo = DumpSiteInfo::ReadCore(stream);
return SiteInfoChange(siteInfo, name, oldTimestamp, newTimestamp);
-}
-
-void SiteInfoChange::Accept(ChangeVisitor &visitor)
-{
- visitor.Visit(*this);
}
\ No newline at end of file
diff --git a/Diff/Changes/SiteInfoChange.h b/Diff/Changes/SiteInfoChange.h
index 63430e8..c338dc7 100644
--- a/Diff/Changes/SiteInfoChange.h
+++ b/Diff/Changes/SiteInfoChange.h
@@ -20,6 +20,4 @@
virtual std::uint32_t NewLength() override;
static SiteInfoChange Read(std::istream &stream);
-
- virtual void Accept(ChangeVisitor &visitor) override;
};
\ No newline at end of file
diff --git a/Incremental dumps.vcxproj b/Incremental dumps.vcxproj
index 44889bf..cce07ea 100644
--- a/Incremental dumps.vcxproj
+++ b/Incremental dumps.vcxproj
@@ -109,7 +109,6 @@
<ClInclude Include="Diff\Changes\DeleteRevisionChange.h" />
<ClInclude Include="Diff\Changes\FullDeletePageChange.h" />
<ClInclude Include="Diff\Changes\PartialDeletePageChange.h" />
- <ClInclude Include="Diff\ChangeVisitor.h" />
<ClInclude Include="Diff\DiffReader.h" />
<ClInclude Include="Diff\DiffWriter.h" />
<ClInclude Include="Diff\Changes\NewModelFormatChange.h" />
--
To view, visit https://gerrit.wikimedia.org/r/83993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibeecdfe8f9f0768599c7df67367eebd7c82b1fd5
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/incremental
Gerrit-Branch: gsoc
Gerrit-Owner: Petr Onderka <[email protected]>
Gerrit-Reviewer: Petr Onderka <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
