Skip to content

Commit 0a8a119

Browse files
KodaiDKodaiD
committed
Fix to enable tests for TIMESTAMPTZ
1 parent 97a8387 commit 0a8a119

File tree

7 files changed

+116
-138
lines changed

7 files changed

+116
-138
lines changed

‎core/src/integration-test/java/com/scalar/db/storage/jdbc/ConsensusCommitAdminIntegrationTestWithJdbcDatabase.java‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
161161
.addColumn("c8", DataType.BLOB)
162162
.addColumn("c9", DataType.DATE)
163163
.addColumn("c10", DataType.TIME)
164+
.addColumn("c11", DataType.TIMESTAMPTZ)
164165
.addPartitionKey("c1")
165166
.addClusteringKey("c2", Scan.Ordering.Order.ASC);
166167
if (isTimestampTypeSupported()) {
167-
currentTableMetadataBuilder
168-
.addColumn("c11", DataType.TIMESTAMP)
169-
.addColumn("c12", DataType.TIMESTAMPTZ);
168+
currentTableMetadataBuilder.addColumn("c12", DataType.TIMESTAMP);
170169
}
171170
TableMetadata currentTableMetadata = currentTableMetadataBuilder.build();
172171
admin.createTable(namespace1, TABLE4, currentTableMetadata, options);
@@ -183,10 +182,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
183182
.textValue("c7", "5")
184183
.blobValue("c8", "6".getBytes(StandardCharsets.UTF_8))
185184
.dateValue("c9", LocalDate.now(ZoneId.of("UTC")))
186-
.timeValue("c10", LocalTime.now(ZoneId.of("UTC")));
185+
.timeValue("c10", LocalTime.now(ZoneId.of("UTC")))
186+
.timestampTZValue("c12", Instant.now());
187187
if (isTimestampTypeSupported()) {
188-
insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC));
189-
insert.timestampTZValue("c12", Instant.now());
188+
insert.timestampValue("c12", LocalDateTime.now(ZoneOffset.UTC));
190189
}
191190
transactionalInsert(insert.build());
192191

@@ -207,9 +206,9 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
207206
.isInstanceOf(UnsupportedOperationException.class);
208207
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c10", DataType.TEXT))
209208
.isInstanceOf(UnsupportedOperationException.class);
209+
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT))
210+
.isInstanceOf(UnsupportedOperationException.class);
210211
if (isTimestampTypeSupported()) {
211-
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT))
212-
.isInstanceOf(UnsupportedOperationException.class);
213212
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT))
214213
.isInstanceOf(UnsupportedOperationException.class);
215214
}
@@ -238,12 +237,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
238237
.addColumn("c8", DataType.BLOB)
239238
.addColumn("c9", DataType.DATE)
240239
.addColumn("c10", DataType.TIME)
240+
.addColumn("c11", DataType.TIMESTAMPTZ)
241241
.addPartitionKey("c1")
242242
.addClusteringKey("c2", Scan.Ordering.Order.ASC);
243243
if (isTimestampTypeSupported()) {
244-
currentTableMetadataBuilder
245-
.addColumn("c11", DataType.TIMESTAMP)
246-
.addColumn("c12", DataType.TIMESTAMPTZ);
244+
currentTableMetadataBuilder.addColumn("c12", DataType.TIMESTAMP);
247245
}
248246
TableMetadata currentTableMetadata = currentTableMetadataBuilder.build();
249247
admin.createTable(namespace1, TABLE4, currentTableMetadata, options);
@@ -260,10 +258,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
260258
.textValue("c7", "5")
261259
.blobValue("c8", "6".getBytes(StandardCharsets.UTF_8))
262260
.dateValue("c9", LocalDate.now(ZoneId.of("UTC")))
263-
.timeValue("c10", LocalTime.now(ZoneId.of("UTC")));
261+
.timeValue("c10", LocalTime.now(ZoneId.of("UTC")))
262+
.timestampTZValue("c11", Instant.now());
264263
if (isTimestampTypeSupported()) {
265-
insert.timestampValue("c11", LocalDateTime.now(ZoneOffset.UTC));
266-
insert.timestampTZValue("c12", Instant.now());
264+
insert.timestampValue("c12", LocalDateTime.now(ZoneOffset.UTC));
267265
}
268266
transactionalInsert(insert.build());
269267

@@ -284,9 +282,9 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
284282
.doesNotThrowAnyException();
285283
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c10", DataType.TEXT))
286284
.doesNotThrowAnyException();
285+
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT))
286+
.doesNotThrowAnyException();
287287
if (isTimestampTypeSupported()) {
288-
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c11", DataType.TEXT))
289-
.doesNotThrowAnyException();
290288
assertThatCode(() -> admin.alterColumnType(namespace1, TABLE4, "c12", DataType.TEXT))
291289
.doesNotThrowAnyException();
292290
}
@@ -303,12 +301,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
303301
.addColumn("c8", DataType.BLOB)
304302
.addColumn("c9", DataType.TEXT)
305303
.addColumn("c10", DataType.TEXT)
304+
.addColumn("c11", DataType.TEXT)
306305
.addPartitionKey("c1")
307306
.addClusteringKey("c2", Scan.Ordering.Order.ASC);
308307
if (isTimestampTypeSupported()) {
309-
expectedTableMetadataBuilder
310-
.addColumn("c11", DataType.TEXT)
311-
.addColumn("c12", DataType.TEXT);
308+
expectedTableMetadataBuilder.addColumn("c12", DataType.TEXT);
312309
}
313310
TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build();
314311
assertThat(admin.getTableMetadata(namespace1, TABLE4)).isEqualTo(expectedTableMetadata);

‎core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminCaseSensitivityIntegrationTest.java‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
168168
.addColumn(getColumnName8(), DataType.BLOB)
169169
.addColumn(getColumnName9(), DataType.DATE)
170170
.addColumn(getColumnName10(), DataType.TIME)
171+
.addColumn(getColumnName11(), DataType.TIMESTAMPTZ)
171172
.addPartitionKey(getColumnName1())
172173
.addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC);
173174
if (isTimestampTypeSupported()) {
174-
currentTableMetadataBuilder
175-
.addColumn(getColumnName11(), DataType.TIMESTAMP)
176-
.addColumn(getColumnName12(), DataType.TIMESTAMPTZ);
175+
currentTableMetadataBuilder.addColumn(getColumnName12(), DataType.TIMESTAMP);
177176
}
178177
TableMetadata currentTableMetadata = currentTableMetadataBuilder.build();
179178
admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options);
@@ -190,10 +189,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
190189
.textValue(getColumnName7(), "5")
191190
.blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8))
192191
.dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC")))
193-
.timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC")));
192+
.timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC")))
193+
.timestampTZValue(getColumnName11(), Instant.now());
194194
if (isTimestampTypeSupported()) {
195-
put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC));
196-
put.timestampTZValue(getColumnName12(), Instant.now());
195+
put.timestampValue(getColumnName12(), LocalDateTime.now(ZoneOffset.UTC));
197196
}
198197
storage.put(put.build());
199198
storage.close();
@@ -239,12 +238,12 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
239238
admin.alterColumnType(
240239
getNamespace1(), getTable4(), getColumnName10(), DataType.TEXT))
241240
.isInstanceOf(UnsupportedOperationException.class);
241+
assertThatCode(
242+
() ->
243+
admin.alterColumnType(
244+
getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT))
245+
.isInstanceOf(UnsupportedOperationException.class);
242246
if (isTimestampTypeSupported()) {
243-
assertThatCode(
244-
() ->
245-
admin.alterColumnType(
246-
getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT))
247-
.isInstanceOf(UnsupportedOperationException.class);
248247
assertThatCode(
249248
() ->
250249
admin.alterColumnType(
@@ -276,12 +275,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
276275
.addColumn(getColumnName8(), DataType.BLOB)
277276
.addColumn(getColumnName9(), DataType.DATE)
278277
.addColumn(getColumnName10(), DataType.TIME)
278+
.addColumn(getColumnName11(), DataType.TIMESTAMPTZ)
279279
.addPartitionKey(getColumnName1())
280280
.addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC);
281281
if (isTimestampTypeSupported()) {
282-
currentTableMetadataBuilder
283-
.addColumn(getColumnName11(), DataType.TIMESTAMP)
284-
.addColumn(getColumnName12(), DataType.TIMESTAMPTZ);
282+
currentTableMetadataBuilder.addColumn(getColumnName12(), DataType.TIMESTAMP);
285283
}
286284
TableMetadata currentTableMetadata = currentTableMetadataBuilder.build();
287285
admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options);
@@ -298,10 +296,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
298296
.textValue(getColumnName7(), "5")
299297
.blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8))
300298
.dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC")))
301-
.timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC")));
299+
.timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC")))
300+
.timestampTZValue(getColumnName11(), Instant.now());
302301
if (isTimestampTypeSupported()) {
303-
put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC));
304-
put.timestampTZValue(getColumnName12(), Instant.now());
302+
put.timestampValue(getColumnName12(), LocalDateTime.now(ZoneOffset.UTC));
305303
}
306304
storage.put(put.build());
307305
storage.close();
@@ -347,12 +345,12 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
347345
admin.alterColumnType(
348346
getNamespace1(), getTable4(), getColumnName10(), DataType.TEXT))
349347
.doesNotThrowAnyException();
348+
assertThatCode(
349+
() ->
350+
admin.alterColumnType(
351+
getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT))
352+
.doesNotThrowAnyException();
350353
if (isTimestampTypeSupported()) {
351-
assertThatCode(
352-
() ->
353-
admin.alterColumnType(
354-
getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT))
355-
.doesNotThrowAnyException();
356354
assertThatCode(
357355
() ->
358356
admin.alterColumnType(
@@ -372,12 +370,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
372370
.addColumn(getColumnName8(), DataType.BLOB)
373371
.addColumn(getColumnName9(), DataType.TEXT)
374372
.addColumn(getColumnName10(), DataType.TEXT)
373+
.addColumn(getColumnName11(), DataType.TEXT)
375374
.addPartitionKey(getColumnName1())
376375
.addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC);
377376
if (isTimestampTypeSupported()) {
378-
expectedTableMetadataBuilder
379-
.addColumn(getColumnName11(), DataType.TEXT)
380-
.addColumn(getColumnName12(), DataType.TEXT);
377+
expectedTableMetadataBuilder.addColumn(getColumnName12(), DataType.TEXT);
381378
}
382379
TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build();
383380
assertThat(admin.getTableMetadata(getNamespace1(), getTable4()))

‎core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcAdminIntegrationTest.java‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
169169
.addColumn(getColumnName8(), DataType.BLOB)
170170
.addColumn(getColumnName9(), DataType.DATE)
171171
.addColumn(getColumnName10(), DataType.TIME)
172+
.addColumn(getColumnName11(), DataType.TIMESTAMPTZ)
172173
.addPartitionKey(getColumnName1())
173174
.addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC);
174175
if (isTimestampTypeSupported()) {
175-
currentTableMetadataBuilder
176-
.addColumn(getColumnName11(), DataType.TIMESTAMP)
177-
.addColumn(getColumnName12(), DataType.TIMESTAMPTZ);
176+
currentTableMetadataBuilder.addColumn(getColumnName12(), DataType.TIMESTAMP);
178177
}
179178
TableMetadata currentTableMetadata = currentTableMetadataBuilder.build();
180179
admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options);
@@ -191,10 +190,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
191190
.textValue(getColumnName7(), "5")
192191
.blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8))
193192
.dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC")))
194-
.timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC")));
193+
.timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC")))
194+
.timestampTZValue(getColumnName11(), Instant.now());
195195
if (isTimestampTypeSupported()) {
196-
put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC));
197-
put.timestampTZValue(getColumnName12(), Instant.now());
196+
put.timestampValue(getColumnName12(), LocalDateTime.now(ZoneOffset.UTC));
198197
}
199198
storage.put(put.build());
200199
storage.close();
@@ -240,12 +239,12 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
240239
admin.alterColumnType(
241240
getNamespace1(), getTable4(), getColumnName10(), DataType.TEXT))
242241
.isInstanceOf(UnsupportedOperationException.class);
242+
assertThatCode(
243+
() ->
244+
admin.alterColumnType(
245+
getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT))
246+
.isInstanceOf(UnsupportedOperationException.class);
243247
if (isTimestampTypeSupported()) {
244-
assertThatCode(
245-
() ->
246-
admin.alterColumnType(
247-
getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT))
248-
.isInstanceOf(UnsupportedOperationException.class);
249248
assertThatCode(
250249
() ->
251250
admin.alterColumnType(
@@ -277,12 +276,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
277276
.addColumn(getColumnName8(), DataType.BLOB)
278277
.addColumn(getColumnName9(), DataType.DATE)
279278
.addColumn(getColumnName10(), DataType.TIME)
279+
.addColumn(getColumnName11(), DataType.TIMESTAMPTZ)
280280
.addPartitionKey(getColumnName1())
281281
.addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC);
282282
if (isTimestampTypeSupported()) {
283-
currentTableMetadataBuilder
284-
.addColumn(getColumnName11(), DataType.TIMESTAMP)
285-
.addColumn(getColumnName12(), DataType.TIMESTAMPTZ);
283+
currentTableMetadataBuilder.addColumn(getColumnName12(), DataType.TIMESTAMP);
286284
}
287285
TableMetadata currentTableMetadata = currentTableMetadataBuilder.build();
288286
admin.createTable(getNamespace1(), getTable4(), currentTableMetadata, options);
@@ -299,10 +297,10 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
299297
.textValue(getColumnName7(), "5")
300298
.blobValue(getColumnName8(), "6".getBytes(StandardCharsets.UTF_8))
301299
.dateValue(getColumnName9(), LocalDate.now(ZoneId.of("UTC")))
302-
.timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC")));
300+
.timeValue(getColumnName10(), LocalTime.now(ZoneId.of("UTC")))
301+
.timestampTZValue(getColumnName11(), Instant.now());
303302
if (isTimestampTypeSupported()) {
304303
put.timestampValue(getColumnName11(), LocalDateTime.now(ZoneOffset.UTC));
305-
put.timestampTZValue(getColumnName12(), Instant.now());
306304
}
307305
storage.put(put.build());
308306
storage.close();
@@ -348,12 +346,12 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
348346
admin.alterColumnType(
349347
getNamespace1(), getTable4(), getColumnName10(), DataType.TEXT))
350348
.doesNotThrowAnyException();
349+
assertThatCode(
350+
() ->
351+
admin.alterColumnType(
352+
getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT))
353+
.doesNotThrowAnyException();
351354
if (isTimestampTypeSupported()) {
352-
assertThatCode(
353-
() ->
354-
admin.alterColumnType(
355-
getNamespace1(), getTable4(), getColumnName11(), DataType.TEXT))
356-
.doesNotThrowAnyException();
357355
assertThatCode(
358356
() ->
359357
admin.alterColumnType(
@@ -373,12 +371,11 @@ public void renameColumn_Db2_ForPrimaryOrIndexKeyColumn_ShouldThrowUnsupportedOp
373371
.addColumn(getColumnName8(), DataType.BLOB)
374372
.addColumn(getColumnName9(), DataType.TEXT)
375373
.addColumn(getColumnName10(), DataType.TEXT)
374+
.addColumn(getColumnName11(), DataType.TEXT)
376375
.addPartitionKey(getColumnName1())
377376
.addClusteringKey(getColumnName2(), Scan.Ordering.Order.ASC);
378377
if (isTimestampTypeSupported()) {
379-
expectedTableMetadataBuilder
380-
.addColumn(getColumnName11(), DataType.TEXT)
381-
.addColumn(getColumnName12(), DataType.TEXT);
378+
expectedTableMetadataBuilder.addColumn(getColumnName12(), DataType.TEXT);
382379
}
383380
TableMetadata expectedTableMetadata = expectedTableMetadataBuilder.build();
384381
assertThat(admin.getTableMetadata(getNamespace1(), getTable4()))

0 commit comments

Comments
 (0)