Skip to content

Commit 69022c2

Browse files
author
Mike Pigott
committed
ARROW-3966: Fixing merge.
1 parent 4a6de86 commit 69022c2

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrow.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public static VectorSchemaRoot sqlToArrow(
118118
Preconditions.checkNotNull(allocator, "Memory allocator object can not be null");
119119
Preconditions.checkNotNull(calendar, "Calendar object can not be null");
120120

121-
return sqlToArrow(connection, query, new JdbcToArrowConfig(allocator, calendar));
121+
return sqlToArrow(connection, query, new JdbcToArrowConfig(allocator, calendar, false));
122122
}
123123

124124
/**
@@ -172,7 +172,7 @@ public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, BaseAllocator all
172172
Preconditions.checkNotNull(allocator, "Memory Allocator object can not be null");
173173

174174
JdbcToArrowConfig config =
175-
new JdbcToArrowConfig(allocator, Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ROOT));
175+
new JdbcToArrowConfig(allocator, Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.ROOT), false);
176176
return sqlToArrow(resultSet, config);
177177
}
178178

@@ -188,7 +188,7 @@ public static VectorSchemaRoot sqlToArrow(ResultSet resultSet, Calendar calendar
188188
Preconditions.checkNotNull(resultSet, "JDBC ResultSet object can not be null");
189189
Preconditions.checkNotNull(calendar, "Calendar object can not be null");
190190

191-
return sqlToArrow(resultSet, new JdbcToArrowConfig(new RootAllocator(Integer.MAX_VALUE), calendar));
191+
return sqlToArrow(resultSet, new JdbcToArrowConfig(new RootAllocator(Integer.MAX_VALUE), calendar, false));
192192
}
193193

194194
/**
@@ -209,7 +209,7 @@ public static VectorSchemaRoot sqlToArrow(
209209
Preconditions.checkNotNull(allocator, "Memory Allocator object can not be null");
210210
Preconditions.checkNotNull(calendar, "Calendar object can not be null");
211211

212-
return sqlToArrow(resultSet, new JdbcToArrowConfig(allocator, calendar));
212+
return sqlToArrow(resultSet, new JdbcToArrowConfig(allocator, calendar, false));
213213
}
214214

215215
/**

java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigBuilder.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,6 @@ public JdbcToArrowConfigBuilder setCalendar(Calendar calendar) {
9898
* @throws NullPointerException if either the allocator or calendar was not set.
9999
*/
100100
public JdbcToArrowConfig build() {
101-
return new JdbcToArrowConfig(allocator, calendar);
101+
return new JdbcToArrowConfig(allocator, calendar, false);
102102
}
103103
}

java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/JdbcToArrowUtils.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public static Schema jdbcToArrowSchema(ResultSetMetaData rsmd, Calendar calendar
105105
Preconditions.checkNotNull(rsmd, "JDBC ResultSetMetaData object can't be null");
106106
Preconditions.checkNotNull(calendar, "Calendar object can't be null");
107107

108-
return jdbcToArrowSchema(rsmd, new JdbcToArrowConfig(new RootAllocator(0), calendar));
108+
return jdbcToArrowSchema(rsmd, new JdbcToArrowConfig(new RootAllocator(0), calendar, false));
109109
}
110110

111111
/**
@@ -270,7 +270,7 @@ public static void jdbcToArrowVectors(ResultSet rs, VectorSchemaRoot root, Calen
270270
Preconditions.checkNotNull(root, "Vector Schema cannot be null");
271271
Preconditions.checkNotNull(calendar, "Calendar object can't be null");
272272

273-
jdbcToArrowVectors(rs, root, new JdbcToArrowConfig(new RootAllocator(0), calendar));
273+
jdbcToArrowVectors(rs, root, new JdbcToArrowConfig(new RootAllocator(0), calendar, false));
274274
}
275275

276276
/**

java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcToArrowConfigTest.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class JdbcToArrowConfigTest {
3434

3535
@Test(expected = NullPointerException.class)
3636
public void testConfigNullArguments() {
37-
new JdbcToArrowConfig(null, null);
37+
new JdbcToArrowConfig(null, null, false);
3838
}
3939

4040
@Test(expected = NullPointerException.class)
@@ -44,7 +44,7 @@ public void testBuilderNullArguments() {
4444

4545
@Test(expected = NullPointerException.class)
4646
public void testConfigNullCalendar() {
47-
new JdbcToArrowConfig(allocator, null);
47+
new JdbcToArrowConfig(allocator, null, false);
4848
}
4949

5050
@Test(expected = NullPointerException.class)
@@ -54,7 +54,7 @@ public void testBuilderNullCalendar() {
5454

5555
@Test(expected = NullPointerException.class)
5656
public void testConfigNullAllocator() {
57-
new JdbcToArrowConfig(null, calendar);
57+
new JdbcToArrowConfig(null, calendar, false);
5858
}
5959

6060
@Test(expected = NullPointerException.class)

0 commit comments

Comments
 (0)