Remove some unused code

neo4j · Sep 25, 2024 · ddfb0ba · ddfb0ba
1 parent cacf359
commit ddfb0ba
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 186 deletions.
diff --git a/core/src/main/java/org/neo4j/gds/api/ValueTypes.java b/core/src/main/java/org/neo4j/gds/api/ValueTypes.java
diff --git a/core/src/main/java/org/neo4j/gds/core/loading/RelationshipImportResult.java b/core/src/main/java/org/neo4j/gds/core/loading/RelationshipImportResult.java
@@ -30,12 +30,10 @@
 import org.neo4j.gds.api.PropertyState;
 import org.neo4j.gds.api.RelationshipProperty;
 import org.neo4j.gds.api.RelationshipPropertyStore;
-import org.neo4j.gds.api.ValueTypes;
 import org.neo4j.gds.api.nodeproperties.ValueType;
 import org.neo4j.gds.api.schema.Direction;
 import org.neo4j.gds.api.schema.MutableRelationshipSchema;
 import org.neo4j.gds.api.schema.MutableRelationshipSchemaEntry;
-import org.neo4j.values.storable.NumberType;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -157,7 +155,7 @@ private static RelationshipPropertyStore constructRelationshipPropertyStore(
                     ),
                     propertyMapping.defaultValue().isUserDefined()
                         ? propertyMapping.defaultValue()
-                        : ValueTypes.fromNumberType(NumberType.FLOATING_POINT).fallbackValue(),
+                        : ValueType.DOUBLE.fallbackValue(),
                     propertyMapping.aggregation()
                 )
             );

diff --git a/core/src/main/java/org/neo4j/gds/core/loading/ValueConverter.java b/core/src/main/java/org/neo4j/gds/core/loading/ValueConverter.java
diff --git a/...c/main/java/org/neo4j/gds/core/loading/nodeproperties/NodePropertiesFromStoreBuilder.java b/...c/main/java/org/neo4j/gds/core/loading/nodeproperties/NodePropertiesFromStoreBuilder.java
@@ -26,11 +26,15 @@
 import org.neo4j.gds.collections.hsa.HugeSparseCollections;
 import org.neo4j.gds.core.concurrency.Concurrency;
 import org.neo4j.gds.core.loading.HighLimitIdMap;
-import org.neo4j.gds.core.loading.ValueConverter;
 import org.neo4j.gds.mem.MemoryEstimation;
 import org.neo4j.gds.mem.MemoryEstimations;
 import org.neo4j.gds.values.GdsNoValue;
 import org.neo4j.gds.values.GdsValue;
+import org.neo4j.values.storable.DoubleArray;
+import org.neo4j.values.storable.FloatArray;
+import org.neo4j.values.storable.FloatingPointValue;
+import org.neo4j.values.storable.IntegralValue;
+import org.neo4j.values.storable.LongArray;
 import org.neo4j.values.storable.Value;
 import org.neo4j.values.storable.Values;
 
@@ -115,7 +119,7 @@ public NodePropertyValues build(IdMap idMap) {
     // This is synchronized as we want to prevent the creation of multiple InnerNodePropertiesBuilders of which only once survives.
     private synchronized void initializeWithType(Value value) {
         if (innerBuilder.get() == null) {
-            var valueType = ValueConverter.valueType(value);
+            var valueType = valueType(value);
             var newBuilder = newInnerBuilder(valueType);
             innerBuilder.compareAndSet(null, newBuilder);
         }
@@ -148,4 +152,23 @@ private InnerNodePropertiesBuilder newInnerBuilder(ValueType valueType) {
                 ));
         }
     }
+
+    private ValueType valueType(Value value) {
+        if (value instanceof IntegralValue) {
+            return ValueType.LONG;
+        } else if (value instanceof FloatingPointValue) {
+            return ValueType.DOUBLE;
+        } else if (value instanceof LongArray) {
+            return ValueType.LONG_ARRAY;
+        } else if (value instanceof DoubleArray) {
+            return ValueType.DOUBLE_ARRAY;
+        } else if (value instanceof FloatArray) {
+            return ValueType.FLOAT_ARRAY;
+        } else {
+            throw new UnsupportedOperationException(formatWithLocale(
+                "Loading of values of type %s is currently not supported",
+                value.getTypeName()
+            ));
+        }
+    }
 }