[FEAT MERGE] GIS

src/sql/engine/basic/ob_chunk_datum_store.cpp

@@ -2543,7 +2543,7 @@ int ObChunkDatumStore::write_file(void *buf, int64_t size)
         LOG_INFO("open file success", K_(io_.fd), K_(io_.dir_id));
       }
     }
-    ret = E(EventTable::EN_8) ret;
+    ret = OB_E(EventTable::EN_8) ret;
   }
   if (OB_SUCC(ret) && size > 0) {
     set_io(size, static_cast<char *>(buf));

src/sql/engine/basic/ob_chunk_row_store.cpp

@@ -1622,7 +1622,7 @@ int ObChunkRowStore::write_file(void *buf, int64_t size)
         LOG_TRACE("open file success", K_(io_.fd), K_(io_.dir_id));
       }
     }
-    ret = E(EventTable::EN_8) ret;
+    ret = OB_E(EventTable::EN_8) ret;
   }
   if (OB_SUCC(ret) && size > 0) {
     set_io(size, static_cast<char *>(buf));

src/sql/engine/basic/ob_expr_values_op.cpp

@@ -476,6 +476,10 @@ OB_INLINE int ObExprValuesOp::calc_next_row()
                                             cm_, datum))) {
             LOG_WARN("fail to dynamic cast", K(dst_expr->datum_meta_),
                                              K(real_src_expr), K(cm_), K(ret));
+            if (dst_expr->obj_meta_.is_geometry()) {
+              ret = OB_ERR_CANT_CREATE_GEOMETRY_OBJECT;
+              LOG_USER_WARN(OB_ERR_CANT_CREATE_GEOMETRY_OBJECT);
+            }
           }
         }
 

src/sql/engine/basic/ob_ra_datum_store.cpp

@@ -1122,7 +1122,7 @@ int ObRADatumStore::write_file(BlockIndex &bi, void *buf, int64_t size)
         LOG_INFO("open file success", K_(fd), K_(dir_id));
       }
     }
-    ret = E(EventTable::EN_8) ret;
+    ret = OB_E(EventTable::EN_8) ret;
   }
   if (OB_SUCC(ret) && size > 0) {
     if (NULL != mem_stat_) {

src/sql/engine/basic/ob_ra_row_store.cpp

@@ -950,7 +950,7 @@ int ObRARowStore::write_file(BlockIndex &bi, void *buf, int64_t size)
         LOG_INFO("open file success", K_(fd), K_(dir_id));
       }
     }
-    ret = E(EventTable::EN_8) ret;
+    ret = OB_E(EventTable::EN_8) ret;
   }
   if (OB_SUCC(ret) && size > 0) {
     blocksstable::ObTmpFileIOInfo io;