sashapolo commented on a change in pull request #169: URL: https://github.com/apache/ignite-3/pull/169#discussion_r659653430
########## File path: modules/storage-api/src/main/java/org/apache/ignite/internal/storage/StorageException.java ########## @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.storage; + +/** + * Exception thrown by storage. Review comment: ```suggestion * Exception thrown by the storage. ``` ########## File path: modules/storage-api/src/main/java/org/apache/ignite/internal/storage/basic/SimpleDataRow.java ########## @@ -0,0 +1,60 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.storage.basic; + +import java.nio.ByteBuffer; +import org.apache.ignite.internal.storage.DataRow; +import org.jetbrains.annotations.Nullable; + +/** + * Basic array-based implementation of the {@link DataRow}. + */ +public class SimpleDataRow implements DataRow { + /** Key array. */ + private final byte[] key; + + /** Value array. */ + @Nullable private final byte[] value; Review comment: same here (and below) about Nullable and arrays ########## File path: modules/storage-api/src/main/java/org/apache/ignite/internal/storage/basic/SimpleReadInvokeClosure.java ########## @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.storage.basic; + +import org.apache.ignite.internal.storage.DataRow; +import org.apache.ignite.internal.storage.InvokeClosure; +import org.apache.ignite.internal.storage.OperationType; +import org.jetbrains.annotations.Nullable; + +/** Invoke closure implementation for read operation. */ +public class SimpleReadInvokeClosure implements InvokeClosure { + /** Copy of the row that was passed to {@link #call(DataRow)} method. */ + private DataRow row; Review comment: this field should be marked as `@Nullable` ########## File path: modules/storage-api/src/main/java/org/apache/ignite/internal/storage/basic/SimpleReadInvokeClosure.java ########## @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.storage.basic; + +import org.apache.ignite.internal.storage.DataRow; +import org.apache.ignite.internal.storage.InvokeClosure; +import org.apache.ignite.internal.storage.OperationType; +import org.jetbrains.annotations.Nullable; + +/** Invoke closure implementation for read operation. */ +public class SimpleReadInvokeClosure implements InvokeClosure { + /** Copy of the row that was passed to {@link #call(DataRow)} method. */ + private DataRow row; + + /** {@inheritDoc} */ + @Override public void call(@Nullable DataRow row) { + this.row = row == null ? null : new SimpleDataRow(row.keyBytes(), row.valueBytes()); + } + + /** {@inheritDoc} */ + @Nullable + @Override public DataRow newRow() { + return null; + } + + /** {@inheritDoc} */ + @Nullable + @Override public OperationType operationType() { + return OperationType.NOOP; + } + + /** Copy of the row that was passed to {@link #call(DataRow)} method. */ + public DataRow row() { Review comment: and this method too ########## File path: modules/storage-api/src/main/java/org/apache/ignite/internal/storage/SearchRow.java ########## @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.storage; + +import java.nio.ByteBuffer; +import org.jetbrains.annotations.Nullable; + +/** + * Interface to be used as a key representation to search data in storage. + */ +public interface SearchRow { + /** + * @return Key bytes. + */ + @Nullable byte[] keyBytes(); Review comment: unfortunately this is not the correct way to use the `@Nullable` annotation on arrays, should be `byte @Nullable []` instead ########## File path: modules/storage-api/src/main/java/org/apache/ignite/internal/storage/basic/SimpleWriteInvokeClosure.java ########## @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.storage.basic; + +import org.apache.ignite.internal.storage.DataRow; +import org.apache.ignite.internal.storage.InvokeClosure; +import org.apache.ignite.internal.storage.OperationType; +import org.jetbrains.annotations.Nullable; + +/** Invoke closure implementation for write operation. */ Review comment: ```suggestion /** Invoke closure implementation for a write operation. */ ``` ########## File path: modules/storage-api/src/main/java/org/apache/ignite/internal/storage/basic/SimpleRemoveInvokeClosure.java ########## @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.storage.basic; + +import org.apache.ignite.internal.storage.DataRow; +import org.apache.ignite.internal.storage.InvokeClosure; +import org.apache.ignite.internal.storage.OperationType; +import org.jetbrains.annotations.Nullable; + +/** Invoke closure implementation for remove operation. */ Review comment: ```suggestion /** Invoke closure implementation for a remove operation. */ ``` ########## File path: modules/storage-api/src/main/java/org/apache/ignite/internal/storage/basic/SimpleWriteInvokeClosure.java ########## @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.storage.basic; + +import org.apache.ignite.internal.storage.DataRow; +import org.apache.ignite.internal.storage.InvokeClosure; +import org.apache.ignite.internal.storage.OperationType; +import org.jetbrains.annotations.Nullable; + +/** Invoke closure implementation for write operation. */ +public class SimpleWriteInvokeClosure implements InvokeClosure { + /** Data row to write into storage. */ + private final DataRow newRow; + + /** + * @param newRow Data row to write into storage. Review comment: ```suggestion * @param newRow Data row to write into the storage. ``` ########## File path: modules/storage-rocksdb/src/main/java/org/apache/ignite/internal/storage/rocksdb/RocksDbStorage.java ########## @@ -0,0 +1,255 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.ignite.internal.storage.rocksdb; + +import java.nio.ByteBuffer; +import java.nio.file.Path; +import java.util.Comparator; +import java.util.Iterator; +import java.util.NoSuchElementException; +import java.util.concurrent.locks.ReadWriteLock; +import java.util.concurrent.locks.ReentrantReadWriteLock; +import java.util.function.Predicate; +import org.apache.ignite.internal.storage.DataRow; +import org.apache.ignite.internal.storage.InvokeClosure; +import org.apache.ignite.internal.storage.SearchRow; +import org.apache.ignite.internal.storage.Storage; +import org.apache.ignite.internal.storage.StorageException; +import org.apache.ignite.internal.storage.basic.SimpleDataRow; +import org.apache.ignite.internal.util.Cursor; +import org.apache.ignite.lang.IgniteInternalException; +import org.jetbrains.annotations.NotNull; +import org.rocksdb.AbstractComparator; +import org.rocksdb.ComparatorOptions; +import org.rocksdb.Options; +import org.rocksdb.RocksDB; +import org.rocksdb.RocksDBException; +import org.rocksdb.RocksIterator; + +/** + * Storage implementation based on a single RocksDB instance. + */ +public class RocksDbStorage implements Storage, AutoCloseable { + static { + RocksDB.loadLibrary(); + } + + /** RocksDB comparator options. */ + private final ComparatorOptions comparatorOptions; + + /** RocksDB comparator. */ + private final AbstractComparator comparator; + + /** RockDB options. */ + private final Options options; + + /** RocksDb instance. */ + private final RocksDB db; + + /** RW lock. */ + private final ReadWriteLock rwLock = new ReentrantReadWriteLock(); + + /** + * @param dbPath Path to the folder to store data. + * @param comparator Keys comparator. + * @throws StorageException If failed to create RocksDB instance. + */ + public RocksDbStorage(Path dbPath, Comparator<ByteBuffer> comparator) throws StorageException { + try { + comparatorOptions = new ComparatorOptions(); + + this.comparator = new AbstractComparator(comparatorOptions) { + /** {@inheritDoc} */ + @Override public String name() { + return "comparator"; + } + + /** {@inheritDoc} */ + @Override public int compare(ByteBuffer a, ByteBuffer b) { + return comparator.compare(a, b); + } + }; + + options = new Options(); + + options.setCreateIfMissing(true); + + options.setComparator(this.comparator); + + this.db = RocksDB.open(options, dbPath.toAbsolutePath().toString()); + } + catch (RocksDBException e) { + close(); + + throw new StorageException("Failed to start storage", e); Review comment: ```suggestion throw new StorageException("Failed to start the storage", e); ``` -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
