Get rid of StampFixed base class. It makes code more comples, instead of making it more simple

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit a3413df43744 · 2023-01-19T13:27:44.000+03:00
diff --git a/blobstamper/stamp.h b/blobstamper/stamp.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.
@@ -107,15 +107,6 @@ StampBaseV<T>::ExtractBin(Blob &blob)
   return v;
 }
 
-class StampFixed : public virtual StampBase
-{
-  protected:
-     int  size;
-  public:
-    virtual int  minSize() override {return size;}
-    virtual int  maxSize() override {return size;}
-};
-
 class StampVariated : public virtual StampBase
 {
   protected:
diff --git a/blobstamper/stamp_arithm.h b/blobstamper/stamp_arithm.h
@@ -23,10 +23,11 @@
 #include "helpers.h"
 #include "stamp.h"
 
-template<class T> class StampArithm: public StampFixed, public StampBaseStr, public StampBaseV<T>
+template<class T> class StampArithm: public StampBaseStr, public StampBaseV<T>
 {
   public:
-    StampArithm() { size = sizeof(T);};
+    virtual int  minSize() override {return sizeof(T);}
+    virtual int  maxSize() override {return sizeof(T);}
     virtual std::string ExtractStr(Blob &blob) override;
     virtual T ExtractValue(Blob &blob) override;
 };
diff --git a/blobstamper/stamp_dict.h b/blobstamper/stamp_dict.h
@@ -26,7 +26,7 @@
 #include "stamp_arithm.h"
 #include "dict.h"
 
-class StampDict: public StampFixed, public StampBaseStr
+class StampDict: public StampBaseStr
 {
   protected:
     StampArithm<unsigned char>  stamp8;
diff --git a/t/test-chars-stamps.h b/t/test-chars-stamps.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.
@@ -19,39 +19,35 @@
 /* This stamps chops first two bytes and treat them as string */
 /* Never do this in real live, as blob is binary and may have \0 in the middle of it*/
 
-class StampTwoChars: public StampFixed, public StampBaseStr
+class StampTwoChars: public StampBaseStr
 {
   public:
-    StampTwoChars();
     std::string ExtractStr(Blob &blob) override;
-};
+    virtual int  minSize() override {return 2;} /* This stamp shifts two characters only */
+    virtual int  maxSize() override {return 2;} /* This stamp shifts two characters only */
 
-StampTwoChars::StampTwoChars() : StampFixed()
-{
-    size = 2;  /* This stamp shifts two characters only */
-}
+};
 
 std::string
 StampTwoChars::ExtractStr(Blob &blob)
 {
-    char * buf;
-    size_t buf_size;
+    /* Chopping suitable data chunk from blob */
+    std::vector<char> data = blob.ChopBlank(*this);
 
-    Blob blob2 = blob.ShiftBytes(size);
-    if (blob2.isEmpty())
-        return "";
+    size_t buf_size = data.size() + 1;
+    char * buf = (char *) malloc(buf_size);
+    memcpy(buf, &data[0], data.size());
+    buf[buf_size-1] = '\0';
 
     /* Save shited data as string */
     /* NEVER do this in prod, as in real live blob is binary and may have 0 in the middle of it */
-    blob2.DataDup(buf, buf_size);
-    buf = (char *) realloc((void *)buf, buf_size + 1);
-    buf[buf_size] = '\0';
     std::string res = buf;
     free(buf);
 
     return res;
 }
 
+/*****************************************************************************/
 class StampSeveralChars: public StampVariated, public StampBaseStr
 {
   public:

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.`
`@@ -107,15 +107,6 @@ StampBaseV<T>::ExtractBin(Blob &blob)`
`107`	`107`	`return v;`
`108`	`108`	`}`
`109`	`109`
`110`		`-class StampFixed : public virtual StampBase`
`111`		`-{`
`112`		`- protected:`
`113`		`- int size;`
`114`		`- public:`
`115`		`- virtual int minSize() override {return size;}`
`116`		`- virtual int maxSize() override {return size;}`
`117`		`-};`
`118`		`-`
`119`	`110`	`class StampVariated : public virtual StampBase`
`120`	`111`	`{`
`121`	`112`	`protected:`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`#include "stamp_arithm.h"`
`27`	`27`	`#include "dict.h"`
`28`	`28`
`29`		`-class StampDict: public StampFixed, public StampBaseStr`
	`29`	`+class StampDict: public StampBaseStr`
`30`	`30`	`{`
`31`	`31`	`protected:`
`32`	`32`	`StampArithm<unsigned char> stamp8;`