Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add time related types #2468

Merged
merged 6 commits into from
Jan 21, 2025
Merged

Add time related types #2468

merged 6 commits into from
Jan 21, 2025

Conversation

Torch3333
Copy link
Contributor

@Torch3333 Torch3333 commented Jan 20, 2025 •
edited
Loading

Description

This merges to the master branch the time-related types feature branch containing the following changes

Related issues and/or PRs

N/A

Changes made

Add the DATE, TIME, TIMESTAMP and TIMESTAMPTZ data types.

Checklist

The following is a best-effort checklist. If any items in this checklist are not applicable to this PR or are dependent on other, unmerged PRs, please still mark the checkboxes after you have read and understood each item.

  • I have commented my code, particularly in hard-to-understand areas.
  • I have updated the documentation to reflect the changes.
  • Any remaining open issues linked to this PR are documented and up-to-date (Jira, GitHub, etc.).
  • Tests (unit, integration, etc.) have been added for the changes.
  • My changes generate no new warnings.
  • Any dependent changes in other PRs have been merged and published.

Additional notes (optional)

Just a brief review is needed as all changes have already been reviewed in previous PRs.

Release notes

Add the new time-related data types DATE, TIME, TIMESTAMP, and TIMESTAMPTZ.

Torch3333 and others added 5 commits December 23, 2024 11:32
@Torch3333
Add time-related types to the Admin and Schema loader (#2301)
91681f5
@Torch3333
Add time-related types to the storage and transactional interfaces. (#…
f851464 
…2437)
@Torch3333 @josh-wong
Revise import table feature for time-related types (#2461)
a8b1930 
Co-authored-by: Josh Wong <[email protected]>
@Torch3333
Finalize integration tests for time related types (#2464)
8080dcd
@Torch3333
Merge branch 'master' of github.com:scalar-labs/scalardb into add_tim…
a47dcbb 
…e_related_types

# Conflicts:
#	build.gradle
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminImportTestUtils.java
#	core/src/main/java/com/scalar/db/common/error/CoreError.java
#	core/src/test/java/com/scalar/db/api/UpdateBuilderTest.java
#	core/src/test/java/com/scalar/db/api/UpsertBuilderTest.java
#	schema-loader/src/main/java/com/scalar/db/schemaloader/ImportTableSchema.java
@Torch3333 Torch3333 added the enhancement New feature or request label Jan 20, 2025
@Torch3333 Torch3333 self-assigned this Jan 20, 2025
@Torch3333 Torch3333 changed the title Merge time related types feature branch Add time related types Jan 20, 2025
@Torch3333 Torch3333 marked this pull request as ready for review January 20, 2025 06:40
brfrn169
brfrn169 approved these changes Jan 20, 2025
View reviewed changes
Copy link
Collaborator

@brfrn169 brfrn169 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you!

feeblefakie
feeblefakie approved these changes Jan 21, 2025
View reviewed changes
Copy link
Contributor

@feeblefakie feeblefakie left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! Thank you!

@feeblefakie
Copy link
Contributor

@Torch3333 There seems conflicts in the build.gradle file. Please check!

@Torch3333
Merge branch 'master' of github.com:scalar-labs/scalardb into add_tim…
919e6c9 
…e_related_types_merge

# Conflicts:
#	build.gradle
komamitsu
komamitsu approved these changes Jan 21, 2025
View reviewed changes
Copy link
Contributor

@komamitsu komamitsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! 👍

@brfrn169 brfrn169 merged commit 86c26d3 into master Jan 21, 2025
48 checks passed
@brfrn169 brfrn169 deleted the add_time_related_types_merge branch January 21, 2025 07:53
@feeblefakie feeblefakie mentioned this pull request Jan 21, 2025
Merged
Torch3333 added a commit that referenced this pull request Jan 22, 2025
@Torch3333
Add time related types (#2468)
b082256 
# Conflicts:
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminRepairIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraColumnValueIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraMultipleClusteringKeyScanIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraMultiplePartitionKeyIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraSchemaLoaderIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraSecondaryIndexIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraSingleClusteringKeyScanIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraSinglePartitionKeyIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminRepairIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/SingleCrudOperationTransactionAdminIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/TwoPhaseConsensusCommitIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminImportTestUtils.java
#	core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java
#	core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java
#	core/src/main/java/com/scalar/db/storage/jdbc/JdbcAdmin.java
#	core/src/main/java/com/scalar/db/storage/jdbc/JdbcConfig.java
#	core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineOracle.java
#	core/src/main/java/com/scalar/db/storage/jdbc/RdbEnginePostgresql.java
#	core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlServer.java
#	core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlite.java
#	core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdmin.java
#	core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTestBase.java
#	core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTestBase.java
#	core/src/test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTest.java
#	integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminImportTableIntegrationTestBase.java
#	integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminRepairTableIntegrationTestBase.java
#	integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminImportTableIntegrationTestBase.java
#	integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminRepairIntegrationTestBase.java
#	integration-test/src/main/java/com/scalar/db/schemaloader/SchemaLoaderIntegrationTestBase.java
Torch3333 added a commit that referenced this pull request Jan 22, 2025
@Torch3333
Add time related types (#2468)
5718121 
# Conflicts:
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraAdminRepairIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraColumnValueIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraMultipleClusteringKeyScanIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraMultiplePartitionKeyIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraSchemaLoaderIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraSecondaryIndexIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraSingleClusteringKeyScanIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/CassandraSinglePartitionKeyIntegrationTest.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitAdminRepairIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/ConsensusCommitIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/SingleCrudOperationTransactionAdminIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/cassandra/TwoPhaseConsensusCommitIntegrationTestWithCassandra.java
#	core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminImportTestUtils.java
#	core/src/main/java/com/scalar/db/common/CheckedDistributedStorageAdmin.java
#	core/src/main/java/com/scalar/db/storage/cassandra/CassandraAdmin.java
#	core/src/main/java/com/scalar/db/storage/jdbc/JdbcAdmin.java
#	core/src/main/java/com/scalar/db/storage/jdbc/JdbcConfig.java
#	core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineOracle.java
#	core/src/main/java/com/scalar/db/storage/jdbc/RdbEnginePostgresql.java
#	core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlServer.java
#	core/src/main/java/com/scalar/db/storage/jdbc/RdbEngineSqlite.java
#	core/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitAdmin.java
#	core/src/test/java/com/scalar/db/storage/cosmos/CosmosAdminTestBase.java
#	core/src/test/java/com/scalar/db/storage/jdbc/JdbcAdminTestBase.java
#	core/src/test/java/com/scalar/db/storage/multistorage/MultiStorageAdminTest.java
#	integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminImportTableIntegrationTestBase.java
#	integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminRepairTableIntegrationTestBase.java
#	integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminImportTableIntegrationTestBase.java
#	integration-test/src/main/java/com/scalar/db/api/DistributedTransactionAdminRepairIntegrationTestBase.java
#	integration-test/src/main/java/com/scalar/db/schemaloader/SchemaLoaderIntegrationTestBase.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feeblefakie feeblefakie feeblefakie approved these changes

@brfrn169 brfrn169 brfrn169 approved these changes

@komamitsu komamitsu komamitsu approved these changes

Assignees

@Torch3333 Torch3333

Labels
enhancement New feature or request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Torch3333 @feeblefakie @komamitsu @brfrn169