allow null value in data loading (#2845)

alibaba · Jun 9, 2023 · 6851cd9 · 6851cd9
1 parent 1ba6102
commit 6851cd9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/charts/graphscope-store/templates/configmap.yaml b/charts/graphscope-store/templates/configmap.yaml
@@ -103,9 +103,9 @@ data:
     pegasus_hosts=""
     i=0
     while [ $i -ne $STORE_COUNT ]; do
-    pod=`echo $DNS_NAME_PREFIX_STORE | sed -e "s/{}/$i/g"`
-    # 60001 is fixed gaia engine port
-    pegasus_hosts="${pegasus_hosts},${pod}:60001"
+      pod=`echo $DNS_NAME_PREFIX_STORE | sed -e "s/{}/$i/g"`
+      # 60001 is fixed gaia engine port
+      pegasus_hosts="${pegasus_hosts},${pod}:60001"
       i=$(($i+1))
     done
     pegasus_hosts=${pegasus_hosts:1}
@@ -120,7 +120,7 @@ data:
               -e "s/STORE/${DNS_NAME_PREFIX_STORE}/g" \
               -e "s/PEGASUS_HOSTS/${pegasus_hosts}/g" \
               -e "s@LOG4RS_CONFIG@${GRAPHSCOPE_HOME}/groot/conf/log4rs.yml@g" \
-    /etc/groot/groot.config.tpl | sudo tee /etc/groot/groot.config
+    /etc/groot/groot.config.tpl | sudo tee -a /etc/groot/groot.config
 
     export LOG_NAME=graphscope-store
     export GROOT_CONF_FILE=/etc/groot/groot.config

diff --git a/...ol/src/main/java/com/alibaba/graphscope/groot/dataload/databuild/DataBuildMapperOdps.java b/...ol/src/main/java/com/alibaba/graphscope/groot/dataload/databuild/DataBuildMapperOdps.java
@@ -81,7 +81,8 @@ public void map(long recordNum, Record record, TaskContext context) throws IOExc
         String[] items = new String[columnCount];
         for (int i = 0; i < columnCount; i++) {
             if (record.get(i) == null) {
-                items[i] = "";
+                //                items[i] = "";
+                items[i] = null;
             } else {
                 items[i] = record.get(i).toString();
             }
@@ -164,10 +165,12 @@ private Map<Integer, PropertyValue> buildPropertiesMap(
                                         + Arrays.toString(items)
                                         + "]");
                     }
-                    DataType dataType = propertyDef.getDataType();
-
                     String val = items[colIdx];
-                    PropertyValue propertyValue = new PropertyValue(dataType, val);
+                    PropertyValue propertyValue = null;
+                    if (val != null) {
+                        DataType dataType = propertyDef.getDataType();
+                        propertyValue = new PropertyValue(dataType, val);
+                    }
                     operationProperties.put(propertyId, propertyValue);
                 });
         return operationProperties;

diff --git a/interactive_engine/pom.xml b/interactive_engine/pom.xml
@@ -99,7 +99,7 @@
     <junit.jupiter.version>5.6.3</junit.jupiter.version>
     <testng.version>6.9.9</testng.version>
     <mockito.version>4.0.0</mockito.version>
-    <rocksdb.version>5.15.10</rocksdb.version>
+    <rocksdb.version>8.0.0</rocksdb.version>
     <metrics.core.version>4.2.18</metrics.core.version>
     <jgrapht.version>1.5.1</jgrapht.version>
     <skip.tests>true</skip.tests>