Simplified creation of IndexDescriptor

community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java

@@ -415,7 +415,7 @@ public void shouldNotReportIndexInconsistenciesIfIndexIsFailed() throws Exceptio
         while ( rules.hasNext() )
         {
             IndexRule rule = rules.next();
-            IndexDescriptor descriptor = IndexDescriptorFactory.from( rule );
+            IndexDescriptor descriptor = IndexDescriptorFactory.of( rule );
             IndexConfiguration indexConfig = IndexConfiguration.NON_UNIQUE;
             IndexSamplingConfig samplingConfig = new IndexSamplingConfig( Config.empty() );
             IndexPopulator populator =

community/cypher/cypher/src/main/scala/org/neo4j/cypher/internal/spi/IndexDescriptorCompatibility.scala

@@ -27,5 +27,5 @@ trait IndexDescriptorCompatibility {
     new IndexDescriptor(index.getLabelId(), index.getPropertyKeyId);
 
   implicit def toNewIndexDescriptor(index: IndexDescriptor): org.neo4j.kernel.api.schema.IndexDescriptor =
-    IndexDescriptorFactory.from(IndexDescriptorFactory.getNodePropertyDescriptor(index.getLabelId(), index.getPropertyKeyId));
+    IndexDescriptorFactory.of(index.getLabelId(), index.getPropertyKeyId);
 }

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

@@ -35,7 +35,7 @@ object TransactionBoundGraphStatistics {
 
     def indexSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] =
       try {
-        val indexDescriptor = IndexDescriptorFactory.from(new NodePropertyDescriptor(label, property))
+        val indexDescriptor = IndexDescriptorFactory.of( label, property )
         val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble
 
         // Probability of any node with the given label, to have a property with a given value
@@ -51,7 +51,7 @@ object TransactionBoundGraphStatistics {
 
     def indexPropertyExistsSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] =
       try {
-        val indexDescriptor = IndexDescriptorFactory.from(new NodePropertyDescriptor(label, property))
+        val indexDescriptor = IndexDescriptorFactory.of( label, property )
         val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble
 
         // Probability of any node with the given label, to have a given property

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

@@ -468,7 +468,7 @@ final class TransactionBoundQueryContext(tc: TransactionalContextWrapper)
   }
 
   def dropIndexRule(labelId: Int, propertyKeyId: Int) =
-    tc.statement.schemaWriteOperations().indexDrop(IndexDescriptorFactory.from(new NodePropertyDescriptor(labelId, propertyKeyId)))
+    tc.statement.schemaWriteOperations().indexDrop(IndexDescriptorFactory.of( labelId, propertyKeyId ))
 
   def createUniqueConstraint(labelId: Int, propertyKeyId: Int): IdempotentResult[UniquenessConstraint] = try {
     IdempotentResult(tc.statement.schemaWriteOperations().uniquePropertyConstraintCreate(new NodePropertyDescriptor(labelId,

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

@@ -24,7 +24,7 @@ import org.neo4j.cypher.internal.compiler.v3_1.spi.{GraphStatistics, StatisticsC
 import org.neo4j.cypher.internal.frontend.v3_1.{LabelId, NameId, PropertyKeyId, RelTypeId}
 import org.neo4j.kernel.api.ReadOperations
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException
-import org.neo4j.kernel.api.schema.{IndexDescriptorFactory, NodePropertyDescriptor}
+import org.neo4j.kernel.api.schema.IndexDescriptorFactory
 
 object TransactionBoundGraphStatistics {
   def apply(ops: ReadOperations) = new StatisticsCompletingGraphStatistics(new BaseTransactionBoundGraphStatistics(ops))
@@ -35,7 +35,7 @@ object TransactionBoundGraphStatistics {
 
     def indexSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] =
       try {
-        val indexDescriptor = IndexDescriptorFactory.from(new NodePropertyDescriptor(label, property))
+        val indexDescriptor = IndexDescriptorFactory.of( label, property )
         val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble
 
         // Probability of any node with the given label, to have a property with a given value
@@ -51,7 +51,7 @@ object TransactionBoundGraphStatistics {
 
     def indexPropertyExistsSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] =
       try {
-        val indexDescriptor = IndexDescriptorFactory.from(new NodePropertyDescriptor(label, property))
+        val indexDescriptor = IndexDescriptorFactory.of( label, property )
         val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble
 
         // Probability of any node with the given label, to have a given property

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

@@ -472,7 +472,7 @@ final class TransactionBoundQueryContext(txContext: TransactionalContextWrapper)
   }
 
   override def dropIndexRule(labelId: Int, propertyKeyId: Int) =
-    txContext.statement.schemaWriteOperations().indexDrop(IndexDescriptorFactory.from(new NodePropertyDescriptor(labelId, propertyKeyId)))
+    txContext.statement.schemaWriteOperations().indexDrop(IndexDescriptorFactory.of( labelId, propertyKeyId ))
 
   override def createUniqueConstraint(labelId: Int, propertyKeyId: Int): IdempotentResult[UniquenessConstraint] = try {
     IdempotentResult(txContext.statement.schemaWriteOperations().uniquePropertyConstraintCreate(new NodePropertyDescriptor(labelId, propertyKeyId)))

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

@@ -24,7 +24,7 @@ import org.neo4j.cypher.internal.frontend.v3_2.{LabelId, NameId, PropertyKeyId,
 import org.neo4j.cypher.internal.ir.v3_2.{Cardinality, Selectivity}
 import org.neo4j.kernel.api.ReadOperations
 import org.neo4j.kernel.api.exceptions.index.IndexNotFoundKernelException
-import org.neo4j.kernel.api.schema.{IndexDescriptorFactory, NodePropertyDescriptor}
+import org.neo4j.kernel.api.schema.IndexDescriptorFactory
 
 object TransactionBoundGraphStatistics {
   def apply(ops: ReadOperations) = new StatisticsCompletingGraphStatistics(new BaseTransactionBoundGraphStatistics(ops))
@@ -35,7 +35,7 @@ object TransactionBoundGraphStatistics {
 
     def indexSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] =
       try {
-        val indexDescriptor = IndexDescriptorFactory.from(new NodePropertyDescriptor(label, property))
+        val indexDescriptor = IndexDescriptorFactory.of( label, property )
         val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble
 
         // Probability of any node with the given label, to have a property with a given value
@@ -51,7 +51,7 @@ object TransactionBoundGraphStatistics {
 
     def indexPropertyExistsSelectivity(label: LabelId, property: PropertyKeyId): Option[Selectivity] =
       try {
-        val indexDescriptor = IndexDescriptorFactory.from(new NodePropertyDescriptor(label, property))
+        val indexDescriptor = IndexDescriptorFactory.of( label, property )
         val labeledNodes = operations.countsForNodeWithoutTxState( label ).toDouble
 
         // Probability of any node with the given label, to have a given property

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

@@ -263,10 +263,10 @@ final class TransactionBoundQueryContext(val transactionalContext: Transactional
   }
 
   implicit private def toKernelIndexDescriptor(descriptor: CypherIndexDescriptor): IndexDescriptor =
-    IndexDescriptorFactory.from(toNodePropertyDescriptor(descriptor))
+    IndexDescriptorFactory.of(toNodePropertyDescriptor(descriptor))
 
   implicit private def toIndexDescriptor(descriptor: NodePropertyDescriptor): IndexDescriptor =
-    IndexDescriptorFactory.from(descriptor)
+    IndexDescriptorFactory.of(descriptor)
 
   implicit private def toNodePropertyDescriptor(descriptor: CypherIndexDescriptor): NodePropertyDescriptor =
     if (descriptor.isComposite)

community/kernel/src/main/java/org/neo4j/kernel/api/constraints/NodePropertyConstraint.java

@@ -54,7 +54,7 @@ public boolean matches( NodePropertyDescriptor descriptor )
     @Override
     public IndexDescriptor indexDescriptor()
     {
-        return IndexDescriptorFactory.from( descriptor );
+        return IndexDescriptorFactory.of( descriptor );
     }
 
     @Override

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

@@ -34,16 +34,32 @@
  */
 public class IndexDescriptorFactory
 {
-    public static IndexDescriptor from( NodePropertyDescriptor descriptor )
+    public static IndexDescriptor of( int labelId, int... propertyKeyIds )
+    {
+        if ( propertyKeyIds.length == 0 )
+        {
+            throw new IllegalArgumentException( "Index descriptors must contain at least one property" );
+        }
+        else if ( propertyKeyIds.length == 1 )
+        {
+            return new SinglePropertyIndexDescriptor( labelId, propertyKeyIds[0] );
+        }
+        else
+        {
+            return new CompositeIndexDescriptor( labelId, propertyKeyIds );
+        }
+    }
+
+    public static IndexDescriptor of( NodePropertyDescriptor descriptor )
     {
         return descriptor.isComposite() ? new CompositeIndexDescriptor( descriptor.getLabelId(),
                 descriptor.getPropertyKeyIds() ) : new SinglePropertyIndexDescriptor( descriptor.getLabelId(),
                 descriptor.getPropertyKeyId() );
     }
 
-    public static IndexDescriptor from( IndexRule rule )
+    public static IndexDescriptor of( IndexRule rule )
     {
-        return from( rule.descriptor() );
+        return of( rule.descriptor() );
     }
 
     public static NodePropertyDescriptor getNodePropertyDescriptor( int labelId, int[] propertyKeyIds )
@@ -63,16 +79,14 @@ public static NodePropertyDescriptor getOrCreateTokens( SchemaWriteOperations sc
         int labelId = schemaWriteOperations.labelGetOrCreateForName( indexDefinition.getLabel().name() );
         int[] propertyKeyIds = getOrCreatePropertyKeyIds( schemaWriteOperations, indexDefinition );
 
-        return propertyKeyIds.length > 1 ? new NodeMultiPropertyDescriptor( labelId, propertyKeyIds )
-                                         : new NodePropertyDescriptor( labelId, propertyKeyIds[0] );
+        return getNodePropertyDescriptor( labelId, propertyKeyIds );
     }
 
     public static NodePropertyDescriptor getTokens( ReadOperations readOperations, IndexDefinition indexDefinition )
     {
         int labelId = readOperations.labelGetForName( indexDefinition.getLabel().name() );
         int[] propertyKeyIds = getPropertyKeyIds( readOperations, indexDefinition.getPropertyKeys() );
 
-        return propertyKeyIds.length > 1 ? new NodeMultiPropertyDescriptor( labelId, propertyKeyIds )
-                                         : new NodePropertyDescriptor( labelId, propertyKeyIds[0] );
+        return getNodePropertyDescriptor( labelId, propertyKeyIds );
     }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java

@@ -377,7 +377,7 @@ public long relationshipsGetCount( KernelStatement state )
     @Override
     public IndexDescriptor indexCreate( KernelStatement state, NodePropertyDescriptor descriptor )
     {
-        IndexDescriptor indexDescriptor = IndexDescriptorFactory.from(descriptor);
+        IndexDescriptor indexDescriptor = IndexDescriptorFactory.of(descriptor);
         state.txState().indexRuleDoAdd( indexDescriptor );
         return indexDescriptor;
     }

community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexUpdaterMap.java

@@ -31,7 +31,6 @@
 
 import org.neo4j.helpers.collection.Pair;
 import org.neo4j.helpers.collection.PrefetchingIterator;
-import org.neo4j.kernel.api.schema.NodePropertyDescriptor;
 import org.neo4j.kernel.api.exceptions.index.IndexEntryConflictException;
 import org.neo4j.kernel.api.schema.IndexDescriptor;
 import org.neo4j.kernel.api.schema.IndexDescriptorFactory;
@@ -63,7 +62,7 @@ class IndexUpdaterMap implements AutoCloseable, Iterable<IndexUpdater>
 
     List<IndexUpdater> getUpdaters( int labelId, int propertyKeyId )
     {
-        IndexDescriptor key = IndexDescriptorFactory.from( new NodePropertyDescriptor( labelId, propertyKeyId ) );
+        IndexDescriptor key = IndexDescriptorFactory.of( labelId, propertyKeyId );
         IndexUpdater updater = getUpdater( key );
         if ( updater != null )
         {

community/kernel/src/main/java/org/neo4j/kernel/impl/api/index/IndexingService.java

@@ -196,7 +196,7 @@ public void init()
             IndexProxy indexProxy;
 
             long indexId = indexRule.getId();
-            IndexDescriptor descriptor = IndexDescriptorFactory.from( indexRule );
+            IndexDescriptor descriptor = IndexDescriptorFactory.of( indexRule );
             SchemaIndexProvider.Descriptor providerDescriptor = indexRule.getProviderDescriptor();
             SchemaIndexProvider provider = providerMap.apply( providerDescriptor );
             InternalIndexState initialState = provider.getInitialState( indexId );
@@ -532,7 +532,7 @@ public void createIndexes( IndexRule... rules ) throws IOException
                 indexMapRef.setIndexMap( indexMap );
                 continue;
             }
-            final IndexDescriptor descriptor = IndexDescriptorFactory.from( rule );
+            final IndexDescriptor descriptor = IndexDescriptorFactory.of( rule );
             SchemaIndexProvider.Descriptor providerDescriptor = rule.getProviderDescriptor();
             boolean constraint = rule.isConstraintIndex();
             if ( state == State.RUNNING )

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/CacheLayer.java

@@ -105,7 +105,7 @@ private static Iterator<IndexDescriptor> toIndexDescriptors( Iterable<SchemaRule
             final SchemaRule.Kind kind )
     {
         Iterator<SchemaRule> filteredRules = Iterators.filter( item -> item.getKind() == kind, rules.iterator() );
-        return Iterators.map( from -> IndexDescriptorFactory.from( (IndexRule) from ), filteredRules );
+        return Iterators.map( from -> IndexDescriptorFactory.of( (IndexRule) from ), filteredRules );
     }
 
     @Override

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DiskLayer.java

@@ -187,7 +187,7 @@ public IndexDescriptor indexGetForLabelAndPropertyKey( NodePropertyDescriptor de
 
     private static IndexDescriptor descriptor( IndexRule ruleRecord )
     {
-        return IndexDescriptorFactory.from( ruleRecord );
+        return IndexDescriptorFactory.of( ruleRecord );
     }
 
     @Override

community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/SchemaCache.java

@@ -147,7 +147,7 @@ else if ( constraint instanceof RelationshipPropertyConstraint )
         else if ( rule instanceof IndexRule )
         {
             IndexRule indexRule = (IndexRule) rule;
-            IndexDescriptor index = IndexDescriptorFactory.from( indexRule );
+            IndexDescriptor index = IndexDescriptorFactory.of( indexRule );
             if ( !indexDescriptors.containsKey( index ) )
             {
                 indexDescriptors.put( index, new CommittedIndexDescriptor( index, indexRule.getId() ) );
@@ -218,13 +218,13 @@ else if ( rule instanceof RelationshipPropertyConstraintRule )
         else if ( rule instanceof IndexRule )
         {
             IndexRule indexRule = (IndexRule) rule;
-            indexDescriptors.remove( IndexDescriptorFactory.from( indexRule ) );
+            indexDescriptors.remove( IndexDescriptorFactory.of( indexRule ) );
         }
     }
 
     public IndexDescriptor indexDescriptor( NodePropertyDescriptor descriptor )
     {
-        IndexDescriptor indexDescriptor = IndexDescriptorFactory.from( descriptor );
+        IndexDescriptor indexDescriptor = IndexDescriptorFactory.of( descriptor );
         return indexDescriptors.containsKey(indexDescriptor) ? indexDescriptor : null;
     }
 }

community/kernel/src/main/java/org/neo4j/kernel/impl/store/countStore/CountsSnapshotDeserializer.java

@@ -69,14 +69,14 @@ public static CountsSnapshot deserialize( ReadableClosableChannel channel ) thro
                 break;
 
             case INDEX_SAMPLE:
-                descriptor = IndexDescriptorFactory.from( readPropertyKeyIds( channel ) );
+                descriptor = IndexDescriptorFactory.of( readNodePropertyDescriptor( channel ) );
                 key = indexSampleKey( descriptor );
                 value = new long[]{channel.getLong(), channel.getLong()};
                 map.put( key, value );
                 break;
 
             case INDEX_STATISTICS:
-                descriptor = IndexDescriptorFactory.from( readPropertyKeyIds( channel ) );
+                descriptor = IndexDescriptorFactory.of( readNodePropertyDescriptor( channel ) );
                 key = indexStatisticsKey( descriptor );
                 value = new long[]{channel.getLong(), channel.getLong()};
                 map.put( key, value );
@@ -92,7 +92,7 @@ public static CountsSnapshot deserialize( ReadableClosableChannel channel ) thro
         return new CountsSnapshot( txid, map );
     }
 
-    private static NodePropertyDescriptor readPropertyKeyIds( ReadableClosableChannel channel ) throws IOException
+    private static NodePropertyDescriptor readNodePropertyDescriptor( ReadableClosableChannel channel ) throws IOException
     {
         int labelId = channel.getInt();
         short length = channel.getShort();

community/kernel/src/main/java/org/neo4j/kernel/impl/store/counts/KeyFormat.java

@@ -146,10 +146,7 @@ public static CountsKey readKey( ReadableBuffer key ) throws UnknownKey
             {
                 propertyKeyIds[i] = key.getInt( 10 + 4 * i );
             }
-            NodePropertyDescriptor descriptor =
-                    propertyKeyIds.length > 1 ? new NodeMultiPropertyDescriptor( labelId, propertyKeyIds )
-                                          : new NodePropertyDescriptor( labelId, propertyKeyIds[0] );
-            IndexDescriptor index = IndexDescriptorFactory.from( descriptor );
+            IndexDescriptor index = IndexDescriptorFactory.of( labelId, propertyKeyIds );
             byte indexKeyByte = key.getByte( 10 + 4 * propertyKeyIds.length );
             switch ( indexKeyByte )
             {

community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureArgumentFormatter.java

@@ -89,7 +89,7 @@ else if ( arg instanceof IndexDescriptor )
         {
             NodePropertyDescriptor descriptor = (NodePropertyDescriptor) arg;
             int labelId = descriptor.getLabelId();
-            builder.append( format( "IndexDescriptorFactory.from( new NodePropertyDescriptor( %s, %s ) )", labelId, descriptor.propertyIdText( ) ) );
+            builder.append( format( "IndexDescriptorFactory.of( %s, %s )", labelId, descriptor.propertyIdText( ) ) );
         }
         else if ( arg instanceof NodePropertyDescriptor )
         {

community/kernel/src/main/java/org/neo4j/kernel/impl/util/dbstructure/DbStructureCollector.java

@@ -335,7 +335,7 @@ public void putIndex( IndexDescriptor descriptor, String userDescription, double
 
         public IndexStatistics getIndex( NodePropertyDescriptor descriptor )
         {
-            return indexMap.get( IndexDescriptorFactory.from( descriptor ) );
+            return indexMap.get( IndexDescriptorFactory.of( descriptor ) );
         }
 
         public Iterator<Pair<String, String>> iterator()

community/kernel/src/main/java/org/neo4j/unsafe/batchinsert/internal/BatchInserterImpl.java

@@ -478,7 +478,7 @@ private void repopulateAllIndexes() throws IOException, IndexEntryConflictExcept
             propertyKeyIds[i] = propertyKeyId;
 
             IndexDescriptor descriptor =
-                    IndexDescriptorFactory.from( new NodePropertyDescriptor( labelId, propertyKeyId ) );
+                    IndexDescriptorFactory.of( labelId, propertyKeyId );
             populators[i] = schemaIndexProviders.apply( rule.getProviderDescriptor() )
                                                 .getPopulator( rule.getId(),
                                                         descriptor,

community/kernel/src/test/java/org/neo4j/kernel/api/index/IndexProviderCompatibilityTestSuite.java

@@ -29,7 +29,6 @@
 import org.neo4j.io.fs.FileSystemAbstraction;
 import org.neo4j.kernel.api.schema.IndexDescriptor;
 import org.neo4j.kernel.api.schema.IndexDescriptorFactory;
-import org.neo4j.kernel.api.schema.NodePropertyDescriptor;
 import org.neo4j.test.rule.TestDirectory;
 import org.neo4j.test.rule.fs.DefaultFileSystemRule;
 import org.neo4j.test.runner.ParameterizedSuiteRunner;
@@ -64,7 +63,7 @@ public void setup()
     public abstract static class Compatibility
     {
         protected final SchemaIndexProvider indexProvider;
-        protected IndexDescriptor descriptor = IndexDescriptorFactory.from( new NodePropertyDescriptor( 1, 2 ) );
+        protected IndexDescriptor descriptor = IndexDescriptorFactory.of( 1, 2 );
 
         public Compatibility( IndexProviderCompatibilityTestSuite testSuite )
         {

community/kernel/src/test/java/org/neo4j/kernel/builtinprocs/AwaitIndexProcedureTest.java

@@ -62,7 +62,7 @@ public class AwaitIndexProcedureTest
     private final IndexProcedures procedure = new IndexProcedures( new StubKernelTransaction( operations ), null );
     private final NodePropertyDescriptor descriptor = new NodePropertyDescriptor( 123, 456 );
     private final NodePropertyDescriptor anyDescriptor = new NodePropertyDescriptor( 0, 0 );
-    private final IndexDescriptor anyIndex = IndexDescriptorFactory.from( anyDescriptor );
+    private final IndexDescriptor anyIndex = IndexDescriptorFactory.of( anyDescriptor );
 
     @Test
     public void shouldThrowAnExceptionIfTheLabelDoesntExist() throws ProcedureException