Skip to content

Commit 2a10965

Browse files
gengdy1545gengdy1545
authored
[Issue #1211] rename PixelsWriterBuffer to PixelsWriteBuffer (#1228)
1 parent 4fb1fbc commit 2a10965

File tree

11 files changed

+59
-59
lines changed

11 files changed

+59
-59
lines changed

‎pixels-common/src/main/java/io/pixelsdb/pixels/common/retina/RetinaService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -361,16 +361,16 @@ public boolean reclaimVisibility(long fileId, int[] rgIds, long timestamp) throw
361361
return true;
362362
}
363363

364-
public RetinaProto.GetWriterBufferResponse getWriterBuffer(String schemaName, String tableName, long timeStamp) throws RetinaException
364+
public RetinaProto.GetWriteBufferResponse getWriteBuffer(String schemaName, String tableName, long timeStamp) throws RetinaException
365365
{
366366
String token = UUID.randomUUID().toString();
367-
RetinaProto.GetWriterBufferRequest request = RetinaProto.GetWriterBufferRequest.newBuilder()
367+
RetinaProto.GetWriteBufferRequest request = RetinaProto.GetWriteBufferRequest.newBuilder()
368368
.setHeader(RetinaProto.RequestHeader.newBuilder().setToken(token).build())
369369
.setSchemaName(schemaName)
370370
.setTableName(tableName)
371371
.setTimestamp(timeStamp)
372372
.build();
373-
RetinaProto.GetWriterBufferResponse response = this.stub.getWriterBuffer(request);
373+
RetinaProto.GetWriteBufferResponse response = this.stub.getWriteBuffer(request);
374374
if (response.getHeader().getErrorCode() != 0)
375375
{
376376
throw new RetinaException("Schema: " + schemaName + "\tTable: " + tableName + ", failed to get superversion: " + response.getHeader().getErrorCode()
@@ -383,19 +383,19 @@ public RetinaProto.GetWriterBufferResponse getWriterBuffer(String schemaName, St
383383
return response;
384384
}
385385

386-
public boolean addWriterBuffer(String schemaName, String tableName) throws RetinaException
386+
public boolean addWriteBuffer(String schemaName, String tableName) throws RetinaException
387387
{
388388
/**
389389
* Since pixels-core was not introduced, TypeDescription cannot be used to represent the schema.
390390
* Ultimately, it is converted to a string and transmitted via bytes, so it does not matter.
391391
*/
392392
String token = UUID.randomUUID().toString();
393-
RetinaProto.AddWriterBufferRequest request = RetinaProto.AddWriterBufferRequest.newBuilder()
393+
RetinaProto.AddWriteBufferRequest request = RetinaProto.AddWriteBufferRequest.newBuilder()
394394
.setHeader(RetinaProto.RequestHeader.newBuilder().setToken(token).build())
395395
.setSchemaName(schemaName)
396396
.setTableName(tableName)
397397
.build();
398-
RetinaProto.AddWriterBufferResponse response = this.stub.addWriterBuffer(request);
398+
RetinaProto.AddWriteBufferResponse response = this.stub.addWriteBuffer(request);
399399
if (response.getHeader().getErrorCode() != 0)
400400
{
401401
throw new RetinaException("Failed to add writer: " + response.getHeader().getErrorCode()

‎pixels-core/src/test/java/io/pixelsdb/pixels/core/reader/TestPixelsRecordReaderBufferImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void testReadBatch() throws RetinaException, IOException
5151
RetinaService retinaService = RetinaService.Instance();
5252
assert retinaService.isEnabled();
5353
long timeStamp = 100000;
54-
RetinaProto.GetWriterBufferResponse superVersion = retinaService.getWriterBuffer(schemaName, tableName, timeStamp);
54+
RetinaProto.GetWriteBufferResponse superVersion = retinaService.getWriteBuffer(schemaName, tableName, timeStamp);
5555
TypeDescription typeDescription = null;
5656

5757

‎pixels-daemon/src/main/java/io/pixelsdb/pixels/daemon/metadata/MetadataServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ public void createTable(MetadataProto.CreateTableRequest request,
355355
}
356356
if (allSuccess)
357357
{
358-
// Issue #930: corresponding writerBuffer was not created when creating table
358+
// Issue #930: corresponding writeBuffer was not created when creating table
359359
// Issue #1218: support multi-retina
360360
NodeService nodeService = NodeService.Instance();
361361
List<NodeProto.NodeInfo> retinaList = nodeService.getRetinaList();
@@ -365,7 +365,7 @@ public void createTable(MetadataProto.CreateTableRequest request,
365365
RetinaService retinaService = RetinaService.CreateInstance(retinaNode.getAddress(), retinaPort);
366366
if (retinaService.isEnabled())
367367
{
368-
if (!retinaService.addWriterBuffer(request.getSchemaName(), request.getTableName()))
368+
if (!retinaService.addWriteBuffer(request.getSchemaName(), request.getTableName()))
369369
{
370370
headerBuilder.setErrorCode(METADATA_ADD_RETINA_BUFFER_FAILED)
371371
.setErrorMsg("failed to add retina's writer buffer for table '" +

‎pixels-daemon/src/main/java/io/pixelsdb/pixels/daemon/retina/RetinaServerImpl.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public RetinaServerImpl()
101101
this.retinaResourceManager.addVisibility(filePath);
102102
}
103103

104-
this.retinaResourceManager.addWriterBuffer(schema.getName(), table.getName());
104+
this.retinaResourceManager.addWriteBuffer(schema.getName(), table.getName());
105105
}
106106
}
107107
} catch (Exception e)
@@ -587,39 +587,39 @@ public void reclaimVisibility(RetinaProto.ReclaimVisibilityRequest request,
587587
}
588588

589589
@Override
590-
public void addWriterBuffer(RetinaProto.AddWriterBufferRequest request,
591-
StreamObserver<RetinaProto.AddWriterBufferResponse> responseObserver)
590+
public void addWriteBuffer(RetinaProto.AddWriteBufferRequest request,
591+
StreamObserver<RetinaProto.AddWriteBufferResponse> responseObserver)
592592
{
593593
RetinaProto.ResponseHeader.Builder headerBuilder = RetinaProto.ResponseHeader.newBuilder()
594594
.setToken(request.getHeader().getToken());
595595
try
596596
{
597-
this.retinaResourceManager.addWriterBuffer(request.getSchemaName(), request.getTableName());
597+
this.retinaResourceManager.addWriteBuffer(request.getSchemaName(), request.getTableName());
598598

599-
RetinaProto.AddWriterBufferResponse response = RetinaProto.AddWriterBufferResponse.newBuilder()
599+
RetinaProto.AddWriteBufferResponse response = RetinaProto.AddWriteBufferResponse.newBuilder()
600600
.setHeader(headerBuilder.build()).build();
601601
responseObserver.onNext(response);
602602
responseObserver.onCompleted();
603603
} catch (RetinaException e)
604604
{
605605
headerBuilder.setErrorCode(1).setErrorMsg(e.getMessage());
606-
responseObserver.onNext(RetinaProto.AddWriterBufferResponse.newBuilder()
606+
responseObserver.onNext(RetinaProto.AddWriteBufferResponse.newBuilder()
607607
.setHeader(headerBuilder.build())
608608
.build());
609609
responseObserver.onCompleted();
610610
}
611611
}
612612

613613
@Override
614-
public void getWriterBuffer(RetinaProto.GetWriterBufferRequest request,
615-
StreamObserver<RetinaProto.GetWriterBufferResponse> responseObserver)
614+
public void getWriteBuffer(RetinaProto.GetWriteBufferRequest request,
615+
StreamObserver<RetinaProto.GetWriteBufferResponse> responseObserver)
616616
{
617617
RetinaProto.ResponseHeader.Builder headerBuilder = RetinaProto.ResponseHeader.newBuilder()
618618
.setToken(request.getHeader().getToken());
619619

620620
try
621621
{
622-
RetinaProto.GetWriterBufferResponse.Builder response = this.retinaResourceManager.getWriterBuffer(
622+
RetinaProto.GetWriteBufferResponse.Builder response = this.retinaResourceManager.getWriteBuffer(
623623
request.getSchemaName(), request.getTableName(), request.getTimestamp());
624624
response.setHeader(headerBuilder);
625625

@@ -628,7 +628,7 @@ public void getWriterBuffer(RetinaProto.GetWriterBufferRequest request,
628628
} catch (RetinaException e)
629629
{
630630
headerBuilder.setErrorCode(1).setErrorMsg(e.getMessage());
631-
responseObserver.onNext(RetinaProto.GetWriterBufferResponse.newBuilder()
631+
responseObserver.onNext(RetinaProto.GetWriteBufferResponse.newBuilder()
632632
.setHeader(headerBuilder.build())
633633
.build());
634634
responseObserver.onCompleted();
@@ -660,4 +660,4 @@ public static void validateOrderedOrCompactPaths(List<Path> paths) throws Retina
660660
}
661661
}
662662

663-
}
663+
}

‎pixels-retina/src/main/java/io/pixelsdb/pixels/retina/ObjectStorageManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ private ObjectStorageManager() throws RetinaException
4646
}
4747
this.path = folder;
4848

49-
String storageSchema = config.getProperty("retina.buffer.object.storage.scheme");
49+
String storageScheme = config.getProperty("retina.buffer.object.storage.scheme");
5050
try
5151
{
52-
switch(storageSchema)
52+
switch(storageScheme)
5353
{
5454
case "s3":
5555
this.storage = StorageFactory.Instance().getStorage(Storage.Scheme.s3);
@@ -58,7 +58,7 @@ private ObjectStorageManager() throws RetinaException
5858
this.storage = StorageFactory.Instance().getStorage(Storage.Scheme.minio);
5959
break;
6060
default:
61-
throw new RetinaException("Unsupported storage scheme: " + storageSchema);
61+
throw new RetinaException("Unsupported storage scheme: " + storageScheme);
6262
}
6363
} catch (IOException e)
6464
{

pixels-retina/src/main/java/io/pixelsdb/pixels/retina/PixelsWriterBuffer.java renamed to pixels-retina/src/main/java/io/pixelsdb/pixels/retina/PixelsWriteBuffer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@
5858
* | CDC | ===> | memTable -> immutable memTable | -> | shared storage | -> | disk file |
5959
* ----- -------------------------------- ---------------- -----------
6060
*/
61-
public class PixelsWriterBuffer
61+
public class PixelsWriteBuffer
6262
{
63-
private static final Logger logger = LogManager.getLogger(PixelsWriterBuffer.class);
63+
private static final Logger logger = LogManager.getLogger(PixelsWriteBuffer.class);
6464

6565
private final long tableId;
6666

@@ -113,7 +113,7 @@ public class PixelsWriterBuffer
113113
private AtomicLong maxObjectKey;
114114
private String retinaHostName;
115115

116-
public PixelsWriterBuffer(long tableId, TypeDescription schema, Path targetOrderedDirPath,
116+
public PixelsWriteBuffer(long tableId, TypeDescription schema, Path targetOrderedDirPath,
117117
Path targetCompactDirPath, String retinaHostName) throws RetinaException
118118
{
119119
this.tableId = tableId;

‎pixels-retina/src/main/java/io/pixelsdb/pixels/retina/RetinaResourceManager.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class RetinaResourceManager
5757
private static final Logger logger = LogManager.getLogger(RetinaResourceManager.class);
5858
private final MetadataService metadataService;
5959
private final Map<String, RGVisibility> rgVisibilityMap;
60-
private final Map<String, PixelsWriterBuffer> pixelsWriterBufferMap;
60+
private final Map<String, PixelsWriteBuffer> pixelsWriteBufferMap;
6161
private String retinaHostName;
6262

6363
// GC related fields
@@ -67,7 +67,7 @@ private RetinaResourceManager()
6767
{
6868
this.metadataService = MetadataService.Instance();
6969
this.rgVisibilityMap = new ConcurrentHashMap<>();
70-
this.pixelsWriterBufferMap = new ConcurrentHashMap<>();
70+
this.pixelsWriteBufferMap = new ConcurrentHashMap<>();
7171

7272
ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(r -> {
7373
Thread t = new Thread(r, "retina-gc-thread");
@@ -181,7 +181,7 @@ public void deleteRecord(IndexProto.RowLocation rowLocation, long timestamp) thr
181181
deleteRecord(rowLocation.getFileId(), rowLocation.getRgId(), rowLocation.getRgRowOffset(), timestamp);
182182
}
183183

184-
public void addWriterBuffer(String schemaName, String tableName) throws RetinaException
184+
public void addWriteBuffer(String schemaName, String tableName) throws RetinaException
185185
{
186186
try
187187
{
@@ -199,10 +199,10 @@ public void addWriterBuffer(String schemaName, String tableName) throws RetinaEx
199199
List<String> columnTypes = columns.stream().map(Column::getType).collect(Collectors.toList());
200200
TypeDescription schema = TypeDescription.createSchemaFromStrings(columnNames, columnTypes);
201201

202-
PixelsWriterBuffer pixelsWriterBuffer = new PixelsWriterBuffer(latestLayout.getTableId(),
202+
PixelsWriteBuffer pixelsWriteBuffer = new PixelsWriteBuffer(latestLayout.getTableId(),
203203
schema, orderedPaths.get(0), compactPaths.get(0), retinaHostName);
204-
String writerBufferKey = schemaName + "_" + tableName;
205-
pixelsWriterBufferMap.put(writerBufferKey, pixelsWriterBuffer);
204+
String writeBufferKey = schemaName + "_" + tableName;
205+
pixelsWriteBufferMap.put(writeBufferKey, pixelsWriteBuffer);
206206
} catch (Exception e)
207207
{
208208
throw new RetinaException(String.format("Failed to add writer buffer for schema %s, table %s", schemaName, tableName), e);
@@ -212,8 +212,8 @@ public void addWriterBuffer(String schemaName, String tableName) throws RetinaEx
212212
public IndexProto.PrimaryIndexEntry.Builder insertRecord(String schemaName, String tableName, byte[][] colValues, long timestamp) throws RetinaException
213213
{
214214
IndexProto.PrimaryIndexEntry.Builder builder = IndexProto.PrimaryIndexEntry.newBuilder();
215-
PixelsWriterBuffer writerBuffer = checkPixelsWriterBuffer(schemaName, tableName);
216-
builder.setRowId(writerBuffer.addRow(colValues, timestamp, builder.getRowLocationBuilder()));
215+
PixelsWriteBuffer writeBuffer = checkPixelsWriteBuffer(schemaName, tableName);
216+
builder.setRowId(writeBuffer.addRow(colValues, timestamp, builder.getRowLocationBuilder()));
217217
return builder;
218218
}
219219

@@ -242,13 +242,13 @@ private RetinaProto.VisibilityBitmap getVisibilityBitmapSlice(long[] visibilityB
242242
.build();
243243
}
244244

245-
public RetinaProto.GetWriterBufferResponse.Builder getWriterBuffer(String schemaName, String tableName, long timestamp) throws RetinaException
245+
public RetinaProto.GetWriteBufferResponse.Builder getWriteBuffer(String schemaName, String tableName, long timestamp) throws RetinaException
246246
{
247-
RetinaProto.GetWriterBufferResponse.Builder responseBuilder = RetinaProto.GetWriterBufferResponse.newBuilder();
247+
RetinaProto.GetWriteBufferResponse.Builder responseBuilder = RetinaProto.GetWriteBufferResponse.newBuilder();
248248

249249
// get super version
250-
PixelsWriterBuffer writerBuffer = checkPixelsWriterBuffer(schemaName, tableName);
251-
SuperVersion superVersion = writerBuffer.getCurrentVersion();
250+
PixelsWriteBuffer writeBuffer = checkPixelsWriteBuffer(schemaName, tableName);
251+
SuperVersion superVersion = writeBuffer.getCurrentVersion();
252252
MemTable activeMemtable = superVersion.getActiveMemTable();
253253
List<MemTable> immutableMemTables = superVersion.getImmutableMemTables();
254254
List<ObjectEntry> objectEntries = superVersion.getObjectEntries();
@@ -340,15 +340,15 @@ private RGVisibility checkRGVisibility(long fileId, int rgId) throws RetinaExcep
340340
/**
341341
* Check if the writer buffer exists for the given schema and table.
342342
*/
343-
private PixelsWriterBuffer checkPixelsWriterBuffer(String schema, String table) throws RetinaException
343+
private PixelsWriteBuffer checkPixelsWriteBuffer(String schema, String table) throws RetinaException
344344
{
345-
String writerBufferKey = schema + "_" + table;
346-
PixelsWriterBuffer writerBuffer = this.pixelsWriterBufferMap.get(writerBufferKey);
347-
if (writerBuffer == null)
345+
String writeBufferKey = schema + "_" + table;
346+
PixelsWriteBuffer writeBuffer = this.pixelsWriteBufferMap.get(writeBufferKey);
347+
if (writeBuffer == null)
348348
{
349349
throw new RetinaException(String.format("Writer buffer not found for schema: %s, table: %s", schema, table));
350350
}
351-
return writerBuffer;
351+
return writeBuffer;
352352
}
353353

354354
/**

‎pixels-retina/src/test/java/io/pixelsdb/pixels/retina/TestFlushObject.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public void setup()
4949
{
5050
try
5151
{
52-
retinaResourceManager.addWriterBuffer(schemaName, tableName_1);
53-
retinaResourceManager.addWriterBuffer(schemaName, tableName_2);
52+
retinaResourceManager.addWriteBuffer(schemaName, tableName_1);
53+
retinaResourceManager.addWriteBuffer(schemaName, tableName_2);
5454
} catch (RetinaException e)
5555
{
5656
throw new RuntimeException("Failed to setup RetinaResourceManager", e);

pixels-retina/src/test/java/io/pixelsdb/pixels/retina/TestPixelsWriterBuffer.java renamed to pixels-retina/src/test/java/io/pixelsdb/pixels/retina/TestPixelsWriteBuffer.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
import java.util.concurrent.ExecutorService;
3434
import java.util.concurrent.Executors;
3535
import java.util.concurrent.atomic.AtomicBoolean;
36-
public class TestPixelsWriterBuffer
36+
public class TestPixelsWriteBuffer
3737
{
3838
private List<String> columnNames = new ArrayList<>();
3939
private List<String> columnTypes = new ArrayList<>();
4040
private TypeDescription schema;
4141
Path targetOrderDirPath;
4242
Path targetCompactDirPath;
43-
PixelsWriterBuffer buffer;
43+
PixelsWriteBuffer buffer;
4444
@Before
4545
public void setup()
4646
{
@@ -58,7 +58,7 @@ public void setup()
5858
columnTypes.add("int");
5959

6060
schema = TypeDescription.createSchemaFromStrings(columnNames, columnTypes);
61-
buffer = new PixelsWriterBuffer(0L, schema, targetOrderDirPath, targetCompactDirPath, "localhost"); // table id get from mysql `TBLS` table
61+
buffer = new PixelsWriteBuffer(0L, schema, targetOrderDirPath, targetCompactDirPath, "localhost"); // table id get from mysql `TBLS` table
6262
} catch (Exception e)
6363
{
6464
System.out.println("setup error: " + e);

‎pixels-retina/src/test/java/io/pixelsdb/pixels/retina/TestRetinaResourceManager.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,20 +81,20 @@ private byte[][] createTpchNationRow(long nationKey, String name, long regionKey
8181
}
8282

8383
@Test
84-
public void testWriterBuffer()
84+
public void testWriteBuffer()
8585
{
8686
try
8787
{
8888
String schemaName = "tpch";
8989
String tableName = "nation";
90-
retinaResourceManager.addWriterBuffer(schemaName, tableName);
90+
retinaResourceManager.addWriteBuffer(schemaName, tableName);
9191

9292
// insert data
9393
byte[][] colValues = createTpchNationRow(2333, "ALGERIA",
9494
0, "haggle. carefully final deposits detect slyly agai");
9595
retinaResourceManager.insertRecord(schemaName, tableName, colValues, 5);
96-
RetinaProto.GetWriterBufferResponse response =
97-
retinaResourceManager.getWriterBuffer(schemaName, tableName, 0).build();
96+
RetinaProto.GetWriteBufferResponse response =
97+
retinaResourceManager.getWriteBuffer(schemaName, tableName, 0).build();
9898
System.out.println(response.getData().isEmpty() ? "empty" :
9999
VectorizedRowBatch.deserialize(response.getData().toByteArray()));
100100
System.out.println(response.getBitmaps(0).getBitmapCount());

0 commit comments

Comments
 (0)