Skip to content

[BEAM-12852] Revert change to int, use bigint in BigTable test #15468

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

Merged
apilloud merged 1 commit into from
Sep 7, 2021
Merged

[BEAM-12852] Revert change to int, use bigint in BigTable test #15468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...java/org/apache/beam/sdk/extensions/sql/meta/provider/bigtable/BigtableTableFlatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public void testSimpleSelectFlat() {
BeamSqlEnv sqlEnv = BeamSqlEnv.inMemory(new BigtableTableProvider());
sqlEnv.executeDdl(createFlatTableString(tableId, location(tableId)));

String query = "SELECT key, boolColumn, intColumn, stringColumn, doubleColumn FROM flatTable";
String query = "SELECT key, boolColumn, longColumn, stringColumn, doubleColumn FROM flatTable";

sqlEnv.parseQuery(query);
PCollection<Row> queryOutput =
Expand Down Expand Up @@ -145,8 +145,8 @@ public void testSimpleInsert() {
sqlEnv.executeDdl(createFlatTableString(tableId, location(tableId)));

String query =
"INSERT INTO beamWriteTable(key, boolColumn, intColumn, stringColumn, doubleColumn) "
+ "VALUES ('key', TRUE, 10, 'stringValue', 5.5)";
"INSERT INTO beamWriteTable(key, boolColumn, longColumn, stringColumn, doubleColumn) "
+ "VALUES ('key', TRUE, CAST(10 AS bigint), 'stringValue', 5.5)";

BeamSqlRelUtils.toPCollection(writePipeline, sqlEnv.parseQuery(query));
writePipeline.run().waitUntilFinish();
Expand Down
2 changes: 1 addition & 1 deletion .../test/java/org/apache/beam/sdk/extensions/sql/meta/provider/bigtable/BigtableTableIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ private void writeData() {
String query =
String.format(
"INSERT INTO `%s`(key, boolColumn, longColumn, stringColumn, doubleColumn) "
+ "VALUES ('key1', FALSE, 1, 'string1', 1.0)",
+ "VALUES ('key1', FALSE, CAST(1 as bigint), 'string1', 1.0)",
TABLE_ID);

BeamSqlRelUtils.toPCollection(p, sqlEnv.parseQuery(query));
Expand Down
24 changes: 12 additions & 12 deletions ...ava/org/apache/beam/sdk/extensions/sql/meta/provider/bigtable/BigtableTableTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
import org.apache.beam.sdk.schemas.Schema;
import org.apache.beam.sdk.values.Row;
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.collect.ImmutableList;
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.primitives.Ints;
import org.apache.beam.vendor.guava.v26_0_jre.com.google.common.primitives.Longs;
import org.checkerframework.checker.nullness.qual.Nullable;

class BigtableTableTestUtils {
Expand All @@ -48,12 +48,12 @@ class BigtableTableTestUtils {
static final String KEY2 = "key2";

static final String BOOL_COLUMN = "boolColumn";
static final String INT_COLUMN = "intColumn";
static final String LONG_COLUMN = "longColumn";
static final String STRING_COLUMN = "stringColumn";
static final String DOUBLE_COLUMN = "doubleColumn";
static final String FAMILY_TEST = "familyTest";

static final Schema INT_COLUMN_SCHEMA =
static final Schema LONG_COLUMN_SCHEMA =
Schema.builder()
.addInt64Field(VALUE)
.addInt64Field(TIMESTAMP_MICROS)
Expand All @@ -63,7 +63,7 @@ class BigtableTableTestUtils {
static final Schema TEST_FAMILY_SCHEMA =
Schema.builder()
.addBooleanField(BOOL_COLUMN)
.addRowField(INT_COLUMN, INT_COLUMN_SCHEMA)
.addRowField(LONG_COLUMN, LONG_COLUMN_SCHEMA)
.addArrayField(STRING_COLUMN, Schema.FieldType.STRING)
.addDoubleField(DOUBLE_COLUMN)
.build();
Expand All @@ -75,7 +75,7 @@ class BigtableTableTestUtils {
Schema.builder()
.addStringField(KEY)
.addBooleanField(BOOL_COLUMN)
.addInt64Field(INT_COLUMN)
.addInt64Field(LONG_COLUMN)
.addStringField(STRING_COLUMN)
.addDoubleField(DOUBLE_COLUMN)
.build();
Expand All @@ -88,7 +88,7 @@ static String createFlatTableString(String table, String location) {
"CREATE EXTERNAL TABLE `%s`( \n"
+ " key VARCHAR NOT NULL, \n"
+ " boolColumn BOOLEAN NOT NULL, \n"
+ " intColumn BIGINT NOT NULL, \n"
+ " longColumn BIGINT NOT NULL, \n"
+ " stringColumn VARCHAR NOT NULL, \n"
+ " doubleColumn DOUBLE NOT NULL \n"
+ ") \n"
Expand All @@ -105,7 +105,7 @@ static String createFullTableString(String tableId, String location) {
+ " key VARCHAR NOT NULL, \n"
+ " familyTest ROW< \n"
+ " boolColumn BOOLEAN NOT NULL, \n"
+ " intColumn ROW< \n"
+ " longColumn ROW< \n"
+ " val BIGINT NOT NULL, \n"
+ " timestampMicros BIGINT NOT NULL, \n"
+ " labels ARRAY<VARCHAR> NOT NULL \n"
Expand All @@ -123,7 +123,7 @@ static Schema expectedFullSchema() {
return Schema.builder()
.addStringField(KEY)
.addBooleanField(BOOL_COLUMN)
.addInt64Field("intValue")
.addInt64Field("longValue")
.addInt64Field(TIMESTAMP_MICROS)
.addArrayField(LABELS, Schema.FieldType.STRING)
.addArrayField(STRING_COLUMN, Schema.FieldType.STRING)
Expand Down Expand Up @@ -155,7 +155,7 @@ static String location(
}

static String columnsMappingString() {
return "familyTest:boolColumn,familyTest:intColumn,familyTest:doubleColumn,"
return "familyTest:boolColumn,familyTest:longColumn,familyTest:doubleColumn,"
+ "familyTest:stringColumn";
}

Expand All @@ -170,7 +170,7 @@ static com.google.bigtable.v2.Row bigTableRow() {
ImmutableList.of(
column("boolColumn", booleanToByteArray(true)),
column("doubleColumn", doubleToByteArray(5.5)),
column("intColumn", Ints.toByteArray(10)),
column("longColumn", Longs.toByteArray(10L)),
column("stringColumn", "stringValue".getBytes(UTF_8)));
Family family = Family.newBuilder().setName("familyTest").addAllColumns(columns).build();
return com.google.bigtable.v2.Row.newBuilder()
Expand Down Expand Up @@ -226,8 +226,8 @@ private static void writeRow(String key, String table, BigtableClientWrapper cli
clientWrapper.writeRow(key, table, FAMILY_TEST, STRING_COLUMN, "string1".getBytes(UTF_8), NOW);
clientWrapper.writeRow(
key, table, FAMILY_TEST, STRING_COLUMN, "string2".getBytes(UTF_8), LATER);
clientWrapper.writeRow(key, table, FAMILY_TEST, INT_COLUMN, longToByteArray(1L), NOW);
clientWrapper.writeRow(key, table, FAMILY_TEST, INT_COLUMN, longToByteArray(2L), LATER);
clientWrapper.writeRow(key, table, FAMILY_TEST, LONG_COLUMN, longToByteArray(1L), NOW);
clientWrapper.writeRow(key, table, FAMILY_TEST, LONG_COLUMN, longToByteArray(2L), LATER);
clientWrapper.writeRow(key, table, FAMILY_TEST, DOUBLE_COLUMN, doubleToByteArray(1.10), NOW);
clientWrapper.writeRow(key, table, FAMILY_TEST, DOUBLE_COLUMN, doubleToByteArray(2.20), LATER);
}
Expand Down
6 changes: 3 additions & 3 deletions .../org/apache/beam/sdk/extensions/sql/meta/provider/bigtable/BigtableTableWithRowsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,9 @@ public void testSimpleSelect() {
String query =
"SELECT key, \n"
+ " bt.familyTest.boolColumn, \n"
+ " bt.familyTest.intColumn.val AS intValue, \n"
+ " bt.familyTest.intColumn.timestampMicros, \n"
+ " bt.familyTest.intColumn.labels, \n"
+ " bt.familyTest.longColumn.val AS longValue, \n"
+ " bt.familyTest.longColumn.timestampMicros, \n"
+ " bt.familyTest.longColumn.labels, \n"
+ " bt.familyTest.stringColumn, \n"
+ " bt.familyTest.doubleColumn \n"
+ "FROM beamTable bt";
Expand Down