Merge branch 'master' into yield_fetch

vesoft-inc · Oct 22, 2021 · 3a8bffc · 3a8bffc
2 parents 71e0224 + cd2ecb9
commit 3a8bffc
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 1 deletion.
diff --git a/src/common/datatypes/Geography.cpp b/src/common/datatypes/Geography.cpp
@@ -19,6 +19,30 @@
 
 namespace nebula {
 
+std::ostream& operator<<(std::ostream& os, const GeoShape& shape) {
+  switch (shape) {
+    case GeoShape::POINT: {
+      os << "POINT";
+      break;
+    }
+    case GeoShape::LINESTRING: {
+      os << "LINESTRING";
+      break;
+    }
+    case GeoShape::POLYGON: {
+      os << "POLYGON";
+      break;
+    }
+    case GeoShape::UNKNOWN:
+    default: {
+      os << "__UNKNOWN__";
+      break;
+    }
+  }
+
+  return os;
+}
+
 constexpr double kMaxLongitude = 180.0;
 constexpr double kMaxLatitude = 90.0;
 

diff --git a/src/common/datatypes/Geography.h b/src/common/datatypes/Geography.h
@@ -32,6 +32,8 @@ enum class GeoShape : uint32_t {
   POLYGON = 3,
 };
 
+std::ostream& operator<<(std::ostream& os, const GeoShape& shape);
+
 // clang-format off
 /*
 static const std::unordered_map<GeoShape, S2Region> kShapeTypeToS2Region = {

diff --git a/src/meta/processors/schema/SchemaUtil.cpp b/src/meta/processors/schema/SchemaUtil.cpp
@@ -158,13 +158,23 @@ bool SchemaUtil::checkType(std::vector<cpp2::ColumnDef>& columns) {
             return false;
           }
           break;
-        case cpp2::PropertyType::GEOGRAPHY:
+        case cpp2::PropertyType::GEOGRAPHY: {
           if (!value.isGeography()) {  // TODO(jie)
             LOG(ERROR) << "Invalid default value for ` " << name << "', value type is "
                        << value.type();
             return false;
           }
+          meta::cpp2::GeoShape columnGeoShape =
+              column.get_type().geo_shape_ref().value_or(meta::cpp2::GeoShape::ANY);
+          GeoShape defaultExprGeoShape = value.getGeography().shape();
+          if (columnGeoShape != meta::cpp2::GeoShape::ANY &&
+              folly::to<uint32_t>(columnGeoShape) != folly::to<uint32_t>(defaultExprGeoShape)) {
+            LOG(ERROR) << "Invalid default value for ` " << name << "', value type is "
+                       << value.type() << ", geo shape is " << defaultExprGeoShape;
+            return false;
+          }
           break;
+        }
         default:
           LOG(ERROR) << "Unsupported type";
           return false;

diff --git a/tests/tck/features/geo/GeoBase.feature b/tests/tck/features/geo/GeoBase.feature
@@ -67,6 +67,48 @@ Feature: Geo base
     Then the result should be, in any order:
       | Tag          | Create Tag                                                                                  |
       | "only_point" | 'CREATE TAG `only_point` (\n `geo` geography(point) NULL\n) ttl_duration = 0, ttl_col = ""' |
+    # Test default property value
+    When executing query:
+      """
+      CREATE TAG test_1(geo geography DEFAULT ST_Point(3, 8));
+      """
+    Then the execution should be successful
+    When executing query:
+      """
+      CREATE EDGE test_2(geo geography DEFAULT ST_GeogFromText("LINESTRING(0 1, 2 3)"));
+      """
+    Then the execution should be successful
+    When executing query:
+      """
+      CREATE EDGE test_2(geo geography DEFAULT ST_GeogFromText("LINESTRING(0 1, 2xxxx"));
+      """
+    Then a ExecutionError should be raised at runtime: Invalid parm!
+    When executing query:
+      """
+      CREATE TAG test_3(geo geography(point) DEFAULT ST_GeogFromText("LineString(0 1, 2 3)"));
+      """
+    Then a ExecutionError should be raised at runtime: Invalid parm!
+    When executing query:
+      """
+      CREATE TAG test_3(geo geography(linestring) DEFAULT ST_GeogFromText("LineString(0 1, 2 3)"));
+      """
+    Then the execution should be successful
+    And wait 3 seconds
+    When executing query:
+      """
+      INSERT VERTEX test_1() VALUES "test_101":()
+      """
+    Then the execution should be successful
+    When executing query:
+      """
+      INSERT EDGE test_2() VALUES "test_101"->"test_102":()
+      """
+    Then the execution should be successful
+    When executing query:
+      """
+      INSERT VERTEX test_3() VALUES "test_103":()
+      """
+    Then the execution should be successful
 
   Scenario: test geo CURD
     # Any geo shape(point/linestring/polygon) is allowed to insert to the column geography