-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed FixedLengthColumn and VariableLengthColumn.
- Loading branch information
1 parent
b2b9621
commit ad1f6d2
Showing
6 changed files
with
152 additions
and
97 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
96 changes: 67 additions & 29 deletions
96
cottontaildb-dbms/src/main/kotlin/org/vitrivr/cottontail/dbms/column/FixedLengthCursor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,65 +1,103 @@ | ||
| package org.vitrivr.cottontail.dbms.column | ||
|
|
||
| import jetbrains.exodus.bindings.LongBinding | ||
| import jetbrains.exodus.env.Store | ||
| import jetbrains.exodus.env.StoreConfig | ||
| import org.vitrivr.cottontail.core.basics.Cursor | ||
| import org.vitrivr.cottontail.core.database.TabletId | ||
| import org.vitrivr.cottontail.core.database.TupleId | ||
| import org.vitrivr.cottontail.core.types.Value | ||
| import org.vitrivr.cottontail.core.values.tablets.Tablet | ||
| import org.vitrivr.cottontail.dbms.catalogue.storeName | ||
| import org.vitrivr.cottontail.dbms.column.FixedLengthColumn.Companion.TABLET_SHR | ||
| import org.vitrivr.cottontail.dbms.column.FixedLengthColumn.Companion.TABLET_SIZE | ||
| import org.vitrivr.cottontail.dbms.exceptions.DatabaseException | ||
| import org.vitrivr.cottontail.dbms.execution.transactions.Transaction | ||
| import org.vitrivr.cottontail.dbms.execution.transactions.TransactionMetadata | ||
| import org.vitrivr.cottontail.storage.serializers.SerializerFactory | ||
| import org.vitrivr.cottontail.storage.serializers.tablets.TabletSerializer | ||
|
|
||
| /** | ||
| * | ||
| * A [Cursor] to iterate over the [Tablet]s of a [Column]. | ||
| */ | ||
| class FixedLengthCursor<T: Value>(private val column: Column<T>, private val transaction: Transaction): Cursor<T> { | ||
| class FixedLengthCursor<T: Value>(column: FixedLengthColumn<T>.Tx): Cursor<T> { | ||
|
|
||
| /** The Xodus transaction snapshot used by this FixedLengthCursor. */ | ||
| private val xodusTx = column.context.txn.xodusTx.readonlySnapshot | ||
|
|
||
| /** Internal data [Store] reference. */ | ||
| private val dataStore: Store = this.column.catalogue.transactionManager.environment.openStore( | ||
| this.column.name.storeName(), | ||
| private val store: Store = this.xodusTx.environment.openStore( | ||
| column.dbo.name.storeName(), | ||
| StoreConfig.USE_EXISTING, | ||
| this.transaction.xodusTx, | ||
| xodusTx, | ||
| false | ||
| ) ?: throw DatabaseException.DataCorruptionException("Data store for column ${this.column.name} is missing.") | ||
| ) ?: throw DatabaseException.DataCorruptionException("Data store for column ${column.dbo.name} is missing.") | ||
|
|
||
|
|
||
| /** The internal [TabletSerializer] reference used for de-/serialization. */ | ||
| private val serializer: TabletSerializer<T> = SerializerFactory.tablet(this.column.columnDef.type, 128) | ||
| private val serializer: TabletSerializer<T> = SerializerFactory.tablet(column.columnDef.type, TABLET_SIZE, column.dbo.compression) | ||
|
|
||
| /** Internal Xodus cursor instance. */ | ||
| private val cursor = this.dataStore.openCursor(this.transaction.xodusTx) | ||
| private val cursor = this.store.openCursor(this.xodusTx) | ||
|
|
||
| /** The [TupleId] of the currently loaded [Tablet]. -1 if no [Tablet] has been loaded. */ | ||
| private var tupleId: TupleId = -1L | ||
|
|
||
| /** The [TabletId] of the currently loaded [Tablet]. -1 if no [Tablet] has been loaded. */ | ||
| private var tupleId: TabletId = -1 | ||
| /** The [TupleId] of the currently loaded [Tablet]. -1 if no [Tablet] has been loaded. */ | ||
| private var tabletId: TabletId= -1L | ||
|
|
||
| /** The [TabletId] of the currently loaded [Tablet]. -1 if no [Tablet] has been loaded. */ | ||
| /** The [TupleId] of the currently loaded [Tablet]. -1 if no [Tablet] has been loaded. */ | ||
| private var tabletIndex: Int = -1 | ||
|
|
||
| /** The currently loaded [Tablet]. */ | ||
| private var tablet: Tablet<T>? = null | ||
|
|
||
| override fun moveNext(): Boolean = moveTo(this.tupleId + 1) | ||
| override fun movePrevious(): Boolean = moveTo(this.tupleId - 1) | ||
| override fun moveTo(tupleId: TupleId): Boolean { | ||
| /* Reposition cursor. */ | ||
| val tabletId = tupleId ushr TABLET_SHR | ||
|
|
||
| override fun moveNext(): Boolean { | ||
| do { | ||
| this.tupleId += this.tupleId + 1L | ||
| this.tabletIndex = ((++this.tupleId) % Long.SIZE_BITS).toInt() | ||
| if (this.tabletIndex == 0 && this.cursor.next) { | ||
| if (this.cursor.next) { | ||
| this.tablet = this.serializer.fromEntry(this.cursor.value) | ||
| return true | ||
| } else { | ||
| return false | ||
| } | ||
| } else if (this.tabletIndex > 0 && this.tablet!![this.tabletIndex] != null) { | ||
| return true | ||
| } | ||
| } while (true) | ||
| /* Load tablet. */ | ||
| return if (this.loadTablet(tabletId)) { | ||
| this.tupleId = tupleId | ||
| this.tabletIndex = ((tupleId) % TABLET_SIZE).toInt() | ||
| true | ||
| } else { | ||
| false | ||
| } | ||
| } | ||
|
|
||
| override fun key(): TupleId = this.tupleId | ||
| override fun value(): T = this.tablet!![this.tabletIndex] ?: throw NoSuchElementException("") | ||
| override fun close() = this.cursor.close() | ||
|
|
||
| /** | ||
| * Loads the [Tablet] with the given [TabletId] into memory. | ||
| * | ||
| * @param tabletId The [TabletId] of the [Tablet] to load. | ||
| * @return True on success, false otherwise. | ||
| */ | ||
| private fun loadTablet(tabletId: TabletId): Boolean { | ||
| if (this.tabletId == tabletId) return true | ||
| val moved = when (tabletId) { | ||
| this.tabletId + 1 -> this.cursor.next | ||
| this.tabletId - 1 -> this.cursor.prev | ||
| else -> this.cursor.getSearchKey(LongBinding.longToCompressedEntry(tabletId)) != null | ||
| } | ||
|
|
||
| /* If cursor did not move, return false. */ | ||
| if (!moved) return false | ||
|
|
||
| /* Load tablet and return serialized value. */ | ||
| val tablet = this.cursor.value | ||
| this.tablet = this.serializer.fromEntry(tablet) | ||
| this.tabletId = tabletId | ||
| return true | ||
| } | ||
|
|
||
| /** | ||
| * Closes this [FixedLengthCursor]. | ||
| */ | ||
| override fun close() { | ||
| this.cursor.close() | ||
| this.xodusTx.abort() | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.