Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;

namespace Apache.DataFusion.TableProviders.ClickHouse;
Expand All @@ -33,7 +32,7 @@ public override void Append(DbDataReader reader)
return;
}

builder.Append(Convert.ToBoolean(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetBoolean(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;

namespace Apache.DataFusion.TableProviders.ClickHouse;
Expand All @@ -33,7 +32,7 @@ public override void Append(DbDataReader reader)
return;
}

builder.Append(Convert.ToDouble(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetDouble(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;

namespace Apache.DataFusion.TableProviders.ClickHouse;
Expand All @@ -33,7 +32,7 @@ public override void Append(DbDataReader reader)
return;
}

builder.Append(Convert.ToSingle(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetFloat(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;

namespace Apache.DataFusion.TableProviders.ClickHouse;
Expand All @@ -33,7 +32,7 @@ public override void Append(DbDataReader reader)
return;
}

builder.Append(Convert.ToInt32(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetInt32(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;

namespace Apache.DataFusion.TableProviders.ClickHouse;
Expand All @@ -33,7 +32,7 @@ public override void Append(DbDataReader reader)
return;
}

builder.Append(Convert.ToInt64(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetInt64(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public override void Append(DbDataReader reader)
return;
}

builder.Append(FormatValue(reader.GetValue(Ordinal)));
builder.Append(reader.GetString(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,24 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;
using MySqlConnector;

namespace Apache.DataFusion.TableProviders.MySql;

internal sealed class BooleanColumnAppender(int ordinal) : ColumnAppender(ordinal)
{
private readonly BooleanArray.Builder builder = new();

public override void Append(DbDataReader reader)
public override void Append(MySqlDataReader reader)
{
if (reader.IsDBNull(Ordinal))
{
builder.AppendNull();
return;
}

builder.Append(Convert.ToBoolean(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetBoolean(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
4 changes: 2 additions & 2 deletions src/Apache.DataFusion.TableProviders.MySql/ColumnAppender.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;
using MySqlConnector;

namespace Apache.DataFusion.TableProviders.MySql;

internal abstract class ColumnAppender(int ordinal)
{
protected int Ordinal { get; } = ordinal;

public abstract void Append(DbDataReader reader);
public abstract void Append(MySqlDataReader reader);

public abstract IArrowArray Build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,24 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;
using MySqlConnector;

namespace Apache.DataFusion.TableProviders.MySql;

internal sealed class DoubleColumnAppender(int ordinal) : ColumnAppender(ordinal)
{
private readonly DoubleArray.Builder builder = new();

public override void Append(DbDataReader reader)
public override void Append(MySqlDataReader reader)
{
if (reader.IsDBNull(Ordinal))
{
builder.AppendNull();
return;
}

builder.Append(Convert.ToDouble(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetDouble(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,24 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;
using MySqlConnector;

namespace Apache.DataFusion.TableProviders.MySql;

internal sealed class FloatColumnAppender(int ordinal) : ColumnAppender(ordinal)
{
private readonly FloatArray.Builder builder = new();

public override void Append(DbDataReader reader)
public override void Append(MySqlDataReader reader)
{
if (reader.IsDBNull(Ordinal))
{
builder.AppendNull();
return;
}

builder.Append(Convert.ToSingle(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetFloat(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,24 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;
using MySqlConnector;

namespace Apache.DataFusion.TableProviders.MySql;

internal sealed class Int32ColumnAppender(int ordinal) : ColumnAppender(ordinal)
{
private readonly Int32Array.Builder builder = new();

public override void Append(DbDataReader reader)
public override void Append(MySqlDataReader reader)
{
if (reader.IsDBNull(Ordinal))
{
builder.AppendNull();
return;
}

builder.Append(Convert.ToInt32(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetInt32(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,24 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;
using MySqlConnector;

namespace Apache.DataFusion.TableProviders.MySql;

internal sealed class Int64ColumnAppender(int ordinal) : ColumnAppender(ordinal)
{
private readonly Int64Array.Builder builder = new();

public override void Append(DbDataReader reader)
public override void Append(MySqlDataReader reader)
{
if (reader.IsDBNull(Ordinal))
{
builder.AppendNull();
return;
}

builder.Append(Convert.ToInt64(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetInt64(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
// under the License.

using System.Data;
using System.Data.Common;
using Apache.Arrow;
using Apache.Arrow.Ipc;
using Apache.DataFusion.TableProviders.MySql.Sql;
Expand All @@ -34,7 +33,7 @@ internal sealed class MySqlArrowArrayStream : IArrowArrayStream
private readonly IReadOnlyList<SqlQueryParameter>? parameters;
private MySqlConnection? connection;
private MySqlCommand? command;
private DbDataReader? reader;
private MySqlDataReader? reader;
private bool finished;

public MySqlArrowArrayStream(
Expand Down Expand Up @@ -66,7 +65,7 @@ public MySqlArrowArrayStream(
return new ValueTask<RecordBatch?>((RecordBatch?)null);
}

DbDataReader activeReader = EnsureReader();
MySqlDataReader activeReader = EnsureReader();

ColumnAppender[] appenders = columns.Select(static column => column.CreateAppender()).ToArray();
int rowCount = 0;
Expand All @@ -92,7 +91,7 @@ public MySqlArrowArrayStream(
return new ValueTask<RecordBatch?>(batch);
}

private DbDataReader EnsureReader()
private MySqlDataReader EnsureReader()
{
if (reader is not null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using Apache.Arrow;
using MySqlConnector;

namespace Apache.DataFusion.TableProviders.MySql;

internal sealed class StringColumnAppender(int ordinal) : ColumnAppender(ordinal)
{
private readonly StringArray.Builder builder = new();

public override void Append(DbDataReader reader)
public override void Append(MySqlDataReader reader)
{
if (reader.IsDBNull(Ordinal))
{
builder.AppendNull();
return;
}

builder.Append(FormatValue(reader.GetValue(Ordinal)));
builder.Append(reader.GetString(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,24 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;
using Npgsql;

namespace Apache.DataFusion.TableProviders.PostgreSql;

internal sealed class BooleanColumnAppender(int ordinal) : ColumnAppender(ordinal)
{
private readonly BooleanArray.Builder builder = new();

public override void Append(DbDataReader reader)
public override void Append(NpgsqlDataReader reader)
{
if (reader.IsDBNull(Ordinal))
{
builder.AppendNull();
return;
}

builder.Append(Convert.ToBoolean(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetBoolean(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,17 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;
using Npgsql;

namespace Apache.DataFusion.TableProviders.PostgreSql;

internal abstract class ColumnAppender(int ordinal)
{
protected int Ordinal { get; } = ordinal;

public abstract void Append(DbDataReader reader);
public abstract void Append(NpgsqlDataReader reader);

public abstract IArrowArray Build();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,25 +15,24 @@
// specific language governing permissions and limitations
// under the License.

using System.Data.Common;
using System.Globalization;
using Apache.Arrow;
using Npgsql;

namespace Apache.DataFusion.TableProviders.PostgreSql;

internal sealed class DoubleColumnAppender(int ordinal) : ColumnAppender(ordinal)
{
private readonly DoubleArray.Builder builder = new();

public override void Append(DbDataReader reader)
public override void Append(NpgsqlDataReader reader)
{
if (reader.IsDBNull(Ordinal))
{
builder.AppendNull();
return;
}

builder.Append(Convert.ToDouble(reader.GetValue(Ordinal), CultureInfo.InvariantCulture));
builder.Append(reader.GetDouble(Ordinal));
}

public override IArrowArray Build() => builder.Build();
Expand Down
Loading
Loading