Author: knoguchi
Date: Thu Oct 10 21:09:42 2024
New Revision: 1921247
URL: http://svn.apache.org/viewvc?rev=1921247&view=rev
Log:
PIG-5420: Update accumulo dependency to 1.10.4 (knoguchi)
Modified:
pig/trunk/CHANGES.txt
pig/trunk/ivy.xml
pig/trunk/ivy/libraries-h3.properties
pig/trunk/src/org/apache/pig/backend/hadoop/accumulo/AccumuloBinaryConverter.java
Modified: pig/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/pig/trunk/CHANGES.txt?rev=1921247&r1=1921246&r2=1921247&view=diff
==============================================================================
--- pig/trunk/CHANGES.txt (original)
+++ pig/trunk/CHANGES.txt Thu Oct 10 21:09:42 2024
@@ -23,6 +23,8 @@ Trunk (unreleased changes)
INCOMPATIBLE CHANGES
IMPROVEMENTS
+PIG-5420: Update accumulo dependency to 1.10.4 (knoguchi)
+
PIG-5462: Always update Owasp version to latest (knoguchi)
PIG-5461: E2E environment variables ignored (knoguchi)
Modified: pig/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1921247&r1=1921246&r2=1921247&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Thu Oct 10 21:09:42 2024
@@ -564,6 +564,7 @@
<dependency org="org.apache.accumulo" name="accumulo-tserver"
rev="${accumulo.version}" conf="hadoop3->master"/>
<dependency org="org.apache.accumulo" name="accumulo-master"
rev="${accumulo.version}" conf="hadoop3->master"/>
<dependency org="org.apache.accumulo" name="accumulo-gc"
rev="${accumulo.version}" conf="hadoop3->master"/>
+ <dependency org="org.apache.accumulo" name="accumulo-trace"
rev="${accumulo.version}" conf="hadoop3->master"/>
<!-- for piggybank -->
<dependency org="org.hsqldb" name="hsqldb" rev="${hsqldb.version}"
Modified: pig/trunk/ivy/libraries-h3.properties
URL:
http://svn.apache.org/viewvc/pig/trunk/ivy/libraries-h3.properties?rev=1921247&r1=1921246&r2=1921247&view=diff
==============================================================================
--- pig/trunk/ivy/libraries-h3.properties (original)
+++ pig/trunk/ivy/libraries-h3.properties Thu Oct 10 21:09:42 2024
@@ -18,7 +18,7 @@ hadoop-common.version=3.3.6
hadoop-hdfs.version=3.3.6
hadoop-mapreduce.version=3.3.6
-accumulo.version=1.6.0
+accumulo.version=1.10.4
netty.version=3.10.6.Final
codahale.metrics-core.version=3.0.1
netty-all.version=4.1.77.Final
Modified:
pig/trunk/src/org/apache/pig/backend/hadoop/accumulo/AccumuloBinaryConverter.java
URL:
http://svn.apache.org/viewvc/pig/trunk/src/org/apache/pig/backend/hadoop/accumulo/AccumuloBinaryConverter.java?rev=1921247&r1=1921246&r2=1921247&view=diff
==============================================================================
---
pig/trunk/src/org/apache/pig/backend/hadoop/accumulo/AccumuloBinaryConverter.java
(original)
+++
pig/trunk/src/org/apache/pig/backend/hadoop/accumulo/AccumuloBinaryConverter.java
Thu Oct 10 21:09:42 2024
@@ -23,9 +23,9 @@ import java.io.DataOutputStream;
import java.io.IOException;
import java.math.BigDecimal;
import java.math.BigInteger;
+import java.nio.charset.StandardCharsets;
import java.util.Map;
-import org.apache.accumulo.core.Constants;
import org.apache.pig.LoadStoreCaster;
import org.apache.pig.ResourceSchema.ResourceFieldSchema;
import org.apache.pig.backend.executionengine.ExecException;
@@ -83,7 +83,7 @@ public class AccumuloBinaryConverter imp
@Override
public String bytesToCharArray(byte[] b) throws IOException {
- return new String(b, Constants.UTF8);
+ return new String(b, StandardCharsets.UTF_8);
}
/**
@@ -91,7 +91,7 @@ public class AccumuloBinaryConverter imp
*/
@Override
public DateTime bytesToDateTime(byte[] b) throws IOException {
- String s = new String(b, Constants.UTF8);
+ String s = new String(b, StandardCharsets.UTF_8);
return DateTime.parse(s);
}
@@ -202,7 +202,7 @@ public class AccumuloBinaryConverter imp
@Override
public byte[] toBytes(DateTime dt) throws IOException {
- return dt.toString().getBytes(Constants.UTF8);
+ return dt.toString().getBytes(StandardCharsets.UTF_8);
}
@Override
@@ -249,7 +249,7 @@ public class AccumuloBinaryConverter imp
@Override
public byte[] toBytes(String s) throws IOException {
- return s.getBytes(Constants.UTF8);
+ return s.getBytes(StandardCharsets.UTF_8);
}
/**
