Skip to content

Commit 2133072

Browse files
authored
Merge branch 'main' into dependabot/maven/io.grpc-grpc-bom-1.81.0
2 parents f28d105 + d88adb3 commit 2133072

6 files changed

Lines changed: 31 additions & 6 deletions

File tree

bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the License.
2323
<parent>
2424
<groupId>org.apache</groupId>
2525
<artifactId>apache</artifactId>
26-
<version>37</version>
26+
<version>38</version>
2727
<relativePath/>
2828
</parent>
2929

flight/flight-sql-jdbc-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ under the License.
159159
<dependency>
160160
<groupId>org.apache.calcite.avatica</groupId>
161161
<artifactId>avatica</artifactId>
162-
<version>1.26.0</version>
162+
<version>1.27.0</version>
163163
</dependency>
164164

165165
<dependency>

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/ArrowFlightJdbcVectorSchemaRootResultSet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ public Object getObject(int columnIndex) throws SQLException {
128128
if (metaData.type.id == Types.TIMESTAMP_WITH_TIMEZONE) {
129129
return accessor.getTimestamp(localCalendar);
130130
} else {
131-
return AvaticaSite.get(accessor, metaData.type.id, localCalendar);
131+
return AvaticaSite.get(accessor, metaData.type.id, true, localCalendar);
132132
}
133133
}
134134

flight/flight-sql-jdbc-core/src/main/java/org/apache/arrow/driver/jdbc/accessor/ArrowFlightJdbcAccessor.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@
3636
import java.util.Calendar;
3737
import java.util.Map;
3838
import java.util.function.IntSupplier;
39+
import org.joou.UByte;
40+
import org.joou.UInteger;
41+
import org.joou.ULong;
42+
import org.joou.UShort;
3943

4044
/** Base Jdbc Accessor. */
4145
public abstract class ArrowFlightJdbcAccessor implements Accessor {
@@ -99,6 +103,26 @@ public long getLong() throws SQLException {
99103
throw getOperationNotSupported(this.getClass());
100104
}
101105

106+
@Override
107+
public UByte getUByte() throws SQLException {
108+
throw getOperationNotSupported(this.getClass());
109+
}
110+
111+
@Override
112+
public UShort getUShort() throws SQLException {
113+
throw getOperationNotSupported(this.getClass());
114+
}
115+
116+
@Override
117+
public UInteger getUInt() throws SQLException {
118+
throw getOperationNotSupported(this.getClass());
119+
}
120+
121+
@Override
122+
public ULong getULong() throws SQLException {
123+
throw getOperationNotSupported(this.getClass());
124+
}
125+
102126
@Override
103127
public float getFloat() throws SQLException {
104128
throw getOperationNotSupported(this.getClass());

flight/flight-sql-jdbc-driver/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ under the License.
159159
<artifact>org.apache.calcite.avatica:*</artifact>
160160
<excludes>
161161
<exclude>META-INF/services/java.sql.Driver</exclude>
162+
<exclude>META-INF/README.txt</exclude>
162163
</excludes>
163164
</filter>
164165
<filter>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ under the License.
2323
<parent>
2424
<groupId>org.apache</groupId>
2525
<artifactId>apache</artifactId>
26-
<version>37</version>
26+
<version>38</version>
2727
</parent>
2828

2929
<groupId>org.apache.arrow</groupId>
@@ -98,7 +98,7 @@ under the License.
9898
<dep.junit.jupiter.version>5.12.2</dep.junit.jupiter.version>
9999
<dep.slf4j.version>2.0.17</dep.slf4j.version>
100100
<dep.guava-bom.version>33.6.0-jre</dep.guava-bom.version>
101-
<dep.netty-bom.version>4.2.12.Final</dep.netty-bom.version>
101+
<dep.netty-bom.version>4.2.13.Final</dep.netty-bom.version>
102102
<dep.grpc-bom.version>1.81.0</dep.grpc-bom.version>
103103
<dep.protobuf-bom.version>4.34.1</dep.protobuf-bom.version>
104104
<dep.jackson-bom.version>2.21.3</dep.jackson-bom.version>
@@ -183,7 +183,7 @@ under the License.
183183
<dependency>
184184
<groupId>org.immutables</groupId>
185185
<artifactId>value-annotations</artifactId>
186-
<version>2.12.1</version>
186+
<version>2.12.2</version>
187187
<scope>provided</scope>
188188
</dependency>
189189
<dependency>

0 commit comments

Comments
 (0)