Merge pull request #2210 from Kajal-NEC/cygnusIssue

Removes "_ " in schema name for DM -schema family
telefonicaid · Jan 11, 2023 · c7d6f13 · c7d6f13
2 parents 54084c4 + 2db6590
commit c7d6f13
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 8 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -3,3 +3,4 @@
 [cygnus-common] Upgrade postgresql from 42.4.1 to 42.4.3
 [cygnus-common] OracleSQL backend (#2195)
 [cygnus-ngsi] OracleSQL ngsi sink added (for OracleS 11g and 12c) (#2195)
+[cygnus-ngsi] Removes "_" in schema name for DM -schema family (#2201)
diff --git a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIPostgreSQLSink.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/sinks/NGSIPostgreSQLSink.java
@@ -547,7 +547,7 @@ public String buildSchemaName(String service, String subService) throws CygnusBa
                 case DMBYENTITYDATABASESCHEMA:
                 case DMBYENTITYTYPEDATABASESCHEMA:
                 case DMBYFIXEDENTITYTYPEDATABASESCHEMA:
-                    name = NGSIUtils.encode(subService, false, true);
+                    name = NGSIUtils.encode(subService, true, false);
                     break;
                 default:
                     name = NGSIUtils.encode(service, false, true);

diff --git a/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/utils/NGSIUtils.java b/cygnus-ngsi/src/main/java/com/telefonica/iot/cygnus/utils/NGSIUtils.java
@@ -60,7 +60,11 @@ private NGSIUtils() {
      */
     public static String encode(String in, boolean deleteSlash, boolean encodeSlash) {
         if (deleteSlash) {
-            return ENCODEPATTERN.matcher(in.substring(1)).replaceAll("_");
+            if (in.startsWith("/")) {
+                return ENCODEPATTERN.matcher(in.substring(1)).replaceAll("_");
+            } else {
+                return ENCODEPATTERN.matcher(in).replaceAll("_");
+            }
         } else if (encodeSlash) {
             return ENCODEPATTERN.matcher(in).replaceAll("_");
         } else {

diff --git a/doc/cygnus-ngsi/flume_extensions_catalogue/ngsi_postgresql_sink.md b/doc/cygnus-ngsi/flume_extensions_catalogue/ngsi_postgresql_sink.md
@@ -54,12 +54,12 @@ For a given entity, `entityname`, of type `entitytype`, inside a tenant `service
 | datamodel name                            | database name | schema  name | table name                        | note                                              |
 |-------------------------------------------|---------------|--------------|-----------------------------------|---------------------------------------------------|
 | by default                                | `agent.conf`  | service      | servicepath_entityname_entitytype | Automatic schema creation                         |
-| `dm-by-fixed-entity-type-database-schema` | service       | _servicepath | entitytype                        | Database and schema need to be created in advance |
+| `dm-by-fixed-entity-type-database-schema` | service       | servicepath | entitytype                        | Database and schema need to be created in advance |
 | `dm-by-fixed-entity-type-database`        | service       | service      | entitytype                        | Database and schema need to be created in advance |
 | `dm-by-fixed-entity-type`                 | `agent.conf`  | service      | entitytype                        | Automatic schema creation                         |
-| `dm-by-entity-database-schema`            | service       | _servicepath | servicepath_entityname_entitytype | Database and schema need to be created in advance |
+| `dm-by-entity-database-schema`            | service       | servicepath | servicepath_entityname_entitytype | Database and schema need to be created in advance |
 | `dm-by-entity-database`                   | service       | service      | servicepath_entityname_entitytype | Database and schema need to be created in advance |
-| `dm-by-entity-type-database-schema` | service | _servicepath | servicepath_entitytype | Database and schema need to be created in advance |
+| `dm-by-entity-type-database-schema` | service | servicepath | servicepath_entitytype | Database and schema need to be created in advance |
 | `dm-by-entity-type-database` | service | service | servicepath_entitytype | Database and schema need to be created in advance |
 | `dm-by-entity-type`                       | `agent.conf`  | service      | servicepath_entitytype            | Automatic schema creation                         |
 | `dm-by-service-path`                      | `agent.conf`  | service      | servicepath                       | Automatic schema creation                         |
@@ -68,9 +68,6 @@ For a given entity, `entityname`, of type `entitytype`, inside a tenant `service
 
 Where [`agent.conf`](https://github.com/telefonicaid/fiware-cygnus/blob/master/doc/cygnus-ngsi/installation_and_administration_guide/ngsi_agent_conf.md) is the default database name selected in that file under the field `cygnus-ngsi.sinks.postgresql-sink.postgresql_database` or the env var `CYGNUS_POSTGRESQL_DATABASE`
 
-**NOTE:** the leading underscore `_` in schema name column for `*-schema` cases is not a typo. However, this may change in the future,
-see issue [#2201](https://github.com/telefonicaid/fiware-cygnus/issues/2201).
-
 [Top](#top)
 
 #### <a name="section1.2.1"></a>PostgreSQL databases naming considerations