1, fixed unused introducer. 2, Unified schema version number to int64_t (vesoft-inc#325)

boshengchen · dangleptr · commit c42f5358abb4 · 2019-05-08T11:13:54.000+08:00
* 1, fixed unused introducer. 2, Unified schema version number to int64_t

* Using SchemaVer instead of int64_t

* Fixed folly::to(int64_t)

* Address comments
diff --git a/src/dataman/ResultSchemaProvider.h b/src/dataman/ResultSchemaProvider.h
@@ -34,7 +34,7 @@ class ResultSchemaProvider : public meta::SchemaProviderIf {
     explicit ResultSchemaProvider(cpp2::Schema);
     virtual ~ResultSchemaProvider() = default;
 
-    int32_t getVersion() const noexcept override {
+    SchemaVer getVersion() const noexcept override {
         return schemaVer_;
     }
 
@@ -51,14 +51,14 @@ class ResultSchemaProvider : public meta::SchemaProviderIf {
         const folly::StringPiece name) const override;
 
 protected:
-    int32_t schemaVer_{0};
+    SchemaVer schemaVer_{0};
 
     ColumnDefs columns_;
     // Map of Hash64(field_name) -> array index
     UnorderedMap<uint64_t, int64_t> nameIndex_;
 
     // Default constructor, only used by SchemaWriter
-    explicit ResultSchemaProvider(int32_t ver = 0) : schemaVer_(ver) {}
+    explicit ResultSchemaProvider(SchemaVer ver = 0) : schemaVer_(ver) {}
 };
 
 }  // namespace nebula
diff --git a/src/dataman/RowReader.cpp b/src/dataman/RowReader.cpp
@@ -164,7 +164,7 @@ std::unique_ptr<RowReader> RowReader::getEdgePropReader(
 std::unique_ptr<RowReader> RowReader::getRowReader(
         folly::StringPiece row,
         std::shared_ptr<const meta::SchemaProviderIf> schema) {
-    int32_t ver = getSchemaVer(row);
+    SchemaVer ver = getSchemaVer(row);
     CHECK_EQ(ver, schema->getVersion());
     return std::unique_ptr<RowReader>(new RowReader(row, std::move(schema)));
 }
@@ -268,7 +268,7 @@ int32_t RowReader::numFields() const noexcept {
 }
 
 
-int32_t RowReader::schemaVer() const noexcept {
+SchemaVer RowReader::schemaVer() const noexcept {
     return schema_->getVersion();
 }
 
diff --git a/src/dataman/RowReader.h b/src/dataman/RowReader.h
@@ -89,7 +89,7 @@ class RowReader {
 
     virtual ~RowReader() = default;
 
-    int32_t schemaVer() const noexcept;
+    SchemaVer schemaVer() const noexcept;
     int32_t numFields() const noexcept;
 
     Iterator begin() const noexcept;
diff --git a/src/dataman/RowWriter.cpp b/src/dataman/RowWriter.cpp
@@ -24,8 +24,8 @@ RowWriter::RowWriter(std::shared_ptr<const SchemaProviderIf> schema)
 
 
 int64_t RowWriter::size() const noexcept {
-    int32_t offsetBytes = calcOccupiedBytes(cord_.size());
-    int32_t verBytes = 0;
+    auto offsetBytes = calcOccupiedBytes(cord_.size());
+    SchemaVer verBytes = 0;
     if (schema_->getVersion() > 0) {
         verBytes = calcOccupiedBytes(schema_->getVersion());
     }
@@ -52,12 +52,12 @@ void RowWriter::encodeTo(std::string& encoded) noexcept {
     }
 
     // Header information
-    int32_t offsetBytes = calcOccupiedBytes(cord_.size());
+    auto offsetBytes = calcOccupiedBytes(cord_.size());
     char header = offsetBytes - 1;
 
-    int32_t ver = schema_->getVersion();
+    SchemaVer ver = schema_->getVersion();
     if (ver > 0) {
-        int32_t verBytes = calcOccupiedBytes(ver);
+        auto verBytes = calcOccupiedBytes(ver);
         header |= verBytes << 5;
         encoded.append(&header, 1);
         // Schema version is stored in Little Endian
@@ -84,8 +84,8 @@ Schema RowWriter::moveSchema() {
 }
 
 
-int32_t RowWriter::calcOccupiedBytes(uint64_t v) const noexcept {
-    int32_t bytes = 0;
+int64_t RowWriter::calcOccupiedBytes(uint64_t v) const noexcept {
+    int64_t bytes = 0;
     do {
         bytes++;
         v >>= 8;
diff --git a/src/dataman/RowWriter.h b/src/dataman/RowWriter.h
@@ -121,7 +121,7 @@ class RowWriter {
     writeInt(T v);
 
     // Calculate the number of bytes occupied (ignore the leading 0s)
-    int32_t calcOccupiedBytes(uint64_t v) const noexcept;
+    int64_t calcOccupiedBytes(uint64_t v) const noexcept;
 };
 
 }  // namespace nebula
diff --git a/src/dataman/SchemaWriter.h b/src/dataman/SchemaWriter.h
@@ -14,7 +14,7 @@ namespace nebula {
 
 class SchemaWriter : public ResultSchemaProvider {
 public:
-    explicit SchemaWriter(int32_t ver = 0) : ResultSchemaProvider(ver) {}
+    explicit SchemaWriter(SchemaVer ver = 0) : ResultSchemaProvider(ver) {}
 
     // Move the schema out of the writer
     cpp2::Schema moveSchema() noexcept;
diff --git a/src/interface/meta.thrift b/src/interface/meta.thrift
@@ -147,7 +147,7 @@ struct ListTagsResp {
 struct ReadTagReq {
     1: common.GraphSpaceID space_id,
     2: common.TagID        tag_id,
-    3: i64                 version,
+    3: common.SchemaVer    version,
 }
 
 struct GetTagResp {
@@ -181,7 +181,7 @@ struct ListEdgesResp {
 struct GetEdgeReq {
     1: common.GraphSpaceID space_id,
     2: common.EdgeType     edge_type,
-    3: i64                 version,
+    3: common.SchemaVer    version,
 }
 
 struct GetEdgeResp {
diff --git a/src/meta/FileBasedSchemaManager.cpp b/src/meta/FileBasedSchemaManager.cpp
@@ -86,7 +86,7 @@ std::shared_ptr<const SchemaProviderIf> FileBasedSchemaManager::readSchema(
 
         if (fname == "__version") {
             try {
-                schema->ver_ = folly::to<int32_t>(type);
+                schema->ver_ = folly::to<SchemaVer>(type);
                 if (schema->ver_ < 0) {
                     LOG(ERROR) << "Invalid schema version: " << schema->ver_;
                     return std::shared_ptr<SchemaProviderIf>();
diff --git a/src/meta/NebulaSchemaProvider.cpp b/src/meta/NebulaSchemaProvider.cpp
@@ -10,7 +10,7 @@
 namespace nebula {
 namespace meta {
 
-int32_t NebulaSchemaProvider::getVersion() const noexcept {
+SchemaVer NebulaSchemaProvider::getVersion() const noexcept {
     return ver_;
 }
 
diff --git a/src/meta/NebulaSchemaProvider.h b/src/meta/NebulaSchemaProvider.h
@@ -40,7 +40,7 @@ class NebulaSchemaProvider : public SchemaProviderIf {
     };
 
 public:
-    int32_t getVersion() const noexcept override;
+    SchemaVer getVersion() const noexcept override;
     size_t getNumFields() const noexcept override;
 
     int64_t getFieldIndex(const folly::StringPiece name) const override;
@@ -57,7 +57,7 @@ class NebulaSchemaProvider : public SchemaProviderIf {
     NebulaSchemaProvider() = default;
 
 protected:
-    int32_t ver_{-1};
+    SchemaVer ver_{-1};
 
     // fieldname -> index
     std::unordered_map<std::string, int64_t> fieldNameIndex_;
diff --git a/src/meta/SchemaProviderIf.h b/src/meta/SchemaProviderIf.h
@@ -87,7 +87,7 @@ class SchemaProviderIf {
 public:
     virtual ~SchemaProviderIf() = default;
 
-    virtual int32_t getVersion() const noexcept = 0;
+    virtual SchemaVer getVersion() const noexcept = 0;
     virtual size_t getNumFields() const noexcept = 0;
 
     virtual int64_t getFieldIndex(const folly::StringPiece name) const = 0;
diff --git a/src/meta/client/MetaClient.cpp b/src/meta/client/MetaClient.cpp
@@ -655,7 +655,7 @@ MetaClient::listTagSchemas(GraphSpaceID spaceId) {
     req.set_space_id(std::move(spaceId));
     return getResponse(std::move(req), [] (auto client, auto request) {
         return client->future_listTags(request);
-    }, [this] (cpp2::ListTagsResp&& resp) -> decltype(auto){
+    }, [] (cpp2::ListTagsResp&& resp) -> decltype(auto){
         return std::move(resp).get_tags();
     });
 }
@@ -679,7 +679,7 @@ MetaClient::listEdgeSchemas(GraphSpaceID spaceId) {
     req.set_space_id(std::move(spaceId));
     return getResponse(std::move(req), [] (auto client, auto request) {
         return client->future_listEdges(request);
-    }, [this] (cpp2::ListEdgesResp&& resp) -> decltype(auto) {
+    }, [] (cpp2::ListEdgesResp&& resp) -> decltype(auto) {
         return std::move(resp).get_edges();
     });
 }
diff --git a/src/meta/test/TestUtils.h b/src/meta/test/TestUtils.h
@@ -99,9 +99,9 @@ class TestUtils {
         return ret;
     }
 
-    static void mockTag(kvstore::KVStore* kv, int32_t tagNum, int64_t version = 0) {
+    static void mockTag(kvstore::KVStore* kv, int32_t tagNum, SchemaVer version = 0) {
         std::vector<nebula::kvstore::KV> tags;
-        int64_t ver = version;
+        SchemaVer ver = version;
         for (auto t = 0; t < tagNum; t++) {
             TagID tagId = t;
             nebula::cpp2::Schema srcsch;

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ std::unique_ptr<RowReader> RowReader::getEdgePropReader(`
`164`	`164`	`std::unique_ptr<RowReader> RowReader::getRowReader(`
`165`	`165`	`folly::StringPiece row,`
`166`	`166`	`std::shared_ptr<const meta::SchemaProviderIf> schema) {`
`167`		`- int32_t ver = getSchemaVer(row);`
	`167`	`+ SchemaVer ver = getSchemaVer(row);`
`168`	`168`	`CHECK_EQ(ver, schema->getVersion());`
`169`	`169`	`return std::unique_ptr<RowReader>(new RowReader(row, std::move(schema)));`
`170`	`170`	`}`
`@@ -268,7 +268,7 @@ int32_t RowReader::numFields() const noexcept {`
`268`	`268`	`}`
`269`	`269`
`270`	`270`
`271`		`-int32_t RowReader::schemaVer() const noexcept {`
	`271`	`+SchemaVer RowReader::schemaVer() const noexcept {`
`272`	`272`	`return schema_->getVersion();`
`273`	`273`	`}`
`274`	`274`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`namespace nebula {`
`11`	`11`	`namespace meta {`
`12`	`12`
`13`		`-int32_t NebulaSchemaProvider::getVersion() const noexcept {`
	`13`	`+SchemaVer NebulaSchemaProvider::getVersion() const noexcept {`
`14`	`14`	`return ver_;`
`15`	`15`	`}`
`16`	`16`