From b04fcb9905e9a1b41b6f53b96c560c8710cc6a7d Mon Sep 17 00:00:00 2001 From: Chengcheng Jin Date: Fri, 16 Aug 2024 16:05:54 +0000 Subject: [PATCH] fix version shim --- .../apache/gluten/utils/InternalRowUtl.scala | 34 +++++++++++++++++++ .../apache/gluten/utils/InternalRowUtl.scala | 34 +++++++++++++++++++ .../apache/gluten/utils/InternalRowUtl.scala | 34 +++++++++++++++++++ .../apache/gluten/utils/InternalRowUtl.scala | 34 +++++++++++++++++++ 4 files changed, 136 insertions(+) create mode 100644 shims/spark32/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala create mode 100644 shims/spark33/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala create mode 100644 shims/spark34/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala create mode 100644 shims/spark35/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala diff --git a/shims/spark32/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala b/shims/spark32/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala new file mode 100644 index 000000000000..32d694371393 --- /dev/null +++ b/shims/spark32/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala @@ -0,0 +1,34 @@ +/* + * 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 org.apache.gluten.utils + +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.catalyst.encoders.RowEncoder +import org.apache.spark.sql.types.StructType + +object InternalRowUtl { + def toString(struct: StructType, rows: Iterator[InternalRow]): String = { + val encoder = RowEncoder(struct).resolveAndBind() + val deserializer = encoder.createDeserializer() + rows.map(deserializer).mkString(System.lineSeparator()) + } + + def toString(struct: StructType, rows: Iterator[InternalRow], start: Int, length: Int): String = { + toString(struct, rows.slice(start, start + length)) + } + +} diff --git a/shims/spark33/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala b/shims/spark33/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala new file mode 100644 index 000000000000..32d694371393 --- /dev/null +++ b/shims/spark33/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala @@ -0,0 +1,34 @@ +/* + * 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 org.apache.gluten.utils + +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.catalyst.encoders.RowEncoder +import org.apache.spark.sql.types.StructType + +object InternalRowUtl { + def toString(struct: StructType, rows: Iterator[InternalRow]): String = { + val encoder = RowEncoder(struct).resolveAndBind() + val deserializer = encoder.createDeserializer() + rows.map(deserializer).mkString(System.lineSeparator()) + } + + def toString(struct: StructType, rows: Iterator[InternalRow], start: Int, length: Int): String = { + toString(struct, rows.slice(start, start + length)) + } + +} diff --git a/shims/spark34/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala b/shims/spark34/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala new file mode 100644 index 000000000000..32d694371393 --- /dev/null +++ b/shims/spark34/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala @@ -0,0 +1,34 @@ +/* + * 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 org.apache.gluten.utils + +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.catalyst.encoders.RowEncoder +import org.apache.spark.sql.types.StructType + +object InternalRowUtl { + def toString(struct: StructType, rows: Iterator[InternalRow]): String = { + val encoder = RowEncoder(struct).resolveAndBind() + val deserializer = encoder.createDeserializer() + rows.map(deserializer).mkString(System.lineSeparator()) + } + + def toString(struct: StructType, rows: Iterator[InternalRow], start: Int, length: Int): String = { + toString(struct, rows.slice(start, start + length)) + } + +} diff --git a/shims/spark35/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala b/shims/spark35/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala new file mode 100644 index 000000000000..73c29c1b9ee5 --- /dev/null +++ b/shims/spark35/src/main/scala/org/apache/gluten/utils/InternalRowUtl.scala @@ -0,0 +1,34 @@ +/* + * 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 org.apache.gluten.utils + +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.catalyst.encoders.ExpressionEncoder +import org.apache.spark.sql.types.StructType + +object InternalRowUtl { + def toString(struct: StructType, rows: Iterator[InternalRow]): String = { + val encoder = ExpressionEncoder(struct).resolveAndBind() + val deserializer = encoder.createDeserializer() + rows.map(deserializer).mkString(System.lineSeparator()) + } + + def toString(struct: StructType, rows: Iterator[InternalRow], start: Int, length: Int): String = { + toString(struct, rows.slice(start, start + length)) + } + +}