-
Notifications
You must be signed in to change notification settings - Fork 888
CASSJAVA-2 Fix TableMetadata.describe() when containing a vector column #1978
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
67 changes: 67 additions & 0 deletions
67
...rc/test/java/com/datastax/oss/driver/internal/core/metadata/schema/TableMetadataTest.java
This file contains hidden or 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 |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * 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 com.datastax.oss.driver.internal.core.metadata.schema; | ||
|
|
||
| import static com.datastax.oss.driver.api.core.CqlIdentifier.fromCql; | ||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import com.datastax.oss.driver.api.core.metadata.schema.TableMetadata; | ||
| import com.datastax.oss.driver.internal.core.type.DefaultVectorType; | ||
| import com.datastax.oss.driver.internal.core.type.PrimitiveType; | ||
| import com.datastax.oss.driver.shaded.guava.common.collect.ImmutableMap; | ||
| import com.datastax.oss.protocol.internal.ProtocolConstants.DataType; | ||
| import com.google.common.collect.ImmutableList; | ||
| import java.util.UUID; | ||
| import org.junit.Test; | ||
|
|
||
| public class TableMetadataTest { | ||
|
|
||
| /** Tests CASSJAVA-2 */ | ||
| @Test | ||
| public void should_describe_table_with_vector_correctly() { | ||
| TableMetadata tableMetadata = | ||
| new DefaultTableMetadata( | ||
| fromCql("ks"), | ||
| fromCql("tb"), | ||
| UUID.randomUUID(), | ||
| false, | ||
| false, | ||
| ImmutableList.of( | ||
| new DefaultColumnMetadata( | ||
| fromCql("ks"), | ||
| fromCql("ks"), | ||
| fromCql("tb"), | ||
| new PrimitiveType(DataType.ASCII), | ||
| false)), | ||
| ImmutableMap.of(), | ||
| ImmutableMap.of( | ||
| fromCql("a"), | ||
| new DefaultColumnMetadata( | ||
| fromCql("ks"), | ||
| fromCql("ks"), | ||
| fromCql("tb"), | ||
| new DefaultVectorType(new PrimitiveType(DataType.INT), 3), | ||
| false)), | ||
| ImmutableMap.of(), | ||
| ImmutableMap.of()); | ||
|
|
||
| String describe1 = tableMetadata.describe(true); | ||
|
|
||
| assertThat(describe1).contains("vector<int, 3>,"); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is already fixed in @SiyaoIsHiding 's PR for JAVA-3118. I like the addition of a unit test for it, however, so my inclination is to merge this PR and then have Jane update her PR to remove her change.
Thoughts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Got confirmation from @SiyaoIsHiding in separate communication that she's fine with tweaking the JAVA-3118 PR after this goes in... so we're all set to go!