Do not keep copy of the stamp as s_stamp, properly cast stamp instead when needed

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit d8f0863fe876 · 2023-01-24T22:24:41.000+03:00
diff --git a/blobstamper/galley.cpp b/blobstamper/galley.cpp
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright 2021 Nikolay Shaplov (Postgres Professional)
+ * Copyright 2021-2023 Nikolay Shaplov (Postgres Professional)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -56,7 +56,7 @@ GalleyVectorStr::ExtractStrVector(Blob &blob)
 
   for(int i = 0; i<blobs.size(); i++)
   {
-    res[i] = s_stamp.ExtractStr(blobs[i]);
+    res[i] = (dynamic_cast<StampBaseStr &>(stamp)).ExtractStr(blobs[i]);  // We know for sure that stamp is StampBaseStr
   }
   return res;
 }
diff --git a/blobstamper/galley.h b/blobstamper/galley.h
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright 2021 Nikolay Shaplov (Postgres Professional)
+ * Copyright 2021-2023 Nikolay Shaplov (Postgres Professional)
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,9 +54,8 @@ class GalleyVectorBase : public GalleyBase
 
 class GalleyVectorStr: public GalleyVectorBase
 {
-    StampBaseStr & s_stamp;
   public:
-    GalleyVectorStr(StampBaseStr & stamp_arg): GalleyVectorBase(stamp_arg), s_stamp(stamp_arg)  {};
+    GalleyVectorStr(StampBaseStr & stamp_arg): GalleyVectorBase(stamp_arg) {};
     std::vector<std::string> ExtractStrVector(Blob &blob);
 };
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`/******************************************************************************`
`2`	`2`	`*`
`3`		`- * Copyright 2021 Nikolay Shaplov (Postgres Professional)`
	`3`	`+ * Copyright 2021-2023 Nikolay Shaplov (Postgres Professional)`
`4`	`4`	`*`
`5`	`5`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`6`	`6`	`* you may not use this file except in compliance with the License.`
`@@ -56,7 +56,7 @@ GalleyVectorStr::ExtractStrVector(Blob &blob)`
`56`	`56`
`57`	`57`	`for(int i = 0; i<blobs.size(); i++)`
`58`	`58`	`{`
`59`		`- res[i] = s_stamp.ExtractStr(blobs[i]);`
	`59`	`+ res[i] = (dynamic_cast<StampBaseStr &>(stamp)).ExtractStr(blobs[i]); // We know for sure that stamp is StampBaseStr`
`60`	`60`	`}`
`61`	`61`	`return res;`
`62`	`62`	`}`