ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [20/38] incubator-ignite git commit: # Renaming
Date Fri, 05 Dec 2014 08:44:47 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
index e425bc8..3175792 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsProcessorSelfTest.java
@@ -569,7 +569,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest
{
 
         // Validate renamed during reading.
 
-        try (GridGgfsInputStream in0 = ggfs.open(path("/A/a"))) {
+        try (IgniteFsInputStream in0 = ggfs.open(path("/A/a"))) {
             // Rename file.
             ggfs.rename(path("/A/a"), path("/b"));
 
@@ -812,7 +812,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest
{
 
         byte[] readBuf = new byte[chunkSize];
 
-        try (GridGgfsInputStream in = ggfs.open(path)) {
+        try (IgniteFsInputStream in = ggfs.open(path)) {
             long pos = 0;
 
             for (int k = 0; k < 2 * cnt; k++) {
@@ -875,7 +875,7 @@ public class GridGgfsProcessorSelfTest extends GridGgfsCommonAbstractTest
{
      */
     private String read(String path) throws Exception {
 
-        try (GridGgfsInputStream in = ggfs.open(path(path))) {
+        try (IgniteFsInputStream in = ggfs.open(path(path))) {
             return IOUtils.toString(in, UTF_8);
         }
     }

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
index 730338a..eff53d1 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsSizeSelfTest.java
@@ -341,7 +341,7 @@ public class GridGgfsSizeSelfTest extends GridGgfsCommonAbstractTest {
             for (int i = 0; i < GRID_CNT; i++) {
                 int total = 0;
 
-                GridGgfsInputStream is = ggfs(i).open(file.path());
+                IgniteFsInputStream is = ggfs(i).open(file.path());
 
                 while (true) {
                     int read = is.read(buf);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
index e4f5145..d9f6f15 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsStreamsSelfTest.java
@@ -265,7 +265,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest
{
             assertTrue(ranges.get(1).endOffset() == 3 * CFG_BLOCK_SIZE - 1);
 
             // Validate data read after colocated writes.
-            try (GridGgfsInputStream in = fs2.open(path)) {
+            try (IgniteFsInputStream in = fs2.open(path)) {
                 // Validate first part of file.
                 for (int i = 0; i < CFG_BLOCK_SIZE * 3 / 2; i++)
                     assertEquals((byte)1, in.read());
@@ -340,7 +340,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest
{
         info("Read and validate saved file: " + path);
 
         final InputStream expIn = new GridGgfsTestInputStream(size, salt);
-        final GridGgfsInputStream actIn = fs.open(path, CFG_BLOCK_SIZE * READING_THREADS_CNT
* 11 / 10);
+        final IgniteFsInputStream actIn = fs.open(path, CFG_BLOCK_SIZE * READING_THREADS_CNT
* 11 / 10);
 
         // Validate continuous reading of whole file.
         assertEqualStreams(expIn, actIn, size, null);
@@ -403,7 +403,7 @@ public class GridGgfsStreamsSelfTest extends GridGgfsCommonAbstractTest
{
      * @param seek Seek to use async position-based reading or {@code null} to use simple
continuous reading.
      * @throws IOException In case of any IO exception.
      */
-    private void assertEqualStreams(InputStream expIn, GridGgfsInputStream actIn,
+    private void assertEqualStreams(InputStream expIn, IgniteFsInputStream actIn,
         @Nullable Long expSize, @Nullable Long seek) throws IOException {
         if (seek != null)
             expIn.skip(seek);

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
index 35f5c9a..8eb4dbb 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/GridGgfsTaskSelfTest.java
@@ -267,7 +267,7 @@ public class GridGgfsTaskSelfTest extends GridGgfsCommonAbstractTest {
         private ComputeJobContext ctx;
 
         /** {@inheritDoc} */
-        @Override public Object execute(IgniteFs ggfs, GridGgfsFileRange range, GridGgfsInputStream
in)
+        @Override public Object execute(IgniteFs ggfs, GridGgfsFileRange range, IgniteFsInputStream
in)
             throws GridException, IOException {
             assert ignite != null;
             assert ses != null;

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
index fcbb563..d348944 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsAbstractRecordResolverSelfTest.java
@@ -145,7 +145,7 @@ public class GridGgfsAbstractRecordResolverSelfTest extends GridCommonAbstractTe
      * @return Input stream.
      * @throws Exception In case of exception.
      */
-    protected GridGgfsInputStream read() throws Exception {
+    protected IgniteFsInputStream read() throws Exception {
         return ggfs.open(FILE);
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java
index a187551..3ae1929 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsByteDelimiterRecordResolverSelfTest.java
@@ -282,7 +282,7 @@ public class GridGgfsByteDelimiterRecordResolverSelfTest extends GridGgfsAbstrac
 
         GridGgfsFileRange split;
 
-        try (GridGgfsInputStream is = read()) {
+        try (IgniteFsInputStream is = read()) {
             split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
         }
 
@@ -308,7 +308,7 @@ public class GridGgfsByteDelimiterRecordResolverSelfTest extends GridGgfsAbstrac
 
         GridGgfsFileRange split;
 
-        try (GridGgfsInputStream is = read()) {
+        try (IgniteFsInputStream is = read()) {
             split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java
index 035e5ac..7170831 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsFixedLengthRecordResolverSelfTest.java
@@ -94,7 +94,7 @@ public class GridGgfsFixedLengthRecordResolverSelfTest extends GridGgfsAbstractR
 
         GridGgfsFileRange split;
 
-        try (GridGgfsInputStream is = read()) {
+        try (IgniteFsInputStream is = read()) {
             split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
         }
 
@@ -120,7 +120,7 @@ public class GridGgfsFixedLengthRecordResolverSelfTest extends GridGgfsAbstractR
 
         GridGgfsFileRange split;
 
-        try (GridGgfsInputStream is = read()) {
+        try (IgniteFsInputStream is = read()) {
             split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java
index a2a2a97..7ed1a6a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsNewLineDelimiterRecordResolverSelfTest.java
@@ -78,7 +78,7 @@ public class GridGgfsNewLineDelimiterRecordResolverSelfTest extends GridGgfsAbst
 
         GridGgfsFileRange split;
 
-        try (GridGgfsInputStream is = read()) {
+        try (IgniteFsInputStream is = read()) {
             split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
         }
 
@@ -103,7 +103,7 @@ public class GridGgfsNewLineDelimiterRecordResolverSelfTest extends GridGgfsAbst
 
         GridGgfsFileRange split;
 
-        try (GridGgfsInputStream is = read()) {
+        try (IgniteFsInputStream is = read()) {
             split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java
b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java
index c62fdda..b9e0f7a 100644
--- a/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java
+++ b/modules/core/src/test/java/org/gridgain/grid/kernal/processors/ggfs/split/GridGgfsStringDelimiterRecordResolverSelfTest.java
@@ -84,7 +84,7 @@ public class GridGgfsStringDelimiterRecordResolverSelfTest extends GridGgfsAbstr
 
         GridGgfsFileRange split;
 
-        try (GridGgfsInputStream is = read()) {
+        try (IgniteFsInputStream is = read()) {
             split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
         }
 
@@ -110,7 +110,7 @@ public class GridGgfsStringDelimiterRecordResolverSelfTest extends GridGgfsAbstr
 
         GridGgfsFileRange split;
 
-        try (GridGgfsInputStream is = read()) {
+        try (IgniteFsInputStream is = read()) {
             split = rslvr.resolveRecords(ggfs, is, split(suggestedStart, suggestedLen));
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
index c3e0dae..091091a 100644
--- a/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
+++ b/modules/hadoop/src/main/java/org/gridgain/grid/kernal/ggfs/hadoop/GridGgfsHadoopFileSystemWrapper.java
@@ -94,7 +94,7 @@ public class GridGgfsHadoopFileSystemWrapper implements IgniteFsFileSystem,
Auto
             (e.getMessage() != null && e.getMessage().contains("Failed on local"));
 
         IgniteFsException ggfsErr = !wrongVer ? cast(detailMsg, e) :
-            new GridGgfsInvalidHdfsVersionException("HDFS version you are connecting to differs
from local " +
+            new IgniteFsInvalidHdfsVersionException("HDFS version you are connecting to differs
from local " +
                 "version.", e);
 
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
index 5e70bd3..edeec58 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoop20FileSystemAbstractSelfTest.java
@@ -322,7 +322,7 @@ public abstract class GridGgfsHadoop20FileSystemAbstractSelfTest extends
GridGgf
         for (int i = 0; i < 4; i++) {
             IgniteFs ggfs = grid(i).fileSystem("ggfs");
 
-            GridGgfsMetrics metrics = ggfs.metrics();
+            IgniteFsMetrics metrics = ggfs.metrics();
 
             used += metrics.localSpaceSize();
             max += metrics.maxSpaceSize();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
index 516fd23..1f05f16 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/ggfs/GridGgfsHadoopDualAbstractSelfTest.java
@@ -269,7 +269,7 @@ public abstract class GridGgfsHadoopDualAbstractSelfTest extends GridGgfsCommonA
         // Try reading the third block. Should fail.
         GridTestUtils.assertThrows(log, new Callable<Object>() {
             @Override public Object call() throws Exception {
-                GridGgfsInputStream in0 = ggfs.open(FILE);
+                IgniteFsInputStream in0 = ggfs.open(FILE);
 
                 in0.seek(blockSize * 2);
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1d26f5fd/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
index 0c75e80..1679f80 100644
--- a/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
+++ b/modules/hadoop/src/test/java/org/gridgain/grid/kernal/processors/hadoop/GridHadoopDefaultMapReducePlannerSelfTest.java
@@ -852,7 +852,7 @@ public class GridHadoopDefaultMapReducePlannerSelfTest extends GridHadoopAbstrac
         }
 
         /** {@inheritDoc} */
-        @Override public GridGgfsMetrics metrics() throws GridException {
+        @Override public IgniteFsMetrics metrics() throws GridException {
             return null;
         }
 


Mime
View raw message