Introduces Value as the property write type

community/consistency-check/src/main/java/org/neo4j/consistency/checking/full/PropertyAndNodeIndexedCheck.java

@@ -45,6 +45,7 @@
 import org.neo4j.kernel.impl.store.record.PropertyRecord;
 import org.neo4j.kernel.impl.store.record.Record;
 import org.neo4j.storageengine.api.schema.IndexReader;
+import org.neo4j.values.Values;
 
 import static java.lang.String.format;
 
@@ -223,7 +224,7 @@ private IndexQuery[] seek( LabelSchemaDescriptor schema, Object[] propertyValues
         IndexQuery[] query = new IndexQuery[propertyValues.length];
         for ( int i = 0; i < query.length; i++ )
         {
-            query[i] = IndexQuery.exact( schema.getPropertyIds()[i], propertyValues[i] );
+            query[i] = IndexQuery.exact( schema.getPropertyIds()[i], Values.of( propertyValues[i] ) );
         }
         return query;
     }

community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v2_3/TransactionBoundQueryContext.scala

@@ -52,6 +52,7 @@ import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory
 import org.neo4j.kernel.api.schema.{IndexQuery, SchemaDescriptorFactory}
 import org.neo4j.kernel.api.{exceptions, _}
 import org.neo4j.kernel.impl.core.NodeManager
+import org.neo4j.values.Values
 
 import scala.collection.JavaConverters._
 import scala.collection.{Iterator, mutable}
@@ -130,7 +131,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper)
 
   def indexSeek(index: SchemaTypes.IndexDescriptor, value: Any) =
     JavaConversionSupport.mapToScalaENFXSafe(
-      tc.statement.readOperations().indexQuery(index, IndexQuery.exact(index.propertyId, value)))(nodeOps.getById)
+      tc.statement.readOperations().indexQuery(index, IndexQuery.exact(index.propertyId, Values.of(value))))(nodeOps.getById)
 
   def indexSeekByRange(index: SchemaTypes.IndexDescriptor, value: Any) = value match {
 
@@ -250,7 +251,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper)
     mapToScalaENFXSafe(tc.statement.readOperations().indexQuery(index, IndexQuery.exists(index.propertyId)))(nodeOps.getById)
 
   override def lockingExactUniqueIndexSearch(index: SchemaTypes.IndexDescriptor, value: Any): Option[Node] = {
-    val nodeId: Long = tc.statement.readOperations().nodeGetFromUniqueIndexSeek(index, IndexQuery.exact(index.propertyId, value))
+    val nodeId: Long = tc.statement.readOperations().nodeGetFromUniqueIndexSeek(index, IndexQuery.exact(index.propertyId, Values.of(value)))
     if (StatementConstants.NO_SUCH_NODE == nodeId) None else Some(nodeOps.getById(nodeId))
   }
 
@@ -325,7 +326,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper)
     }
 
     def setProperty(id: Long, propertyKeyId: Int, value: Any) = try {
-      tc.statement.dataWriteOperations().nodeSetProperty(id, properties.Property.property(propertyKeyId, value) )
+      tc.statement.dataWriteOperations().nodeSetProperty(id, propertyKeyId, Values.of(value))
     } catch {
       case _: org.neo4j.kernel.api.exceptions.EntityNotFoundException => //ignore
     }
@@ -395,7 +396,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper)
     }
 
     override def setProperty(id: Long, propertyKeyId: Int, value: Any) = try {
-      tc.statement.dataWriteOperations().relationshipSetProperty(id, properties.Property.property(propertyKeyId, value))
+      tc.statement.dataWriteOperations().relationshipSetProperty(id, propertyKeyId, Values.of(value))
     } catch {
       case _: exceptions.EntityNotFoundException => //ignore
     }

community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_1/TransactionBoundQueryContext.scala

@@ -58,6 +58,7 @@ import org.neo4j.kernel.api.schema.constaints.{ConstraintDescriptor, ConstraintD
 import org.neo4j.kernel.api.schema.index.IndexDescriptorFactory
 import org.neo4j.kernel.impl.core.NodeManager
 import org.neo4j.kernel.impl.locking.ResourceTypes
+import org.neo4j.values.Values
 
 import scala.collection.Iterator
 import scala.collection.JavaConverters._
@@ -140,7 +141,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper)
 
   override def indexSeek(index: IndexDescriptor, value: Any) = {
     indexSearchMonitor.indexSeek(index, value)
-    JavaConversionSupport.mapToScalaENFXSafe(txContext.statement.readOperations().indexQuery(index, IndexQuery.exact(index.propertyId, value)))(nodeOps.getById)
+    JavaConversionSupport.mapToScalaENFXSafe(txContext.statement.readOperations().indexQuery(index, IndexQuery.exact(index.propertyId, Values.of(value))))(nodeOps.getById)
   }
 
   override def indexSeekByRange(index: IndexDescriptor, value: Any) = value match {
@@ -328,7 +329,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper)
 
     override def setProperty(id: Long, propertyKeyId: Int, value: Any) {
       try {
-        txContext.statement.dataWriteOperations().nodeSetProperty(id, properties.Property.property(propertyKeyId, value) )
+        txContext.statement.dataWriteOperations().nodeSetProperty(id, propertyKeyId, Values.of(value) )
       } catch {
         case _: exceptions.EntityNotFoundException => //ignore
       }
@@ -403,7 +404,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper)
 
     override def setProperty(id: Long, propertyKeyId: Int, value: Any) {
       try {
-        txContext.statement.dataWriteOperations().relationshipSetProperty(id, properties.Property.property(propertyKeyId, value))
+        txContext.statement.dataWriteOperations().relationshipSetProperty(id, propertyKeyId, Values.of(value) )
       } catch {
         case _: exceptions.EntityNotFoundException => //ignore
       }

community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_2/TransactionBoundQueryContext.scala

@@ -56,6 +56,7 @@ import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptorFactory
 import org.neo4j.kernel.api.schema.{IndexQuery, SchemaDescriptorFactory}
 import org.neo4j.kernel.impl.core.NodeManager
 import org.neo4j.kernel.impl.locking.ResourceTypes
+import org.neo4j.values.Values
 
 import scala.collection.Iterator
 import scala.collection.JavaConverters._
@@ -335,7 +336,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
 
     override def setProperty(id: Long, propertyKeyId: Int, value: Any) {
       try {
-        transactionalContext.statement.dataWriteOperations().nodeSetProperty(id, properties.Property.property(propertyKeyId, value) )
+        transactionalContext.statement.dataWriteOperations().nodeSetProperty(id, propertyKeyId, Values.of(value))
       } catch {
         case _: exceptions.EntityNotFoundException => //ignore
       }
@@ -410,7 +411,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
 
     override def setProperty(id: Long, propertyKeyId: Int, value: Any) {
       try {
-        transactionalContext.statement.dataWriteOperations().relationshipSetProperty(id, properties.Property.property(propertyKeyId, value))
+        transactionalContext.statement.dataWriteOperations().relationshipSetProperty(id, propertyKeyId, Values.of(value))
       } catch {
         case _: exceptions.EntityNotFoundException => //ignore
       }

community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/v3_3/TransactionBoundQueryContext.scala

@@ -56,6 +56,7 @@ import org.neo4j.kernel.impl.locking.ResourceTypes
 import JavaConversionSupport._
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.commands.expressions.{KernelPredicate, OnlyDirectionExpander, TypeAndDirectionExpander, UserDefinedAggregator}
 import org.neo4j.cypher.internal.compatibility.v3_3.runtime.commands.expressions
+import org.neo4j.values.Values
 
 import scala.collection.Iterator
 import scala.collection.JavaConverters._
@@ -335,7 +336,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
 
     override def setProperty(id: Long, propertyKeyId: Int, value: Any) {
       try {
-        transactionalContext.statement.dataWriteOperations().nodeSetProperty(id, properties.Property.property(propertyKeyId, value) )
+        transactionalContext.statement.dataWriteOperations().nodeSetProperty(id, propertyKeyId, Values.of(value))
       } catch {
         case _: exceptions.EntityNotFoundException => //ignore
       }
@@ -409,7 +410,7 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
 
     override def setProperty(id: Long, propertyKeyId: Int, value: Any) {
       try {
-        transactionalContext.statement.dataWriteOperations().relationshipSetProperty(id, properties.Property.property(propertyKeyId, value))
+        transactionalContext.statement.dataWriteOperations().relationshipSetProperty(id, propertyKeyId, Values.of(value))
       } catch {
         case _: exceptions.EntityNotFoundException => //ignore
       }

community/kernel/pom.xml

@@ -160,6 +160,11 @@ the relevant Commercial Agreement.
       <artifactId>neo4j-common</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.neo4j</groupId>
+      <artifactId>neo4j-values</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.neo4j</groupId>
       <artifactId>neo4j-collections</artifactId>

community/kernel/src/main/java/org/neo4j/kernel/api/DataWriteOperations.java

@@ -28,8 +28,7 @@
 import org.neo4j.kernel.api.exceptions.legacyindex.AutoIndexingKernelException;
 import org.neo4j.kernel.api.exceptions.legacyindex.LegacyIndexNotFoundKernelException;
 import org.neo4j.kernel.api.exceptions.schema.ConstraintValidationException;
-import org.neo4j.kernel.api.properties.DefinedProperty;
-import org.neo4j.kernel.api.properties.Property;
+import org.neo4j.values.Value;
 
 public interface DataWriteOperations
 {
@@ -70,26 +69,26 @@ boolean nodeAddLabel( long nodeId, int labelId )
      */
     boolean nodeRemoveLabel( long nodeId, int labelId ) throws EntityNotFoundException;
 
-    Property nodeSetProperty( long nodeId, DefinedProperty property )
+    Value nodeSetProperty( long nodeId, int propertyKeyId, Value value )
             throws EntityNotFoundException, AutoIndexingKernelException,
                     InvalidTransactionTypeKernelException, ConstraintValidationException;
 
-    Property relationshipSetProperty( long relationshipId, DefinedProperty property )
+    Value relationshipSetProperty( long relationshipId, int propertyKeyId, Value value )
             throws EntityNotFoundException, AutoIndexingKernelException, InvalidTransactionTypeKernelException;
 
-    Property graphSetProperty( DefinedProperty property );
+    Value graphSetProperty( int propertyKeyId, Value value );
 
     /**
      * Remove a node's property given the node's id and the property key id and return the value to which
      * it was set or null if it was not set on the node
      */
-    Property nodeRemoveProperty( long nodeId, int propertyKeyId )
+    Value nodeRemoveProperty( long nodeId, int propertyKeyId )
             throws EntityNotFoundException, AutoIndexingKernelException, InvalidTransactionTypeKernelException;
 
-    Property relationshipRemoveProperty( long relationshipId, int propertyKeyId )
+    Value relationshipRemoveProperty( long relationshipId, int propertyKeyId )
             throws EntityNotFoundException, AutoIndexingKernelException, InvalidTransactionTypeKernelException;
 
-    Property graphRemoveProperty( int propertyKeyId );
+    Value graphRemoveProperty( int propertyKeyId );
 
     /**
      * Creates a legacy index in a separate transaction if not yet available.

community/kernel/src/main/java/org/neo4j/kernel/api/legacyindex/AutoIndexOperations.java

@@ -23,7 +23,7 @@
 
 import org.neo4j.kernel.api.DataWriteOperations;
 import org.neo4j.kernel.api.exceptions.legacyindex.AutoIndexingKernelException;
-import org.neo4j.kernel.api.properties.Property;
+import org.neo4j.values.Value;
 
 /**
  * Abstract interface for accessing legacy auto indexing facilities for a given type of entity (nodes or relationships)
@@ -38,8 +38,8 @@
  */
 public interface AutoIndexOperations
 {
-    void propertyAdded( DataWriteOperations ops, long entityId, Property property ) throws AutoIndexingKernelException;
-    void propertyChanged( DataWriteOperations ops, long entityId, Property oldProperty, Property newProperty )
+    void propertyAdded( DataWriteOperations ops, long entityId, int propertyKeyId, Value value ) throws AutoIndexingKernelException;
+    void propertyChanged( DataWriteOperations ops, long entityId, int propertyKeyId, Value oldValue, Value newValue )
         throws AutoIndexingKernelException;
     void propertyRemoved( DataWriteOperations ops, long entityId, int propertyKey )
         throws AutoIndexingKernelException;
@@ -60,14 +60,15 @@ void propertyRemoved( DataWriteOperations ops, long entityId, int propertyKey )
     AutoIndexOperations UNSUPPORTED = new AutoIndexOperations()
     {
         @Override
-        public void propertyAdded( DataWriteOperations ops, long entityId, Property property ) throws AutoIndexingKernelException
+        public void propertyAdded( DataWriteOperations ops, long entityId, int propertyKeyId, Value value )
+                throws AutoIndexingKernelException
         {
             throw new UnsupportedOperationException();
         }
 
         @Override
-        public void propertyChanged( DataWriteOperations ops, long entityId, Property oldProperty,
-                Property newProperty ) throws AutoIndexingKernelException
+        public void propertyChanged( DataWriteOperations ops, long entityId, int propertyKeyId, Value oldValue,
+                Value newValue ) throws AutoIndexingKernelException
         {
             throw new UnsupportedOperationException();
         }

community/kernel/src/main/java/org/neo4j/kernel/api/schema/IndexQuery.java

@@ -31,6 +31,8 @@
 import org.neo4j.kernel.api.properties.Property;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
 import org.neo4j.kernel.impl.api.PropertyValueComparison;
+import org.neo4j.values.Value;
+import org.neo4j.values.Values;
 
 public abstract class IndexQuery implements Predicate<Object>
 {
@@ -203,12 +205,12 @@ public boolean test( Object value )
 
     public static final class ExactPredicate extends IndexQuery
     {
-        private final DefinedProperty exactValue;
+        private final Value exactValue;
 
         ExactPredicate( int propertyKeyId, Object value )
         {
             super( propertyKeyId );
-            this.exactValue = Property.property( propertyKeyId, value );
+            this.exactValue = value instanceof Value ? (Value)value : Values.of( value );
         }
 
         @Override
@@ -220,12 +222,12 @@ public IndexQueryType type()
         @Override
         public boolean test( Object value )
         {
-            return exactValue.valueEquals( value );
+            return exactValue.equals( Values.of( value ) );
         }
 
         public Object value()
         {
-            return exactValue.value();
+            return exactValue.asPublic();
         }
     }
 

community/kernel/src/main/java/org/neo4j/kernel/api/txstate/TransactionState.java

@@ -19,14 +19,13 @@
  */
 package org.neo4j.kernel.api.txstate;
 
-import org.neo4j.kernel.api.properties.DefinedProperty;
-import org.neo4j.kernel.api.properties.Property;
 import org.neo4j.kernel.api.schema.LabelSchemaDescriptor;
 import org.neo4j.kernel.api.schema.OrderedPropertyValues;
 import org.neo4j.kernel.api.schema.constaints.ConstraintDescriptor;
 import org.neo4j.kernel.api.schema.constaints.IndexBackedConstraintDescriptor;
 import org.neo4j.kernel.api.schema.index.IndexDescriptor;
 import org.neo4j.storageengine.api.txstate.ReadableTransactionState;
+import org.neo4j.values.Value;
 
 /**
  * Kernel transaction state, please see {@link org.neo4j.kernel.impl.api.state.TxState} for implementation details.
@@ -50,20 +49,19 @@ public interface TransactionState extends ReadableTransactionState
 
     void nodeDoDelete( long nodeId );
 
-    void nodeDoAddProperty( long nodeId, DefinedProperty newProperty );
+    void nodeDoAddProperty( long nodeId, int newPropertyKeyId, Value value );
 
-    void nodeDoChangeProperty( long nodeId, DefinedProperty replacedProperty, DefinedProperty newProperty );
+    void nodeDoChangeProperty( long nodeId, int propertyKeyId, Value replacedValue, Value newValue );
 
-    void relationshipDoReplaceProperty( long relationshipId,
-                                        Property replacedProperty, DefinedProperty newProperty );
+    void relationshipDoReplaceProperty( long relationshipId, int propertyKeyId, Value replacedValue, Value newValue );
 
-    void graphDoReplaceProperty( Property replacedProperty, DefinedProperty newProperty );
+    void graphDoReplaceProperty( int propertyKeyId, Value replacedValue, Value newValue );
 
-    void nodeDoRemoveProperty( long nodeId, DefinedProperty removedProperty );
+    void nodeDoRemoveProperty( long nodeId, int propertyKeyId, Value removedValue );
 
-    void relationshipDoRemoveProperty( long relationshipId, DefinedProperty removedProperty );
+    void relationshipDoRemoveProperty( long relationshipId, int propertyKeyId, Value removedValue );
 
-    void graphDoRemoveProperty( DefinedProperty removedProperty );
+    void graphDoRemoveProperty( int propertyKeyId, Value removedValue );
 
     void nodeDoAddLabel( int labelId, long nodeId );